Merge branch 'main' into componentRefTest

SynBioHub · Sep 18, 2024 · 529ea43 · 529ea43
2 parents 0f02894 + 1119e58
commit 529ea43
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 7 deletions.
diff --git a/.github/workflows/package-jar.yml b/.github/workflows/package-jar.yml
@@ -40,7 +40,7 @@ jobs:
             java-version: 17
         - run: cd backend && mvn -B package --file pom.xml -DskipTests
         - run: cd backend && mkdir staging && cp target/*.jar staging
-        - uses: actions/upload-artifact@v1
+        - uses: actions/upload-artifact@v3
           with:
             name: Package
             path: backend/staging
diff --git a/frontend/components/Viewing/PageJSON/MasterJSON.js b/frontend/components/Viewing/PageJSON/MasterJSON.js
@@ -48,6 +48,8 @@ import Participation3 from './Types/Participation3.json';
 import Range3 from './Types/Range3.json';
 import VariableFeature3 from './Types/VariableFeature3.json';
 import Interaction3 from './Types/Interaction3.json';
+import Constraint3 from './Types/Constraint3.json';
+import Interface3  from './Types/Interface3.json';
 
 const TypeToJson = {
   'http://sbols.org/v2#ComponentDefinition': ComponentDefinition,
@@ -99,7 +101,9 @@ const TypeToJson = {
   'http://sbols.org/v3#Model': Model3,
   'http://sbols.org/v3#Participation': Participation3,
   'http://sbols.org/v3#Range': Range3,
-  'http://sbols.org/v3#VariableFeature': VariableFeature3
+  'http://sbols.org/v3#VariableFeature': VariableFeature3,
+  'http://sbols.org/v3#Constraint': Constraint3,
+  'http://sbols.org/v3#Interface': Interface3,
 };
 
 export default TypeToJson;
diff --git a/frontend/components/Viewing/PageJSON/Types/Constraint3.json b/frontend/components/Viewing/PageJSON/Types/Constraint3.json
@@ -20,8 +20,8 @@
                 {
                     "title": "Subject",
                     "predicates": [
-                     "sbol:displayId"
                     ],
+                    "stripAfter": "#",
                     "link": "$<subjectLink>"
                 },
                 {
@@ -57,7 +57,8 @@
                   "sections": [
                       {
                           "title": "Object",
-                          "predicates": ["sbol:displayId"],
+                          "predicates": [],
+                          "stripAfter": "#",
                           "link": "$<objectLink>"
                       },
                       {

diff --git a/frontend/components/Viewing/PageJSON/Types/EntireSequence3.json b/frontend/components/Viewing/PageJSON/Types/EntireSequence3.json
@@ -24,7 +24,6 @@
                     "predicates": [
 
                     ],
-                    "text": "generic",
                     "link": "https://sbols.org/v3#Location"
                 }
             ]

diff --git a/frontend/components/Viewing/PageJSON/Types/Interaction3.json b/frontend/components/Viewing/PageJSON/Types/Interaction3.json
@@ -34,7 +34,7 @@
     "tables": [
         {
             "title": "Participations",
-            "rootPredicate": "sbol:participation",
+            "rootPredicate": "sbol:hasParticipation",
             "icon": "faPeopleArrows",
             "sections": [
                 {

diff --git a/frontend/components/Viewing/PageJSON/Types/Interface3.json b/frontend/components/Viewing/PageJSON/Types/Interface3.json
@@ -0,0 +1,54 @@
+{
+    "type": "http://sbols.org/v3#Interface",
+    "prefixes": [
+       "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>",
+       "PREFIX dcterms: <http://purl.org/dc/terms/>",
+       "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/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/>"
+    ],
+    "metadata": [],
+    "tables": [
+       {
+          "icon": "faTable",
+          "title": "Features",
+          "rootPredicate": "sbol:hasInterface",
+          "sections": [
+             {
+                "title": "Feature",
+                "infoLink": "https://sbols.org/v3#Feature",
+                "predicates": [
+                ],
+                "link": "$<featureLink>"
+             },
+             {
+                "title": "featureLink",
+                "predicates": [
+                ],
+                "hide": true
+             },
+             {
+                "title": "Type",
+                "predicates": [
+                ],
+                "link": "$<typeLink>"
+             },
+             {
+                "title": "typeLink",
+                "predicates": [],
+                "hide": true
+             }
+          ]
+       }
+    ],
+    "pages": [
+       "$TABLES[Features]",
+       "Details",
+       "Other Properties",
+       "Attachments"
+    ]
+ }
diff --git a/frontend/components/Viewing/PageJSON/Types/Location3.json b/frontend/components/Viewing/PageJSON/Types/Location3.json
@@ -21,7 +21,7 @@
                     "title": "Extra Work",
                     "stripAfter": "#",
                     "predicates": [],
-                    "link": "$<orientationLink"
+                    "link": "$<orientationLink>"
                 },
                 {
                     "title": "orientationLink",

diff --git a/frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json b/frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json
@@ -12,6 +12,27 @@
         "PREFIX purl: <http://purl.obolibrary.org/obo/>"
     ],
     "metadata": [
+        {
+            "title": "Orientation",
+            "rootPredicate": "sbol:orientation",
+            "infoLink": "https://sbols.org/v3#orientation",
+            "icon": "faCompass",
+            "sections": [
+                {
+                    "title": "Extra Work",
+                    "stripAfter": "#",
+                    "predicates": [
+
+                    ],
+                    "link": "$<orientationLink>"
+                },
+                {
+                    "title": "orientationLink",
+                    "predicates": [],
+                    "hide": true
+                }
+            ]
+        }
     ],
     "tables": [
         {