From 67200742289533acf2cc214a42fb4ba1c52604ea Mon Sep 17 00:00:00 2001 From: Liam Fitzgerald Date: Fri, 12 Mar 2021 13:11:08 +1000 Subject: [PATCH 1/2] graph-update: sort indices correctly --- pkg/interface/src/logic/reducers/graph-update.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/interface/src/logic/reducers/graph-update.js b/pkg/interface/src/logic/reducers/graph-update.js index 1bf12d8a16..6def8b85c4 100644 --- a/pkg/interface/src/logic/reducers/graph-update.js +++ b/pkg/interface/src/logic/reducers/graph-update.js @@ -109,7 +109,7 @@ const addNodes = (json, state) => { let parNode = graph.get(index[0]); if (!parNode) { console.error('parent node does not exist, cannot add child'); - return; + return graph; } parNode.children = _addNode(parNode.children, index.slice(1), node); graph.set(index[0], parNode); @@ -134,7 +134,7 @@ const addNodes = (json, state) => { if (state.graphTimesentMap[resource][timestamp]) { let index = state.graphTimesentMap[resource][timestamp]; - if (index.split('/').length === 0) { return; } + if (index.split('/').length === 0) { return graph; } let indexArr = index.split('/').slice(1).map((ind) => { return bigInt(ind); }); @@ -178,7 +178,7 @@ const addNodes = (json, state) => { indices.sort((a, b) => { let aArr = a.split('/'); let bArr = b.split('/'); - return bArr.length < aArr.length; + return aArr.length - bArr.length; }); let graph = state.graphs[resource]; From 0a8d82d8227feaa9af9447ab4e706e361afa40d3 Mon Sep 17 00:00:00 2001 From: janeway Date: Fri, 12 Mar 2021 14:35:19 +1000 Subject: [PATCH 2/2] glob: update to 0vtbs05.a6mkl.r5ark.jfj84.3fa4h --- 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 6b7c74910b..92802fcddc 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d5d569d5bb9abc36b515f9c0690974706ba615c624ff76fd299712695506863 -size 9346854 +oid sha256:bb221ce7316346bfaf1ddd953927c0f2afe7eaf5b160bed545f67ec7e5ccb005 +size 9410487 diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon index 3ffcd16eb9..76b9521155 100644 --- a/pkg/arvo/app/glob.hoon +++ b/pkg/arvo/app/glob.hoon @@ -5,7 +5,7 @@ /- glob /+ default-agent, verb, dbug |% -++ hash 0v3.o81b7.9dkd7.6ubrn.ebhmi.dtree +++ hash 0vtbs05.a6mkl.r5ark.jfj84.3fa4h +$ 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 305f892bb2..dbb03accaa 100644 --- a/pkg/arvo/app/landscape/index.html +++ b/pkg/arvo/app/landscape/index.html @@ -24,6 +24,6 @@
- +