@beinformed/ui 1.57.0-contextpath.1 → 1.57.0

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

@@ -37,14 +37,11 @@ describe("model hooks", () => {
 
     result.current.reload(application);
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
           locale: "en",
         }),
@@ -83,14 +80,11 @@ describe("model hooks", () => {
       model.selfhref.equals(new Href("/")),
     );
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
           locale: "en",
         }),
@@ -130,14 +124,11 @@ describe("model hooks", () => {
       model.selfhref.equals(new Href("/books/books")),
     );
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "list(/books/books)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "list(/books/books)(en)",
           href: caselist.selfhref,
           locale: "en",
         }),

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();
   });
 
@@ -57,10 +66,6 @@ describe("modularui hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `app(/)(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
@@ -107,10 +112,6 @@ describe("modularui hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `app(/)(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",

package/lib/hooks/useModularUI.js

@@ -7,6 +7,7 @@ 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"));
@@ -16,7 +17,7 @@ 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]);
 };
 
 /**
@@ -28,40 +29,40 @@ 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);
   if (url instanceof _Href.default) {
     options.origin = options.origin ?? url.origin;
     options.contextPath = options.contextPath ?? url.contextPath;
   }
+  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 {
@@ -19,7 +20,10 @@ 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,7 +38,7 @@ export const useModularUI = (
   },
 ): any => {
   const dispatch = useDispatch();
-  const href = url?.toString() || "";
+  const href = useMemo(() => url?.toString() || "", [url]);
   const key = useKeyForHook(modelKey, href);
 
   if (url instanceof Href) {
@@ -42,8 +46,14 @@ export const useModularUI = (
     options.contextPath = options.contextPath ?? url.contextPath;
   }
 
+  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(() => {
@@ -53,25 +63,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","_Href","useKeyForHook","modelKey","url","locale","useLocale","split","useModularUI","options","arguments","length","undefined","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","Href","origin","contextPath","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\";\nimport Href from \"../models/href/Href\";\n\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  if (url instanceof Href) {\n    options.origin = options.origin ?? url.origin;\n    options.contextPath = options.contextPath ?? url.contextPath;\n  }\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;AACA,IAAAO,KAAA,GAAAF,sBAAA,CAAAL,OAAA;AAIA;AACA;AACA,MAAMQ,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,IAAIf,GAAG,YAAYkB,aAAI,EAAE;IACvBb,OAAO,CAACc,MAAM,GAAGd,OAAO,CAACc,MAAM,IAAInB,GAAG,CAACmB,MAAM;IAC7Cd,OAAO,CAACe,WAAW,GAAGf,OAAO,CAACe,WAAW,IAAIpB,GAAG,CAACoB,WAAW;EAC9D;EAEA,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAACjB,OAAO,CAAC;EACnC,MAAMkB,QAAQ,GAAG,IAAAD,aAAM,EAACP,IAAI,CAAC;;EAE7B;EACA,IAAAS,6BAAoB,EAAC,MAAM;IACzB;IACA,MAAMC,WAAW,GACfF,QAAQ,CAACG,OAAO,KAAKX,IAAI,IACzBM,WAAW,CAACK,OAAO,CAACC,QAAQ,IAC5B,CAACtB,OAAO,CAACsB,QAAQ;IAEnB,IAAIZ,IAAI,KAAK,EAAE,IAAI,CAACU,WAAW,EAAE;MAC/BZ,QAAQ,CAAC,IAAAe,+BAAa,EAACX,GAAG,EAAEF,IAAI,EAAEV,OAAO,CAAC,CAAC;IAC7C;IAEAgB,WAAW,CAACK,OAAO,GAAGrB,OAAO;IAC7BkB,QAAQ,CAACG,OAAO,GAAGX,IAAI;EACzB,CAAC,EAAE,CAACE,GAAG,EAAEF,IAAI,EAAEV,OAAO,CAAC,CAAC;EAExB,MAAM;IAAEO,eAAe,GAAG;EAAM,CAAC,GAAGP,OAAO;EAC3C,IAAAwB,gBAAS,EAAC,MAAM;IACd,OAAO,MAAM;MACX,IAAIjB,eAAe,EAAE;QACnBC,QAAQ,CAAC,IAAAiB,kCAAgB,EAACb,GAAG,CAAC,CAAC;MACjC;IACF,CAAC;EACH,CAAC,EAAE,CAACJ,QAAQ,EAAEI,GAAG,EAAEL,eAAe,CAAC,CAAC;;EAEpC;EACA,OAAO,IAAAmB,uBAAW,EAAEC,KAAK,IAAK;IAC5B,OAAOA,KAAK,CAACC,SAAS,CAAChB,GAAG,CAAC;EAC7B,CAAC,CAAC;AACJ,CAAC;AAACiB,OAAA,CAAA9B,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","Href","origin","contextPath","location","useLocation","redirectLocation","state","forceReload","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\";\nimport Href from \"../models/href/Href\";\n\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  if (url instanceof Href) {\n    options.origin = options.origin ?? url.origin;\n    options.contextPath = options.contextPath ?? url.contextPath;\n  }\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/lib/hooks/useModularUIBasic.js

@@ -6,22 +6,14 @@ 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");
-/**
- */
-const useModularUIBasic = function (key, href) {
+// Helper to create useModularUI options
+const createUseModularUIOptions = (options, href, location) => {
   var _context;
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-    expectedModels: [],
-    targetModel: undefined,
-    forceTargetModel: false,
-    origin: undefined,
-    contextPath: undefined
-  };
-  const location = (0, _useRouter.useLocation)();
-  const useModularUIOptions = {
+  const baseOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
     isReload: false,
@@ -29,44 +21,63 @@ const useModularUIBasic = function (key, href) {
     contextPath: undefined,
     cache: false
   };
+
+  // Handle targetModel and forceTargetModel
   if (options.targetModel) {
-    useModularUIOptions.targetModel = options.targetModel;
-    useModularUIOptions.forceTargetModel = options.forceTargetModel;
+    baseOptions.targetModel = options.targetModel;
+    baseOptions.forceTargetModel = options.forceTargetModel;
   }
+
+  // Handle cache option
   if (options.cache) {
-    useModularUIOptions.cache = options.cache;
+    baseOptions.cache = options.cache;
   }
 
-  // reload when the modular service starts with the current location
-  if (location.state?.reload && (0, _startsWith.default)(_context = location.pathname).call(_context, href.toString())) {
-    useModularUIOptions.isReload = true;
-  }
-  if (options.origin) {
-    useModularUIOptions.origin = options.origin;
-  }
-  if (options.contextPath) {
-    useModularUIOptions.contextPath = options.contextPath;
+  // Check for reload if location matches href
+  if (location.state?.reload && (0, _startsWith.default)(_context = location.pathname).call(_context, href)) {
+    baseOptions.isReload = true;
   }
 
-  // $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");
-      }
+  // Handle origin and contextPath options
+  baseOptions.origin = options.origin ?? baseOptions.origin;
+  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;
+  return baseOptions;
+};
+
+// Helper to validate the model against expectedModels
+const validateModel = (model, expectedModels) => {
+  if (expectedModels.length > 0) {
+    const isCorrectModel = expectedModels.some(expectedModel => model.type === expectedModel);
+    if (!isCorrectModel) {
+      console.error(model, "is not of instance", expectedModels);
+      throw new _exceptions.IllegalStateException("Resolved model has incorrect type");
     }
-    return model;
   }
-  return null;
+};
+
+/**
+ * useModularUIBasic Hook
+ */
+const useModularUIBasic = function (key, href) {
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+    expectedModels: [],
+    targetModel: undefined,
+    forceTargetModel: false,
+    origin: undefined,
+    contextPath: undefined
+  };
+  const location = (0, _useRouter.useLocation)();
+  const memoizedHref = (0, _react.useMemo)(() => href.toString(), [href]);
+  const useModularUIOptions = (0, _react.useMemo)(() => createUseModularUIOptions(options, memoizedHref, location), [options, memoizedHref, location]);
+  const modularUI = (0, _useModularUI.useModularUI)(key, memoizedHref, useModularUIOptions);
+  const expectedModels = (0, _react.useMemo)(() => options.expectedModels ?? [], [options.expectedModels]);
+  return (0, _react.useMemo)(() => {
+    if (modularUI?.model) {
+      validateModel(modularUI.model, expectedModels);
+      return modularUI.model;
+    }
+    return null;
+  }, [expectedModels, modularUI]);
 };
 exports.useModularUIBasic = useModularUIBasic;
 //# sourceMappingURL=useModularUIBasic.js.map

