WIP: Allow multiple entries for note and scopeNote #281

skohub-io · Mar 26, 2024 · ff13455 · ff13455
1 parent b7d07de
commit ff13455
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/src/components/Concept.jsx b/src/components/Concept.jsx
@@ -52,22 +52,24 @@ const Concept = ({
           </Markdown>
         </div>
       )}
-      {concept.scopeNote && (
+      {concept.scopeNote && i18n(language)(concept.scopeNote) !== "" && (
         <div className="markdown">
-          <h3>Scope Note</h3>
-          <Markdown>
-            {i18n(language)(concept.scopeNote) ||
-              `*No scope note in language "${language}" provided.*`}
-          </Markdown>
+          <h3>ScopeNote</h3>
+          <ul aria-labelledby="scopeNote">
+            {i18n(language)(concept.scopeNote).map((scopeNote, i) => (
+              <li key={i}>{scopeNote}</li>
+            ))}
+          </ul>
         </div>
       )}
-      {concept.note && (
+      {concept.note && i18n(language)(concept.note) !== "" && (
         <div className="markdown">
           <h3>Note</h3>
-          <Markdown>
-            {i18n(language)(concept.note) ||
-              `*No note in language "${language}" provided.*`}
-          </Markdown>
+          <ul aria-labelledby="note">
+            {i18n(language)(concept.note).map((note, i) => (
+              <li key={i}>{note}</li>
+            ))}
+          </ul>
         </div>
       )}
       {concept.altLabel && i18n(language)(concept.altLabel) !== "" && (

diff --git a/src/context.js b/src/context.js
@@ -49,10 +49,10 @@ const jsonld = {
       "@container": "@language",
     },
     scopeNote: {
-      "@container": "@language",
+      "@container": ["@language", "@set"],
     },
     note: {
-      "@container": "@language",
+      "@container": ["@language", "@set"],
     },
     notation: {
       "@container": "@set",

diff --git a/src/types.js b/src/types.js
@@ -20,8 +20,8 @@ module.exports = (languages) => `
     altLabel: LanguageMapArray,
     hiddenLabel: LanguageMapArray,
     definition: LanguageMap,
-    scopeNote: LanguageMap,
-    note: LanguageMap,
+    scopeNote: LanguageMapArray,
+    note: LanguageMapArray,
     notation: [String],
     example: LanguageMap,
     topConceptOf: [ConceptScheme] @link(from: "topConceptOf___NODE"),

diff --git a/test/data/pageContext.js b/test/data/pageContext.js
@@ -50,10 +50,10 @@ export const topConcept = {
     de: "Ein Beispiel",
   },
   scopeNote: {
-    de: "Meine Scope Note",
+    de: ["Meine Scope Note"],
   },
   note: {
-    de: "Meine Anmerkung",
+    de: ["Meine Anmerkung"],
   },
   notation: ["1"],
   narrower: [concept2],