Merge branch 'master' into release/next-js

This commit is contained in:
Matilde Park 2021-03-15 13:19:22 -04:00
commit 693bf40cd4
4 changed files with 7 additions and 7 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d5d569d5bb9abc36b515f9c0690974706ba615c624ff76fd299712695506863
size 9346854
oid sha256:bb221ce7316346bfaf1ddd953927c0f2afe7eaf5b160bed545f67ec7e5ccb005
size 9410487

View File

@ -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

View File

@ -24,6 +24,6 @@
<div id="portal-root"></div>
<script src="/~landscape/js/channel.js"></script>
<script src="/~landscape/js/session.js"></script>
<script src="/~landscape/js/bundle/index.beee3f473ccb51b21245.js"></script>
<script src="/~landscape/js/bundle/index.6bb292037c57ac3279cf.js"></script>
</body>
</html>

View File

@ -115,7 +115,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);
@ -140,7 +140,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);
});
@ -184,7 +184,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];