@beinformed/ui 1.57.0-contextpath.0 → 1.57.0

package/lib/constants/Settings.js.flow

@@ -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/lib/constants/Settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.js","names":["_objects","require","_repositoryResource","_Constants","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","settings","setSettings","config","isPlainObject","_assign","default","exports","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getUploadPath","UPLOAD_PATH","getCaptchaPath","CAPTCHA_PATH","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","loginType","LOGIN_TYPE","INTERNAL_LOGIN_TYPE","JAAS","loginPath","clientName","arguments","length","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING","getSwimLaneDiagramConfiguration","configLocation","_startsWith","call","getRepositoryResourceUrl","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * Base path\n * This uses contextPath set from property from server\n * When requesting a remote server with CORS enabled, add the origin, for example:\n * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (): string => `${getBasePath()}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (): string => `${getBasePath()}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n * Login type, only available when pac4j is configured\n *\n * Preview does not support pac4j, thus is probably not configured when started, which results in login type JAAS\n */\nexport const loginType = (): string =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Settings.js","names":["_objects","require","_repositoryResource","_Constants","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","settings","setSettings","config","isPlainObject","_assign","default","exports","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getUploadPath","arguments","length","origin","UPLOAD_PATH","getCaptchaPath","CAPTCHA_PATH","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","loginType","LOGIN_TYPE","INTERNAL_LOGIN_TYPE","JAAS","loginPath","clientName","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING","getSwimLaneDiagramConfiguration","configLocation","_startsWith","call","getRepositoryResourceUrl","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * Base path\n * This uses contextPath set from property from server\n * When requesting a remote server with CORS enabled, add the origin, for example:\n * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n * Login type, only available when pac4j is configured\n *\n * Preview does not support pac4j, thus is probably not configured when started, which results in login type JAAS\n */\nexport const loginType = (): string =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","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", () => {
@@ -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/lib/hooks/__tests__/useAuthentication.spec.js.flow

@@ -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/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
@@ -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/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", () => {
@@ -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/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,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,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 {
@@ -11,15 +12,18 @@ import {
 import useDeepCompareEffect from "./useDeepCompareEffect";
 
 import { useLocale } from "./useI18n";
+import Href from "../models/href/Href";
 
-import type 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,22 @@ 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) {
+    options.origin = options.origin ?? url.origin;
+    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(() => {
@@ -48,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","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","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":[]}