Merge pull request #6132 from urbit/philip/grid-copy

grid: only block on live apps
This commit is contained in:
Zach Alberico 2022-12-05 16:14:40 -08:00 committed by GitHub
commit da8496e01a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -1,7 +1,7 @@
:~ title+'System' :~ title+'System'
info+'An app launcher for Urbit.' info+'An app launcher for Urbit.'
color+0xee.5432 color+0xee.5432
glob-http+['https://bootstrap.urbit.org/glob-0v7.oqalc.b9vf3.5ft2u.2f86m.7oa8v.glob' 0v7.oqalc.b9vf3.5ft2u.2f86m.7oa8v] glob-http+['https://bootstrap.urbit.org/glob-0vm65f9.defur.eqhgj.62ls6.9v9lf.glob' 0vm65f9.defur.eqhgj.62ls6.9v9lf]
::glob-ames+~zod^0v0 ::glob-ames+~zod^0v0
base+'grid' base+'grid'
version+[1 1 6] version+[1 1 6]

View File

@ -39,7 +39,7 @@ export const RuntimeLagNotification = () => (
); );
function pikeIsBlocked(newKelvin: number, pike: Pike) { function pikeIsBlocked(newKelvin: number, pike: Pike) {
return !pike.wefts?.find(({ kelvin }) => kelvin === newKelvin); return pike.zest === 'live' && !pike.wefts?.find(({ kelvin }) => kelvin === newKelvin);
} }
export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkLid }) => { export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkLid }) => {
@ -127,10 +127,9 @@ export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkL
className="space-y-6 text-base tracking-tight" className="space-y-6 text-base tracking-tight"
containerClass="w-full max-w-md" containerClass="w-full max-w-md"
> >
<h2 className="h4">Archive ({count}) Apps and Apply System Update</h2> <h2 className="h4">Suspend ({count}) Apps and Apply System Update</h2>
<p> <p>
The following apps will be archived until their developer provides a compatible update The following apps will be suspended until their developer provides an update.
to your system.
</p> </p>
<AppList <AppList
apps={blockedCharges} apps={blockedCharges}
@ -143,7 +142,7 @@ export const BaseBlockedNotification = ({ bin, lid }: { bin: HarkBin, lid: HarkL
Cancel Cancel
</DialogClose> </DialogClose>
<DialogClose as={Button} variant="caution" onClick={handleArchiveApps}> <DialogClose as={Button} variant="caution" onClick={handleArchiveApps}>
Archive Apps Suspend Apps and Upgrade
</DialogClose> </DialogClose>
</div> </div>
</DialogContent> </DialogContent>