From e868ea2db293e7918607341129571fc89d44d64e Mon Sep 17 00:00:00 2001 From: Matilde Park Date: Thu, 11 Feb 2021 20:34:34 -0500 Subject: [PATCH 01/10] StatusBar: prevent sigil flexing offscreen --- pkg/interface/src/views/components/Dropdown.tsx | 2 +- pkg/interface/src/views/components/StatusBar.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/interface/src/views/components/Dropdown.tsx b/pkg/interface/src/views/components/Dropdown.tsx index 0c27caf6c8..7e2a1fb2c3 100644 --- a/pkg/interface/src/views/components/Dropdown.tsx +++ b/pkg/interface/src/views/components/Dropdown.tsx @@ -75,7 +75,7 @@ export function Dropdown(props: DropdownProps) { }); return ( - + {children} diff --git a/pkg/interface/src/views/components/StatusBar.js b/pkg/interface/src/views/components/StatusBar.js index 6741dc5c3b..b674354a8e 100644 --- a/pkg/interface/src/views/components/StatusBar.js +++ b/pkg/interface/src/views/components/StatusBar.js @@ -107,6 +107,7 @@ const StatusBar = (props) => { width="auto" alignY="top" alignX="right" + flexShrink={0} options={ Date: Fri, 12 Feb 2021 11:58:18 +1000 Subject: [PATCH 02/10] metadata-hook: fix on-load --- pkg/arvo/app/metadata-hook.hoon | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/arvo/app/metadata-hook.hoon b/pkg/arvo/app/metadata-hook.hoon index a013dd6d92..14f60d3a75 100644 --- a/pkg/arvo/app/metadata-hook.hoon +++ b/pkg/arvo/app/metadata-hook.hoon @@ -39,7 +39,10 @@ ++ on-save !>(state) ++ on-load |= =vase - =+ !<(old=versioned-state vase) + =/ m-old=(unit versioned-state) + (mole |.(!<(versioned-state vase))) + ?~ m-old `this + =* old u.m-old |^ ?: ?=(%2 -.old) `this From 63cfde673bc632e7c17d1ce3206765b5d2b80755 Mon Sep 17 00:00:00 2001 From: Matilde Park Date: Thu, 11 Feb 2021 21:02:40 -0500 Subject: [PATCH 03/10] SetStatusBarModal: prevent flexShrink on mobile --- pkg/interface/src/views/components/SetStatusBarModal.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/interface/src/views/components/SetStatusBarModal.js b/pkg/interface/src/views/components/SetStatusBarModal.js index fe0491554c..85f9769e71 100644 --- a/pkg/interface/src/views/components/SetStatusBarModal.js +++ b/pkg/interface/src/views/components/SetStatusBarModal.js @@ -77,9 +77,11 @@ export const SetStatusBarModal = (props) => { )} setModalShown(true)}> Set Status From e33ac3d0ef590daa515ae18fd754604c2b6ea117 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 12:01:02 +1000 Subject: [PATCH 04/10] goad: %force in +on-load --- pkg/arvo/app/goad.hoon | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/arvo/app/goad.hoon b/pkg/arvo/app/goad.hoon index 5e34f2151e..5b043309be 100644 --- a/pkg/arvo/app/goad.hoon +++ b/pkg/arvo/app/goad.hoon @@ -7,6 +7,9 @@ |= force=? :~ [%pass /gall %arvo %g %goad force ~] == + +$ state + $@ ~ + [%0 ~] -- |_ =bowl:gall +* this . @@ -31,8 +34,13 @@ ++ on-fail on-fail:def ++ on-init on-init:def ++ on-leave on-leave:def -++ on-load on-load:def +++ on-load + |= =vase + =+ !<(old=state vase) + ?^ old `this + [(goad &) this] +:: ++ on-peek on-peek:def -++ on-save on-save:def +++ on-save !>([%0 ~]) ++ on-watch on-watch:def -- From ed3d3335cbe9050cf31b835c367a8642aad3fd19 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 12:14:56 +1000 Subject: [PATCH 05/10] metadata-hook: fix default-agent --- pkg/arvo/app/metadata-hook.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/arvo/app/metadata-hook.hoon b/pkg/arvo/app/metadata-hook.hoon index 14f60d3a75..c66ac0f6ae 100644 --- a/pkg/arvo/app/metadata-hook.hoon +++ b/pkg/arvo/app/metadata-hook.hoon @@ -34,7 +34,7 @@ ^- agent:gall |_ =bowl:gall +* this . - def ~(. (default-agent *agent:gall %|) bowl) + def ~(. (default-agent this %|) bowl) ++ on-init on-init:def ++ on-save !>(state) ++ on-load From b6addb5ed392033cd1c89ae3ad1d2cfb237d47fb Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 12:31:33 +1000 Subject: [PATCH 06/10] glob: update to 0v3.t4lg5.84a6h.2bi2s.ni2p9.32uor --- bin/solid.pill | 4 ++-- pkg/arvo/app/glob.hoon | 2 +- pkg/arvo/app/landscape/index.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/solid.pill b/bin/solid.pill index daf95af8f5..92ee7a0714 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:016d6672c471304c7c728913b169a9a938d3fcb1a5f0d47e92e1c1c9ebde8d92 -size 9282017 +oid sha256:f4b93e4d91e42c8444bb22447a0ae7d969ec552ba2d0f4b87a8dd20a41709d4e +size 9345380 diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon index 7b7c727518..432396eade 100644 --- a/pkg/arvo/app/glob.hoon +++ b/pkg/arvo/app/glob.hoon @@ -5,7 +5,7 @@ /- glob /+ default-agent, verb, dbug |% -++ hash 0v1.grvkp.m0c8p.i7s2g.p5mje.im0qo +++ hash 0v3.t4lg5.84a6h.2bi2s.ni2p9.32uor +$ state-0 [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))] +$ all-states $% state-0 diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html index bc22e45c03..258622e72d 100644 --- a/pkg/arvo/app/landscape/index.html +++ b/pkg/arvo/app/landscape/index.html @@ -24,6 +24,6 @@
- + From 9cc8fe61398fa0d56471b460e47062574b43c2ad Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 14:30:39 +1000 Subject: [PATCH 07/10] metadata-push-hook: keep track of pending requests --- pkg/arvo/app/metadata-pull-hook.hoon | 95 +++++++++++++++++++++------- 1 file changed, 73 insertions(+), 22 deletions(-) diff --git a/pkg/arvo/app/metadata-pull-hook.hoon b/pkg/arvo/app/metadata-pull-hook.hoon index 14bd000e42..221087e22f 100644 --- a/pkg/arvo/app/metadata-pull-hook.hoon +++ b/pkg/arvo/app/metadata-pull-hook.hoon @@ -20,6 +20,17 @@ +$ state-zero [%0 previews=(map resource group-preview:metadata)] :: ++$ state-one + $: %1 + pending=(set resource) + previews=(map resource group-preview:metadata) + == +:: ++$ versioned-state + $% state-zero + state-one + == +:: -- :: :: @@ -28,7 +39,7 @@ ^- agent:gall %- (agent:pull-hook config) ^- (pull-hook:pull-hook config) -=| state-zero +=| state-one =* state - => |_ =bowl:gall ++ def ~(. (default-agent state %|) bowl) @@ -53,8 +64,9 @@ %fact ?> ?=(%invite-update p.cage.sign) =+ !<(=update:invite-store q.cage.sign) - :_ state - ?. ?=(%invite -.update) ~ + ?. ?=(%invite -.update) `state + ?: (~(has in pending) resource.invite.update) `state + :_ state(pending (~(put in pending) resource.invite.update)) (get-preview resource.invite.update)^~ :: %kick [watch-invites^~ state] @@ -70,41 +82,64 @@ %kick [~[watch-contacts] state] :: %fact - :_ state ?> ?=(%contact-update p.cage.sign) =+ !<(=update:contact q.cage.sign) - ?+ -.update ~ + ?+ -.update `state %add - (check-contact contact.update) + =/ missing=(set resource) + (check-contact contact.update) + =. pending + (~(uni in pending) missing) + :_ state + (get-many-previews missing) + :: %edit - ?. ?=(%add-group -.edit-field.update) ~ - %- add-missing-previews - (~(gas in *(set resource)) resource.edit-field.update ~) + ?. ?=(%add-group -.edit-field.update) `state + =/ missing=(set resource) + %- add-missing-previews + (~(gas in *(set resource)) resource.edit-field.update ~) + =. pending + (~(uni in pending) missing) + :_ state + (get-many-previews missing) + :: :: %initial - ^- (list card) - %- zing - %+ turn ~(tap by rolodex.update) - |=([ship =contact:contact] (check-contact contact)) + =/ missing=(set resource) + %- add-missing-previews + %+ roll ~(tap by rolodex.update) + |= [[ship =contact:contact] out=(set resource)] + (~(uni in out) (check-contact contact)) + =. pending + (~(uni in pending) missing) + :_ state + (get-many-previews missing) == == :: + ++ get-many-previews + |= rids=(set resource) + (turn ~(tap by rids) get-preview) + :: ++ check-contact |= =contact:contact - ^- (list card) + ^- (set resource) (add-missing-previews groups.contact) :: ++ add-missing-previews |= groups=(set resource) - ^- (list card) + ^- (set resource) + =/ have=(set resource) + (~(uni in ~(key by previews)) pending) =/ missing=(set resource) - (~(dif in ~(key by previews)) groups) + (~(dif in groups) have) + %- ~(gas by *(set resource)) %+ murn ~(tap by missing) |= group=resource - ^- (unit card) + ^- (unit resource) ?^ (peek-metadatum:met %groups group) ~ - `(get-preview group) + `group :: ++ watch-store (~(watch-our pass:io /store) %metadata-store /all) @@ -139,8 +174,19 @@ ++ on-save !>(state) ++ on-load |= =vase - =+ !<(old=state-zero vase) - `this(state old) + =+ !<(old=versioned-state vase) + |- + ?- -.old + %1 `this(state old) + :: + %0 + %_ $ + old + %* . *state-one + previews previews.old + == + == + == :: ++ on-poke |= [=mark =vase] @@ -149,7 +195,11 @@ =+ !<(=hook-update:metadata vase) ?. ?=(%preview -.hook-update) (on-poke:def mark vase) - :_ this(previews (~(put by previews) group.hook-update +.hook-update)) + =. previews + (~(put by previews) group.hook-update +.hook-update) + =. pending + (~(del in pending) group.hook-update) + :_ this =/ =path preview+(en-path:resource group.hook-update) (fact-kick:io path mark^vase) @@ -182,9 +232,10 @@ ?^ (peek-metadatum:met %groups rid) (some (get-preview:met rid)) (~(get by previews) rid) - :_ this ?~ prev + :_ this(pending (~(put in pending) rid)) (get-preview rid)^~ + :_ this (fact-init:io metadata-hook-update+!>([%preview u.prev]))^~ :: ++ on-leave on-leave:def From 34f6db54dc2d64edb03730be0f1e523dfdcc96d1 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 14:39:15 +1000 Subject: [PATCH 08/10] contact-store: add lib/verb --- pkg/arvo/app/contact-store.hoon | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/arvo/app/contact-store.hoon b/pkg/arvo/app/contact-store.hoon index 27a3c6cc34..d61f9edbda 100644 --- a/pkg/arvo/app/contact-store.hoon +++ b/pkg/arvo/app/contact-store.hoon @@ -3,7 +3,7 @@ :: data store that holds individual contact data :: /- store=contact-store, *resource -/+ default-agent, dbug, *migrate, contact +/+ default-agent, dbug, *migrate, contact, verb |% +$ card card:agent:gall +$ state-4 @@ -25,6 +25,7 @@ =| state-4 =* state - %- agent:dbug +%+ verb | ^- agent:gall |_ =bowl:gall +* this . From ccd98b6287b78c069173a2b52ef2ba6bff17d5d6 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 14:49:24 +1000 Subject: [PATCH 09/10] metadata-pull-hook: remove pending on nack --- pkg/arvo/app/metadata-pull-hook.hoon | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/arvo/app/metadata-pull-hook.hoon b/pkg/arvo/app/metadata-pull-hook.hoon index 221087e22f..7402a2ccc3 100644 --- a/pkg/arvo/app/metadata-pull-hook.hoon +++ b/pkg/arvo/app/metadata-pull-hook.hoon @@ -215,8 +215,10 @@ [%preview @ @ @ ~] ?. ?=(%poke-ack -.sign) (on-agent:def:hc wire sign) - :_ state - ?~ p.sign ~ + ?~ p.sign `state + =/ rid + (de-path:resource t.wire) + :_ state(pending (~(del in pending) rid)) (fact-kick:io wire tang+!>(u.p.sign)) == [cards this] From 38ac5f191f0ab7118ab0fdf96c193ff8878a9d00 Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Feb 2021 14:59:16 +1000 Subject: [PATCH 10/10] metadata-pull-hook: address L review --- pkg/arvo/app/metadata-pull-hook.hoon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/arvo/app/metadata-pull-hook.hoon b/pkg/arvo/app/metadata-pull-hook.hoon index 7402a2ccc3..3e57c04b61 100644 --- a/pkg/arvo/app/metadata-pull-hook.hoon +++ b/pkg/arvo/app/metadata-pull-hook.hoon @@ -195,10 +195,10 @@ =+ !<(=hook-update:metadata vase) ?. ?=(%preview -.hook-update) (on-poke:def mark vase) - =. previews - (~(put by previews) group.hook-update +.hook-update) - =. pending - (~(del in pending) group.hook-update) + =: pending (~(del in pending) group.hook-update) + previews + (~(put by previews) group.hook-update +.hook-update) + == :_ this =/ =path preview+(en-path:resource group.hook-update)