package/lib/hooks/useModularUIBasic.js.flow

@@ -1,10 +1,8 @@
 // @flow
+import { useMemo } from "react";
 import { useModularUI } from "./useModularUI";
-
 import { useLocation } from "./useRouter";
-
 import { IllegalStateException } from "../exceptions";
-
 import type { ModularUIModel, Href } from "../models";
 
 export type UseModularUIBasicOptions<T: ModularUIModel> = {
@@ -16,22 +14,13 @@ export type UseModularUIBasicOptions<T: ModularUIModel> = {
   cache?: boolean,
 };
 
-/**
- */
-export const useModularUIBasic = <T: ModularUIModel>(
-  key: string,
-  href: string | Href,
-  options: UseModularUIBasicOptions<T> = {
-    expectedModels: [],
-    targetModel: undefined,
-    forceTargetModel: false,
-    origin: undefined,
-    contextPath: undefined,
-  },
-): T | null => {
-  const location = useLocation();
-
-  const useModularUIOptions = {
+// Helper to create useModularUI options
+const createUseModularUIOptions = <T: ModularUIModel>(
+  options: UseModularUIBasicOptions<T>,
+  href: string,
+  location: any,
+): Object => {
+  const baseOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
     isReload: false,
@@ -39,48 +28,75 @@ export const useModularUIBasic = <T: ModularUIModel>(
     contextPath: undefined,
     cache: false,
   };
+
+  // Handle targetModel and forceTargetModel
   if (options.targetModel) {
-    useModularUIOptions.targetModel = options.targetModel;
-    useModularUIOptions.forceTargetModel = options.forceTargetModel;
+    baseOptions.targetModel = options.targetModel;
+    baseOptions.forceTargetModel = options.forceTargetModel;
   }
 
+  // Handle cache option
   if (options.cache) {
-    useModularUIOptions.cache = options.cache;
-  }
-
-  // reload when the modular service starts with the current location
-  if (location.state?.reload && location.pathname.startsWith(href.toString())) {
-    useModularUIOptions.isReload = true;
+    baseOptions.cache = options.cache;
   }
 
-  if (options.origin) {
-    useModularUIOptions.origin = options.origin;
+  // Check for reload if location matches href
+  if (location.state?.reload && location.pathname.startsWith(href)) {
+    baseOptions.isReload = true;
   }
 
-  if (options.contextPath) {
-    useModularUIOptions.contextPath = options.contextPath;
-  }
-
-  // $FlowFixMe[incompatible-call]
-  const modularUI = useModularUI(key, href, useModularUIOptions);
-
-  if (modularUI?.model) {
-    const { model } = modularUI;
+  // Handle origin and contextPath options
+  baseOptions.origin = options.origin ?? baseOptions.origin;
+  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;
 
-    const expectedModels = options.expectedModels ?? [];
-    if (expectedModels.length > 0) {
-      const isCorrectModel = expectedModels.some((expectedModel) => {
-        return model.type === expectedModel;
-      });
+  return baseOptions;
+};
 
-      if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", expectedModels);
-        throw new IllegalStateException("Resolved model has incorrect type");
-      }
+// Helper to validate the model against expectedModels
+const validateModel = (model: any, expectedModels: Array<string>) => {
+  if (expectedModels.length > 0) {
+    const isCorrectModel = expectedModels.some(
+      (expectedModel) => model.type === expectedModel,
+    );
+    if (!isCorrectModel) {
+      console.error(model, "is not of instance", expectedModels);
+      throw new IllegalStateException("Resolved model has incorrect type");
     }
-
-    return model;
   }
+};
 
-  return null;
+/**
+ * useModularUIBasic Hook
+ */
+export const useModularUIBasic = <T: ModularUIModel>(
+  key: string,
+  href: string | Href,
+  options: UseModularUIBasicOptions<T> = {
+    expectedModels: [],
+    targetModel: undefined,
+    forceTargetModel: false,
+    origin: undefined,
+    contextPath: undefined,
+  },
+): T | null => {
+  const location = useLocation();
+  const memoizedHref = useMemo(() => href.toString(), [href]);
+  const useModularUIOptions = useMemo(
+    () => createUseModularUIOptions(options, memoizedHref, location),
+    [options, memoizedHref, location],
+  );
+
+  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);
+  const expectedModels = useMemo(
+    () => options.expectedModels ?? [],
+    [options.expectedModels],
+  );
+
+  return useMemo((): T | null => {
+    if (modularUI?.model) {
+      validateModel(modularUI.model, expectedModels);
+      return modularUI.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","origin","contextPath","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  origin?: string,\n  contextPath?: string,\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    origin: undefined,\n    contextPath: undefined,\n  },\n): T | null => {\n  const location = useLocation();\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    origin: undefined,\n    contextPath: undefined,\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  if (options.origin) {\n    useModularUIOptions.origin = options.origin;\n  }\n\n  if (options.contextPath) {\n    useModularUIOptions.contextPath = options.contextPath;\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;AAaA;AACA;AACO,MAAMG,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAQN;EAAA,IAAAC,QAAA;EAAA,IAPbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE,KAAK;IACvBC,MAAM,EAAEJ,SAAS;IACjBK,WAAW,EAAEL;EACf,CAAC;EAED,MAAMM,QAAQ,GAAG,IAAAC,sBAAW,EAAC,CAAC;EAE9B,MAAMC,mBAAmB,GAAG;IAC1BN,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BS,QAAQ,EAAE,KAAK;IACfL,MAAM,EAAEJ,SAAS;IACjBK,WAAW,EAAEL,SAAS;IACtBU,KAAK,EAAE;EACT,CAAC;EACD,IAAIb,OAAO,CAACK,WAAW,EAAE;IACvBM,mBAAmB,CAACN,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDM,mBAAmB,CAACL,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;EAEA,IAAIN,OAAO,CAACa,KAAK,EAAE;IACjBF,mBAAmB,CAACE,KAAK,GAAGb,OAAO,CAACa,KAAK;EAC3C;;EAEA;EACA,IAAIJ,QAAQ,CAACK,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAlB,QAAA,GAAAU,QAAQ,CAACS,QAAQ,EAAAC,IAAA,CAAApB,QAAA,EAAYD,IAAI,CAACsB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3ET,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;EAEA,IAAIZ,OAAO,CAACO,MAAM,EAAE;IAClBI,mBAAmB,CAACJ,MAAM,GAAGP,OAAO,CAACO,MAAM;EAC7C;EAEA,IAAIP,OAAO,CAACQ,WAAW,EAAE;IACvBG,mBAAmB,CAACH,WAAW,GAAGR,OAAO,CAACQ,WAAW;EACvD;;EAEA;EACA,MAAMa,SAAS,GAAG,IAAAC,0BAAY,EAACzB,GAAG,EAAEC,IAAI,EAAEa,mBAAmB,CAAC;EAE9D,IAAIU,SAAS,EAAEE,KAAK,EAAE;IACpB,MAAM;MAAEA;IAAM,CAAC,GAAGF,SAAS;IAE3B,MAAMjB,cAAc,GAAGJ,OAAO,CAACI,cAAc,IAAI,EAAE;IACnD,IAAIA,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;MAC7B,MAAMsB,cAAc,GAAGpB,cAAc,CAACqB,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,EAAEjB,cAAc,CAAC;QAC9D,MAAM,IAAI0B,iCAAqB,CAAC,mCAAmC,CAAC;MACtE;IACF;IAEA,OAAOP,KAAK;EACd;EAEA,OAAO,IAAI;AACb,CAAC;AAACQ,OAAA,CAAAnC,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["_react","require","_useModularUI","_useRouter","_exceptions","createUseModularUIOptions","options","href","location","_context","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","state","reload","_startsWith","default","pathname","call","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","error","IllegalStateException","useModularUIBasic","key","arguments","useLocation","memoizedHref","useMemo","toString","useModularUIOptions","modularUI","useModularUI","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\nimport { useLocation } from \"./useRouter\";\nimport { IllegalStateException } from \"../exceptions\";\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  origin?: string,\n  contextPath?: string,\n  cache?: boolean,\n};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n  options: UseModularUIBasicOptions<T>,\n  href: string,\n  location: any,\n): Object => {\n  const baseOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    origin: undefined,\n    contextPath: undefined,\n    cache: false,\n  };\n\n  // Handle targetModel and forceTargetModel\n  if (options.targetModel) {\n    baseOptions.targetModel = options.targetModel;\n    baseOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  // Handle cache option\n  if (options.cache) {\n    baseOptions.cache = options.cache;\n  }\n\n  // Check for reload if location matches href\n  if (location.state?.reload && location.pathname.startsWith(href)) {\n    baseOptions.isReload = true;\n  }\n\n  // Handle origin and contextPath options\n  baseOptions.origin = options.origin ?? baseOptions.origin;\n  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;\n\n  return baseOptions;\n};\n\n// Helper to validate the model against expectedModels\nconst validateModel = (model: any, expectedModels: Array<string>) => {\n  if (expectedModels.length > 0) {\n    const isCorrectModel = expectedModels.some(\n      (expectedModel) => model.type === expectedModel,\n    );\n    if (!isCorrectModel) {\n      console.error(model, \"is not of instance\", expectedModels);\n      throw new IllegalStateException(\"Resolved model has incorrect type\");\n    }\n  }\n};\n\n/**\n * useModularUIBasic Hook\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    origin: undefined,\n    contextPath: undefined,\n  },\n): T | null => {\n  const location = useLocation();\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n  const useModularUIOptions = useMemo(\n    () => createUseModularUIOptions(options, memoizedHref, location),\n    [options, memoizedHref, location],\n  );\n\n  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      validateModel(modularUI.model, expectedModels);\n      return modularUI.model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AAYA;AACA,MAAMI,yBAAyB,GAAGA,CAChCC,OAAoC,EACpCC,IAAY,EACZC,QAAa,KACF;EAAA,IAAAC,QAAA;EACX,MAAMC,WAAW,GAAG;IAClBC,WAAW,EAAEC,SAAS;IACtBC,gBAAgB,EAAED,SAAS;IAC3BE,QAAQ,EAAE,KAAK;IACfC,MAAM,EAAEH,SAAS;IACjBI,WAAW,EAAEJ,SAAS;IACtBK,KAAK,EAAE;EACT,CAAC;;EAED;EACA,IAAIX,OAAO,CAACK,WAAW,EAAE;IACvBD,WAAW,CAACC,WAAW,GAAGL,OAAO,CAACK,WAAW;IAC7CD,WAAW,CAACG,gBAAgB,GAAGP,OAAO,CAACO,gBAAgB;EACzD;;EAEA;EACA,IAAIP,OAAO,CAACW,KAAK,EAAE;IACjBP,WAAW,CAACO,KAAK,GAAGX,OAAO,CAACW,KAAK;EACnC;;EAEA;EACA,IAAIT,QAAQ,CAACU,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAZ,QAAA,GAAAD,QAAQ,CAACc,QAAQ,EAAAC,IAAA,CAAAd,QAAA,EAAYF,IAAI,CAAC,EAAE;IAChEG,WAAW,CAACI,QAAQ,GAAG,IAAI;EAC7B;;EAEA;EACAJ,WAAW,CAACK,MAAM,GAAGT,OAAO,CAACS,MAAM,IAAIL,WAAW,CAACK,MAAM;EACzDL,WAAW,CAACM,WAAW,GAAGV,OAAO,CAACU,WAAW,IAAIN,WAAW,CAACM,WAAW;EAExE,OAAON,WAAW;AACpB,CAAC;;AAED;AACA,MAAMc,aAAa,GAAGA,CAACC,KAAU,EAAEC,cAA6B,KAAK;EACnE,IAAIA,cAAc,CAACC,MAAM,GAAG,CAAC,EAAE;IAC7B,MAAMC,cAAc,GAAGF,cAAc,CAACG,IAAI,CACvCC,aAAa,IAAKL,KAAK,CAACM,IAAI,KAAKD,aACpC,CAAC;IACD,IAAI,CAACF,cAAc,EAAE;MACnBI,OAAO,CAACC,KAAK,CAACR,KAAK,EAAE,oBAAoB,EAAEC,cAAc,CAAC;MAC1D,MAAM,IAAIQ,iCAAqB,CAAC,mCAAmC,CAAC;IACtE;EACF;AACF,CAAC;;AAED;AACA;AACA;AACO,MAAMC,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACX7B,IAAmB,EAQN;EAAA,IAPbD,OAAoC,GAAA+B,SAAA,CAAAV,MAAA,QAAAU,SAAA,QAAAzB,SAAA,GAAAyB,SAAA,MAAG;IACrCX,cAAc,EAAE,EAAE;IAClBf,WAAW,EAAEC,SAAS;IACtBC,gBAAgB,EAAE,KAAK;IACvBE,MAAM,EAAEH,SAAS;IACjBI,WAAW,EAAEJ;EACf,CAAC;EAED,MAAMJ,QAAQ,GAAG,IAAA8B,sBAAW,EAAC,CAAC;EAC9B,MAAMC,YAAY,GAAG,IAAAC,cAAO,EAAC,MAAMjC,IAAI,CAACkC,QAAQ,CAAC,CAAC,EAAE,CAAClC,IAAI,CAAC,CAAC;EAC3D,MAAMmC,mBAAmB,GAAG,IAAAF,cAAO,EACjC,MAAMnC,yBAAyB,CAACC,OAAO,EAAEiC,YAAY,EAAE/B,QAAQ,CAAC,EAChE,CAACF,OAAO,EAAEiC,YAAY,EAAE/B,QAAQ,CAClC,CAAC;EAED,MAAMmC,SAAS,GAAG,IAAAC,0BAAY,EAACR,GAAG,EAAEG,YAAY,EAAEG,mBAAmB,CAAC;EACtE,MAAMhB,cAAc,GAAG,IAAAc,cAAO,EAC5B,MAAMlC,OAAO,CAACoB,cAAc,IAAI,EAAE,EAClC,CAACpB,OAAO,CAACoB,cAAc,CACzB,CAAC;EAED,OAAO,IAAAc,cAAO,EAAC,MAAgB;IAC7B,IAAIG,SAAS,EAAElB,KAAK,EAAE;MACpBD,aAAa,CAACmB,SAAS,CAAClB,KAAK,EAAEC,cAAc,CAAC;MAC9C,OAAOiB,SAAS,CAAClB,KAAK;IACxB;IACA,OAAO,IAAI;EACb,CAAC,EAAE,CAACC,cAAc,EAAEiB,SAAS,CAAC,CAAC;AACjC,CAAC;AAACE,OAAA,CAAAV,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/lib/models/concepts/ConceptDetailModel.js

@@ -230,7 +230,7 @@ class ConceptDetailModel extends _ResourceModel.default {
   getSourceReferenceCollection() {
     let availableLocales = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     if (!this._sourceReferences) {
-      this._sourceReferences = new _SourceReferenceCollection.default(this.getSourceReferencesForCurrentLanguage(availableLocales), this.entryDate);
+      this._sourceReferences = new _SourceReferenceCollection.default(this.getSourceReferencesForCurrentLanguage(availableLocales), this.entryDate, this.origin, this.contextPath);
     }
     return this._sourceReferences;
   }
@@ -276,13 +276,6 @@ class ConceptDetailModel extends _ResourceModel.default {
   isOfConceptType(conceptTypeId) {
     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) {
-    return this.conceptType?.hasMetamodelIdInHierarchy(metamodelId) ?? false;
-  }
 }
 exports.default = ConceptDetailModel;
 //# sourceMappingURL=ConceptDetailModel.js.map

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

@@ -273,6 +273,8 @@ export default class ConceptDetailModel extends ResourceModel {
       this._sourceReferences = new SourceReferenceCollection(
         this.getSourceReferencesForCurrentLanguage(availableLocales),
         this.entryDate,
+        this.origin,
+        this.contextPath,
       );
     }
 
@@ -338,11 +340,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;
-  }
 }