Merge pull request #477 from kbss-cvut/development

[3.1.1] Release

Author: ledsoft

NEWS.cs.md

@@ -1,3 +1,7 @@
+#### Verze 3.1.1
+
+- Opravy chyb, aktualizace knihoven.
+
 #### Verze 3.1.0
 
 - Přidána možnost zvýraznit v anotátoru výskyty vybraného pojmu.

NEWS.en.md

@@ -1,3 +1,7 @@
+#### Version 3.1.1
+
+- Bug fixes, dependency updates.
+
 #### Version 3.1.0
 
 - Added the possibility to highlight occurrences of the selected term in annotator.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "termit-ui",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "private": true,
   "homepage": ".",
   "license": "GPL-3.0-only",

package.json

@@ -24,8 +24,11 @@ const UnmappedProperties: React.FC<UnmappedPropertiesProps> = (
       </div>
     ) : null;
   }
-  const result: JSX.Element[] = [];
+  const result: React.JSX.Element[] = [];
   props.properties.forEach((values, k) => {
+    if (values.length === 0) {
+      return;
+    }
     const sortedItems = values.map((v) =>
       (v as { iri: string }).iri ? (v as { iri: string }).iri : (v as string)
     );

src/component/genericmetadata/UnmappedProperties.tsx

@@ -9,6 +9,13 @@ export function context(propertyIri: string) {
   };
 }
 
+export function pluralContext(propertyIri: string) {
+  return {
+    "@id": propertyIri,
+    "@container": ["@language", "@set"],
+  };
+}
+
 export interface MultilingualString {
   [key: string]: string;
 }

src/model/MultilingualString.ts

@@ -16,15 +16,16 @@ import {
 import MultilingualString, {
   context,
   getLocalized,
+  pluralContext,
   PluralMultilingualString,
 } from "./MultilingualString";
 import { SupportsSnapshots } from "./Snapshot";
 import { getLanguages, removeTranslation } from "../util/IntlUtil";
 
 const ctx = {
   label: context(VocabularyUtils.SKOS_PREF_LABEL),
-  altLabels: context(VocabularyUtils.SKOS_ALT_LABEL),
-  hiddenLabels: context(VocabularyUtils.SKOS_HIDDEN_LABEL),
+  altLabels: pluralContext(VocabularyUtils.SKOS_ALT_LABEL),
+  hiddenLabels: pluralContext(VocabularyUtils.SKOS_HIDDEN_LABEL),
   definition: context(VocabularyUtils.DEFINITION),
   scopeNote: context(VocabularyUtils.SKOS_SCOPE_NOTE),
   parentTerms: VocabularyUtils.BROADER,
@@ -38,7 +39,7 @@ const ctx = {
   state: VocabularyUtils.HAS_TERM_STATE,
   glossary: VocabularyUtils.SKOS_IN_SCHEME,
   notations: VocabularyUtils.SKOS_NOTATION,
-  examples: context(VocabularyUtils.SKOS_EXAMPLE),
+  examples: pluralContext(VocabularyUtils.SKOS_EXAMPLE),
   types: "@type",
 };
 

src/model/Term.ts

@@ -1,4 +1,5 @@
 import { compact, JsonLdContext, JsonLdDictionary, JsonLdInput } from "jsonld";
+import Utils from "./Utils";
 
 /**
  * Utility functions for processing JSON-LD data.
@@ -18,9 +19,36 @@ export default class JsonLdUtils {
     input: JsonLdInput,
     context: JsonLdContext
   ): Promise<T> {
-    return compact<T>(input, context).then((res) =>
-      JsonLdUtils.resolveReferences<T>(res, new Map<string, object>())
-    );
+    return compact<T>(input, context).then((res) => {
+      res = JsonLdUtils.removeEmptyPluralLanguageContainers<T>(res, context);
+      return JsonLdUtils.resolveReferences<T>(res, new Map<string, object>());
+    });
+  }
+
+  /**
+   * An empty array is added for plural language containers (context @container = @language and @set) if they are not specified
+   * in the data. This function removes them, because otherwise they show up as unmapped properties
+   * (e.g., instead of altLabels, the term would have attribute http://www.w3.org/2004/02/skos/core#altLabel with value []).
+   * @param input Input object
+   * @param context JSON-LD context definition
+   * @private
+   */
+  private static removeEmptyPluralLanguageContainers<
+    T extends JsonLdDictionary
+  >(input: T, context: JsonLdContext): T {
+    Object.keys(context)
+      .filter((k) => {
+        return (
+          Array.isArray(context[k]["@container"]) &&
+          Utils.arraysAreEqual(context[k]["@container"], [
+            "@language",
+            "@set",
+          ]) &&
+          Utils.sanitizeArray(input[context[k]["@id"]]).length === 0
+        );
+      })
+      .forEach((k) => delete input[context[k]["@id"]]);
+    return input;
   }
 
   /**

src/util/JsonLdUtils.ts

@@ -340,6 +340,29 @@ const Utils = {
   normalizeString(str: string) {
     return str.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
   },
+
+  /**
+   * Checks if the specified arrays are equal.
+   * @param a Array
+   * @param b Array
+   */
+  arraysAreEqual(a: any[], b: any[]) {
+    if (a === b) {
+      return true;
+    }
+    if (a == null || b == null) {
+      return false;
+    }
+    if (a.length !== b.length) {
+      return false;
+    }
+    for (let i = 0; i < a.length; i++) {
+      if (a[i] !== b[i]) {
+        return false;
+      }
+    }
+    return true;
+  },
 };
 
 export default Utils;

src/util/Utils.ts

@@ -1,6 +1,7 @@
 import VocabularyUtils from "../VocabularyUtils";
 import JsonLdUtils from "../JsonLdUtils";
 import { CONTEXT as VOCABULARY_CONTEXT } from "../../model/Vocabulary";
+import { CONTEXT as TERM_CONTEXT, TermData } from "../../model/Term";
 
 describe("JsonLdUtils", () => {
   describe("resolveReferences", () => {
@@ -73,6 +74,76 @@ describe("JsonLdUtils", () => {
         expect(result.document.vocabulary).toEqual(result);
       });
     });
+
+    it("does not add empty arrays for plural language containers", () => {
+      const input = {
+        "@context": {
+          types: "@type",
+          sources: "http://purl.org/dc/terms/source",
+          notations: "http://www.w3.org/2004/02/skos/core#notation",
+          label: {
+            "@id": "http://www.w3.org/2004/02/skos/core#prefLabel",
+            "@container": "@language",
+          },
+          uri: "@id",
+          subTerms: "http://www.w3.org/2004/02/skos/core#narrower",
+          glossary: "http://www.w3.org/2004/02/skos/core#inScheme",
+          vocabulary:
+            "http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/je-pojmem-ze-slovníku",
+          hiddenLabels: "http://www.w3.org/2004/02/skos/core#hiddenLabel",
+          examples: "http://www.w3.org/2004/02/skos/core#example",
+          related: "http://www.w3.org/2004/02/skos/core#related",
+          relatedMatch: "http://www.w3.org/2004/02/skos/core#relatedMatch",
+          definition: {
+            "@id": "http://www.w3.org/2004/02/skos/core#definition",
+            "@container": "@language",
+          },
+          state:
+            "http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/má-stav-pojmu",
+          parentTerms: "http://www.w3.org/2004/02/skos/core#broader",
+          altLabels: {
+            "@id": "http://www.w3.org/2004/02/skos/core#altLabel",
+            "@container": "@language",
+          },
+          exactMatchTerms: "http://www.w3.org/2004/02/skos/core#exactMatch",
+        },
+        uri: "http://onto.fel.cvut.cz/ontologies/slovnik/ml-test/pojem/lokalita",
+        types: [
+          "http://onto.fel.cvut.cz/ontologies/ufo/object",
+          "http://www.w3.org/2004/02/skos/core#Concept",
+        ],
+        label: {
+          cs: "Lokalita",
+          en: "Locality",
+        },
+        subTerms: [],
+        notations: [],
+        definition: {
+          cs: "Plocha nebo soubor ploch, popřípadě část plochy, vymezená na základě převažujícího charakteru. Upraveno. Ještě přidána explicitně zmíněná testovací plocha, aby se nám přidala do definičně souvisejících pojmů.\n\nDefinice znovu upravena, abychom spustili textovou analýzu. A znovu.",
+          en: "English definition of the term Locality is just a placeholder proving that multilingual definition works.",
+        },
+        sources: [],
+        altLabels: [],
+        hiddenLabels: [],
+        examples: [],
+        vocabulary: {
+          uri: "http://onto.fel.cvut.cz/ontologies/slovnik/ml-test",
+        },
+        glossary: {
+          uri: "http://onto.fel.cvut.cz/ontologies/slovnik/ml-test/glosář",
+        },
+        state: {
+          uri: "http://onto.fel.cvut.cz/ontologies/application/termit/pojem/publikovaný-pojem",
+        },
+      };
+      return JsonLdUtils.compactAndResolveReferences(input, TERM_CONTEXT).then(
+        (result: TermData) => {
+          expect(result[VocabularyUtils.SKOS_ALT_LABEL]).not.toBeDefined();
+          expect(result[VocabularyUtils.SKOS_HIDDEN_LABEL]).not.toBeDefined();
+          expect(result[VocabularyUtils.SKOS_EXAMPLE]).not.toBeDefined();
+        }
+      );
+    });
   });
 
   describe("compactAndResolveReferencesAsArray", () => {