Merge pull request #746 from SynBioHub/addtoMasterJSON

Addto master json
SynBioHub · Sep 4, 2024 · 5af31bb · 5af31bb
2 parents eded0bc + 1e2ac2c
commit 5af31bb
Show file tree

Hide file tree

Showing 6 changed files with 207 additions and 96 deletions.
diff --git a/frontend/components/Viewing/PageJSON/MasterJSON.js b/frontend/components/Viewing/PageJSON/MasterJSON.js
@@ -34,7 +34,20 @@ import SubComponent3 from './Types/SubComponent3.json';
 import LocalSubComponent3 from './Types/LocalSubComponent3.json';
 import ExternallyDefined3 from './Types/ExternallyDefined3.json';
 import SequenceFeature3 from './Types/SequenceFeature3.json';
-
+import Attachment3 from './Types/Attachment3.json';
+import Collection3 from './Types/Collection3.json';
+import Cut3 from './Types/Cut3.json';
+import CombinatorialDerivation3 from './Types/CombinatorialDerivation3.json';
+import EntireSequence3 from './Types/EntireSequence3.json';
+import Experiment3 from './Types/Experiment3.json';
+import ExperimentalData3 from './Types/ExperimentalData3.json';
+import Implementation3 from './Types/Implementation3.json';
+import Location3 from './Types/Location3.json';
+import Model3 from './Types/Model3.json';
+import Participation3 from './Types/Participation3.json';
+import Range3 from './Types/Range3.json';
+import VariableFeature3 from './Types/VariableFeature3.json';
+import Interaction3 from './Types/Interaction3.json';
 
 const TypeToJson = {
   'http://sbols.org/v2#ComponentDefinition': ComponentDefinition,
@@ -72,8 +85,21 @@ const TypeToJson = {
   'http://sbols.org/v3#SubComponent': SubComponent3,
   'http://sbols.org/v3#LocalSubComponent': LocalSubComponent3,
   'http://sbols.org/v3#ExternallyDefined': ExternallyDefined3,
-  'http://sbols.org/v3#SequenceFeature': SequenceFeature3
-
+  'http://sbols.org/v3#SequenceFeature': SequenceFeature3,
+  'http://sbols.org/v3#Attachment': Attachment3,
+  'http://sbols.org/v3#Collection': Collection3,
+  'http://sbols.org/v3#Cut': Cut3,
+  'http://sbols.org/v3#CombinatorialDerivation': CombinatorialDerivation3,
+  'http://sbols.org/v3#EntireSequence': EntireSequence3,
+  'http://sbols.org/v3#Experiment': Experiment3,
+  'http://sbols.org/v3#ExperimentalData': ExperimentalData3,
+  'http://sbols.org/v3#Implementation': Implementation3,
+  'http://sbols.org/v3#Interaction': Interaction3,
+  'http://sbols.org/v3#Location': Location3,
+  'http://sbols.org/v3#Model': Model3,
+  'http://sbols.org/v3#Participation': Participation3,
+  'http://sbols.org/v3#Range': Range3,
+  'http://sbols.org/v3#VariableFeature': VariableFeature3
 };
 
 export default TypeToJson;
diff --git a/frontend/components/Viewing/PageJSON/Types/Component3.json b/frontend/components/Viewing/PageJSON/Types/Component3.json
@@ -79,7 +79,6 @@
                     "title": "SubComponents",
                     "infoLink": "https://sbols.org/v3#SubComponent",
                     "predicates": [
-                        "rdf:type"
                     ],
                     "stripAfter": "#",
                     "link": "$<subcomponentLink>"
@@ -112,22 +111,36 @@
             ]
         },
         {
-            "title": "Sequence Constraints",
+            "title": "Constraints",
             "rootPredicate": "sbol:hasConstraint",
             "icon": "faVirusSlash",
             "sections": [
                 {
-                    "title": "Sequence Constraint",
+                    "title": "Constraint",
                     "infoLink": "https://sbols.org/v3#Constraint",
                     "predicates": [
-                        "sbol:Constraint"
                     ],
+                    "stripAfter": "#",
                     "link": "$<constraintLink>"
                 },
                 {
                     "title": "constraintLink",
                     "hide": true,
                     "predicates": []
+                },
+                {
+                    "title": "Subject",
+                    "infoLink": "https://sbols.org/v3#Subject",
+                    "predicates": [
+                        "sbol:subject"
+                    ],
+                    "stripAfter": "#",
+                    "link": "$<subjectLink>"
+                },
+                {
+                    "title": "subjectLink",
+                    "hide": true,
+                    "predicates": []
                 }
             ]
         },
