@beinformed/ui 1.56.1 → 1.56.4

package/lib/models/concepts/ConceptTypeDetailModel.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _ResourceModel = _interopRequireDefault(require("../base/ResourceModel"));
 /**
  * Model for concept details, available through modelcatalog
@@ -15,8 +14,8 @@ class ConceptTypeDetailModel extends _ResourceModel.default {
    * The name of the concept type consists of the functional id of the kmt and the functional id of the concept type separated by a #.<br>
    * For example BEI_CaseManagement#Case
    */
-  get name() {
-    return this.getData("name", "");
+  get kmtId() {
+    return this.getData("kmtId", "");
   }
 
   /**
@@ -119,26 +118,10 @@ class ConceptTypeDetailModel extends _ResourceModel.default {
     return this.getData("sectionReferenceTypes", []);
   }
 
-  /**
-   */
-  get conceptTypeHierarchy() {
-    return this.links.getLinksByGroup("conceptTypeHierarchy");
-  }
-
   /**
    */
   isOfConceptType(conceptTypeId) {
-    return this.conceptTypeHierarchy?.hasLinkByKey(conceptTypeId) || this.conceptTypeHierarchy?.hasLinkByHref(conceptTypeId) || this.selfhref.equals(conceptTypeId);
-  }
-
-  /**
-   * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types
-   */
-  hasMetamodelIdInHierarchy(metamodelId) {
-    return this.conceptTypeHierarchy?.all.some(link => {
-      var _context;
-      return (0, _startsWith.default)(_context = link.key).call(_context, metamodelId + "#");
-    }) || false;
+    return this.selfhref.equals(conceptTypeId);
   }
 }
 var _default = exports.default = ConceptTypeDetailModel;

package/lib/models/concepts/ConceptTypeDetailModel.js.flow

@@ -2,7 +2,6 @@
 import ResourceModel from "../base/ResourceModel";
 
 import type ModularUIResponse from "../../modularui/ModularUIResponse";
-import type LinkCollection from "../links/LinkCollection";
 
 /**
  * Model for concept details, available through modelcatalog
@@ -12,8 +11,8 @@ class ConceptTypeDetailModel extends ResourceModel {
    * The name of the concept type consists of the functional id of the kmt and the functional id of the concept type separated by a #.<br>
    * For example BEI_CaseManagement#Case
    */
-  get name(): string {
-    return this.getData("name", "");
+  get kmtId(): string {
+    return this.getData("kmtId", "");
   }
 
   /**
@@ -119,31 +118,10 @@ class ConceptTypeDetailModel extends ResourceModel {
     return this.getData("sectionReferenceTypes", []);
   }
 
-  /**
-   */
-  get conceptTypeHierarchy(): LinkCollection {
-    return this.links.getLinksByGroup("conceptTypeHierarchy");
-  }
-
   /**
    */
   isOfConceptType(conceptTypeId: string): boolean {
-    return (
-      this.conceptTypeHierarchy?.hasLinkByKey(conceptTypeId) ||
-      this.conceptTypeHierarchy?.hasLinkByHref(conceptTypeId) ||
-      this.selfhref.equals(conceptTypeId)
-    );
-  }
-
-  /**
-   * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types
-   */
-  hasMetamodelIdInHierarchy(metamodelId: string): boolean {
-    return (
-      this.conceptTypeHierarchy?.all.some((link) =>
-        link.key.startsWith(metamodelId + "#"),
-      ) || false
-    );
+    return this.selfhref.equals(conceptTypeId);
   }
 }
 

