diff --git a/frontend/components/Viewing/PageJSON/Rendering/SectionRenderer.js b/frontend/components/Viewing/PageJSON/Rendering/SectionRenderer.js index 3e9240be..25834a90 100644 --- a/frontend/components/Viewing/PageJSON/Rendering/SectionRenderer.js +++ b/frontend/components/Viewing/PageJSON/Rendering/SectionRenderer.js @@ -97,10 +97,12 @@ export default function SectionRenderer({ section, metadata }) { } } } - if (/^(http:\/\/edamontology\.org\/format_\d{4}|edam:format_\d{4})$/.test(section.text)) { + if (/^(http:\/\/edamontology\.org\/format_\d{4}|edam:format_\d{4}|https:\/\/identifiers\.org\/edam:format_\d{4})$/.test(section.text)) { // Normalize the section.text to the full URL format if (/^edam:format_\d{4}$/.test(section.text)) { section.text = section.text.replace(/^edam:format_(\d{4})$/, 'http://edamontology.org/format_$1'); + } else if (/^https:\/\/identifiers\.org\/edam:format_\d{4}$/.test(section.text)) { + section.text = section.text.replace(/^https:\/\/identifiers\.org\/edam:format_(\d{4})$/, 'http://edamontology.org/format_$1'); } // Now proceed with checking against the keys in edamOntology @@ -111,6 +113,7 @@ export default function SectionRenderer({ section, metadata }) { } } + if (section.grouped) { const items = section.text.split(', '); const content = items.map((item, index) => { diff --git a/frontend/components/Viewing/PageJSON/Types/Model3.json b/frontend/components/Viewing/PageJSON/Types/Model3.json index 2b56d562..477b65cb 100644 --- a/frontend/components/Viewing/PageJSON/Types/Model3.json +++ b/frontend/components/Viewing/PageJSON/Types/Model3.json @@ -1,63 +1,75 @@ - { - - "type": "http://sbols.org/v3#Model", - "prefixes": [ - "PREFIX rdf: ", - "PREFIX dcterms: ", - "PREFIX dc: ", - "PREFIX sbh: ", - "PREFIX prov: ", - "PREFIX sbol: ", - "PREFIX xsd: ", - "PREFIX rdfs: ", - "PREFIX purl: " - ], - "metadata": [ - { - "title": "Language", - "icon": "faVials", - "rootPredicate": "sbol:language", - "sections": [ - { - "title": "lang", - "predicates": [ - ], - "link": "$" - } - ] - }, - { - "title": "Framework", - "rootPredicate": "sbol:framework", - "icon": "faVials", - "sections": [ - { - "title": "framework", - "predicates": [], - "link": "$", - "stripAfter": "/" - } - ] - }, - { - "title": "Model File", - "rootPredicate": "sbol:source", - "icon": "faVials", - "sections": [ - { - "title": "mfile", - "predicates": [], - "link": "$" - } - ] + "type": "http://sbols.org/v3#Model", + "prefixes": [ + "PREFIX rdf: ", + "PREFIX dcterms: ", + "PREFIX dc: ", + "PREFIX sbh: ", + "PREFIX prov: ", + "PREFIX sbol: ", + "PREFIX xsd: ", + "PREFIX rdfs: ", + "PREFIX purl: " + ], + "metadata": [ + { + "title": "Language", + "icon": "faVials", + "rootPredicate": "sbol:language", + "sections": [ + { + "title": "lang", + "predicates": [], + "link": "$" + }, + { + "title": "languageLink", + "predicates": [], + "hide": true } - ], - "tables": [], - "pages": [ - "Details", - "Other Properties", - "Member of these Collections", - "Attachments" - ] - } \ No newline at end of file + ] + }, + { + "title": "Framework", + "rootPredicate": "sbol:framework", + "icon": "faVials", + "sections": [ + { + "title": "framework", + "predicates": [], + "link": "$", + "stripAfter": "/" + }, + { + "title": "frameworkLink", + "predicates": [], + "hide": true + } + ] + }, + { + "title": "Model File", + "rootPredicate": "sbol:source", + "icon": "faVials", + "sections": [ + { + "title": "mfile", + "predicates": [], + "link": "$" + }, + { + "title": "sourceLink", + "predicates": [], + "hide": true + } + ] + } + ], + "tables": [], + "pages": [ + "Details", + "Other Properties", + "Member of these Collections", + "Attachments" + ] +} \ No newline at end of file diff --git a/frontend/public/commitHash.txt b/frontend/public/commitHash.txt index a23139eb..eeae27fb 100644 --- a/frontend/public/commitHash.txt +++ b/frontend/public/commitHash.txt @@ -1 +1 @@ -a77cfaaf0bd54e7954ef9954d9555cd4cf306f49 \ No newline at end of file +5af31bb4414db276ba10fd44d4d6847dc521bcb8 \ No newline at end of file diff --git a/frontend/sparql/getMetadata.js b/frontend/sparql/getMetadata.js index 56a3e066..822111a1 100644 --- a/frontend/sparql/getMetadata.js +++ b/frontend/sparql/getMetadata.js @@ -1,4 +1,5 @@ const query = `PREFIX sbol2: +PREFIX sbol3: PREFIX dcterms: PREFIX synbiohub: PREFIX dc: @@ -23,6 +24,9 @@ WHERE { OPTIONAL { <$uri> sbol2:persistentIdentity ?persistentIdentity . } OPTIONAL { <$uri> sbol2:displayId ?displayId . } OPTIONAL { <$uri> sbol2:version ?version . } + OPTIONAL { <$uri> sbol3:persistentIdentity ?persistentIdentity . } + OPTIONAL { <$uri> sbol3:displayId ?displayId . } + OPTIONAL { <$uri> sbol3:version ?version . } OPTIONAL { <$uri> dcterms:title ?name . } OPTIONAL { <$uri> dcterms:description ?description . } OPTIONAL { <$uri> dc:creator ?creator . }