From 83f65014181b3366d89428ccffe4155e33cc3f33 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Tue, 26 Oct 2021 11:53:48 -0500 Subject: [PATCH 1/8] hark-graph-hook: fix dm notifications --- pkg/landscape/app/hark-graph-hook.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/landscape/app/hark-graph-hook.hoon b/pkg/landscape/app/hark-graph-hook.hoon index 0f18e725a..5e7a628dd 100644 --- a/pkg/landscape/app/hark-graph-hook.hoon +++ b/pkg/landscape/app/hark-graph-hook.hoon @@ -464,7 +464,7 @@ ++ should-notify ?| is-mention (~(has in watching) [rid parent-idx]) - =(mark `%graph-validator-dm) + =(mark %graph-validator-dm) == :: ++ add-note From 4ba1223c3f99d2dcc4be9b6d42f1d35c3c13b262 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Tue, 26 Oct 2021 12:59:35 -0500 Subject: [PATCH 2/8] hark-store: cap size of half-open timeboxes Prevents unnecessarily large timeboxes from accumulating, which can negatively impact performance. --- pkg/garden/app/hark-store.hoon | 5 +++-- pkg/garden/tests/app/hark-store.hoon | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pkg/garden/app/hark-store.hoon b/pkg/garden/app/hark-store.hoon index adef676f1..651a1c6a5 100644 --- a/pkg/garden/app/hark-store.hoon +++ b/pkg/garden/app/hark-store.hoon @@ -403,11 +403,12 @@ (~(put by half-open) bin now.bowl) =/ existing (get-lid archive/time bin) =/ new (merge-notification existing note) + =? half-open (lth 30 (lent body.new)) + (~(del by half-open) bin) =. poke-core (put-lid archive/time bin new) =. poke-core (del-lid lid bin) - =. poke-core (give %archived now.bowl unseen+~ (~(got re archive) time bin)) - =. poke-core (give %archived now.bowl seen+~ (~(got re archive) time bin)) + =. poke-core (give %archived time lid (~(got re archive) time bin)) $(bins t.bins) :: ++ read-count diff --git a/pkg/garden/tests/app/hark-store.hoon b/pkg/garden/tests/app/hark-store.hoon index fe06b6d01..c42f5334c 100644 --- a/pkg/garden/tests/app/hark-store.hoon +++ b/pkg/garden/tests/app/hark-store.hoon @@ -30,7 +30,7 @@ [%read-count place] :: +$ state - $: %8 + $: %9 places=(map place:hark stats:hark) seen=timebox:hark unseen=timebox:hark @@ -87,4 +87,17 @@ =/ actual-archive=notification:hark (~(got re archive.state) (add *time ~s1) bin) (expect-eq !>(expected-archive) !>(actual-archive)) +:: +++ test-half-open-capped + =| run=@ud + |- + ?: =(run 31) + =+ !<(=state on-save:agent) + (expect-eq !>(~) !>(half-open.state)) + =^ movs agent + (~(on-poke agent (bowl run)) %hark-action !>((add-note run))) + =^ mavs agent + (~(on-poke agent (bowl run)) %hark-action !>(read-count)) + $(run +(run)) +:: -- From 2777bd99421e0bfec24415cdbcadc3319ecc6ade Mon Sep 17 00:00:00 2001 From: Hunter Miller Date: Tue, 26 Oct 2021 17:01:56 -0500 Subject: [PATCH 3/8] grid: updated glob --- pkg/garden/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/garden/desk.docket-0 b/pkg/garden/desk.docket-0 index b1df32528..be2d8630d 100644 --- a/pkg/garden/desk.docket-0 +++ b/pkg/garden/desk.docket-0 @@ -1,7 +1,7 @@ :~ title+'System' info+'An app launcher for Urbit.' color+0xee.5432 - glob-http+['https://bootstrap.urbit.org/glob-0v5.slogg.kqr7c.dm79h.c99un.6d9om.glob' 0v5.slogg.kqr7c.dm79h.c99un.6d9om] + glob-http+['https://bootstrap.urbit.org/glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob' 0v5.fdf99.nph65.qecq3.ncpjn.q13mb] ::glob-ames+~zod^0v0 base+'grid' version+[1 0 0] From da1495e398bd8852af35275f8365e3bc5d8aa4e8 Mon Sep 17 00:00:00 2001 From: fang Date: Wed, 27 Oct 2021 01:15:03 +0200 Subject: [PATCH 4/8] docket: note browser compatibility on upload page --- pkg/garden/app/docket.hoon | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/garden/app/docket.hoon b/pkg/garden/app/docket.hoon index 7321694b8..ecff8ebf2 100644 --- a/pkg/garden/app/docket.hoon +++ b/pkg/garden/app/docket.hoon @@ -478,6 +478,8 @@ """ ;li:"glob!" == + (safari and internet explorer do not support uploading directory + trees properly. please glob from other browsers.) ;+ ?: =(~ desks) ;p:"no desks eligible for glob upload" ;form(method "post", enctype "multipart/form-data") From 2871ea87d5d5bc13929b595e2678ce892133e088 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Thu, 28 Oct 2021 09:04:00 -0500 Subject: [PATCH 5/8] hark-system-hook: use correct mark for cage from kiln --- pkg/garden/app/hark-system-hook.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/garden/app/hark-system-hook.hoon b/pkg/garden/app/hark-system-hook.hoon index f4f7b8f5a..e7cd7132d 100644 --- a/pkg/garden/app/hark-system-hook.hoon +++ b/pkg/garden/app/hark-system-hook.hoon @@ -44,7 +44,7 @@ %kick :_(this (drop safe-watch:kiln:cc)) :: %fact - ?. ?=(%kiln-vats-diff p.cage.sign) `this + ?. ?=(%kiln-vats-diff-0 p.cage.sign) `this =+ !<(=diff:hood q.cage.sign) ?+ -.diff `this :: From a931707039f70cb23bf54a97fcd90f7b769dea04 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Thu, 28 Oct 2021 12:08:59 -0500 Subject: [PATCH 6/8] garden: update docket version --- pkg/garden/desk.docket-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/garden/desk.docket-0 b/pkg/garden/desk.docket-0 index be2d8630d..9b443f75f 100644 --- a/pkg/garden/desk.docket-0 +++ b/pkg/garden/desk.docket-0 @@ -4,7 +4,7 @@ glob-http+['https://bootstrap.urbit.org/glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob' 0v5.fdf99.nph65.qecq3.ncpjn.q13mb] ::glob-ames+~zod^0v0 base+'grid' - version+[1 0 0] + version+[1 0 1] website+'https://tlon.io' license+'MIT' == From f5cddc86c91610d634ebd9c67a32f54a72a6b4bd Mon Sep 17 00:00:00 2001 From: fang Date: Sat, 30 Oct 2021 00:32:26 +0200 Subject: [PATCH 7/8] vercel: remove .vercel from root It's in the .gitignore and was never supposed to be included. --- .vercel/README.txt | 11 ----------- .vercel/project.json | 1 - 2 files changed, 12 deletions(-) delete mode 100644 .vercel/README.txt delete mode 100644 .vercel/project.json diff --git a/.vercel/README.txt b/.vercel/README.txt deleted file mode 100644 index 525d8ce8e..000000000 --- a/.vercel/README.txt +++ /dev/null @@ -1,11 +0,0 @@ -> Why do I have a folder named ".vercel" in my project? -The ".vercel" folder is created when you link a directory to a Vercel project. - -> What does the "project.json" file contain? -The "project.json" file contains: -- The ID of the Vercel project that you linked ("projectId") -- The ID of the user or team your Vercel project is owned by ("orgId") - -> Should I commit the ".vercel" folder? -No, you should not share the ".vercel" folder with anyone. -Upon creation, it will be automatically added to your ".gitignore" file. diff --git a/.vercel/project.json b/.vercel/project.json deleted file mode 100644 index 3ffe22dfc..000000000 --- a/.vercel/project.json +++ /dev/null @@ -1 +0,0 @@ -{"orgId":"EDiU8DZExvM9N4unZGYQbG3d","projectId":"prj_fbAU5smemBgtr5t8lsk5ZoT9zNtI"} \ No newline at end of file From 2cb882e983c1a7f18f4240aabbb3ee3a527cc24b Mon Sep 17 00:00:00 2001 From: urcades Date: Mon, 1 Nov 2021 18:08:41 -0400 Subject: [PATCH 8/8] copyedits: apptile menu, remove/suspend interfaces --- pkg/grid/src/tiles/RemoveApp.tsx | 9 ++++++--- pkg/grid/src/tiles/SuspendApp.tsx | 8 +++++--- pkg/grid/src/tiles/TileMenu.tsx | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkg/grid/src/tiles/RemoveApp.tsx b/pkg/grid/src/tiles/RemoveApp.tsx index 4f0783091..a2357d03d 100644 --- a/pkg/grid/src/tiles/RemoveApp.tsx +++ b/pkg/grid/src/tiles/RemoveApp.tsx @@ -22,16 +22,19 @@ export const RemoveApp = () => { return ( !open && history.push('/')}> -

Remove “{getAppName(docket)}”?

+

Uninstall “{getAppName(docket)}”?

- This will remove the software's tile from your home screen. + The app tile will be removed from Landscape, all processes will be stopped and their data archived, and the app will stop receiving updates. +

+

+ If the app is reinstalled, the archived data will be restored and you'll be able to pick up where you left off.

Cancel - Remove “{getAppName(docket)}” + Uninstall
diff --git a/pkg/grid/src/tiles/SuspendApp.tsx b/pkg/grid/src/tiles/SuspendApp.tsx index c8c3e4732..a31c65cfd 100644 --- a/pkg/grid/src/tiles/SuspendApp.tsx +++ b/pkg/grid/src/tiles/SuspendApp.tsx @@ -27,15 +27,17 @@ export const SuspendApp = () => {

Suspend “{getAppName(charge)}”

- Suspending an app will turn off automatic updates. You cannot use an app when it is - suspended, but you can resume it at any time. + All processes will be stopped and data archived. The app will continue to receive updates from its publisher. +

+

+ When unsuspended, archived data will be loaded and all processes will resume running, so you can pick up where you left off.

Cancel - Suspend “{getAppName(charge)}” + Suspend
diff --git a/pkg/grid/src/tiles/TileMenu.tsx b/pkg/grid/src/tiles/TileMenu.tsx index 52d6253dd..5a811301a 100644 --- a/pkg/grid/src/tiles/TileMenu.tsx +++ b/pkg/grid/src/tiles/TileMenu.tsx @@ -85,7 +85,7 @@ export const TileMenu = ({ desk, chad, menuColor, lightText, className }: TileMe )} {suspended && toggleDocket(desk)}>Resume App} - Remove App + Uninstall App