package/lib/models/concepts/ConceptTypeDetailModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConceptTypeDetailModel.js","names":["_ResourceModel","_interopRequireDefault","require","ConceptTypeDetailModel","ResourceModel","name","getData","type","modelName","isApplicableModel","data","contributions","resourcetype","key","_id","label","modelCategory","isCoreTaxonomy","icon","textColor","backgroundColor","borderColor","labelTypes","propertyTypes","textFragmentTypes","sectionReferenceTypes","conceptTypeHierarchy","links","getLinksByGroup","isOfConceptType","conceptTypeId","hasLinkByKey","hasLinkByHref","selfhref","equals","hasMetamodelIdInHierarchy","metamodelId","all","some","link","_context","_startsWith","default","call","_default","exports"],"sources":["../../../src/models/concepts/ConceptTypeDetailModel.js"],"sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\n\nimport type ModularUIResponse from \"../../modularui/ModularUIResponse\";\nimport type LinkCollection from \"../links/LinkCollection\";\n\n/**\n * Model for concept details, available through modelcatalog\n */\nclass ConceptTypeDetailModel extends ResourceModel {\n  /**\n   * The name of the concept type consists of the functional id of the kmt and the functional id of the concept type separated by a #.<br>\n   * For example BEI_CaseManagement#Case\n   */\n  get name(): string {\n    return this.getData(\"name\", \"\");\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"ConceptTypeDetail\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ConceptTypeDetailModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"ConceptTypeDetail\"\n    );\n  }\n\n  /**\n   */\n  get key(): string {\n    return this.data._id;\n  }\n\n  /**\n   * Get concept type label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Get model category of the concept type\n   */\n  get modelCategory(): string {\n    return this.getData(\"modelCategory\", \"\");\n  }\n\n  /**\n   */\n  get isCoreTaxonomy(): boolean {\n    return this.getData(\"coreTaxonomy\", \"false\") === \"true\";\n  }\n\n  /**\n   * Get concept type icon\n   */\n  get icon(): string {\n    return this.getData(\"icon\", \"\");\n  }\n\n  /**\n   * Get concept type text color\n   */\n  get textColor(): string {\n    return this.getData(\"textColor\", \"#000\");\n  }\n\n  /**\n   * Get concept type background color\n   */\n  get backgroundColor(): string {\n    return this.getData(\"backgroundColor\", \"#fff\");\n  }\n\n  /**\n   * Get concept line color\n   */\n  get borderColor(): string {\n    return this.getData(\"lineColor\", \"#000\");\n  }\n\n  /**\n   * Get label types\n   */\n  get labelTypes(): ?Array<Object> {\n    return this.data.labelTypes;\n  }\n\n  /**\n   * Get propertyTypes\n   */\n  get propertyTypes(): Array<Object> {\n    return this.getData(\"propertyTypes\", []);\n  }\n\n  /**\n   * Get textFragmentTypes\n   */\n  get textFragmentTypes(): Array<Object> {\n    return this.getData(\"textFragmentTypes\", []);\n  }\n\n  /**\n   * Get sectionReferenceTypes\n   */\n  get sectionReferenceTypes(): Array<Object> {\n    return this.getData(\"sectionReferenceTypes\", []);\n  }\n\n  /**\n   */\n  get conceptTypeHierarchy(): LinkCollection {\n    return this.links.getLinksByGroup(\"conceptTypeHierarchy\");\n  }\n\n  /**\n   */\n  isOfConceptType(conceptTypeId: string): boolean {\n    return (\n      this.conceptTypeHierarchy?.hasLinkByKey(conceptTypeId) ||\n      this.conceptTypeHierarchy?.hasLinkByHref(conceptTypeId) ||\n      this.selfhref.equals(conceptTypeId)\n    );\n  }\n\n  /**\n   * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types\n   */\n  hasMetamodelIdInHierarchy(metamodelId: string): boolean {\n    return (\n      this.conceptTypeHierarchy?.all.some((link) =>\n        link.key.startsWith(metamodelId + \"#\"),\n      ) || false\n    );\n  }\n}\n\nexport default ConceptTypeDetailModel;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ConceptTypeDetailModel.js","names":["_ResourceModel","_interopRequireDefault","require","ConceptTypeDetailModel","ResourceModel","kmtId","getData","type","modelName","isApplicableModel","data","contributions","resourcetype","key","_id","label","modelCategory","isCoreTaxonomy","icon","textColor","backgroundColor","borderColor","labelTypes","propertyTypes","textFragmentTypes","sectionReferenceTypes","isOfConceptType","conceptTypeId","selfhref","equals","_default","exports","default"],"sources":["../../../src/models/concepts/ConceptTypeDetailModel.js"],"sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\n\nimport type ModularUIResponse from \"../../modularui/ModularUIResponse\";\n\n/**\n * Model for concept details, available through modelcatalog\n */\nclass ConceptTypeDetailModel extends ResourceModel {\n  /**\n   * The name of the concept type consists of the functional id of the kmt and the functional id of the concept type separated by a #.<br>\n   * For example BEI_CaseManagement#Case\n   */\n  get kmtId(): string {\n    return this.getData(\"kmtId\", \"\");\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"ConceptTypeDetail\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ConceptTypeDetailModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"ConceptTypeDetail\"\n    );\n  }\n\n  /**\n   */\n  get key(): string {\n    return this.data._id;\n  }\n\n  /**\n   * Get concept type label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Get model category of the concept type\n   */\n  get modelCategory(): string {\n    return this.getData(\"modelCategory\", \"\");\n  }\n\n  /**\n   */\n  get isCoreTaxonomy(): boolean {\n    return this.getData(\"coreTaxonomy\", \"false\") === \"true\";\n  }\n\n  /**\n   * Get concept type icon\n   */\n  get icon(): string {\n    return this.getData(\"icon\", \"\");\n  }\n\n  /**\n   * Get concept type text color\n   */\n  get textColor(): string {\n    return this.getData(\"textColor\", \"#000\");\n  }\n\n  /**\n   * Get concept type background color\n   */\n  get backgroundColor(): string {\n    return this.getData(\"backgroundColor\", \"#fff\");\n  }\n\n  /**\n   * Get concept line color\n   */\n  get borderColor(): string {\n    return this.getData(\"lineColor\", \"#000\");\n  }\n\n  /**\n   * Get label types\n   */\n  get labelTypes(): ?Array<Object> {\n    return this.data.labelTypes;\n  }\n\n  /**\n   * Get propertyTypes\n   */\n  get propertyTypes(): Array<Object> {\n    return this.getData(\"propertyTypes\", []);\n  }\n\n  /**\n   * Get textFragmentTypes\n   */\n  get textFragmentTypes(): Array<Object> {\n    return this.getData(\"textFragmentTypes\", []);\n  }\n\n  /**\n   * Get sectionReferenceTypes\n   */\n  get sectionReferenceTypes(): Array<Object> {\n    return this.getData(\"sectionReferenceTypes\", []);\n  }\n\n  /**\n   */\n  isOfConceptType(conceptTypeId: string): boolean {\n    return this.selfhref.equals(conceptTypeId);\n  }\n}\n\nexport default ConceptTypeDetailModel;\n"],"mappings":";;;;;;;AACA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACA;AACA,MAAMC,sBAAsB,SAASC,sBAAa,CAAC;EACjD;AACF;AACA;AACA;EACE,IAAIC,KAAKA,CAAA,EAAW;IAClB,OAAO,IAAI,CAACC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;EAClC;;EAEA;AACF;EACE,IAAIC,IAAIA,CAAA,EAAW;IACjB,OAAO,mBAAmB;EAC5B;;EAEA;AACF;EACE,WAAWC,SAASA,CAAA,EAAW;IAC7B,OAAO,wBAAwB;EACjC;;EAEA;AACF;EACE,OAAOC,iBAAiBA,CAACC,IAAuB,EAAW;IACzD,OACEA,IAAI,CAACC,aAAa,CAACC,YAAY,IAC/BF,IAAI,CAACC,aAAa,CAACC,YAAY,KAAK,mBAAmB;EAE3D;;EAEA;AACF;EACE,IAAIC,GAAGA,CAAA,EAAW;IAChB,OAAO,IAAI,CAACH,IAAI,CAACI,GAAG;EACtB;;EAEA;AACF;AACA;EACE,IAAIC,KAAKA,CAAA,EAAW;IAClB,OAAO,IAAI,CAACT,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;EAClC;;EAEA;AACF;AACA;EACE,IAAIU,aAAaA,CAAA,EAAW;IAC1B,OAAO,IAAI,CAACV,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;EAC1C;;EAEA;AACF;EACE,IAAIW,cAAcA,CAAA,EAAY;IAC5B,OAAO,IAAI,CAACX,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,KAAK,MAAM;EACzD;;EAEA;AACF;AACA;EACE,IAAIY,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACZ,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;EACjC;;EAEA;AACF;AACA;EACE,IAAIa,SAASA,CAAA,EAAW;IACtB,OAAO,IAAI,CAACb,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;EAC1C;;EAEA;AACF;AACA;EACE,IAAIc,eAAeA,CAAA,EAAW;IAC5B,OAAO,IAAI,CAACd,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC;EAChD;;EAEA;AACF;AACA;EACE,IAAIe,WAAWA,CAAA,EAAW;IACxB,OAAO,IAAI,CAACf,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;EAC1C;;EAEA;AACF;AACA;EACE,IAAIgB,UAAUA,CAAA,EAAmB;IAC/B,OAAO,IAAI,CAACZ,IAAI,CAACY,UAAU;EAC7B;;EAEA;AACF;AACA;EACE,IAAIC,aAAaA,CAAA,EAAkB;IACjC,OAAO,IAAI,CAACjB,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;EAC1C;;EAEA;AACF;AACA;EACE,IAAIkB,iBAAiBA,CAAA,EAAkB;IACrC,OAAO,IAAI,CAAClB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;EAC9C;;EAEA;AACF;AACA;EACE,IAAImB,qBAAqBA,CAAA,EAAkB;IACzC,OAAO,IAAI,CAACnB,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC;EAClD;;EAEA;AACF;EACEoB,eAAeA,CAACC,aAAqB,EAAW;IAC9C,OAAO,IAAI,CAACC,QAAQ,CAACC,MAAM,CAACF,aAAa,CAAC;EAC5C;AACF;AAAC,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEc7B,sBAAsB","ignoreList":[]}

