@beinformed/ui 1.56.2 → 1.56.4

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.56.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.56.3...v1.56.4) (2024-10-16)
+
+
+### Bug Fixes
+
+* **modularui:** memoize expectedmodels property ([8dac1a6](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/8dac1a6d6cfe4c78c9d67fd7cdab3a3d7cda7ab8))
+
+## [1.56.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.56.2...v1.56.3) (2024-10-16)
+
+
+### Bug Fixes
+
+* **concept-type:** rename name property to kmtId ([c8e8b77](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c8e8b779fb567747a600c626077201560a2b866e))
+* **modularui:** force reload of existing model when form redirect ([91cfb43](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/91cfb436c1c076e8d424944a181e4599b58eccf4))
+
 ## [1.56.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.56.1...v1.56.2) (2024-10-10)
 
 

package/esm/hooks/useModularUI.js

@@ -1,14 +1,16 @@
-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 { loadModularUI, removeModelByKey } from "../redux/_modularui/ModularUIActions";
 import useDeepCompareEffect from "./useDeepCompareEffect";
 import { useLocale } from "./useI18n";
+import Href from "../models/href/Href";
 /**
  */
 const useKeyForHook = (modelKey, url) => {
   const locale = useLocale();
-  return `${modelKey}(${url.split("?")[0]})(${locale})`;
+  return useMemo(() => `${modelKey}(${url.split("?")[0]})(${locale})`, [modelKey, url, locale]);
 };
 
 /**
@@ -20,35 +22,35 @@ export const useModularUI = function (modelKey, url) {
     removeOnUnmount: false
   };
   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(() => {
     // prevent reloads when previous option had the isReload, but the new options not
     const isOldReload = prevHref.current === href && 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]);
-  const {
-    removeOnUnmount = false
-  } = options;
+    prevForceReload.current = forceReload;
+  }, [key, href, options, forceReload]);
   useEffect(() => {
-    return () => {
-      if (removeOnUnmount) {
+    if (options.removeOnUnmount) {
+      return () => {
         dispatch(removeModelByKey(key));
-      }
-    };
-  }, [dispatch, key, removeOnUnmount]);
-
-  // retrieve current model from modularui reducer
-  return useSelector(state => {
-    return state.modularui[key];
-  });
+      };
+    }
+  }, [dispatch, key, options.removeOnUnmount]);
+  const selector = useMemo(() => state => state.modularui[key], [key]);
+  return useSelector(selector);
 };
 //# sourceMappingURL=useModularUI.js.map

package/esm/hooks/useModularUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUI.js","names":["useEffect","useRef","useDispatch","useSelector","HTTP_METHODS","loadModularUI","removeModelByKey","useDeepCompareEffect","useLocale","useKeyForHook","modelKey","url","locale","split","useModularUI","options","arguments","length","undefined","method","GET","removeOnUnmount","dispatch","href","toString","key","prevOptions","prevHref","isOldReload","current","isReload","state","modularui"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\n\nimport { useLocale } from \"./useI18n\";\n\nimport type Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n */\nconst useKeyForHook = (modelKey: string, url: string) => {\n  const locale = useLocale();\n  return `${modelKey}(${url.split(\"?\")[0]})(${locale})`;\n};\n\n/**\n * Use redux action and selector to retrieve the correct modular ui service model\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = url?.toString() || \"\";\n  const key = useKeyForHook(modelKey, href);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    if (href !== \"\" && !isOldReload) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n  }, [key, href, options]);\n\n  const { removeOnUnmount = false } = options;\n  useEffect(() => {\n    return () => {\n      if (removeOnUnmount) {\n        dispatch(removeModelByKey(key));\n      }\n    };\n  }, [dispatch, key, removeOnUnmount]);\n\n  // retrieve current model from modularui reducer\n  return useSelector((state) => {\n    return state.modularui[key];\n  });\n};\n"],"mappings":"AACA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,SAASC,WAAW,EAAEC,WAAW,QAAQ,aAAa;AAEtD,SAASC,YAAY,QAAQ,cAAc;AAC3C,SACEC,aAAa,EACbC,gBAAgB,QACX,sCAAsC;AAE7C,OAAOC,oBAAoB,MAAM,wBAAwB;AAEzD,SAASC,SAAS,QAAQ,WAAW;AAKrC;AACA;AACA,MAAMC,aAAa,GAAGA,CAACC,QAAgB,EAAEC,GAAW,KAAK;EACvD,MAAMC,MAAM,GAAGJ,SAAS,CAAC,CAAC;EAC1B,OAAO,GAAGE,QAAQ,IAAIC,GAAG,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKD,MAAM,GAAG;AACvD,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAME,YAAY,GAAG,SAAAA,CAC1BJ,QAAgB,EAChBC,GAAkB,EAKV;EAAA,IAJRI,OAAgC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACjCG,MAAM,EAAEf,YAAY,CAACgB,GAAG;IACxBC,eAAe,EAAE;EACnB,CAAC;EAED,MAAMC,QAAQ,GAAGpB,WAAW,CAAC,CAAC;EAC9B,MAAMqB,IAAI,GAAGZ,GAAG,EAAEa,QAAQ,CAAC,CAAC,IAAI,EAAE;EAClC,MAAMC,GAAG,GAAGhB,aAAa,CAACC,QAAQ,EAAEa,IAAI,CAAC;EAEzC,MAAMG,WAAW,GAAGzB,MAAM,CAACc,OAAO,CAAC;EACnC,MAAMY,QAAQ,GAAG1B,MAAM,CAACsB,IAAI,CAAC;;EAE7B;EACAhB,oBAAoB,CAAC,MAAM;IACzB;IACA,MAAMqB,WAAW,GACfD,QAAQ,CAACE,OAAO,KAAKN,IAAI,IACzBG,WAAW,CAACG,OAAO,CAACC,QAAQ,IAC5B,CAACf,OAAO,CAACe,QAAQ;IAEnB,IAAIP,IAAI,KAAK,EAAE,IAAI,CAACK,WAAW,EAAE;MAC/BN,QAAQ,CAACjB,aAAa,CAACoB,GAAG,EAAEF,IAAI,EAAER,OAAO,CAAC,CAAC;IAC7C;IAEAW,WAAW,CAACG,OAAO,GAAGd,OAAO;IAC7BY,QAAQ,CAACE,OAAO,GAAGN,IAAI;EACzB,CAAC,EAAE,CAACE,GAAG,EAAEF,IAAI,EAAER,OAAO,CAAC,CAAC;EAExB,MAAM;IAAEM,eAAe,GAAG;EAAM,CAAC,GAAGN,OAAO;EAC3Cf,SAAS,CAAC,MAAM;IACd,OAAO,MAAM;MACX,IAAIqB,eAAe,EAAE;QACnBC,QAAQ,CAAChB,gBAAgB,CAACmB,GAAG,CAAC,CAAC;MACjC;IACF,CAAC;EACH,CAAC,EAAE,CAACH,QAAQ,EAAEG,GAAG,EAAEJ,eAAe,CAAC,CAAC;;EAEpC;EACA,OAAOlB,WAAW,CAAE4B,KAAK,IAAK;IAC5B,OAAOA,KAAK,CAACC,SAAS,CAACP,GAAG,CAAC;EAC7B,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"file":"useModularUI.js","names":["useEffect","useRef","useMemo","useDispatch","useSelector","useLocation","HTTP_METHODS","loadModularUI","removeModelByKey","useDeepCompareEffect","useLocale","Href","useKeyForHook","modelKey","url","locale","split","useModularUI","options","arguments","length","undefined","method","GET","removeOnUnmount","dispatch","href","toString","key","location","redirectLocation","state","forceReload","equals","prevOptions","prevHref","prevForceReload","isOldReload","current","isReload","doForceReload","selector","modularui"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef, useMemo } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\n\nimport { useLocale } from \"./useI18n\";\n\nimport Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n */\nconst useKeyForHook = (modelKey: string, url: string) => {\n  const locale = useLocale();\n  return useMemo(\n    () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n    [modelKey, url, locale],\n  );\n};\n\n/**\n * Use redux action and selector to retrieve the correct modular ui service model\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = useMemo(() => url?.toString() || \"\", [url]);\n  const key = useKeyForHook(modelKey, href);\n\n  const location = useLocation();\n  const redirectLocation = location.state?.redirectLocation;\n  const forceReload =\n    redirectLocation instanceof Href ? redirectLocation?.equals(href) : false;\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceReload = useRef(forceReload);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    const doForceReload = forceReload && !prevForceReload.current;\n\n    if (href !== \"\" && (doForceReload || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceReload.current = forceReload;\n  }, [key, href, options, forceReload]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  const selector = useMemo(() => (state) => state.modularui[key], [key]);\n  return useSelector(selector);\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/hooks/useModularUIBasic.js

@@ -1,4 +1,5 @@
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
+import { useMemo } from "react";
 import { useModularUI } from "./useModularUI";
 import { useLocation } from "./useRouter";
 import { IllegalStateException } from "../exceptions";
@@ -12,6 +13,7 @@ export const useModularUIBasic = function (key, href) {
     forceTargetModel: false
   };
   const location = useLocation();
+  const memoizedHref = useMemo(() => href.toString(), [href]);
   const useModularUIOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
@@ -32,23 +34,23 @@ export const useModularUIBasic = function (key, href) {
   }
 
   // $FlowFixMe[incompatible-call]
-  const modularUI = useModularUI(key, href, useModularUIOptions);
-  if (modularUI?.model) {
-    const {
-      model
-    } = modularUI;
-    const expectedModels = options.expectedModels ?? [];
-    if (expectedModels.length > 0) {
-      const isCorrectModel = expectedModels.some(expectedModel => {
-        return model.type === expectedModel;
-      });
-      if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", expectedModels);
-        throw new IllegalStateException("Resolved model has incorrect type");
+  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);
+  const expectedModels = useMemo(() => options.expectedModels ?? [], [options.expectedModels]);
+  return useMemo(() => {
+    if (modularUI?.model) {
+      const {
+        model
+      } = modularUI;
+      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 model;
-  }
-  return null;
+    return null;
+  }, [expectedModels, modularUI]);
 };
 //# sourceMappingURL=useModularUIBasic.js.map

package/esm/hooks/useModularUIBasic.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUIBasic.js","names":["useModularUI","useLocation","IllegalStateException","useModularUIBasic","key","href","_context","options","arguments","length","undefined","expectedModels","targetModel","forceTargetModel","location","useModularUIOptions","isReload","cache","state","reload","_startsWithInstanceProperty","pathname","call","toString","modularUI","model","isCorrectModel","some","expectedModel","type","console","error"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useModularUI } from \"./useModularUI\";\n\nimport { useLocation } from \"./useRouter\";\n\nimport { IllegalStateException } from \"../exceptions\";\n\nimport type { ModularUIModel, Href } from \"../models\";\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  cache?: boolean,\n};\n\n/**\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  key: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n  },\n): T | null => {\n  const location = useLocation();\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    cache: false,\n  };\n  if (options.targetModel) {\n    useModularUIOptions.targetModel = options.targetModel;\n    useModularUIOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  if (options.cache) {\n    useModularUIOptions.cache = options.cache;\n  }\n\n  // reload when the modular service starts with the current location\n  if (location.state?.reload && location.pathname.startsWith(href.toString())) {\n    useModularUIOptions.isReload = true;\n  }\n\n  // $FlowFixMe[incompatible-call]\n  const modularUI = useModularUI(key, href, useModularUIOptions);\n\n  if (modularUI?.model) {\n    const { model } = modularUI;\n\n    const expectedModels = options.expectedModels ?? [];\n    if (expectedModels.length > 0) {\n      const isCorrectModel = expectedModels.some((expectedModel) => {\n        return model.type === expectedModel;\n      });\n\n      if (!isCorrectModel) {\n        console.error(modularUI, \"is not of instance\", expectedModels);\n        throw new IllegalStateException(\"Resolved model has incorrect type\");\n      }\n    }\n\n    return model;\n  }\n\n  return null;\n};\n"],"mappings":";AACA,SAASA,YAAY,QAAQ,gBAAgB;AAE7C,SAASC,WAAW,QAAQ,aAAa;AAEzC,SAASC,qBAAqB,QAAQ,eAAe;AAWrD;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAMN;EAAA,IAAAC,QAAA;EAAA,IALbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE;EACpB,CAAC;EAED,MAAMC,QAAQ,GAAGb,WAAW,CAAC,CAAC;EAE9B,MAAMc,mBAAmB,GAAG;IAC1BH,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BM,QAAQ,EAAE,KAAK;IACfC,KAAK,EAAE;EACT,CAAC;EACD,IAAIV,OAAO,CAACK,WAAW,EAAE;IACvBG,mBAAmB,CAACH,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDG,mBAAmB,CAACF,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;EAEA,IAAIN,OAAO,CAACU,KAAK,EAAE;IACjBF,mBAAmB,CAACE,KAAK,GAAGV,OAAO,CAACU,KAAK;EAC3C;;EAEA;EACA,IAAIH,QAAQ,CAACI,KAAK,EAAEC,MAAM,IAAIC,2BAAA,CAAAd,QAAA,GAAAQ,QAAQ,CAACO,QAAQ,EAAAC,IAAA,CAAAhB,QAAA,EAAYD,IAAI,CAACkB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3ER,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;;EAEA;EACA,MAAMQ,SAAS,GAAGxB,YAAY,CAACI,GAAG,EAAEC,IAAI,EAAEU,mBAAmB,CAAC;EAE9D,IAAIS,SAAS,EAAEC,KAAK,EAAE;IACpB,MAAM;MAAEA;IAAM,CAAC,GAAGD,SAAS;IAE3B,MAAMb,cAAc,GAAGJ,OAAO,CAACI,cAAc,IAAI,EAAE;IACnD,IAAIA,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;MAC7B,MAAMiB,cAAc,GAAGf,cAAc,CAACgB,IAAI,CAAEC,aAAa,IAAK;QAC5D,OAAOH,KAAK,CAACI,IAAI,KAAKD,aAAa;MACrC,CAAC,CAAC;MAEF,IAAI,CAACF,cAAc,EAAE;QACnBI,OAAO,CAACC,KAAK,CAACP,SAAS,EAAE,oBAAoB,EAAEb,cAAc,CAAC;QAC9D,MAAM,IAAIT,qBAAqB,CAAC,mCAAmC,CAAC;MACtE;IACF;IAEA,OAAOuB,KAAK;EACd;EAEA,OAAO,IAAI;AACb,CAAC","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["useMemo","useModularUI","useLocation","IllegalStateException","useModularUIBasic","key","href","_context","options","arguments","length","undefined","expectedModels","targetModel","forceTargetModel","location","memoizedHref","toString","useModularUIOptions","isReload","cache","state","reload","_startsWithInstanceProperty","pathname","call","modularUI","model","isCorrectModel","some","expectedModel","type","console","error"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useMemo } from \"react\";\n\nimport { useModularUI } from \"./useModularUI\";\n\nimport { useLocation } from \"./useRouter\";\n\nimport { IllegalStateException } from \"../exceptions\";\n\nimport type { ModularUIModel, Href } from \"../models\";\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  cache?: boolean,\n};\n\n/**\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  key: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n  },\n): T | null => {\n  const location = useLocation();\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    cache: false,\n  };\n  if (options.targetModel) {\n    useModularUIOptions.targetModel = options.targetModel;\n    useModularUIOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  if (options.cache) {\n    useModularUIOptions.cache = options.cache;\n  }\n\n  // reload when the modular service starts with the current location\n  if (location.state?.reload && location.pathname.startsWith(href.toString())) {\n    useModularUIOptions.isReload = true;\n  }\n\n  // $FlowFixMe[incompatible-call]\n  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);\n\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      const { model } = modularUI;\n\n      if (expectedModels.length > 0) {\n        const isCorrectModel = expectedModels.some(\n          (expectedModel) => model.type === expectedModel,\n        );\n        if (!isCorrectModel) {\n          console.error(modularUI, \"is not of instance\", expectedModels);\n          throw new IllegalStateException(\"Resolved model has incorrect type\");\n        }\n      }\n\n      return model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n"],"mappings":";AACA,SAASA,OAAO,QAAQ,OAAO;AAE/B,SAASC,YAAY,QAAQ,gBAAgB;AAE7C,SAASC,WAAW,QAAQ,aAAa;AAEzC,SAASC,qBAAqB,QAAQ,eAAe;AAWrD;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAMN;EAAA,IAAAC,QAAA;EAAA,IALbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE;EACpB,CAAC;EAED,MAAMC,QAAQ,GAAGb,WAAW,CAAC,CAAC;EAC9B,MAAMc,YAAY,GAAGhB,OAAO,CAAC,MAAMM,IAAI,CAACW,QAAQ,CAAC,CAAC,EAAE,CAACX,IAAI,CAAC,CAAC;EAE3D,MAAMY,mBAAmB,GAAG;IAC1BL,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BQ,QAAQ,EAAE,KAAK;IACfC,KAAK,EAAE;EACT,CAAC;EACD,IAAIZ,OAAO,CAACK,WAAW,EAAE;IACvBK,mBAAmB,CAACL,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDK,mBAAmB,CAACJ,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;EAEA,IAAIN,OAAO,CAACY,KAAK,EAAE;IACjBF,mBAAmB,CAACE,KAAK,GAAGZ,OAAO,CAACY,KAAK;EAC3C;;EAEA;EACA,IAAIL,QAAQ,CAACM,KAAK,EAAEC,MAAM,IAAIC,2BAAA,CAAAhB,QAAA,GAAAQ,QAAQ,CAACS,QAAQ,EAAAC,IAAA,CAAAlB,QAAA,EAAYD,IAAI,CAACW,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3EC,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;;EAEA;EACA,MAAMO,SAAS,GAAGzB,YAAY,CAACI,GAAG,EAAEW,YAAY,EAAEE,mBAAmB,CAAC;EAEtE,MAAMN,cAAc,GAAGZ,OAAO,CAC5B,MAAMQ,OAAO,CAACI,cAAc,IAAI,EAAE,EAClC,CAACJ,OAAO,CAACI,cAAc,CACzB,CAAC;EAED,OAAOZ,OAAO,CAAC,MAAgB;IAC7B,IAAI0B,SAAS,EAAEC,KAAK,EAAE;MACpB,MAAM;QAAEA;MAAM,CAAC,GAAGD,SAAS;MAE3B,IAAId,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;QAC7B,MAAMkB,cAAc,GAAGhB,cAAc,CAACiB,IAAI,CACvCC,aAAa,IAAKH,KAAK,CAACI,IAAI,KAAKD,aACpC,CAAC;QACD,IAAI,CAACF,cAAc,EAAE;UACnBI,OAAO,CAACC,KAAK,CAACP,SAAS,EAAE,oBAAoB,EAAEd,cAAc,CAAC;UAC9D,MAAM,IAAIT,qBAAqB,CAAC,mCAAmC,CAAC;QACtE;MACF;MAEA,OAAOwB,KAAK;IACd;IACA,OAAO,IAAI;EACb,CAAC,EAAE,CAACf,cAAc,EAAEc,SAAS,CAAC,CAAC;AACjC,CAAC","ignoreList":[]}

package/esm/models/concepts/ConceptTypeDetailModel.js

@@ -7,8 +7,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() {
-    return this.getData("name", "");
+  get kmtId() {
+    return this.getData("kmtId", "");
   }
 
   /**

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

@@ -1 +1 @@
-{"version":3,"file":"ConceptTypeDetailModel.js","names":["ResourceModel","ConceptTypeDetailModel","name","getData","type","modelName","isApplicableModel","data","contributions","resourcetype","key","_id","label","modelCategory","isCoreTaxonomy","icon","textColor","backgroundColor","borderColor","labelTypes","propertyTypes","textFragmentTypes","sectionReferenceTypes","isOfConceptType","conceptTypeId","selfhref","equals"],"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 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  isOfConceptType(conceptTypeId: string): boolean {\n    return this.selfhref.equals(conceptTypeId);\n  }\n}\n\nexport default ConceptTypeDetailModel;\n"],"mappings":"AACA,OAAOA,aAAa,MAAM,uBAAuB;AAIjD;AACA;AACA;AACA,MAAMC,sBAAsB,SAASD,aAAa,CAAC;EACjD;AACF;AACA;AACA;EACE,IAAIE,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;EACjC;;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;AAEA,eAAevB,sBAAsB","ignoreList":[]}
+{"version":3,"file":"ConceptTypeDetailModel.js","names":["ResourceModel","ConceptTypeDetailModel","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"],"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,OAAOA,aAAa,MAAM,uBAAuB;AAIjD;AACA;AACA;AACA,MAAMC,sBAAsB,SAASD,aAAa,CAAC;EACjD;AACF;AACA;AACA;EACE,IAAIE,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;AAEA,eAAevB,sBAAsB","ignoreList":[]}

package/lib/hooks/__tests__/UseModularUIModel.spec.js.flow

@@ -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/lib/hooks/__tests__/useForm.spec.js.flow

@@ -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/lib/hooks/__tests__/useModelCatalog.spec.js.flow

@@ -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/lib/hooks/__tests__/useModularUIBasic.spec.js.flow

@@ -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/lib/hooks/useModularUI.js

@@ -7,15 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.useModularUI = void 0;
 var _react = require("react");
 var _reactRedux = require("react-redux");
+var _reactRouter = require("react-router");
 var _constants = require("../constants");
 var _ModularUIActions = require("../redux/_modularui/ModularUIActions");
 var _useDeepCompareEffect = _interopRequireDefault(require("./useDeepCompareEffect"));
 var _useI18n = require("./useI18n");
+var _Href = _interopRequireDefault(require("../models/href/Href"));
 /**
  */
 const useKeyForHook = (modelKey, url) => {
   const locale = (0, _useI18n.useLocale)();
-  return `${modelKey}(${url.split("?")[0]})(${locale})`;
+  return (0, _react.useMemo)(() => `${modelKey}(${url.split("?")[0]})(${locale})`, [modelKey, url, locale]);
 };
 
 /**
@@ -27,36 +29,36 @@ const useModularUI = function (modelKey, url) {
     removeOnUnmount: false
   };
   const dispatch = (0, _reactRedux.useDispatch)();
-  const href = url?.toString() || "";
+  const href = (0, _react.useMemo)(() => url?.toString() || "", [url]);
   const key = useKeyForHook(modelKey, href);
+  const location = (0, _reactRouter.useLocation)();
+  const redirectLocation = location.state?.redirectLocation;
+  const forceReload = redirectLocation instanceof _Href.default ? redirectLocation?.equals(href) : false;
   const prevOptions = (0, _react.useRef)(options);
   const prevHref = (0, _react.useRef)(href);
+  const prevForceReload = (0, _react.useRef)(forceReload);
 
   // dispatch loadModularUI
   (0, _useDeepCompareEffect.default)(() => {
     // prevent reloads when previous option had the isReload, but the new options not
     const isOldReload = prevHref.current === href && prevOptions.current.isReload && !options.isReload;
-    if (href !== "" && !isOldReload) {
+    const doForceReload = forceReload && !prevForceReload.current;
+    if (href !== "" && (doForceReload || !isOldReload)) {
       dispatch((0, _ModularUIActions.loadModularUI)(key, href, options));
     }
     prevOptions.current = options;
     prevHref.current = href;
-  }, [key, href, options]);
-  const {
-    removeOnUnmount = false
-  } = options;
+    prevForceReload.current = forceReload;
+  }, [key, href, options, forceReload]);
   (0, _react.useEffect)(() => {
-    return () => {
-      if (removeOnUnmount) {
+    if (options.removeOnUnmount) {
+      return () => {
         dispatch((0, _ModularUIActions.removeModelByKey)(key));
-      }
-    };
-  }, [dispatch, key, removeOnUnmount]);
-
-  // retrieve current model from modularui reducer
-  return (0, _reactRedux.useSelector)(state => {
-    return state.modularui[key];
-  });
+      };
+    }
+  }, [dispatch, key, options.removeOnUnmount]);
+  const selector = (0, _react.useMemo)(() => state => state.modularui[key], [key]);
+  return (0, _reactRedux.useSelector)(selector);
 };
 exports.useModularUI = useModularUI;
 //# sourceMappingURL=useModularUI.js.map

package/lib/hooks/useModularUI.js.flow

@@ -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/lib/hooks/useModularUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useI18n","useKeyForHook","modelKey","url","locale","useLocale","split","useModularUI","options","arguments","length","undefined","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","prevOptions","useRef","prevHref","useDeepCompareEffect","isOldReload","current","isReload","loadModularUI","useEffect","removeModelByKey","useSelector","state","modularui","exports"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\n\nimport { useLocale } from \"./useI18n\";\n\nimport type Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n */\nconst useKeyForHook = (modelKey: string, url: string) => {\n  const locale = useLocale();\n  return `${modelKey}(${url.split(\"?\")[0]})(${locale})`;\n};\n\n/**\n * Use redux action and selector to retrieve the correct modular ui service model\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = url?.toString() || \"\";\n  const key = useKeyForHook(modelKey, href);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    if (href !== \"\" && !isOldReload) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n  }, [key, href, options]);\n\n  const { removeOnUnmount = false } = options;\n  useEffect(() => {\n    return () => {\n      if (removeOnUnmount) {\n        dispatch(removeModelByKey(key));\n      }\n    };\n  }, [dispatch, key, removeOnUnmount]);\n\n  // retrieve current model from modularui reducer\n  return useSelector((state) => {\n    return state.modularui[key];\n  });\n};\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAKA,IAAAI,qBAAA,GAAAC,sBAAA,CAAAL,OAAA;AAEA,IAAAM,QAAA,GAAAN,OAAA;AAKA;AACA;AACA,MAAMO,aAAa,GAAGA,CAACC,QAAgB,EAAEC,GAAW,KAAK;EACvD,MAAMC,MAAM,GAAG,IAAAC,kBAAS,EAAC,CAAC;EAC1B,OAAO,GAAGH,QAAQ,IAAIC,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKF,MAAM,GAAG;AACvD,CAAC;;AAED;AACA;AACA;AACO,MAAMG,YAAY,GAAG,SAAAA,CAC1BL,QAAgB,EAChBC,GAAkB,EAKV;EAAA,IAJRK,OAAgC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACjCG,MAAM,EAAEC,uBAAY,CAACC,GAAG;IACxBC,eAAe,EAAE;EACnB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAC9B,MAAMC,IAAI,GAAGf,GAAG,EAAEgB,QAAQ,CAAC,CAAC,IAAI,EAAE;EAClC,MAAMC,GAAG,GAAGnB,aAAa,CAACC,QAAQ,EAAEgB,IAAI,CAAC;EAEzC,MAAMG,WAAW,GAAG,IAAAC,aAAM,EAACd,OAAO,CAAC;EACnC,MAAMe,QAAQ,GAAG,IAAAD,aAAM,EAACJ,IAAI,CAAC;;EAE7B;EACA,IAAAM,6BAAoB,EAAC,MAAM;IACzB;IACA,MAAMC,WAAW,GACfF,QAAQ,CAACG,OAAO,KAAKR,IAAI,IACzBG,WAAW,CAACK,OAAO,CAACC,QAAQ,IAC5B,CAACnB,OAAO,CAACmB,QAAQ;IAEnB,IAAIT,IAAI,KAAK,EAAE,IAAI,CAACO,WAAW,EAAE;MAC/BT,QAAQ,CAAC,IAAAY,+BAAa,EAACR,GAAG,EAAEF,IAAI,EAAEV,OAAO,CAAC,CAAC;IAC7C;IAEAa,WAAW,CAACK,OAAO,GAAGlB,OAAO;IAC7Be,QAAQ,CAACG,OAAO,GAAGR,IAAI;EACzB,CAAC,EAAE,CAACE,GAAG,EAAEF,IAAI,EAAEV,OAAO,CAAC,CAAC;EAExB,MAAM;IAAEO,eAAe,GAAG;EAAM,CAAC,GAAGP,OAAO;EAC3C,IAAAqB,gBAAS,EAAC,MAAM;IACd,OAAO,MAAM;MACX,IAAId,eAAe,EAAE;QACnBC,QAAQ,CAAC,IAAAc,kCAAgB,EAACV,GAAG,CAAC,CAAC;MACjC;IACF,CAAC;EACH,CAAC,EAAE,CAACJ,QAAQ,EAAEI,GAAG,EAAEL,eAAe,CAAC,CAAC;;EAEpC;EACA,OAAO,IAAAgB,uBAAW,EAAEC,KAAK,IAAK;IAC5B,OAAOA,KAAK,CAACC,SAAS,CAACb,GAAG,CAAC;EAC7B,CAAC,CAAC;AACJ,CAAC;AAACc,OAAA,CAAA3B,YAAA,GAAAA,YAAA","ignoreList":[]}
+{"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useI18n","_Href","useKeyForHook","modelKey","url","locale","useLocale","useMemo","split","useModularUI","options","arguments","length","undefined","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","location","useLocation","redirectLocation","state","forceReload","Href","equals","prevOptions","useRef","prevHref","prevForceReload","useDeepCompareEffect","isOldReload","current","isReload","doForceReload","loadModularUI","useEffect","removeModelByKey","selector","modularui","useSelector","exports"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef, useMemo } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\n\nimport { useLocale } from \"./useI18n\";\n\nimport Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n */\nconst useKeyForHook = (modelKey: string, url: string) => {\n  const locale = useLocale();\n  return useMemo(\n    () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n    [modelKey, url, locale],\n  );\n};\n\n/**\n * Use redux action and selector to retrieve the correct modular ui service model\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = useMemo(() => url?.toString() || \"\", [url]);\n  const key = useKeyForHook(modelKey, href);\n\n  const location = useLocation();\n  const redirectLocation = location.state?.redirectLocation;\n  const forceReload =\n    redirectLocation instanceof Href ? redirectLocation?.equals(href) : false;\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceReload = useRef(forceReload);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    const doForceReload = forceReload && !prevForceReload.current;\n\n    if (href !== \"\" && (doForceReload || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceReload.current = forceReload;\n  }, [key, href, options, forceReload]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  const selector = useMemo(() => (state) => state.modularui[key], [key]);\n  return useSelector(selector);\n};\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAEA,IAAAG,UAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AAKA,IAAAK,qBAAA,GAAAC,sBAAA,CAAAN,OAAA;AAEA,IAAAO,QAAA,GAAAP,OAAA;AAEA,IAAAQ,KAAA,GAAAF,sBAAA,CAAAN,OAAA;AAGA;AACA;AACA,MAAMS,aAAa,GAAGA,CAACC,QAAgB,EAAEC,GAAW,KAAK;EACvD,MAAMC,MAAM,GAAG,IAAAC,kBAAS,EAAC,CAAC;EAC1B,OAAO,IAAAC,cAAO,EACZ,MAAM,GAAGJ,QAAQ,IAAIC,GAAG,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKH,MAAM,GAAG,EACpD,CAACF,QAAQ,EAAEC,GAAG,EAAEC,MAAM,CACxB,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACO,MAAMI,YAAY,GAAG,SAAAA,CAC1BN,QAAgB,EAChBC,GAAkB,EAKV;EAAA,IAJRM,OAAgC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACjCG,MAAM,EAAEC,uBAAY,CAACC,GAAG;IACxBC,eAAe,EAAE;EACnB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAC9B,MAAMC,IAAI,GAAG,IAAAb,cAAO,EAAC,MAAMH,GAAG,EAAEiB,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAACjB,GAAG,CAAC,CAAC;EACxD,MAAMkB,GAAG,GAAGpB,aAAa,CAACC,QAAQ,EAAEiB,IAAI,CAAC;EAEzC,MAAMG,QAAQ,GAAG,IAAAC,wBAAW,EAAC,CAAC;EAC9B,MAAMC,gBAAgB,GAAGF,QAAQ,CAACG,KAAK,EAAED,gBAAgB;EACzD,MAAME,WAAW,GACfF,gBAAgB,YAAYG,aAAI,GAAGH,gBAAgB,EAAEI,MAAM,CAACT,IAAI,CAAC,GAAG,KAAK;EAE3E,MAAMU,WAAW,GAAG,IAAAC,aAAM,EAACrB,OAAO,CAAC;EACnC,MAAMsB,QAAQ,GAAG,IAAAD,aAAM,EAACX,IAAI,CAAC;EAC7B,MAAMa,eAAe,GAAG,IAAAF,aAAM,EAACJ,WAAW,CAAC;;EAE3C;EACA,IAAAO,6BAAoB,EAAC,MAAM;IACzB;IACA,MAAMC,WAAW,GACfH,QAAQ,CAACI,OAAO,KAAKhB,IAAI,IACzBU,WAAW,CAACM,OAAO,CAACC,QAAQ,IAC5B,CAAC3B,OAAO,CAAC2B,QAAQ;IAEnB,MAAMC,aAAa,GAAGX,WAAW,IAAI,CAACM,eAAe,CAACG,OAAO;IAE7D,IAAIhB,IAAI,KAAK,EAAE,KAAKkB,aAAa,IAAI,CAACH,WAAW,CAAC,EAAE;MAClDjB,QAAQ,CAAC,IAAAqB,+BAAa,EAACjB,GAAG,EAAEF,IAAI,EAAEV,OAAO,CAAC,CAAC;IAC7C;IAEAoB,WAAW,CAACM,OAAO,GAAG1B,OAAO;IAC7BsB,QAAQ,CAACI,OAAO,GAAGhB,IAAI;IACvBa,eAAe,CAACG,OAAO,GAAGT,WAAW;EACvC,CAAC,EAAE,CAACL,GAAG,EAAEF,IAAI,EAAEV,OAAO,EAAEiB,WAAW,CAAC,CAAC;EAErC,IAAAa,gBAAS,EAAC,MAAM;IACd,IAAI9B,OAAO,CAACO,eAAe,EAAE;MAC3B,OAAO,MAAM;QACXC,QAAQ,CAAC,IAAAuB,kCAAgB,EAACnB,GAAG,CAAC,CAAC;MACjC,CAAC;IACH;EACF,CAAC,EAAE,CAACJ,QAAQ,EAAEI,GAAG,EAAEZ,OAAO,CAACO,eAAe,CAAC,CAAC;EAE5C,MAAMyB,QAAQ,GAAG,IAAAnC,cAAO,EAAC,MAAOmB,KAAK,IAAKA,KAAK,CAACiB,SAAS,CAACrB,GAAG,CAAC,EAAE,CAACA,GAAG,CAAC,CAAC;EACtE,OAAO,IAAAsB,uBAAW,EAACF,QAAQ,CAAC;AAC9B,CAAC;AAACG,OAAA,CAAApC,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/hooks/useModularUIBasic.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useModularUIBasic = void 0;
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
+var _react = require("react");
 var _useModularUI = require("./useModularUI");
 var _useRouter = require("./useRouter");
 var _exceptions = require("../exceptions");
@@ -19,6 +20,7 @@ const useModularUIBasic = function (key, href) {
     forceTargetModel: false
   };
   const location = (0, _useRouter.useLocation)();
+  const memoizedHref = (0, _react.useMemo)(() => href.toString(), [href]);
   const useModularUIOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
@@ -39,24 +41,24 @@ const useModularUIBasic = function (key, href) {
   }
 
   // $FlowFixMe[incompatible-call]
-  const modularUI = (0, _useModularUI.useModularUI)(key, href, useModularUIOptions);
-  if (modularUI?.model) {
-    const {
-      model
-    } = modularUI;
-    const expectedModels = options.expectedModels ?? [];
-    if (expectedModels.length > 0) {
-      const isCorrectModel = expectedModels.some(expectedModel => {
-        return model.type === expectedModel;
-      });
-      if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", expectedModels);
-        throw new _exceptions.IllegalStateException("Resolved model has incorrect type");
+  const modularUI = (0, _useModularUI.useModularUI)(key, memoizedHref, useModularUIOptions);
+  const expectedModels = (0, _react.useMemo)(() => options.expectedModels ?? [], [options.expectedModels]);
+  return (0, _react.useMemo)(() => {
+    if (modularUI?.model) {
+      const {
+        model
+      } = modularUI;
+      if (expectedModels.length > 0) {
+        const isCorrectModel = expectedModels.some(expectedModel => model.type === expectedModel);
+        if (!isCorrectModel) {
+          console.error(modularUI, "is not of instance", expectedModels);
+          throw new _exceptions.IllegalStateException("Resolved model has incorrect type");
+        }
       }
+      return model;
     }
-    return model;
-  }
-  return null;
+    return null;
+  }, [expectedModels, modularUI]);
 };
 exports.useModularUIBasic = useModularUIBasic;
 //# sourceMappingURL=useModularUIBasic.js.map

package/lib/hooks/useModularUIBasic.js.flow

@@ -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/lib/hooks/useModularUIBasic.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUIBasic.js","names":["_useModularUI","require","_useRouter","_exceptions","useModularUIBasic","key","href","_context","options","arguments","length","undefined","expectedModels","targetModel","forceTargetModel","location","useLocation","useModularUIOptions","isReload","cache","state","reload","_startsWith","default","pathname","call","toString","modularUI","useModularUI","model","isCorrectModel","some","expectedModel","type","console","error","IllegalStateException","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useModularUI } from \"./useModularUI\";\n\nimport { useLocation } from \"./useRouter\";\n\nimport { IllegalStateException } from \"../exceptions\";\n\nimport type { ModularUIModel, Href } from \"../models\";\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  cache?: boolean,\n};\n\n/**\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  key: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n  },\n): T | null => {\n  const location = useLocation();\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    cache: false,\n  };\n  if (options.targetModel) {\n    useModularUIOptions.targetModel = options.targetModel;\n    useModularUIOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  if (options.cache) {\n    useModularUIOptions.cache = options.cache;\n  }\n\n  // reload when the modular service starts with the current location\n  if (location.state?.reload && location.pathname.startsWith(href.toString())) {\n    useModularUIOptions.isReload = true;\n  }\n\n  // $FlowFixMe[incompatible-call]\n  const modularUI = useModularUI(key, href, useModularUIOptions);\n\n  if (modularUI?.model) {\n    const { model } = modularUI;\n\n    const expectedModels = options.expectedModels ?? [];\n    if (expectedModels.length > 0) {\n      const isCorrectModel = expectedModels.some((expectedModel) => {\n        return model.type === expectedModel;\n      });\n\n      if (!isCorrectModel) {\n        console.error(modularUI, \"is not of instance\", expectedModels);\n        throw new IllegalStateException(\"Resolved model has incorrect type\");\n      }\n    }\n\n    return model;\n  }\n\n  return null;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AAWA;AACA;AACO,MAAMG,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAMN;EAAA,IAAAC,QAAA;EAAA,IALbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE;EACpB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,sBAAW,EAAC,CAAC;EAE9B,MAAMC,mBAAmB,GAAG;IAC1BJ,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BO,QAAQ,EAAE,KAAK;IACfC,KAAK,EAAE;EACT,CAAC;EACD,IAAIX,OAAO,CAACK,WAAW,EAAE;IACvBI,mBAAmB,CAACJ,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDI,mBAAmB,CAACH,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;EAEA,IAAIN,OAAO,CAACW,KAAK,EAAE;IACjBF,mBAAmB,CAACE,KAAK,GAAGX,OAAO,CAACW,KAAK;EAC3C;;EAEA;EACA,IAAIJ,QAAQ,CAACK,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAhB,QAAA,GAAAQ,QAAQ,CAACS,QAAQ,EAAAC,IAAA,CAAAlB,QAAA,EAAYD,IAAI,CAACoB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3ET,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;;EAEA;EACA,MAAMS,SAAS,GAAG,IAAAC,0BAAY,EAACvB,GAAG,EAAEC,IAAI,EAAEW,mBAAmB,CAAC;EAE9D,IAAIU,SAAS,EAAEE,KAAK,EAAE;IACpB,MAAM;MAAEA;IAAM,CAAC,GAAGF,SAAS;IAE3B,MAAMf,cAAc,GAAGJ,OAAO,CAACI,cAAc,IAAI,EAAE;IACnD,IAAIA,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;MAC7B,MAAMoB,cAAc,GAAGlB,cAAc,CAACmB,IAAI,CAAEC,aAAa,IAAK;QAC5D,OAAOH,KAAK,CAACI,IAAI,KAAKD,aAAa;MACrC,CAAC,CAAC;MAEF,IAAI,CAACF,cAAc,EAAE;QACnBI,OAAO,CAACC,KAAK,CAACR,SAAS,EAAE,oBAAoB,EAAEf,cAAc,CAAC;QAC9D,MAAM,IAAIwB,iCAAqB,CAAC,mCAAmC,CAAC;MACtE;IACF;IAEA,OAAOP,KAAK;EACd;EAEA,OAAO,IAAI;AACb,CAAC;AAACQ,OAAA,CAAAjC,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["_react","require","_useModularUI","_useRouter","_exceptions","useModularUIBasic","key","href","_context","options","arguments","length","undefined","expectedModels","targetModel","forceTargetModel","location","useLocation","memoizedHref","useMemo","toString","useModularUIOptions","isReload","cache","state","reload","_startsWith","default","pathname","call","modularUI","useModularUI","model","isCorrectModel","some","expectedModel","type","console","error","IllegalStateException","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useMemo } from \"react\";\n\nimport { useModularUI } from \"./useModularUI\";\n\nimport { useLocation } from \"./useRouter\";\n\nimport { IllegalStateException } from \"../exceptions\";\n\nimport type { ModularUIModel, Href } from \"../models\";\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  cache?: boolean,\n};\n\n/**\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  key: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n  },\n): T | null => {\n  const location = useLocation();\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    cache: false,\n  };\n  if (options.targetModel) {\n    useModularUIOptions.targetModel = options.targetModel;\n    useModularUIOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  if (options.cache) {\n    useModularUIOptions.cache = options.cache;\n  }\n\n  // reload when the modular service starts with the current location\n  if (location.state?.reload && location.pathname.startsWith(href.toString())) {\n    useModularUIOptions.isReload = true;\n  }\n\n  // $FlowFixMe[incompatible-call]\n  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);\n\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      const { model } = modularUI;\n\n      if (expectedModels.length > 0) {\n        const isCorrectModel = expectedModels.some(\n          (expectedModel) => model.type === expectedModel,\n        );\n        if (!isCorrectModel) {\n          console.error(modularUI, \"is not of instance\", expectedModels);\n          throw new IllegalStateException(\"Resolved model has incorrect type\");\n        }\n      }\n\n      return model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,aAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AAWA;AACA;AACO,MAAMI,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAMN;EAAA,IAAAC,QAAA;EAAA,IALbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE;EACpB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,sBAAW,EAAC,CAAC;EAC9B,MAAMC,YAAY,GAAG,IAAAC,cAAO,EAAC,MAAMZ,IAAI,CAACa,QAAQ,CAAC,CAAC,EAAE,CAACb,IAAI,CAAC,CAAC;EAE3D,MAAMc,mBAAmB,GAAG;IAC1BP,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BU,QAAQ,EAAE,KAAK;IACfC,KAAK,EAAE;EACT,CAAC;EACD,IAAId,OAAO,CAACK,WAAW,EAAE;IACvBO,mBAAmB,CAACP,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDO,mBAAmB,CAACN,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;EAEA,IAAIN,OAAO,CAACc,KAAK,EAAE;IACjBF,mBAAmB,CAACE,KAAK,GAAGd,OAAO,CAACc,KAAK;EAC3C;;EAEA;EACA,IAAIP,QAAQ,CAACQ,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAnB,QAAA,GAAAQ,QAAQ,CAACY,QAAQ,EAAAC,IAAA,CAAArB,QAAA,EAAYD,IAAI,CAACa,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3EC,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;;EAEA;EACA,MAAMQ,SAAS,GAAG,IAAAC,0BAAY,EAACzB,GAAG,EAAEY,YAAY,EAAEG,mBAAmB,CAAC;EAEtE,MAAMR,cAAc,GAAG,IAAAM,cAAO,EAC5B,MAAMV,OAAO,CAACI,cAAc,IAAI,EAAE,EAClC,CAACJ,OAAO,CAACI,cAAc,CACzB,CAAC;EAED,OAAO,IAAAM,cAAO,EAAC,MAAgB;IAC7B,IAAIW,SAAS,EAAEE,KAAK,EAAE;MACpB,MAAM;QAAEA;MAAM,CAAC,GAAGF,SAAS;MAE3B,IAAIjB,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;QAC7B,MAAMsB,cAAc,GAAGpB,cAAc,CAACqB,IAAI,CACvCC,aAAa,IAAKH,KAAK,CAACI,IAAI,KAAKD,aACpC,CAAC;QACD,IAAI,CAACF,cAAc,EAAE;UACnBI,OAAO,CAACC,KAAK,CAACR,SAAS,EAAE,oBAAoB,EAAEjB,cAAc,CAAC;UAC9D,MAAM,IAAI0B,iCAAqB,CAAC,mCAAmC,CAAC;QACtE;MACF;MAEA,OAAOP,KAAK;IACd;IACA,OAAO,IAAI;EACb,CAAC,EAAE,CAACnB,cAAc,EAAEiB,SAAS,CAAC,CAAC;AACjC,CAAC;AAACU,OAAA,CAAAnC,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/lib/models/concepts/ConceptTypeDetailModel.js

@@ -14,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", "");
   }
 
   /**

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

@@ -11,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", "");
   }
 
   /**

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","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 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  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,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;EACjC;;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":[]}
+{"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.56.2",
+  "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/ConceptTypeDetailModel.js

@@ -11,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", "");
   }
 
   /**