@@ -140,14 +153,39 @@
                     "title": "Interface",
                     "infoLink": "https://sbols.org/v3#Interface",
                     "predicates": [
-
                     ],
                     "link": "$<interfaceLink>"
                 },
                 {
                     "title": "interfaceLink",
                     "hide": true,
                     "predicates": []
+                },
+                {
+                    "title": "Output",
+                    "infoLink": "https://sbols.org/v3#Output",
+                    "predicates": [
+                        "sbol:output"
+                    ],
+                    "link": "$<outputLink>"
+                },
+                {
+                    "title": "outputLink",
+                    "hide": true,
+                    "predicates": []
+                },
+                {
+                    "title": "Input",
+                    "infoLink": "https://sbols.org/v3#Input",
+                    "predicates": [
+                        "sbol:input"
+                    ],
+                    "link": "$<inputLink>"
+                },
+                {
+                    "title": "inputLink",
+                    "hide": true,
+                    "predicates": []
                 }
             ]
         },
@@ -160,14 +198,59 @@
                     "title": "Model",
                     "infoLink": "https://sbols.org/v3#Model",
                     "predicates": [
-
+                        "sbol:displayId"
                     ],
                     "link": "$<modelLink>"
                 },
                 {
                     "title": "modelLink",
                     "hide": true,
                     "predicates": []
+                },
+                {
+                    "title": "Framework",
+                    "infoLink": "https://sbols.org/v3#Framework",
+                    "predicates": [
+                        "sbol:framework"
+                    ],
+                    "link": "$<frameworkLink>"
+                },
+                {
+                    "title": "frameworkLink",
+                    "hide": true,
+                    "predicates": [
+                        "sbol:framework"
+                    ]
+                },
+                {
+                    "title": "Source",
+                    "infoLink": "https://sbols.org/v3#Source",
+                    "predicates": [
+                        "sbol:source"
+                    ],
+                    "link": "$<sourceLink>"
+                },
+                {
+                    "title": "sourceLink",
+                    "hide": true,
+                    "predicates": [
+                        "sbol:source"
+                    ]
+                },
+                {
+                    "title": "Language",
+                    "infoLink": "https://sbols.org/v3#Language",
+                    "predicates": [
+                        "sbol:language"
+                    ],
+                    "link": "$<languageLink>"
+                },
+                {
+                    "title": "languageLink",
+                    "hide": true,
+                    "predicates": [
+                        "sbol:language"
+                    ]
                 }
             ]
         }
@@ -177,7 +260,7 @@
         "$TABLES[Sequences]",
         "$TABLES[Features]",
         "$TABLES[Interactions]",
-        "$TABLES[Sequence Constraints]",
+        "$TABLES[Constraints]",
         "$TABLES[Interfaces]",
         "$TABLES[Models]",
         "Other Properties",

diff --git a/frontend/components/Viewing/PageJSON/Types/Model3.json b/frontend/components/Viewing/PageJSON/Types/Model3.json
@@ -8,7 +8,7 @@
        "PREFIX dc: <http://purl.org/dc/elements/1.1/>",
        "PREFIX sbh: <http://wiki.synbiohub.org/wiki/Terms/synbiohub#>",
        "PREFIX prov: <http://www.w3.org/ns/prov#>",
-       "PREFIX sbol: <http://sbols.org/v2#>",
+       "PREFIX sbol: <http://sbols.org/v3#>",
        "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>",
        "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
        "PREFIX purl: <http://purl.obolibrary.org/obo/>"

diff --git a/frontend/components/Viewing/Shell.js b/frontend/components/Viewing/Shell.js
@@ -10,6 +10,7 @@ import systemsBiologyOntology from '../../namespace/systems-biology-ontology';
 import edamOntology from '../../namespace/edam-ontology';
 
 export default function Shell(properties) {
+  console.log(properties);
   const plugins = properties.plugins;
   const metadata = properties.metadata;
 
@@ -22,6 +23,7 @@ export default function Shell(properties) {
   metadata.search = getSearchData;
 
   if (!json) {
+    console.log("NO JSON");
     return (
       <div className={styles.container}>
         <SidePanel

diff --git a/frontend/public/commitHash.txt b/frontend/public/commitHash.txt
@@ -1 +1 @@
-da6f1e938c11e43d33b168cff8dd56f054fc0130
+a77cfaaf0bd54e7954ef9954d9555cd4cf306f49
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		da6f1e938c11e43d33b168cff8dd56f054fc0130
		a77cfaaf0bd54e7954ef9954d9555cd4cf306f49