package/lib/models/concepts/__tests__/ConceptTypeDetailModel.spec.js.flow

@@ -19,30 +19,13 @@ describe("conceptTypeDetailModel", () => {
     expect(conceptTypeDetail.backgroundColor).toBe("#FFFF3C");
     expect(conceptTypeDetail.borderColor).toBe("#000000");
 
-    expect(conceptTypeDetail.conceptTypeHierarchy.length).toBe(2);
     expect(
       conceptTypeDetail.isOfConceptType(
-        "Adviceandrequestbusinessscenarios#ScenarioStep_Advice",
+        "/concepttypes/bundle-com.beinformed.fs.demo.metamodels/Advice%20and%20request%20business%20scenarios.bixml/ScenarioStep_Advice",
       ),
     ).toBe(true);
-    expect(
-      conceptTypeDetail.isOfConceptType("BusinessScenarios#ScenarioStep"),
-    ).toBe(true);
     expect(conceptTypeDetail.isOfConceptType("BEI_CaseManagement#Case")).toBe(
       false,
     );
-
-    expect(
-      conceptTypeDetail.isOfConceptType(
-        "/concepttypes/bundle-com.beinformed.fs.demo.metamodels/Business%20scenarios.bixml/ScenarioStep",
-      ),
-    ).toBe(true);
-
-    expect(
-      conceptTypeDetail.hasMetamodelIdInHierarchy("BusinessScenarios"),
-    ).toBe(true);
-    expect(
-      conceptTypeDetail.hasMetamodelIdInHierarchy("BEI_CaseManagement"),
-    ).toBe(false);
   });
 });

package/lib/redux/_modularui/ModularUISelectors.js

@@ -11,7 +11,6 @@ var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
-var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
 var _reselect = require("reselect");
 var _objects = require("../../utils/helpers/objects");
 var _Href = _interopRequireDefault(require("../../models/href/Href"));
