Merge pull request #187 from MetaCell/development

jrmartin · web-flow · commit 47d8febcb987 · 2023-09-14T15:11:27.000-07:00
Development to master
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "axios": "^0.21.1",
     "fs": "^0.0.1-security",
     "gh-pages": "^3.2.3",
-    "jest": "27.5.1",
+    "jest": "26.6.0",
     "jest-image-snapshot": "4.5.1",
     "jest-puppeteer": "6.1.0",
     "material-ui-dropzone": "^3.5.0",
diff --git a/public/index.html b/public/index.html
@@ -38,7 +38,7 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap"
       rel="stylesheet"
     />
-    <title>SDS Viewer</title>
+    <title>SPARC Dataset (SDS) Viewer</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/public/manifest.json b/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "short_name": "SDS Viewer",
-  "name": "SDS Viewer",
+  "short_name": "SPARC Dataset (SDS) Viewer",
+  "name": "SPARC Dataset (SDS) Viewer",
   "icons": [
     {
       "src": "favicon.ico",
diff --git a/src/components/Sidebar/Footer.js b/src/components/Sidebar/Footer.js
@@ -1,30 +1,38 @@
 import Plus from '../../images/plus.svg';
 import { ADD_DATASET } from '../../constants';
-import { Box, Button } from '@material-ui/core';
+import { Box, Button, Typography, Link } from '@material-ui/core';
 import config from "./../../config/app.json";
 
 const SidebarFooter = (props) => {
   return (
-    <Box display="flex" justifyContent="space-between">
-      <Button
-        variant='contained'
-        disableElevation
-        color='primary'
-        style={{ "width" : "45%","minWidth" : "45%" }}
-        onClick={() => props.setOpenUploadDialog(true)}
-      >
-        <img src={Plus} alt='Plus' />
-        {ADD_DATASET}
-      </Button>
-      <Button
-        variant='contained'
-        disableElevation
-        color='primary'
-        style={{ "width" : "45%", "minWidth" : "45%" }}
-        onClick={() => props.setOpenDatasetsListDialog(true)}
-      >
-        {config.text.datasetsButtonText}
-      </Button>
+    <Box>
+      <Box display="flex" justifyContent="space-between">
+        <Button
+          variant='contained'
+          disableElevation
+          color='primary'
+          style={{ "width" : "45%","minWidth" : "45%" }}
+          onClick={() => props.setOpenUploadDialog(true)}
+        >
+          <img src={Plus} alt='Plus' />
+          {ADD_DATASET}
+        </Button>
+        <Button
+          variant='contained'
+          disableElevation
+          color='primary'
+          style={{ "width" : "45%", "minWidth" : "45%" }}
+          onClick={() => props.setOpenDatasetsListDialog(true)}
+        >
+          {config.text.datasetsButtonText}
+        </Button>
+      </Box>
+      <Box display="flex" justifyContent="center">
+        <Typography variant='body1'><Link href={config.docs_url}>User manual</Link></Typography>
+      </Box>
+      <Box display="flex" justifyContent="center">
+        <Typography variant='caption'>Powered by MetaCell</Typography>
+      </Box>
     </Box>
   );
 };
diff --git a/src/config/app.json b/src/config/app.json
@@ -1,6 +1,7 @@
 {
     "datasets_url": "https://cassava.ucsd.edu/sparc/datasets/",
     "repository_url": "https://cassava.ucsd.edu/sparc/preview/exports/",
+    "docs_url": "https://github.com/MetaCell/sds-viewer/blob/development/README.md",
     "available_datasets": "curation-export-published.ttl",
     "groups" : { 
         "order" : 
diff --git a/src/utils/Splinter.js b/src/utils/Splinter.js
@@ -220,7 +220,7 @@ class Splinter {
             if ( !existingLing ) {
                 const a = this.nodes.get( link.source );
                 const b = this.nodes.get( link.target );
-                if ( a && b && ( a?.type !== rdfTypes.Award.key && b?.type !== rdfTypes.Award.key )) {
+                if ( a && b && ( a?.type !== rdfTypes.Award.key && b?.type !== rdfTypes.Award.key ) && !((a?.type === rdfTypes.Collection.key && a.children_counter < 1 ) || ( b?.type === rdfTypes.Collection.key && b.children_counter < 1))) {
                     !a.neighbors && (a.neighbors = []);
                     !b.neighbors && (b.neighbors = []);
                     if ( !a.neighbors.find( n => n.id === b.id )){
diff --git a/src/utils/nodesFactory.js b/src/utils/nodesFactory.js
@@ -7,7 +7,7 @@ function createImage(node) {
         img.src = "./images/graph/files/" + extension + ".svg"
     } else {
         if ( node.type !== "Group" ) {
-            img.src = (rdfTypes[String(node.type)]?.image !== "") ? rdfTypes[String(node.type)].image : rdfTypes.Unknown.image
+            img.src = (rdfTypes[String(node.type)]?.image !== "") ? rdfTypes[String(node.type)]?.image : rdfTypes.Unknown?.image
         }
     }
     return img;
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "short_name": "SDS Viewer",`
`3`		`- "name": "SDS Viewer",`
	`2`	`+ "short_name": "SPARC Dataset (SDS) Viewer",`
	`3`	`+ "name": "SPARC Dataset (SDS) Viewer",`
`4`	`4`	`"icons": [`
`5`	`5`	`{`
`6`	`6`	`"src": "favicon.ico",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"datasets_url": "https://cassava.ucsd.edu/sparc/datasets/",`
`3`	`3`	`"repository_url": "https://cassava.ucsd.edu/sparc/preview/exports/",`
	`4`	`+ "docs_url": "https://github.com/MetaCell/sds-viewer/blob/development/README.md",`
`4`	`5`	`"available_datasets": "curation-export-published.ttl",`
`5`	`6`	`"groups" : {`
`6`	`7`	`"order" :`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function createImage(node) {`
`7`	`7`	`img.src = "./images/graph/files/" + extension + ".svg"`
`8`	`8`	`} else {`
`9`	`9`	`if ( node.type !== "Group" ) {`
`10`		`- img.src = (rdfTypes[String(node.type)]?.image !== "") ? rdfTypes[String(node.type)].image : rdfTypes.Unknown.image`
	`10`	`+ img.src = (rdfTypes[String(node.type)]?.image !== "") ? rdfTypes[String(node.type)]?.image : rdfTypes.Unknown?.image`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`return img;`