@beinformed/ui 1.61.0 → 1.62.0

package/lib/utils/helpers/createHash.js

@@ -1,28 +1,30 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createHashFromHref = exports.createHash = void 0;
+var _hashIt = _interopRequireDefault(require("hash-it"));
 /**
  * https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
  */
 const createHash = str => {
-  if (!str) return 0;
-  let hash = 0;
-  for (let i = 0; i < str.length; i++) {
-    hash = (hash << 5) - hash + str.charCodeAt(i);
-    hash = hash & hash;
-  }
-  return hash;
+  return (0, _hashIt.default)(str);
 };
 
 /**
  */
 exports.createHash = createHash;
-const createHashFromHref = href => {
+const createHashFromHref = (href, fragment) => {
   const hrefString = href.hash ? [href.toString(), href.hash].join("#") : href.toString();
-  return createHash(hrefString);
+  if (fragment) {
+    return (0, _hashIt.default)({
+      hrefString,
+      fragment
+    });
+  }
+  return (0, _hashIt.default)(hrefString);
 };
 exports.createHashFromHref = createHashFromHref;
 //# sourceMappingURL=createHash.js.map

package/lib/utils/helpers/createHash.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHash.js","names":["createHash","str","hash","i","length","charCodeAt","exports","createHashFromHref","href","hrefString","toString","join"],"sources":["../../../src/utils/helpers/createHash.js"],"sourcesContent":["// @flow\nimport type Href from \"../../models/href/Href\";\n\n/**\n * https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/\n */\nconst createHash = (str: string): number => {\n  if (!str) return 0;\n\n  let hash = 0;\n  for (let i = 0; i < str.length; i++) {\n    hash = (hash << 5) - hash + str.charCodeAt(i);\n    hash = hash & hash;\n  }\n  return hash;\n};\n\n/**\n */\nconst createHashFromHref = (href: Href): number => {\n  const hrefString = href.hash\n    ? [href.toString(), href.hash].join(\"#\")\n    : href.toString();\n\n  return createHash(hrefString);\n};\n\nexport { createHash, createHashFromHref };\n"],"mappings":";;;;;;AAGA;AACA;AACA;AACA,MAAMA,UAAU,GAAIC,GAAW,IAAa;EAC1C,IAAI,CAACA,GAAG,EAAE,OAAO,CAAC;EAElB,IAAIC,IAAI,GAAG,CAAC;EACZ,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,GAAG,CAACG,MAAM,EAAED,CAAC,EAAE,EAAE;IACnCD,IAAI,GAAG,CAACA,IAAI,IAAI,CAAC,IAAIA,IAAI,GAAGD,GAAG,CAACI,UAAU,CAACF,CAAC,CAAC;IAC7CD,IAAI,GAAGA,IAAI,GAAGA,IAAI;EACpB;EACA,OAAOA,IAAI;AACb,CAAC;;AAED;AACA;AADAI,OAAA,CAAAN,UAAA,GAAAA,UAAA;AAEA,MAAMO,kBAAkB,GAAIC,IAAU,IAAa;EACjD,MAAMC,UAAU,GAAGD,IAAI,CAACN,IAAI,GACxB,CAACM,IAAI,CAACE,QAAQ,CAAC,CAAC,EAAEF,IAAI,CAACN,IAAI,CAAC,CAACS,IAAI,CAAC,GAAG,CAAC,GACtCH,IAAI,CAACE,QAAQ,CAAC,CAAC;EAEnB,OAAOV,UAAU,CAACS,UAAU,CAAC;AAC/B,CAAC;AAACH,OAAA,CAAAC,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"file":"createHash.js","names":["_hashIt","_interopRequireDefault","require","createHash","str","hash","exports","createHashFromHref","href","fragment","hrefString","toString","join"],"sources":["../../../src/utils/helpers/createHash.js"],"sourcesContent":["// @flow\nimport hash from \"hash-it\";\n\nimport type Href from \"../../models/href/Href\";\nimport type { SectionFragment } from \"../../models\";\n\n/**\n * https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/\n */\nconst createHash = (str: string): number => {\n  return hash(str);\n};\n\n/**\n */\nconst createHashFromHref = (href: Href, fragment?: SectionFragment): number => {\n  const hrefString = href.hash\n    ? [href.toString(), href.hash].join(\"#\")\n    : href.toString();\n\n  if (fragment) {\n    return hash({ hrefString, fragment });\n  }\n\n  return hash(hrefString);\n};\n\nexport { createHash, createHashFromHref };\n"],"mappings":";;;;;;;AACA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AAKA;AACA;AACA;AACA,MAAMC,UAAU,GAAIC,GAAW,IAAa;EAC1C,OAAO,IAAAC,eAAI,EAACD,GAAG,CAAC;AAClB,CAAC;;AAED;AACA;AADAE,OAAA,CAAAH,UAAA,GAAAA,UAAA;AAEA,MAAMI,kBAAkB,GAAGA,CAACC,IAAU,EAAEC,QAA0B,KAAa;EAC7E,MAAMC,UAAU,GAAGF,IAAI,CAACH,IAAI,GACxB,CAACG,IAAI,CAACG,QAAQ,CAAC,CAAC,EAAEH,IAAI,CAACH,IAAI,CAAC,CAACO,IAAI,CAAC,GAAG,CAAC,GACtCJ,IAAI,CAACG,QAAQ,CAAC,CAAC;EAEnB,IAAIF,QAAQ,EAAE;IACZ,OAAO,IAAAJ,eAAI,EAAC;MAAEK,UAAU;MAAED;IAAS,CAAC,CAAC;EACvC;EAEA,OAAO,IAAAJ,eAAI,EAACK,UAAU,CAAC;AACzB,CAAC;AAACJ,OAAA,CAAAC,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.61.0",
+  "version": "1.62.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -27,6 +27,7 @@
     "clean": "rimraf lib dist esm coverage && npm run clean:proxies",
     "clean:proxies": "node .build/proxies.js --clean",
     "lint": "eslint --cache .",
+    "lint:fix": "eslint --cache . --fix",
     "prettier": "prettier --write \"./src/**/*.js\"",
     "flow": "flow",
     "flow:ci": "flow check",
@@ -76,6 +77,7 @@
     "dequal": "^2.0.3",
     "file-size": "^1.0.0",
     "format-message": "^6.2.4",
+    "hash-it": "^6.0.0",
     "html-entities": "^2.6.0",
     "iban": "^0.0.14",
     "js-cookie": "^3.0.5",

package/src/models/attributes/__tests__/AttributeContent.spec.js

@@ -205,7 +205,7 @@ describe("AttributeContent", () => {
 
     expect(firstSection.childSections).toHaveLength(2);
     expect(firstSection.subSections).toHaveLength(2);
-    expect(firstSection.referenceHash).toBe(-1954774597);
+    expect(firstSection.referenceHash).toBe(4345174491453);
   });
 
   it("can handle referredSections", () => {

package/src/models/concepts/ConceptIndexModel.js

@@ -67,7 +67,9 @@ export default class ConceptIndexModel extends ResourceModel {
   static isApplicableModel(data: ModularUIResponse): boolean {
     const resourceType = data.contributions?.resourcetype;
     return (
-      resourceType === "ConceptSearch" || resourceType === "relatedConcepts"
+      resourceType === "ConceptSearch" ||
+      resourceType === "relatedConcepts" ||
+      resourceType === "RelatedConcepts"
     );
   }
 

package/src/models/concepts/ConceptLinkModel.js

@@ -12,6 +12,13 @@ import type {
 } from "../types";
 import type Href from "../href/Href";
 
+type SectionFragment = {
+  sectionId: string,
+  text: string,
+  startOffset: number,
+  endOffset: number,
+};
+
 /**
  * Link to a concept
  */
@@ -184,4 +191,18 @@ export default class ConceptLinkModel
   isOfConceptType(conceptTypeId: string): boolean {
     return this.conceptType?.isOfConceptType(conceptTypeId) ?? false;
   }
+
+  /**
+   *
+   */
+  get modelCategory(): string {
+    return this.getData("modelCategory");
+  }
+
+  /**
+   *
+   */
+  get fragment(): SectionFragment {
+    return this.getData("sectionFragment");
+  }
 }

package/src/models/concepts/SourceReferenceModel.js

@@ -4,7 +4,7 @@ import { createHashFromHref } from "../../utils/helpers/createHash";
 import ContentLinkModel from "../content/ContentLinkModel";
 import Href from "../href/Href";
 import { getBasePathModularUI } from "../../constants";
-import type { ModelOptions } from "../types";
+import type { ModelOptions, SectionFragment } from "../types";
 
 /**
  */
@@ -74,11 +74,25 @@ class SourceReferenceModel {
     return this._sourceReference.sourceLabel;
   }
 
+  /**
+   *
+   */
+  get sourceAbbreviation(): string {
+    return this._sourceReference.sourceAbbreviation;
+  }
+
   /**
    */
   get referenceHash(): number {
     return createHashFromHref(this.selfhref);
   }
+
+  /**
+   *
+   */
+  get fragment(): SectionFragment | void {
+    return this._sourceReference.sectionFragment;
+  }
 }
 
 export default SourceReferenceModel;

package/src/models/concepts/__mock__/related_concepts.js

@@ -0,0 +1,12 @@
+import ModularUIResponse from "../../../modularui/ModularUIResponse";
+import data from "./related_concepts_data.json";
+import contributions from "./related_concepts_contributions.json";
+import ConceptIndexModel from "../ConceptIndexModel";
+
+const response = ModularUIResponse.create({
+  key: "concept",
+  data,
+  contributions,
+});
+
+export const relatedConcepts = new ConceptIndexModel(response);

package/src/models/concepts/__mock__/related_concepts_contributions.json

@@ -0,0 +1,41 @@
+{
+  "RelatedConceptsOfContentSection": {
+    "label": "Related concepts of content",
+    "resourcetype": "RelatedConcepts",
+    "filter": [
+      {
+        "entryDate": {
+          "type": "datefilter",
+          "label": "Entry date",
+          "format": "dd-MM-yyyy",
+          "formatlabel": "dd-mm-yyyy",
+          "operator": "greater-than-or-equal"
+        }
+      },
+      {
+        "modelCategory": {
+          "type": "stringfilter",
+          "label": "Model category",
+          "multiplechoice": false
+        }
+      }
+    ],
+    "results": {
+      "concept": {
+        "metadata": {
+          "_id": {
+            "type": "string"
+          }
+        },
+        "attributes": [
+          {
+            "label": {
+              "type": "string",
+              "label": "concept label"
+            }
+          }
+        ]
+      }
+    }
+  }
+}