diff --git a/.github/workflows/package-jar.yml b/.github/workflows/package-jar.yml index 95397d5a..a0bc5810 100644 --- 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 index 22b813b0..6af35d13 100644 --- 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 index d5d024b8..7afa3343 100644 --- 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": "$" }, { @@ -57,7 +57,8 @@ "sections": [ { "title": "Object", - "predicates": ["sbol:displayId"], + "predicates": [], + "stripAfter": "#", "link": "$" }, { diff --git a/frontend/components/Viewing/PageJSON/Types/EntireSequence3.json b/frontend/components/Viewing/PageJSON/Types/EntireSequence3.json index 42ccda86..0f309602 100644 --- 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 index 68cf5420..2d358f05 100644 --- 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 new file mode 100644 index 00000000..210cd942 --- /dev/null +++ b/frontend/components/Viewing/PageJSON/Types/Interface3.json @@ -0,0 +1,54 @@ +{ + "type": "http://sbols.org/v3#Interface", + "prefixes": [ + "PREFIX rdf: ", + "PREFIX dcterms: ", + "PREFIX dc: ", + "PREFIX sbh: ", + "PREFIX prov: ", + "PREFIX sbol: ", + "PREFIX xsd: ", + "PREFIX rdfs: ", + "PREFIX purl: " + ], + "metadata": [], + "tables": [ + { + "icon": "faTable", + "title": "Features", + "rootPredicate": "sbol:hasInterface", + "sections": [ + { + "title": "Feature", + "infoLink": "https://sbols.org/v3#Feature", + "predicates": [ + ], + "link": "$" + }, + { + "title": "featureLink", + "predicates": [ + ], + "hide": true + }, + { + "title": "Type", + "predicates": [ + ], + "link": "$" + }, + { + "title": "typeLink", + "predicates": [], + "hide": true + } + ] + } + ], + "pages": [ + "$TABLES[Features]", + "Details", + "Other Properties", + "Attachments" + ] + } \ No newline at end of file diff --git a/frontend/components/Viewing/PageJSON/Types/Location3.json b/frontend/components/Viewing/PageJSON/Types/Location3.json index 7a2a2159..18aaa787 100644 --- 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": "$" }, { "title": "orientationLink", diff --git a/frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json b/frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json index bdcd8a45..e688b7d8 100644 --- a/frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json +++ b/frontend/components/Viewing/PageJSON/Types/SequenceFeature3.json @@ -12,6 +12,27 @@ "PREFIX purl: " ], "metadata": [ + { + "title": "Orientation", + "rootPredicate": "sbol:orientation", + "infoLink": "https://sbols.org/v3#orientation", + "icon": "faCompass", + "sections": [ + { + "title": "Extra Work", + "stripAfter": "#", + "predicates": [ + + ], + "link": "$" + }, + { + "title": "orientationLink", + "predicates": [], + "hide": true + } + ] + } ], "tables": [ {