@@ -21,6 +20,7 @@ var _ApplicationModel = _interopRequireDefault(require("../../models/application
 var _TabModel = _interopRequireDefault(require("../../models/tab/TabModel"));
 var _CaseViewModel = _interopRequireDefault(require("../../models/caseview/CaseViewModel"));
 var _FormModel = _interopRequireDefault(require("../../models/form/FormModel"));
+var _constants = require("../../constants");
 /**
  */
 const getAllModelsByInstance = (state, instance) => {
@@ -263,7 +263,7 @@ exports.getModelsByType = getModelsByType;
 const getAllFinishedModels = exports.getAllFinishedModels = (0, _reselect.createSelector)(state => state.modularui, modularui => {
   if (modularui) {
     var _context10, _context11;
-    return (0, _map.default)(_context10 = (0, _filter.default)(_context11 = (0, _values.default)(modularui)).call(_context11, entry => entry.status === "FINISHED")).call(_context10, entry => entry.model);
+    return (0, _map.default)(_context10 = (0, _filter.default)(_context11 = (0, _keys.default)(modularui)).call(_context11, key => modularui[key] && modularui[key].status === _constants.MODULARUI_STATUS.FINISHED)).call(_context10, key => modularui[key].model);
   }
   return [];
 });

package/lib/redux/_modularui/ModularUISelectors.js.flow

@@ -16,6 +16,7 @@ import FormModel from "../../models/form/FormModel";
 
 import type { ReduxState, PreferenceValue } from "../types";
 import type { ModularUIModel } from "../../models/types";
+import { MODULARUI_STATUS } from "../../constants";
 
 /**
  */
@@ -308,9 +309,13 @@ export const getAllFinishedModels: (
   (state: ReduxState) => state.modularui,
   (modularui): Array<ModularUIModel> => {
     if (modularui) {
-      return Object.values(modularui)
-        .filter((entry) => entry.status === "FINISHED")
-        .map((entry) => entry.model);
+      return Object.keys(modularui)
+        .filter(
+          (key) =>
+            modularui[key] &&
+            modularui[key].status === MODULARUI_STATUS.FINISHED,
+        )
+        .map((key) => modularui[key].model);
     }
     return [];
   },

package/lib/redux/_modularui/ModularUISelectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUISelectors.js","names":["_reselect","require","_objects","_Href","_interopRequireDefault","_ContentModel","_ContentTOCModel","_ApplicationModel","_TabModel","_CaseViewModel","_FormModel","getAllModelsByInstance","state","instance","locale","i18n","modularui","_context","_context2","_map","default","_filter","_keys","call","key","model","exports","getFirstModelByInstance","_context3","_find","getActiveModelByInstance","location","getLocation","_context4","_startsWith","selfhref","path","getApplication","ApplicationModel","getTab","TabModel","getCaseView","CaseViewModel","getForm","FormModel","modelByHref","href","_context5","findHref","Href","modelConfigKey","equals","keyByHref","_context6","allKeysByHref","_context7","router","pathname","getModels","models","forEach","modelKey","modelEntry","has","label","type","modelInfo","selfContentLink","ContentModel","ContentTOCModel","push","getActiveModels","createSelectorCreator","defaultMemoize","value","other","_stringify","contextModels","locationParts","split","reduce","accumulator","current","comparePath","decodeURIComponent","replace","foundEntry","encodedHref","toString","getPreference","preferenceName","preferences","getModelsByType","_context8","_context9","getAllFinishedModels","createSelector","_context10","_context11","_values","entry","status"],"sources":["../../../src/redux/_modularui/ModularUISelectors.js"],"sourcesContent":["// @flow\nimport {\n  createSelector,\n  createSelectorCreator,\n  defaultMemoize,\n} from \"reselect\";\nimport { has } from \"../../utils/helpers/objects\";\n\nimport Href from \"../../models/href/Href\";\nimport ContentModel from \"../../models/content/ContentModel\";\nimport ContentTOCModel from \"../../models/content/ContentTOCModel\";\nimport ApplicationModel from \"../../models/application/ApplicationModel\";\nimport TabModel from \"../../models/tab/TabModel\";\nimport CaseViewModel from \"../../models/caseview/CaseViewModel\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ReduxState, PreferenceValue } from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\n\n/**\n */\nexport const getAllModelsByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): Array<ModularUIModel> => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    return Object.keys(modularui)\n      .filter((key) => {\n        const { model } = modularui[key];\n        return model instanceof instance && model.locale === locale;\n      })\n      .map((key) => modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getFirstModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return model instanceof instance && model.locale === locale;\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n */\nexport const getActiveModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const location = getLocation(state);\n\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return (\n        model instanceof instance &&\n        model.locale === locale &&\n        location.startsWith(model.selfhref.path)\n      );\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n * Get the application model, which is the model with selfhref '/'\n */\nexport const getApplication = (state: ReduxState): null | ApplicationModel =>\n  getFirstModelByInstance(state, ApplicationModel);\n\n/**\n */\nexport const getTab = (state: ReduxState): null | TabModel =>\n  getFirstModelByInstance(state, TabModel);\n\n/**\n */\nexport const getCaseView = (state: ReduxState): null | CaseViewModel =>\n  getFirstModelByInstance(state, CaseViewModel);\n\n/**\n */\nexport const getForm = (state: ReduxState): null | FormModel =>\n  getFirstModelByInstance(state, FormModel);\n\n/**\n * Get the model by it's href\n */\nexport const modelByHref = (\n  state: ReduxState,\n  href: Href | string,\n): null | ModularUIModel => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    const modelConfigKey = Object.keys(state.modularui).find((key) => {\n      const model = state.modularui[key];\n\n      return (\n        model.model &&\n        model.model.selfhref &&\n        model.model.selfhref.equals(findHref)\n      );\n    });\n\n    if (modelConfigKey) {\n      return state.modularui[modelConfigKey].model;\n    }\n  }\n\n  return null;\n};\n\n/**\n * Return the key of a model by the selfhref the model is saved in the reducer\n */\nexport const keyByHref = (state: ReduxState, href: Href | string): ?string => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).find((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return null;\n};\n\n/**\n * Returns all model keys found in the store, restrict on href\n */\nexport const allKeysByHref = (\n  state: ReduxState,\n  href: Href | string,\n): Array<string> => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).filter((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return [];\n};\n\n/**\n */\nconst getLocation = (state: ReduxState): string =>\n  state?.router?.location.pathname;\n\n/**\n */\nconst getModels = (state: ReduxState) => {\n  const models = [];\n\n  Object.keys(state.modularui).forEach((modelKey: string) => {\n    const modelEntry = state.modularui[modelKey];\n\n    if (has(modelEntry, \"model\")) {\n      const { key, selfhref, label, type } = modelEntry.model;\n\n      const modelInfo = {\n        key,\n        selfhref,\n        label,\n        type,\n        selfContentLink: null,\n      };\n\n      if (\n        modelEntry.model instanceof ContentModel ||\n        modelEntry.model instanceof ContentTOCModel\n      ) {\n        models.push({\n          ...modelInfo,\n          selfContentLink: modelEntry.model.selfContentLink,\n        });\n      } else {\n        models.push(modelInfo);\n      }\n    }\n  });\n\n  return models;\n};\n\nexport const getActiveModels: (state: ReduxState) => Array<{\n  key: string,\n  href: Href,\n  label: string,\n  type: string,\n}> = createSelectorCreator(\n  defaultMemoize,\n  (value, other) => JSON.stringify(value) === JSON.stringify(other),\n)([getLocation, getModels], (location, models) => {\n  const contextModels = [];\n\n  if (location) {\n    const locationParts = location.split(\"/\");\n\n    locationParts.reduce((accumulator, current) => {\n      const path = `${accumulator}/${current}`;\n\n      // Remove modelcatalog part to match breadcrumb parts\n      const comparePath = decodeURIComponent(path).replace(\n        \"/modelcatalog/\",\n        \"/\",\n      );\n\n      const foundEntry = models.find(\n        (model) => model.selfhref && model.selfhref.equals(comparePath),\n      );\n\n      if (foundEntry) {\n        const { key, label, type, selfhref, selfContentLink } = foundEntry;\n\n        const href =\n          path.startsWith(\"/modelcatalog/\") && selfContentLink\n            ? new Href(`/modelcatalog${selfContentLink.encodedHref.toString()}`)\n            : selfhref;\n\n        contextModels.push({ key, href, label, type });\n      }\n\n      return path;\n    });\n  }\n\n  return contextModels;\n});\n\n/**\n */\nexport const getPreference = (\n  state: ReduxState,\n  preferenceName: string,\n): null | PreferenceValue => {\n  if (state && state.preferences) {\n    return state.preferences[preferenceName];\n  }\n\n  return null;\n};\n\n/**\n * @deprecated - Use getFirstModelByInstance or the appropriate getter for the model type: getApplication, getTab, etc\n */\nexport const getModelsByType = (\n  state: ReduxState,\n  type: string,\n): Array<ModularUIModel> => {\n  if (state && state.modularui) {\n    return Object.keys(state.modularui)\n      .filter(\n        (key) =>\n          state.modularui[key] &&\n          state.modularui[key].model &&\n          state.modularui[key].model.type === type,\n      )\n      .map((key) => state.modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getAllFinishedModels: (\n  state: ReduxState,\n) => Array<ModularUIModel> = createSelector(\n  (state: ReduxState) => state.modularui,\n  (modularui): Array<ModularUIModel> => {\n    if (modularui) {\n      return Object.values(modularui)\n        .filter((entry) => entry.status === \"FINISHED\")\n        .map((entry) => entry.model);\n    }\n    return [];\n  },\n);\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUISelectors.js","names":["_reselect","require","_objects","_Href","_interopRequireDefault","_ContentModel","_ContentTOCModel","_ApplicationModel","_TabModel","_CaseViewModel","_FormModel","_constants","getAllModelsByInstance","state","instance","locale","i18n","modularui","_context","_context2","_map","default","_filter","_keys","call","key","model","exports","getFirstModelByInstance","_context3","_find","getActiveModelByInstance","location","getLocation","_context4","_startsWith","selfhref","path","getApplication","ApplicationModel","getTab","TabModel","getCaseView","CaseViewModel","getForm","FormModel","modelByHref","href","_context5","findHref","Href","modelConfigKey","equals","keyByHref","_context6","allKeysByHref","_context7","router","pathname","getModels","models","forEach","modelKey","modelEntry","has","label","type","modelInfo","selfContentLink","ContentModel","ContentTOCModel","push","getActiveModels","createSelectorCreator","defaultMemoize","value","other","_stringify","contextModels","locationParts","split","reduce","accumulator","current","comparePath","decodeURIComponent","replace","foundEntry","encodedHref","toString","getPreference","preferenceName","preferences","getModelsByType","_context8","_context9","getAllFinishedModels","createSelector","_context10","_context11","status","MODULARUI_STATUS","FINISHED"],"sources":["../../../src/redux/_modularui/ModularUISelectors.js"],"sourcesContent":["// @flow\nimport {\n  createSelector,\n  createSelectorCreator,\n  defaultMemoize,\n} from \"reselect\";\nimport { has } from \"../../utils/helpers/objects\";\n\nimport Href from \"../../models/href/Href\";\nimport ContentModel from \"../../models/content/ContentModel\";\nimport ContentTOCModel from \"../../models/content/ContentTOCModel\";\nimport ApplicationModel from \"../../models/application/ApplicationModel\";\nimport TabModel from \"../../models/tab/TabModel\";\nimport CaseViewModel from \"../../models/caseview/CaseViewModel\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ReduxState, PreferenceValue } from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport { MODULARUI_STATUS } from \"../../constants\";\n\n/**\n */\nexport const getAllModelsByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): Array<ModularUIModel> => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    return Object.keys(modularui)\n      .filter((key) => {\n        const { model } = modularui[key];\n        return model instanceof instance && model.locale === locale;\n      })\n      .map((key) => modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getFirstModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return model instanceof instance && model.locale === locale;\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n */\nexport const getActiveModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const location = getLocation(state);\n\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return (\n        model instanceof instance &&\n        model.locale === locale &&\n        location.startsWith(model.selfhref.path)\n      );\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n * Get the application model, which is the model with selfhref '/'\n */\nexport const getApplication = (state: ReduxState): null | ApplicationModel =>\n  getFirstModelByInstance(state, ApplicationModel);\n\n/**\n */\nexport const getTab = (state: ReduxState): null | TabModel =>\n  getFirstModelByInstance(state, TabModel);\n\n/**\n */\nexport const getCaseView = (state: ReduxState): null | CaseViewModel =>\n  getFirstModelByInstance(state, CaseViewModel);\n\n/**\n */\nexport const getForm = (state: ReduxState): null | FormModel =>\n  getFirstModelByInstance(state, FormModel);\n\n/**\n * Get the model by it's href\n */\nexport const modelByHref = (\n  state: ReduxState,\n  href: Href | string,\n): null | ModularUIModel => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    const modelConfigKey = Object.keys(state.modularui).find((key) => {\n      const model = state.modularui[key];\n\n      return (\n        model.model &&\n        model.model.selfhref &&\n        model.model.selfhref.equals(findHref)\n      );\n    });\n\n    if (modelConfigKey) {\n      return state.modularui[modelConfigKey].model;\n    }\n  }\n\n  return null;\n};\n\n/**\n * Return the key of a model by the selfhref the model is saved in the reducer\n */\nexport const keyByHref = (state: ReduxState, href: Href | string): ?string => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).find((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return null;\n};\n\n/**\n * Returns all model keys found in the store, restrict on href\n */\nexport const allKeysByHref = (\n  state: ReduxState,\n  href: Href | string,\n): Array<string> => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).filter((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return [];\n};\n\n/**\n */\nconst getLocation = (state: ReduxState): string =>\n  state?.router?.location.pathname;\n\n/**\n */\nconst getModels = (state: ReduxState) => {\n  const models = [];\n\n  Object.keys(state.modularui).forEach((modelKey: string) => {\n    const modelEntry = state.modularui[modelKey];\n\n    if (has(modelEntry, \"model\")) {\n      const { key, selfhref, label, type } = modelEntry.model;\n\n      const modelInfo = {\n        key,\n        selfhref,\n        label,\n        type,\n        selfContentLink: null,\n      };\n\n      if (\n        modelEntry.model instanceof ContentModel ||\n        modelEntry.model instanceof ContentTOCModel\n      ) {\n        models.push({\n          ...modelInfo,\n          selfContentLink: modelEntry.model.selfContentLink,\n        });\n      } else {\n        models.push(modelInfo);\n      }\n    }\n  });\n\n  return models;\n};\n\nexport const getActiveModels: (state: ReduxState) => Array<{\n  key: string,\n  href: Href,\n  label: string,\n  type: string,\n}> = createSelectorCreator(\n  defaultMemoize,\n  (value, other) => JSON.stringify(value) === JSON.stringify(other),\n)([getLocation, getModels], (location, models) => {\n  const contextModels = [];\n\n  if (location) {\n    const locationParts = location.split(\"/\");\n\n    locationParts.reduce((accumulator, current) => {\n      const path = `${accumulator}/${current}`;\n\n      // Remove modelcatalog part to match breadcrumb parts\n      const comparePath = decodeURIComponent(path).replace(\n        \"/modelcatalog/\",\n        \"/\",\n      );\n\n      const foundEntry = models.find(\n        (model) => model.selfhref && model.selfhref.equals(comparePath),\n      );\n\n      if (foundEntry) {\n        const { key, label, type, selfhref, selfContentLink } = foundEntry;\n\n        const href =\n          path.startsWith(\"/modelcatalog/\") && selfContentLink\n            ? new Href(`/modelcatalog${selfContentLink.encodedHref.toString()}`)\n            : selfhref;\n\n        contextModels.push({ key, href, label, type });\n      }\n\n      return path;\n    });\n  }\n\n  return contextModels;\n});\n\n/**\n */\nexport const getPreference = (\n  state: ReduxState,\n  preferenceName: string,\n): null | PreferenceValue => {\n  if (state && state.preferences) {\n    return state.preferences[preferenceName];\n  }\n\n  return null;\n};\n\n/**\n * @deprecated - Use getFirstModelByInstance or the appropriate getter for the model type: getApplication, getTab, etc\n */\nexport const getModelsByType = (\n  state: ReduxState,\n  type: string,\n): Array<ModularUIModel> => {\n  if (state && state.modularui) {\n    return Object.keys(state.modularui)\n      .filter(\n        (key) =>\n          state.modularui[key] &&\n          state.modularui[key].model &&\n          state.modularui[key].model.type === type,\n      )\n      .map((key) => state.modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getAllFinishedModels: (\n  state: ReduxState,\n) => Array<ModularUIModel> = createSelector(\n  (state: ReduxState) => state.modularui,\n  (modularui): Array<ModularUIModel> => {\n    if (modularui) {\n      return Object.keys(modularui)\n        .filter(\n          (key) =>\n            modularui[key] &&\n            modularui[key].status === MODULARUI_STATUS.FINISHED,\n        )\n        .map((key) => modularui[key].model);\n    }\n    return [];\n  },\n);\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/hooks/__tests__/UseModularUIModel.spec.js

@@ -4,6 +4,8 @@ import { Provider } from "react-redux";
 import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
 
+import { useLocation } from "react-router";
+
 import {
   useApplication,
   useTab,
@@ -32,6 +34,11 @@ import {
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"), // Keep other methods from react-router as is
+  useLocation: jest.fn(), // Mock useLocation
+}));
+
 const JSON_TYPE = "application/json";
 
 describe("modularui hooks", () => {
@@ -83,6 +90,9 @@ describe("modularui hooks", () => {
   // replace the real XHR object with the mock XHR object before each test
   // eslint-disable-next-line jest/no-hooks
   beforeEach(() => {
+    useLocation.mockReturnValue({
+      state: null,
+    });
     xhrMock.setup();
   });
 

package/src/hooks/__tests__/useForm.spec.js

@@ -3,6 +3,7 @@ import thunk from "redux-thunk";
 import { Provider } from "react-redux";
 import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
+import { useLocation } from "react-router";
 
 import {
   useAttributeSet,
@@ -19,12 +20,22 @@ import { IllegalArgumentException } from "../../exceptions";
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"), // Keep other methods from react-router as is
+  useLocation: jest.fn(), // Mock useLocation
+}));
+
 const JSON_TYPE = "application/json";
 
 describe("form hooks", () => {
   // replace the real XHR object with the mock XHR object before each test
   // eslint-disable-next-line jest/no-hooks
-  beforeEach(() => xhrMock.setup());
+  beforeEach(() => {
+    useLocation.mockReturnValue({
+      state: null,
+    });
+    xhrMock.setup();
+  });
 
   // put the real XHR object back and clear the mocks after each test
   // eslint-disable-next-line jest/no-hooks

package/src/hooks/__tests__/useModelCatalog.spec.js

@@ -3,6 +3,7 @@ import thunk from "redux-thunk";
 import { Provider } from "react-redux";
 import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
+import { useLocation } from "react-router";
 
 import {
   ConceptIndexModel,
@@ -26,6 +27,11 @@ import {
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"), // Keep other methods from react-router as is
+  useLocation: jest.fn(), // Mock useLocation
+}));
+
 const JSON_TYPE = "application/json";
 
 describe("modelcatalog hooks", () => {
@@ -77,6 +83,9 @@ describe("modelcatalog hooks", () => {
   // replace the real XHR object with the mock XHR object before each test
   // eslint-disable-next-line jest/no-hooks
   beforeEach(() => {
+    useLocation.mockReturnValue({
+      state: null,
+    });
     xhrMock.setup();
   });
 

package/src/hooks/__tests__/useModularUIBasic.spec.js

@@ -6,16 +6,25 @@ import xhrMock from "xhr-mock";
 
 import { useModularUIBasic } from "../useModularUIBasic";
 import { ApplicationModel, Href } from "../../models";
+import { useLocation } from "react-router";
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"), // Keep other methods from react-router as is
+  useLocation: jest.fn(), // Mock useLocation
+}));
+
 const JSON_TYPE = "application/json";
 
 describe("modularui hooks", () => {
   // replace the real XHR object with the mock XHR object before each test
   // eslint-disable-next-line jest/no-hooks
   beforeEach(() => {
+    useLocation.mockReturnValue({
+      state: null,
+    });
     xhrMock.setup();
   });
 

package/src/hooks/useModularUI.js

@@ -1,6 +1,7 @@
 // @flow
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
+import { useLocation } from "react-router";
 
 import { HTTP_METHODS } from "../constants";
 import {
@@ -12,14 +13,17 @@ import useDeepCompareEffect from "./useDeepCompareEffect";
 
 import { useLocale } from "./useI18n";
 
-import type Href from "../models/href/Href";
+import Href from "../models/href/Href";
 import type { RequestModularUIOptions } from "../utils";
 
 /**
  */
 const useKeyForHook = (modelKey: string, url: string) => {
   const locale = useLocale();
-  return `${modelKey}(${url.split("?")[0]})(${locale})`;
+  return useMemo(
+    () => `${modelKey}(${url.split("?")[0]})(${locale})`,
+    [modelKey, url, locale],
+  );
 };
 
 /**
@@ -34,11 +38,17 @@ export const useModularUI = (
   },
 ): any => {
   const dispatch = useDispatch();
-  const href = url?.toString() || "";
+  const href = useMemo(() => url?.toString() || "", [url]);
   const key = useKeyForHook(modelKey, href);
 
+  const location = useLocation();
+  const redirectLocation = location.state?.redirectLocation;
+  const forceReload =
+    redirectLocation instanceof Href ? redirectLocation?.equals(href) : false;
+
   const prevOptions = useRef(options);
   const prevHref = useRef(href);
+  const prevForceReload = useRef(forceReload);
 
   // dispatch loadModularUI
   useDeepCompareEffect(() => {
@@ -48,25 +58,25 @@ export const useModularUI = (
       prevOptions.current.isReload &&
       !options.isReload;
 
-    if (href !== "" && !isOldReload) {
+    const doForceReload = forceReload && !prevForceReload.current;
+
+    if (href !== "" && (doForceReload || !isOldReload)) {
       dispatch(loadModularUI(key, href, options));
     }
 
     prevOptions.current = options;
     prevHref.current = href;
-  }, [key, href, options]);
+    prevForceReload.current = forceReload;
+  }, [key, href, options, forceReload]);
 
-  const { removeOnUnmount = false } = options;
   useEffect(() => {
-    return () => {
-      if (removeOnUnmount) {
+    if (options.removeOnUnmount) {
+      return () => {
         dispatch(removeModelByKey(key));
-      }
-    };
-  }, [dispatch, key, removeOnUnmount]);
+      };
+    }
+  }, [dispatch, key, options.removeOnUnmount]);
 
-  // retrieve current model from modularui reducer
-  return useSelector((state) => {
-    return state.modularui[key];
-  });
+  const selector = useMemo(() => (state) => state.modularui[key], [key]);
+  return useSelector(selector);
 };

package/src/hooks/useModularUIBasic.js

@@ -1,4 +1,6 @@
 // @flow
+import { useMemo } from "react";
+
 import { useModularUI } from "./useModularUI";
 
 import { useLocation } from "./useRouter";
@@ -26,6 +28,7 @@ export const useModularUIBasic = <T: ModularUIModel>(
   },
 ): T | null => {
   const location = useLocation();
+  const memoizedHref = useMemo(() => href.toString(), [href]);
 
   const useModularUIOptions = {
     targetModel: undefined,
@@ -48,25 +51,29 @@ export const useModularUIBasic = <T: ModularUIModel>(
   }
 
   // $FlowFixMe[incompatible-call]
-  const modularUI = useModularUI(key, href, useModularUIOptions);
+  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);
 
-  if (modularUI?.model) {
-    const { model } = modularUI;
+  const expectedModels = useMemo(
+    () => options.expectedModels ?? [],
+    [options.expectedModels],
+  );
 
-    const expectedModels = options.expectedModels ?? [];
-    if (expectedModels.length > 0) {
-      const isCorrectModel = expectedModels.some((expectedModel) => {
-        return model.type === expectedModel;
-      });
+  return useMemo((): T | null => {
+    if (modularUI?.model) {
+      const { model } = modularUI;
 
-      if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", expectedModels);
-        throw new IllegalStateException("Resolved model has incorrect type");
+      if (expectedModels.length > 0) {
+        const isCorrectModel = expectedModels.some(
+          (expectedModel) => model.type === expectedModel,
+        );
+        if (!isCorrectModel) {
+          console.error(modularUI, "is not of instance", expectedModels);
+          throw new IllegalStateException("Resolved model has incorrect type");
+        }
       }
-    }
 
-    return model;
-  }
-
-  return null;
+      return model;
+    }
+    return null;
+  }, [expectedModels, modularUI]);
 };

package/src/models/concepts/ConceptDetailModel.js

@@ -338,11 +338,4 @@ export default class ConceptDetailModel extends ResourceModel {
   isOfConceptType(conceptTypeId: string): boolean {
     return this.conceptType?.isOfConceptType(conceptTypeId) ?? false;
   }
-
-  /**
-   * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types for this concept
-   */
-  hasMetamodelIdInConceptTypeHierarchy(metamodelId: string): boolean {
-    return this.conceptType?.hasMetamodelIdInHierarchy(metamodelId) ?? false;
-  }
 }

package/src/models/concepts/ConceptLinkModel.js

@@ -168,11 +168,4 @@ export default class ConceptLinkModel
   isOfConceptType(conceptTypeId: string): boolean {
     return this.conceptType?.isOfConceptType(conceptTypeId) ?? false;
   }
-
-  /**
-   * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types for this concept
-   */
-  hasMetamodelIdInConceptTypeHierarchy(metamodelId: string): boolean {
-    return this.conceptType?.hasMetamodelIdInHierarchy(metamodelId) ?? false;
-  }
 }