@beinformed/ui 1.50.1 → 1.50.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.50.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.50.1...v1.50.2) (2024-07-17)
+
+
+### Bug Fixes
+
+* **content:** handle incorrect relatedConcepts links ([265ee33](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/265ee33db296149766dac6d94e57963953c05dd2))
+
 ## [1.50.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.50.0...v1.50.1) (2024-07-08)
 
 

package/esm/models/content/SubSectionModel.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import { createHashFromHref } from "../../utils/helpers/createHash";
 import BaseModel from "../base/BaseModel";
 import LinkCollection from "../links/LinkCollection";
@@ -110,9 +111,16 @@ export default class SubSectionModel extends BaseModel {
   get relatedConceptsHref() {
     const relatedConceptsLink = this.links.getLinkByKey("relatedConcepts");
     if (relatedConceptsLink) {
+      var _context2;
       const {
         href
       } = relatedConceptsLink;
+      if (_includesInstanceProperty(_context2 = href.hash).call(_context2, "/relatedConcepts")) {
+        var _context3;
+        const firstPart = href.path.substring(0, href.path.lastIndexOf("/"));
+        href.path = firstPart + "/" + href.hash;
+        href.hash = _includesInstanceProperty(_context3 = href.hash).call(_context3, "#") ? href.hash.substring(href.hash.indexOf("#")) : "";
+      }
       href.setReferenceHash(this.referenceHash);
       return href;
     }

package/esm/models/content/SubSectionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubSectionModel.js","names":["createHashFromHref","BaseModel","LinkCollection","Href","LinkModel","retrieveText","SubSectionModel","constructor","data","_defineProperty","referred","id","_id","key","body","getData","number","label","subSections","_context","_mapInstanceProperty","call","subSection","links","_links","contributions","selflink","getLinkByKey","selfhref","href","relatedConceptsHrefs","hrefs","relatedConceptsHref","push","forEach","relatedConceptsLink","setReferenceHash","referenceHash","getReferredSections","sections","referredChilds"],"sources":["../../../src/models/content/SubSectionModel.js"],"sourcesContent":["// @flow\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport LinkCollection from \"../links/LinkCollection\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport { retrieveText } from \"../../utils\";\n\n/**\n * Link to a concept\n */\nexport default class SubSectionModel extends BaseModel {\n  _links: LinkCollection;\n\n  /**\n   */\n  constructor(data: Object) {\n    super(data, {});\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   * Retrieve key of subsection\n   */\n  get key(): ?string {\n    return this.id;\n  }\n\n  /**\n   * Retrieve html body\n   */\n  get body(): string {\n    const body = this.getData(\"body\", \"\");\n    return retrieveText(body);\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Retrieve label of section\n   */\n  get label(): ?string {\n    return this.data.label;\n  }\n\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) => new SubSectionModel(subSection),\n        )\n      : [];\n  }\n\n  /**\n   * Retrieve links of section\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        this.data._links,\n        this.contributions._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel | null {\n    return this.links.getLinkByKey(\"self\");\n  }\n\n  /**\n   * Return default self link of resource\n   */\n  get selfhref(): Href | null {\n    return this.selflink ? this.selflink.href : null;\n  }\n\n  /**\n   */\n  get relatedConceptsHrefs(): Array<Href> {\n    const hrefs = [];\n    if (this.relatedConceptsHref) {\n      hrefs.push(this.relatedConceptsHref);\n    }\n\n    this.subSections.forEach((subSection) => {\n      hrefs.push(...subSection.relatedConceptsHrefs);\n    });\n\n    return hrefs;\n  }\n\n  /**\n   * Get related concepts link\n   */\n  get relatedConceptsHref(): Href | null {\n    const relatedConceptsLink = this.links.getLinkByKey(\"relatedConcepts\");\n\n    if (relatedConceptsLink) {\n      const { href } = relatedConceptsLink;\n      href.setReferenceHash(this.referenceHash);\n      return href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    const selfhref = this.selfhref || new Href();\n    return createHashFromHref(selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SubSectionModel.js","names":["createHashFromHref","BaseModel","LinkCollection","Href","LinkModel","retrieveText","SubSectionModel","constructor","data","_defineProperty","referred","id","_id","key","body","getData","number","label","subSections","_context","_mapInstanceProperty","call","subSection","links","_links","contributions","selflink","getLinkByKey","selfhref","href","relatedConceptsHrefs","hrefs","relatedConceptsHref","push","forEach","relatedConceptsLink","_context2","_includesInstanceProperty","hash","_context3","firstPart","path","substring","lastIndexOf","indexOf","setReferenceHash","referenceHash","getReferredSections","sections","referredChilds"],"sources":["../../../src/models/content/SubSectionModel.js"],"sourcesContent":["// @flow\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport LinkCollection from \"../links/LinkCollection\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport { retrieveText } from \"../../utils\";\n\n/**\n * Link to a concept\n */\nexport default class SubSectionModel extends BaseModel {\n  _links: LinkCollection;\n\n  /**\n   */\n  constructor(data: Object) {\n    super(data, {});\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   * Retrieve key of subsection\n   */\n  get key(): ?string {\n    return this.id;\n  }\n\n  /**\n   * Retrieve html body\n   */\n  get body(): string {\n    const body = this.getData(\"body\", \"\");\n    return retrieveText(body);\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Retrieve label of section\n   */\n  get label(): ?string {\n    return this.data.label;\n  }\n\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) => new SubSectionModel(subSection),\n        )\n      : [];\n  }\n\n  /**\n   * Retrieve links of section\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        this.data._links,\n        this.contributions._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel | null {\n    return this.links.getLinkByKey(\"self\");\n  }\n\n  /**\n   * Return default self link of resource\n   */\n  get selfhref(): Href | null {\n    return this.selflink ? this.selflink.href : null;\n  }\n\n  /**\n   */\n  get relatedConceptsHrefs(): Array<Href> {\n    const hrefs = [];\n    if (this.relatedConceptsHref) {\n      hrefs.push(this.relatedConceptsHref);\n    }\n\n    this.subSections.forEach((subSection) => {\n      hrefs.push(...subSection.relatedConceptsHrefs);\n    });\n\n    return hrefs;\n  }\n\n  /**\n   * Get related concepts link\n   */\n  get relatedConceptsHref(): Href | null {\n    const relatedConceptsLink = this.links.getLinkByKey(\"relatedConcepts\");\n\n    if (relatedConceptsLink) {\n      const { href } = relatedConceptsLink;\n\n      if (href.hash.includes(\"/relatedConcepts\")) {\n        const firstPart = href.path.substring(0, href.path.lastIndexOf(\"/\"));\n        href.path = firstPart + \"/\" + href.hash;\n        href.hash = href.hash.includes(\"#\")\n          ? href.hash.substring(href.hash.indexOf(\"#\"))\n          : \"\";\n      }\n\n      href.setReferenceHash(this.referenceHash);\n      return href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    const selfhref = this.selfhref || new Href();\n    return createHashFromHref(selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/models/content/SubSectionModel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _createHash = require("../../utils/helpers/createHash");
 var _BaseModel = _interopRequireDefault(require("../base/BaseModel"));
@@ -116,9 +117,16 @@ class SubSectionModel extends _BaseModel.default {
   get relatedConceptsHref() {
     const relatedConceptsLink = this.links.getLinkByKey("relatedConcepts");
     if (relatedConceptsLink) {
+      var _context2;
       const {
         href
       } = relatedConceptsLink;
+      if ((0, _includes.default)(_context2 = href.hash).call(_context2, "/relatedConcepts")) {
+        var _context3;
+        const firstPart = href.path.substring(0, href.path.lastIndexOf("/"));
+        href.path = firstPart + "/" + href.hash;
+        href.hash = (0, _includes.default)(_context3 = href.hash).call(_context3, "#") ? href.hash.substring(href.hash.indexOf("#")) : "";
+      }
       href.setReferenceHash(this.referenceHash);
       return href;
     }

package/lib/models/content/SubSectionModel.js.flow

@@ -122,6 +122,15 @@ export default class SubSectionModel extends BaseModel {
 
     if (relatedConceptsLink) {
       const { href } = relatedConceptsLink;
+
+      if (href.hash.includes("/relatedConcepts")) {
+        const firstPart = href.path.substring(0, href.path.lastIndexOf("/"));
+        href.path = firstPart + "/" + href.hash;
+        href.hash = href.hash.includes("#")
+          ? href.hash.substring(href.hash.indexOf("#"))
+          : "";
+      }
+
       href.setReferenceHash(this.referenceHash);
       return href;
     }

package/lib/models/content/SubSectionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubSectionModel.js","names":["_createHash","require","_BaseModel","_interopRequireDefault","_LinkCollection","_Href","_LinkModel","_utils","SubSectionModel","BaseModel","constructor","data","_defineProperty2","default","referred","id","_id","key","body","getData","retrieveText","number","label","subSections","_context","_map","call","subSection","links","_links","LinkCollection","contributions","selflink","getLinkByKey","selfhref","href","relatedConceptsHrefs","hrefs","relatedConceptsHref","push","forEach","relatedConceptsLink","setReferenceHash","referenceHash","Href","createHashFromHref","getReferredSections","sections","referredChilds","exports"],"sources":["../../../src/models/content/SubSectionModel.js"],"sourcesContent":["// @flow\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport LinkCollection from \"../links/LinkCollection\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport { retrieveText } from \"../../utils\";\n\n/**\n * Link to a concept\n */\nexport default class SubSectionModel extends BaseModel {\n  _links: LinkCollection;\n\n  /**\n   */\n  constructor(data: Object) {\n    super(data, {});\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   * Retrieve key of subsection\n   */\n  get key(): ?string {\n    return this.id;\n  }\n\n  /**\n   * Retrieve html body\n   */\n  get body(): string {\n    const body = this.getData(\"body\", \"\");\n    return retrieveText(body);\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Retrieve label of section\n   */\n  get label(): ?string {\n    return this.data.label;\n  }\n\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) => new SubSectionModel(subSection),\n        )\n      : [];\n  }\n\n  /**\n   * Retrieve links of section\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        this.data._links,\n        this.contributions._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel | null {\n    return this.links.getLinkByKey(\"self\");\n  }\n\n  /**\n   * Return default self link of resource\n   */\n  get selfhref(): Href | null {\n    return this.selflink ? this.selflink.href : null;\n  }\n\n  /**\n   */\n  get relatedConceptsHrefs(): Array<Href> {\n    const hrefs = [];\n    if (this.relatedConceptsHref) {\n      hrefs.push(this.relatedConceptsHref);\n    }\n\n    this.subSections.forEach((subSection) => {\n      hrefs.push(...subSection.relatedConceptsHrefs);\n    });\n\n    return hrefs;\n  }\n\n  /**\n   * Get related concepts link\n   */\n  get relatedConceptsHref(): Href | null {\n    const relatedConceptsLink = this.links.getLinkByKey(\"relatedConcepts\");\n\n    if (relatedConceptsLink) {\n      const { href } = relatedConceptsLink;\n      href.setReferenceHash(this.referenceHash);\n      return href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    const selfhref = this.selfhref || new Href();\n    return createHashFromHref(selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SubSectionModel.js","names":["_createHash","require","_BaseModel","_interopRequireDefault","_LinkCollection","_Href","_LinkModel","_utils","SubSectionModel","BaseModel","constructor","data","_defineProperty2","default","referred","id","_id","key","body","getData","retrieveText","number","label","subSections","_context","_map","call","subSection","links","_links","LinkCollection","contributions","selflink","getLinkByKey","selfhref","href","relatedConceptsHrefs","hrefs","relatedConceptsHref","push","forEach","relatedConceptsLink","_context2","_includes","hash","_context3","firstPart","path","substring","lastIndexOf","indexOf","setReferenceHash","referenceHash","Href","createHashFromHref","getReferredSections","sections","referredChilds","exports"],"sources":["../../../src/models/content/SubSectionModel.js"],"sourcesContent":["// @flow\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport LinkCollection from \"../links/LinkCollection\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport { retrieveText } from \"../../utils\";\n\n/**\n * Link to a concept\n */\nexport default class SubSectionModel extends BaseModel {\n  _links: LinkCollection;\n\n  /**\n   */\n  constructor(data: Object) {\n    super(data, {});\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   * Retrieve key of subsection\n   */\n  get key(): ?string {\n    return this.id;\n  }\n\n  /**\n   * Retrieve html body\n   */\n  get body(): string {\n    const body = this.getData(\"body\", \"\");\n    return retrieveText(body);\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Retrieve label of section\n   */\n  get label(): ?string {\n    return this.data.label;\n  }\n\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) => new SubSectionModel(subSection),\n        )\n      : [];\n  }\n\n  /**\n   * Retrieve links of section\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        this.data._links,\n        this.contributions._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel | null {\n    return this.links.getLinkByKey(\"self\");\n  }\n\n  /**\n   * Return default self link of resource\n   */\n  get selfhref(): Href | null {\n    return this.selflink ? this.selflink.href : null;\n  }\n\n  /**\n   */\n  get relatedConceptsHrefs(): Array<Href> {\n    const hrefs = [];\n    if (this.relatedConceptsHref) {\n      hrefs.push(this.relatedConceptsHref);\n    }\n\n    this.subSections.forEach((subSection) => {\n      hrefs.push(...subSection.relatedConceptsHrefs);\n    });\n\n    return hrefs;\n  }\n\n  /**\n   * Get related concepts link\n   */\n  get relatedConceptsHref(): Href | null {\n    const relatedConceptsLink = this.links.getLinkByKey(\"relatedConcepts\");\n\n    if (relatedConceptsLink) {\n      const { href } = relatedConceptsLink;\n\n      if (href.hash.includes(\"/relatedConcepts\")) {\n        const firstPart = href.path.substring(0, href.path.lastIndexOf(\"/\"));\n        href.path = firstPart + \"/\" + href.hash;\n        href.hash = href.hash.includes(\"#\")\n          ? href.hash.substring(href.hash.indexOf(\"#\"))\n          : \"\";\n      }\n\n      href.setReferenceHash(this.referenceHash);\n      return href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    const selfhref = this.selfhref || new Href();\n    return createHashFromHref(selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n"],"mappings":";;;;;;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,eAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,KAAA,GAAAF,sBAAA,CAAAF,OAAA;AACA,IAAAK,UAAA,GAAAH,sBAAA,CAAAF,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAEA;AACA;AACA;AACe,MAAMO,eAAe,SAASC,kBAAS,CAAC;EAGrD;AACF;EACEC,WAAWA,CAACC,IAAY,EAAE;IACxB,KAAK,CAACA,IAAI,EAAE,CAAC,CAAC,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA;EAClB;;EAEA;AACF;EACE,IAAIC,QAAQA,CAAA,EAAY;IACtB,OAAO,IAAI,CAACH,IAAI,CAACG,QAAQ;EAC3B;;EAEA;AACF;EACE,IAAIC,EAAEA,CAAA,EAAW;IACf,OAAO,IAAI,CAACJ,IAAI,CAACI,EAAE,IAAI,IAAI,CAACJ,IAAI,CAACK,GAAG;EACtC;;EAEA;AACF;AACA;EACE,IAAIC,GAAGA,CAAA,EAAY;IACjB,OAAO,IAAI,CAACF,EAAE;EAChB;;EAEA;AACF;AACA;EACE,IAAIG,IAAIA,CAAA,EAAW;IACjB,MAAMA,IAAI,GAAG,IAAI,CAACC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IACrC,OAAO,IAAAC,mBAAY,EAACF,IAAI,CAAC;EAC3B;;EAEA;AACF;AACA;EACE,IAAIG,MAAMA,CAAA,EAAkB;IAC1B,OAAO,IAAI,CAACV,IAAI,CAACU,MAAM,IAAI,IAAI;EACjC;;EAEA;AACF;AACA;EACE,IAAIC,KAAKA,CAAA,EAAY;IACnB,OAAO,IAAI,CAACX,IAAI,CAACW,KAAK;EACxB;;EAEA;AACF;AACA;EACE,IAAIC,WAAWA,CAAA,EAA2B;IAAA,IAAAC,QAAA;IACxC,OAAO,IAAI,CAACb,IAAI,CAACY,WAAW,GACxB,IAAAE,IAAA,CAAAZ,OAAA,EAAAW,QAAA,OAAI,CAACb,IAAI,CAACY,WAAW,EAAAG,IAAA,CAAAF,QAAA,EAClBG,UAAU,IAAK,IAAInB,eAAe,CAACmB,UAAU,CAChD,CAAC,GACD,EAAE;EACR;;EAEA;AACF;AACA;EACE,IAAIC,KAAKA,CAAA,EAAmB;IAC1B,IAAI,CAAC,IAAI,CAACC,MAAM,EAAE;MAChB,IAAI,CAACA,MAAM,GAAG,IAAIC,uBAAc,CAC9B,IAAI,CAACnB,IAAI,CAACkB,MAAM,EAChB,IAAI,CAACE,aAAa,CAACF,MACrB,CAAC;IACH;IAEA,OAAO,IAAI,CAACA,MAAM;EACpB;;EAEA;AACF;AACA;EACE,IAAIG,QAAQA,CAAA,EAAqB;IAC/B,OAAO,IAAI,CAACJ,KAAK,CAACK,YAAY,CAAC,MAAM,CAAC;EACxC;;EAEA;AACF;AACA;EACE,IAAIC,QAAQA,CAAA,EAAgB;IAC1B,OAAO,IAAI,CAACF,QAAQ,GAAG,IAAI,CAACA,QAAQ,CAACG,IAAI,GAAG,IAAI;EAClD;;EAEA;AACF;EACE,IAAIC,oBAAoBA,CAAA,EAAgB;IACtC,MAAMC,KAAK,GAAG,EAAE;IAChB,IAAI,IAAI,CAACC,mBAAmB,EAAE;MAC5BD,KAAK,CAACE,IAAI,CAAC,IAAI,CAACD,mBAAmB,CAAC;IACtC;IAEA,IAAI,CAACf,WAAW,CAACiB,OAAO,CAAEb,UAAU,IAAK;MACvCU,KAAK,CAACE,IAAI,CAAC,GAAGZ,UAAU,CAACS,oBAAoB,CAAC;IAChD,CAAC,CAAC;IAEF,OAAOC,KAAK;EACd;;EAEA;AACF;AACA;EACE,IAAIC,mBAAmBA,CAAA,EAAgB;IACrC,MAAMG,mBAAmB,GAAG,IAAI,CAACb,KAAK,CAACK,YAAY,CAAC,iBAAiB,CAAC;IAEtE,IAAIQ,mBAAmB,EAAE;MAAA,IAAAC,SAAA;MACvB,MAAM;QAAEP;MAAK,CAAC,GAAGM,mBAAmB;MAEpC,IAAI,IAAAE,SAAA,CAAA9B,OAAA,EAAA6B,SAAA,GAAAP,IAAI,CAACS,IAAI,EAAAlB,IAAA,CAAAgB,SAAA,EAAU,kBAAkB,CAAC,EAAE;QAAA,IAAAG,SAAA;QAC1C,MAAMC,SAAS,GAAGX,IAAI,CAACY,IAAI,CAACC,SAAS,CAAC,CAAC,EAAEb,IAAI,CAACY,IAAI,CAACE,WAAW,CAAC,GAAG,CAAC,CAAC;QACpEd,IAAI,CAACY,IAAI,GAAGD,SAAS,GAAG,GAAG,GAAGX,IAAI,CAACS,IAAI;QACvCT,IAAI,CAACS,IAAI,GAAG,IAAAD,SAAA,CAAA9B,OAAA,EAAAgC,SAAA,GAAAV,IAAI,CAACS,IAAI,EAAAlB,IAAA,CAAAmB,SAAA,EAAU,GAAG,CAAC,GAC/BV,IAAI,CAACS,IAAI,CAACI,SAAS,CAACb,IAAI,CAACS,IAAI,CAACM,OAAO,CAAC,GAAG,CAAC,CAAC,GAC3C,EAAE;MACR;MAEAf,IAAI,CAACgB,gBAAgB,CAAC,IAAI,CAACC,aAAa,CAAC;MACzC,OAAOjB,IAAI;IACb;IAEA,OAAO,IAAI;EACb;;EAEA;AACF;EACE,IAAIiB,aAAaA,CAAA,EAAW;IAC1B,MAAMlB,QAAQ,GAAG,IAAI,CAACA,QAAQ,IAAI,IAAImB,aAAI,CAAC,CAAC;IAC5C,OAAO,IAAAC,8BAAkB,EAACpB,QAAQ,CAAC;EACrC;;EAEA;AACF;EACEqB,mBAAmBA,CAAA,EAA2B;IAC5C,MAAMC,QAAQ,GAAG,EAAE;IAEnB,KAAK,MAAM7B,UAAU,IAAI,IAAI,CAACJ,WAAW,EAAE;MACzC,IAAII,UAAU,CAACb,QAAQ,EAAE;QACvB0C,QAAQ,CAACjB,IAAI,CAACZ,UAAU,CAAC;MAC3B;MAEA,MAAM8B,cAAc,GAAG9B,UAAU,CAAC4B,mBAAmB,CAAC,CAAC;MACvDC,QAAQ,CAACjB,IAAI,CAAC,GAAGkB,cAAc,CAAC;IAClC;IAEA,OAAOD,QAAQ;EACjB;AACF;AAACE,OAAA,CAAA7C,OAAA,GAAAL,eAAA","ignoreList":[]}

package/lib/models/content/__tests__/ContentModel.spec.js.flow

@@ -6,6 +6,7 @@ import contributions from "./contributions.json";
 
 import content from "./content.json";
 import contentWithSubsections from "./content-with-subsections.json";
+import contentWithSubsections2 from "./content-with-subsections2.json";
 import contentWithChildsections from "./content-with-childsections.json";
 import ContentLinkModel from "../ContentLinkModel";
 
@@ -118,6 +119,27 @@ describe("contentmodel", () => {
     );
   });
 
+  it("can handle content service with subsections and correct related concepts", () => {
+    const response = ModularUIResponse.create({
+      key: "contentmodel",
+      data: contentWithSubsections2,
+      contributions,
+    });
+
+    const contentModel = new ContentModel(response);
+    expect(contentModel.relatedConceptsHrefs).toHaveLength(3);
+
+    expect(contentModel.relatedConceptsHrefs[0].toString()).toBe(
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1/relatedConcepts?entryDate=2024-07-17",
+    );
+    expect(contentModel.relatedConceptsHrefs[1].toString()).toBe(
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1a/relatedConcepts",
+    );
+    expect(contentModel.relatedConceptsHrefs[2].toString()).toBe(
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1b/relatedConcepts",
+    );
+  });
+
   it("can handle content service with subsections", () => {
     const response = ModularUIResponse.create({
       key: "contentmodel",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.50.1",
+  "version": "1.50.2",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/models/content/SubSectionModel.js

@@ -122,6 +122,15 @@ export default class SubSectionModel extends BaseModel {
 
     if (relatedConceptsLink) {
       const { href } = relatedConceptsLink;
+
+      if (href.hash.includes("/relatedConcepts")) {
+        const firstPart = href.path.substring(0, href.path.lastIndexOf("/"));
+        href.path = firstPart + "/" + href.hash;
+        href.hash = href.hash.includes("#")
+          ? href.hash.substring(href.hash.indexOf("#"))
+          : "";
+      }
+
       href.setReferenceHash(this.referenceHash);
       return href;
     }

package/src/models/content/__tests__/ContentModel.spec.js

@@ -6,6 +6,7 @@ import contributions from "./contributions.json";
 
 import content from "./content.json";
 import contentWithSubsections from "./content-with-subsections.json";
+import contentWithSubsections2 from "./content-with-subsections2.json";
 import contentWithChildsections from "./content-with-childsections.json";
 import ContentLinkModel from "../ContentLinkModel";
 
@@ -118,6 +119,27 @@ describe("contentmodel", () => {
     );
   });
 
+  it("can handle content service with subsections and correct related concepts", () => {
+    const response = ModularUIResponse.create({
+      key: "contentmodel",
+      data: contentWithSubsections2,
+      contributions,
+    });
+
+    const contentModel = new ContentModel(response);
+    expect(contentModel.relatedConceptsHrefs).toHaveLength(3);
+
+    expect(contentModel.relatedConceptsHrefs[0].toString()).toBe(
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1/relatedConcepts?entryDate=2024-07-17",
+    );
+    expect(contentModel.relatedConceptsHrefs[1].toString()).toBe(
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1a/relatedConcepts",
+    );
+    expect(contentModel.relatedConceptsHrefs[2].toString()).toBe(
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1b/relatedConcepts",
+    );
+  });
+
   it("can handle content service with subsections", () => {
     const response = ModularUIResponse.create({
       key: "contentmodel",

package/src/models/content/__tests__/content-with-subsections2.json

@@ -0,0 +1,79 @@
+{
+  "section": {
+    "_id": "Chapter5_1",
+    "label": "Eligibility Criteria",
+    "number": "5.1",
+    "body": "<p>Applications will need to meet the following eligibility criteria:</p>",
+    "subSections": [
+      {
+        "_id": "Chapter5_1a",
+        "number": "a.",
+        "body": "<p>The research project can be classified as innovative. This includes innovation levels 2 and 3 as described in Annex A.</p>",
+        "_links": {
+          "self": {
+            "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1#Chapter5_1a"
+          },
+          "api_doc": {
+            "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+          },
+          "contributions": {
+            "href": "/contributions/content/(content-identifier)/(section-identifier)"
+          },
+          "relatedConcepts": {
+            "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1#Chapter5_1a/relatedConcepts"
+          },
+          "content": {
+            "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource"
+          }
+        }
+      },
+      {
+        "_id": "Chapter5_1b",
+        "number": "b.",
+        "body": "<p>The research project contributes to open source, which includes the following projects:</p>",
+        "subSections": [],
+        "_links": {
+          "self": {
+            "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1#Chapter5_1b"
+          },
+          "api_doc": {
+            "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+          },
+          "contributions": {
+            "href": "/contributions/content/(content-identifier)/(section-identifier)"
+          },
+          "relatedConcepts": {
+            "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1#Chapter5_1b/relatedConcepts"
+          },
+          "content": {
+            "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource"
+          }
+        }
+      }
+    ],
+    "_links": {
+      "self": {
+        "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+      },
+      "contributions": {
+        "href": "/contributions/content/(content-identifier)/(section-identifier)"
+      },
+      "relatedConcepts": {
+        "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1/relatedConcepts"
+      },
+      "content": {
+        "href": "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource"
+      }
+    },
+    "filter": {
+      "entryDate": {
+        "param": "entryDate",
+        "name": "entryDate",
+        "value": "2024-07-17"
+      }
+    }
+  }
+}