@beinformed/ui 1.57.0-contextpath.1 → 1.57.0

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

@@ -1 +1 @@
-{"version":3,"file":"repositoryResource.js","names":["_constants","require","getRepositoryResourceUrl","resourceUrl","basePath","getBasePath","_startsWith","default","call","RESOURCE_PATH","exports"],"sources":["../../../src/utils/helpers/repositoryResource.js"],"sourcesContent":["// @flow\nimport { getBasePath, RESOURCE_PATH } from \"../../constants\";\n\n/**\n * Creates an url to a resource in the Be Informed repository\n * Only possible when serving using the UI Servlet of Be Informed\n */\nexport const getRepositoryResourceUrl = (resourceUrl: string): string => {\n  const basePath = getBasePath();\n\n  if (resourceUrl.startsWith(basePath)) {\n    return resourceUrl;\n  }\n\n  if (resourceUrl.startsWith(RESOURCE_PATH)) {\n    return `${basePath}${resourceUrl}`;\n  }\n\n  return `${basePath}${RESOURCE_PATH}${resourceUrl}`;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACO,MAAMC,wBAAwB,GAAIC,WAAmB,IAAa;EACvE,MAAMC,QAAQ,GAAG,IAAAC,sBAAW,EAAC,CAAC;EAE9B,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAJ,WAAW,EAAAK,IAAA,CAAXL,WAAW,EAAYC,QAAQ,CAAC,EAAE;IACpC,OAAOD,WAAW;EACpB;EAEA,IAAI,IAAAG,WAAA,CAAAC,OAAA,EAAAJ,WAAW,EAAAK,IAAA,CAAXL,WAAW,EAAYM,wBAAa,CAAC,EAAE;IACzC,OAAO,GAAGL,QAAQ,GAAGD,WAAW,EAAE;EACpC;EAEA,OAAO,GAAGC,QAAQ,GAAGK,wBAAa,GAAGN,WAAW,EAAE;AACpD,CAAC;AAACO,OAAA,CAAAR,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"file":"repositoryResource.js","names":["_constants","require","getRepositoryResourceUrl","resourceUrl","contextPath","arguments","length","undefined","getBasePath","origin","_startsWith","default","call","RESOURCE_PATH","exports"],"sources":["../../../src/utils/helpers/repositoryResource.js"],"sourcesContent":["// @flow\nimport { getBasePath, RESOURCE_PATH } from \"../../constants\";\n\n/**\n * Creates an url to a resource in the Be Informed repository\n * Only possible when serving using the UI Servlet of Be Informed\n */\nexport const getRepositoryResourceUrl = (\n  resourceUrl: string,\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => {\n  if (resourceUrl.startsWith(origin + contextPath)) {\n    return resourceUrl;\n  }\n\n  if (resourceUrl.startsWith(RESOURCE_PATH)) {\n    return `${origin}${contextPath}${resourceUrl}`;\n  }\n\n  return `${origin}${contextPath}${RESOURCE_PATH}${resourceUrl}`;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACO,MAAMC,wBAAwB,GAAG,SAAAA,CACtCC,WAAmB,EAGR;EAAA,IAFXC,WAAmB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAAG,sBAAW,EAAC,CAAC;EAAA,IACnCC,MAAc,GAAAJ,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEnB,IAAI,IAAAK,WAAA,CAAAC,OAAA,EAAAR,WAAW,EAAAS,IAAA,CAAXT,WAAW,EAAYM,MAAM,GAAGL,WAAW,CAAC,EAAE;IAChD,OAAOD,WAAW;EACpB;EAEA,IAAI,IAAAO,WAAA,CAAAC,OAAA,EAAAR,WAAW,EAAAS,IAAA,CAAXT,WAAW,EAAYU,wBAAa,CAAC,EAAE;IACzC,OAAO,GAAGJ,MAAM,GAAGL,WAAW,GAAGD,WAAW,EAAE;EAChD;EAEA,OAAO,GAAGM,MAAM,GAAGL,WAAW,GAAGS,wBAAa,GAAGV,WAAW,EAAE;AAChE,CAAC;AAACW,OAAA,CAAAZ,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.57.0-contextpath.1",
+  "version": "1.57.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -29,7 +29,7 @@
     "flow": "flow",
     "flow:ci": "flow check",
     "flow-typed-install": "flow-typed install -l .flow/flow-typed/ --ignoreDeps peer --overwrite",
-    "test": "jest",
+    "test": "jest --bail",
     "test:ci": "jest --ci",
     "test:changed": "jest --onlyChanged",
     "upgrade-interactive": "npm-check -u",
@@ -82,7 +82,7 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.25.7",
+    "@babel/runtime-corejs3": "^7.25.9",
     "big.js": "^6.2.2",
     "date-fns": "^4.1.0",
     "deepmerge": "^4.3.1",
@@ -98,16 +98,16 @@
     "setimmediate": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.7",
-    "@babel/core": "^7.25.7",
-    "@babel/eslint-parser": "^7.25.7",
-    "@babel/eslint-plugin": "^7.25.7",
+    "@babel/cli": "^7.25.9",
+    "@babel/core": "^7.25.9",
+    "@babel/eslint-parser": "^7.25.9",
+    "@babel/eslint-plugin": "^7.25.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.25.7",
-    "@babel/preset-env": "^7.25.7",
-    "@babel/preset-flow": "^7.25.7",
-    "@babel/preset-react": "^7.25.7",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.25.9",
+    "@babel/preset-flow": "^7.25.9",
+    "@babel/preset-react": "^7.25.9",
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
     "@testing-library/react": "^16.0.1",
@@ -115,7 +115,7 @@
     "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
     "cherry-pick": "^0.5.0",
-    "commit-and-tag-version": "^12.4.4",
+    "commit-and-tag-version": "^12.5.0",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
     "eslint": "^8.57.0",
@@ -124,21 +124,21 @@
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.8.3",
-    "eslint-plugin-jsdoc": "^50.3.1",
-    "eslint-plugin-react": "^7.37.1",
-    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-jsdoc": "^50.4.3",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.9.0",
-    "hermes-eslint": "^0.24.0",
+    "hermes-eslint": "^0.25.0",
     "history": "^4.0.0",
     "husky": "^9.1.6",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
-    "jscodeshift": "^0.16.1",
+    "jscodeshift": "^17.0.0",
     "lint-staged": "^15.2.10",
     "polished": "^4.0.0",
     "prettier": "^3.3.3",
@@ -149,7 +149,7 @@
     "react-router": "^5.0.0",
     "react-test-renderer": "^18.3.1",
     "redux": "^4.2.1",
-    "redux-mock-store": "^1.5.4",
+    "redux-mock-store": "^1.5.5",
     "redux-thunk": "^2.4.2",
     "rimraf": "^6.0.1",
     "styled-components": "^5.3.11",

package/src/constants/Settings.js

@@ -172,12 +172,18 @@ export const getBasePath = (): string =>
 /**
  * Path to upload service
  */
-export const getUploadPath = (): string => `${getBasePath()}${UPLOAD_PATH}`;
+export const getUploadPath = (
+  contextPath: string = getBasePath(),
+  origin: string = "",
+): string => `${origin}${contextPath}${UPLOAD_PATH}`;
 
 /**
  * Path to captcha service
  */
-export const getCaptchaPath = (): string => `${getBasePath()}${CAPTCHA_PATH}`;
+export const getCaptchaPath = (
+  contextPath: string = getBasePath(),
+  origin: string = "",
+): string => `${origin}${contextPath}${CAPTCHA_PATH}`;
 
 /**
  */

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", () => {
@@ -64,14 +71,11 @@ describe("modularui hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `${key}(${url})(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: `${key}(${url})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,
@@ -83,6 +87,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__/useAuthentication.spec.js

@@ -61,14 +61,11 @@ describe("authentication hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
         }),
       }),
@@ -108,14 +105,11 @@ describe("authentication hooks", () => {
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
       { type: "MODULARUI/RESET" },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
         }),
       }),

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
@@ -58,14 +69,11 @@ describe("form hooks", () => {
     expect(result.current).toBeUndefined();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "form(/form)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "form(/form)(en)",
           href: new Href("/form?commit=false"),
           locale: "en",
           targetModel: FormModel,
@@ -102,17 +110,11 @@ describe("form hooks", () => {
     href.resourcetype = "Form";
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: {
-          key: "form(/persons/persons/createperson)(en)",
-          status: "LOADING",
-        },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "form(/persons/persons/createperson)(en)",
           href: href,
           locale: "en",
           targetModel: FormModel,

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", () => {
@@ -58,14 +64,11 @@ describe("modelcatalog hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `${key}(${url})(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: `${key}(${url})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,
@@ -77,6 +80,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__/useModels.spec.js

@@ -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/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();
   });
 
@@ -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/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 {
@@ -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/src/hooks/useModularUIBasic.js

@@ -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/src/models/concepts/ConceptDetailModel.js

@@ -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;
-  }
 }