@beinformed/ui 1.65.1 → 1.65.2

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.65.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.65.1...v1.65.2) (2025-12-19)
+
+
+### Bug Fixes
+
+* **hooks:** modularui basic hook, add removeOnUnmount ([137c86c](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/137c86ca5bf9b4c934b16ef4477e3d6f6fddf657))
+* **hooks:** refactor key generation and reload handling for modular UI hooks ([11f3131](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/11f3131cadf4b79139f0ad8d8dd1357c429367f4))
+* **login:** handle failing login attempt ([1ace402](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/1ace402589fdfe9270feec9d342452358edbac59))
+* **use-panel:** improve panel key in store ([79e55fb](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/79e55fb932db26e6a2112f182d9ff4741003565e))
+
 ## [1.65.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.65.0...v1.65.1) (2025-12-18)
 
 

package/esm/hooks/useModularUI.js

@@ -4,17 +4,10 @@ import { useLocation } from "react-router";
 import { HTTP_METHODS } from "../constants";
 import { loadModularUI, removeModelByKey } from "../redux/_modularui/ModularUIActions";
 import useDeepCompareEffect from "./useDeepCompareEffect";
-import { useLocale } from "./useI18n";
+import { useModularUIKey } from "./useModularUIKey";
 import Href from "../models/href/Href";
 /**
- */
-const useKeyForHook = (modelKey, url) => {
-  const locale = useLocale();
-  return useMemo(() => `${modelKey}(${url.split("?")[0]})(${locale})`, [modelKey, url, locale]);
-};
-
-/**
- * Use redux action and selector to retrieve the correct modular ui service model
+ * Core hook to retrieve information for a Be Informed modular ui resource
  */
 export const useModularUI = (modelKey, url, options = {
   method: HTTP_METHODS.GET,
@@ -22,7 +15,7 @@ export const useModularUI = (modelKey, url, options = {
 }) => {
   const dispatch = useDispatch();
   const href = useMemo(() => url?.toString() || "", [url]);
-  const key = useKeyForHook(modelKey, href);
+  const key = useModularUIKey(modelKey, href);
   const modelSelector = useMemo(() => state => state.modularui[key], [key]);
   const model = useSelector(modelSelector);
   if (url instanceof Href) {

package/esm/hooks/useModularUI.js.flow

@@ -10,24 +10,13 @@ import {
 } from "../redux/_modularui/ModularUIActions";
 
 import useDeepCompareEffect from "./useDeepCompareEffect";
+import { useModularUIKey } from "./useModularUIKey";
 
-import { useLocale } from "./useI18n";
 import Href from "../models/href/Href";
-
 import type { RequestModularUIOptions } from "../utils";
 
 /**
- */
-const useKeyForHook = (modelKey: string, url: string) => {
-  const locale = useLocale();
-  return useMemo(
-    () => `${modelKey}(${url.split("?")[0]})(${locale})`,
-    [modelKey, url, locale],
-  );
-};
-
-/**
- * Use redux action and selector to retrieve the correct modular ui service model
+ * Core hook to retrieve information for a Be Informed modular ui resource
  */
 export const useModularUI = (
   modelKey: string,
@@ -39,7 +28,7 @@ export const useModularUI = (
 ): any => {
   const dispatch = useDispatch();
   const href = useMemo(() => url?.toString() || "", [url]);
-  const key = useKeyForHook(modelKey, href);
+  const key = useModularUIKey(modelKey, href);
 
   const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);
   const model = useSelector(modelSelector);

package/esm/hooks/useModularUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUI.js","names":["useEffect","useRef","useMemo","useDispatch","useSelector","useLocation","HTTP_METHODS","loadModularUI","removeModelByKey","useDeepCompareEffect","useLocale","Href","useKeyForHook","modelKey","url","locale","split","useModularUI","options","method","GET","removeOnUnmount","dispatch","href","toString","key","modelSelector","state","modularui","model","origin","contextPath","location","redirectLocation","forceLoad","equals","prevOptions","prevHref","prevForceLoad","isOldReload","current","isReload","doForceLoad"],"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  const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);\n  const model = useSelector(modelSelector);\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 forceLoad =\n    model == null ||\n    (redirectLocation instanceof Href ? redirectLocation?.equals(href) : false);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceLoad = useRef(forceLoad);\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 doForceLoad = forceLoad && !prevForceLoad.current;\n\n    if (href !== \"\" && (doForceLoad || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceLoad.current = forceLoad;\n  }, [key, href, options, forceLoad]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  return model;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModularUI.js","names":["useEffect","useRef","useMemo","useDispatch","useSelector","useLocation","HTTP_METHODS","loadModularUI","removeModelByKey","useDeepCompareEffect","useModularUIKey","Href","useModularUI","modelKey","url","options","method","GET","removeOnUnmount","dispatch","href","toString","key","modelSelector","state","modularui","model","origin","contextPath","location","redirectLocation","forceLoad","equals","prevOptions","prevHref","prevForceLoad","isOldReload","current","isReload","doForceLoad"],"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\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n * Core hook to retrieve information for a Be Informed modular ui resource\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 = useModularUIKey(modelKey, href);\n\n  const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);\n  const model = useSelector(modelSelector);\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 forceLoad =\n    model == null ||\n    (redirectLocation instanceof Href ? redirectLocation?.equals(href) : false);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceLoad = useRef(forceLoad);\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 doForceLoad = forceLoad && !prevForceLoad.current;\n\n    if (href !== \"\" && (doForceLoad || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceLoad.current = forceLoad;\n  }, [key, href, options, forceLoad]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  return model;\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/hooks/useModularUIBasic.js

@@ -1,17 +1,19 @@
-import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import { useLocation } from "react-router";
+import { useSelector } from "react-redux";
 import { useMemo } from "react";
 import { useModularUI } from "./useModularUI";
+import { MODULARUI_STATUS } from "../constants";
+import { useModularUIKey } from "./useModularUIKey";
 // Helper to create useModularUI options
-const createUseModularUIOptions = (options, href, location) => {
-  var _context;
+const createUseModularUIOptions = (options, href, mustReload) => {
   const baseOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
     isReload: false,
     origin: undefined,
     contextPath: undefined,
-    cache: false
+    cache: false,
+    removeOnUnmount: false
   };
 
   // Handle targetModel and forceTargetModel
@@ -24,11 +26,12 @@ const createUseModularUIOptions = (options, href, location) => {
   if (options.cache) {
     baseOptions.cache = options.cache;
   }
-
-  // Check for reload if location matches href
-  if (location.state?.reload && _startsWithInstanceProperty(_context = location.pathname).call(_context, href)) {
+  if (mustReload) {
     baseOptions.isReload = true;
   }
+  if (options.removeOnUnmount) {
+    baseOptions.removeOnUnmount = true;
+  }
 
   // Handle origin and contextPath options
   baseOptions.origin = options.origin ?? baseOptions.origin;
@@ -49,17 +52,19 @@ const validateModel = (model, expectedModels) => {
 /**
  * useModularUIBasic Hook
  */
-export const useModularUIBasic = (key, href, options = {
+export const useModularUIBasic = (defaultKey, href, options = {
   expectedModels: [],
   targetModel: undefined,
   forceTargetModel: false,
   origin: undefined,
-  contextPath: undefined
+  contextPath: undefined,
+  key: undefined
 }) => {
-  const location = useLocation();
   const memoizedHref = useMemo(() => href.toString(), [href]);
-  const useModularUIOptions = useMemo(() => createUseModularUIOptions(options, memoizedHref, location), [options, memoizedHref, location]);
-  const modularUI = useModularUI(key, href, useModularUIOptions);
+  const key = options.key ?? defaultKey;
+  const mustReload = useReload(key, memoizedHref);
+  const modularUIOptions = useMemo(() => createUseModularUIOptions(options, memoizedHref, mustReload), [options, memoizedHref, mustReload]);
+  const modularUI = useModularUI(key, href, modularUIOptions);
   const expectedModels = useMemo(() => options.expectedModels ?? [], [options.expectedModels]);
   return useMemo(() => {
     if (modularUI?.model) {
@@ -69,4 +74,24 @@ export const useModularUIBasic = (key, href, options = {
     return null;
   }, [expectedModels, modularUI]);
 };
+
+/**
+ * Check if the model corresponding to a modular ui service should be reloaded
+ */
+export const useReload = (modelKey, url) => {
+  const location = useLocation();
+  const key = useModularUIKey(modelKey, url);
+  const modelEntry = useSelector(state => state.modularui[key]);
+  if (modelEntry) {
+    const reload = location.state?.reload || 0;
+    if (reload > 0) {
+      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;
+      const lastModification = modelEntry?.lastModification ?? 0;
+      if (isFullyLoaded && lastModification < reload) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 //# sourceMappingURL=useModularUIBasic.js.map

package/esm/hooks/useModularUIBasic.js.flow

@@ -1,12 +1,18 @@
 // @flow
-import type { ModularUIModel, Href } from "../models";
 import { useLocation } from "react-router";
+import { useSelector } from "react-redux";
 import { useMemo } from "react";
 import { useModularUI } from "./useModularUI";
 
+import { MODULARUI_STATUS } from "../constants";
+import { useModularUIKey } from "./useModularUIKey";
+
+import type { ModularUIModel, Href } from "../models";
 export type HookOptions = {
+  key?: string,
   origin?: string,
   contextPath?: string,
+  removeOnUnmount?: boolean,
 };
 
 export type UseModularUIBasicOptions<T: ModularUIModel> = {
@@ -16,13 +22,16 @@ export type UseModularUIBasicOptions<T: ModularUIModel> = {
   origin?: string,
   contextPath?: string,
   cache?: boolean,
+  key?: string,
+  isReload?: boolean,
+  removeOnUnmount?: boolean,
 };
 
 // Helper to create useModularUI options
 const createUseModularUIOptions = <T: ModularUIModel>(
   options: UseModularUIBasicOptions<T>,
   href: string,
-  location: any,
+  mustReload: boolean,
 ): Object => {
   const baseOptions = {
     targetModel: undefined,
@@ -31,6 +40,7 @@ const createUseModularUIOptions = <T: ModularUIModel>(
     origin: undefined,
     contextPath: undefined,
     cache: false,
+    removeOnUnmount: false,
   };
 
   // Handle targetModel and forceTargetModel
@@ -44,11 +54,14 @@ const createUseModularUIOptions = <T: ModularUIModel>(
     baseOptions.cache = options.cache;
   }
 
-  // Check for reload if location matches href
-  if (location.state?.reload && location.pathname.startsWith(href)) {
+  if (mustReload) {
     baseOptions.isReload = true;
   }
 
+  if (options.removeOnUnmount) {
+    baseOptions.removeOnUnmount = true;
+  }
+
   // Handle origin and contextPath options
   baseOptions.origin = options.origin ?? baseOptions.origin;
   baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;
@@ -72,7 +85,7 @@ const validateModel = (model: any, expectedModels: Array<string>) => {
  * useModularUIBasic Hook
  */
 export const useModularUIBasic = <T: ModularUIModel>(
-  key: string,
+  defaultKey: string,
   href: string | Href,
   options: UseModularUIBasicOptions<T> = {
     expectedModels: [],
@@ -80,16 +93,19 @@ export const useModularUIBasic = <T: ModularUIModel>(
     forceTargetModel: false,
     origin: undefined,
     contextPath: undefined,
+    key: undefined,
   },
 ): T | null => {
-  const location = useLocation();
   const memoizedHref = useMemo(() => href.toString(), [href]);
-  const useModularUIOptions = useMemo(
-    () => createUseModularUIOptions(options, memoizedHref, location),
-    [options, memoizedHref, location],
+  const key = options.key ?? defaultKey;
+
+  const mustReload = useReload(key, memoizedHref);
+  const modularUIOptions = useMemo(
+    () => createUseModularUIOptions(options, memoizedHref, mustReload),
+    [options, memoizedHref, mustReload],
   );
 
-  const modularUI = useModularUI(key, href, useModularUIOptions);
+  const modularUI = useModularUI(key, href, modularUIOptions);
   const expectedModels = useMemo(
     () => options.expectedModels ?? [],
     [options.expectedModels],
@@ -103,3 +119,24 @@ export const useModularUIBasic = <T: ModularUIModel>(
     return null;
   }, [expectedModels, modularUI]);
 };
+
+/**
+ * Check if the model corresponding to a modular ui service should be reloaded
+ */
+export const useReload = (modelKey: string, url: string): boolean => {
+  const location = useLocation();
+  const key = useModularUIKey(modelKey, url);
+  const modelEntry = useSelector((state) => state.modularui[key]);
+
+  if (modelEntry) {
+    const reload = location.state?.reload || 0;
+    if (reload > 0) {
+      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;
+      const lastModification = modelEntry?.lastModification ?? 0;
+      if (isFullyLoaded && lastModification < reload) {
+        return true;
+      }
+    }
+  }
+  return false;
+};

package/esm/hooks/useModularUIBasic.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUIBasic.js","names":["useLocation","useMemo","useModularUI","createUseModularUIOptions","options","href","location","_context","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","state","reload","_startsWithInstanceProperty","pathname","call","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","warn","useModularUIBasic","key","memoizedHref","toString","useModularUIOptions","modularUI"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel, Href } from \"../models\";\nimport { useLocation } from \"react-router\";\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\n\nexport type HookOptions = {\n  origin?: string,\n  contextPath?: string,\n};\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.warn(model, \"is not of instance\", expectedModels);\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, href, 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":";AAEA,SAASA,WAAW,QAAQ,cAAc;AAC1C,SAASC,OAAO,QAAQ,OAAO;AAC/B,SAASC,YAAY,QAAQ,gBAAgB;AAgB7C;AACA,MAAMC,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,IAAIC,2BAAA,CAAAX,QAAA,GAAAD,QAAQ,CAACa,QAAQ,EAAAC,IAAA,CAAAb,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,MAAMa,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,IAAI,CAACR,KAAK,EAAE,oBAAoB,EAAEC,cAAc,CAAC;IAC3D;EACF;AACF,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMQ,iBAAiB,GAAGA,CAC/BC,GAAW,EACX3B,IAAmB,EACnBD,OAAoC,GAAG;EACrCmB,cAAc,EAAE,EAAE;EAClBd,WAAW,EAAEC,SAAS;EACtBC,gBAAgB,EAAE,KAAK;EACvBE,MAAM,EAAEH,SAAS;EACjBI,WAAW,EAAEJ;AACf,CAAC,KACY;EACb,MAAMJ,QAAQ,GAAGN,WAAW,CAAC,CAAC;EAC9B,MAAMiC,YAAY,GAAGhC,OAAO,CAAC,MAAMI,IAAI,CAAC6B,QAAQ,CAAC,CAAC,EAAE,CAAC7B,IAAI,CAAC,CAAC;EAC3D,MAAM8B,mBAAmB,GAAGlC,OAAO,CACjC,MAAME,yBAAyB,CAACC,OAAO,EAAE6B,YAAY,EAAE3B,QAAQ,CAAC,EAChE,CAACF,OAAO,EAAE6B,YAAY,EAAE3B,QAAQ,CAClC,CAAC;EAED,MAAM8B,SAAS,GAAGlC,YAAY,CAAC8B,GAAG,EAAE3B,IAAI,EAAE8B,mBAAmB,CAAC;EAC9D,MAAMZ,cAAc,GAAGtB,OAAO,CAC5B,MAAMG,OAAO,CAACmB,cAAc,IAAI,EAAE,EAClC,CAACnB,OAAO,CAACmB,cAAc,CACzB,CAAC;EAED,OAAOtB,OAAO,CAAC,MAAgB;IAC7B,IAAImC,SAAS,EAAEd,KAAK,EAAE;MACpBD,aAAa,CAACe,SAAS,CAACd,KAAK,EAAEC,cAAc,CAAC;MAC9C,OAAOa,SAAS,CAACd,KAAK;IACxB;IACA,OAAO,IAAI;EACb,CAAC,EAAE,CAACC,cAAc,EAAEa,SAAS,CAAC,CAAC;AACjC,CAAC","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["useLocation","useSelector","useMemo","useModularUI","MODULARUI_STATUS","useModularUIKey","createUseModularUIOptions","options","href","mustReload","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","removeOnUnmount","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","warn","useModularUIBasic","defaultKey","key","memoizedHref","toString","useReload","modularUIOptions","modularUI","modelKey","url","location","modelEntry","state","modularui","reload","isFullyLoaded","status","FINISHED","lastModification"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"react-router\";\nimport { useSelector } from \"react-redux\";\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\n\nimport { MODULARUI_STATUS } from \"../constants\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport type { ModularUIModel, Href } from \"../models\";\nexport type HookOptions = {\n  key?: string,\n  origin?: string,\n  contextPath?: string,\n  removeOnUnmount?: boolean,\n};\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  key?: string,\n  isReload?: boolean,\n  removeOnUnmount?: boolean,\n};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n  options: UseModularUIBasicOptions<T>,\n  href: string,\n  mustReload: boolean,\n): Object => {\n  const baseOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    origin: undefined,\n    contextPath: undefined,\n    cache: false,\n    removeOnUnmount: 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  if (mustReload) {\n    baseOptions.isReload = true;\n  }\n\n  if (options.removeOnUnmount) {\n    baseOptions.removeOnUnmount = 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.warn(model, \"is not of instance\", expectedModels);\n    }\n  }\n};\n\n/**\n * useModularUIBasic Hook\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  defaultKey: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n    origin: undefined,\n    contextPath: undefined,\n    key: undefined,\n  },\n): T | null => {\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n  const key = options.key ?? defaultKey;\n\n  const mustReload = useReload(key, memoizedHref);\n  const modularUIOptions = useMemo(\n    () => createUseModularUIOptions(options, memoizedHref, mustReload),\n    [options, memoizedHref, mustReload],\n  );\n\n  const modularUI = useModularUI(key, href, modularUIOptions);\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\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelKey: string, url: string): boolean => {\n  const location = useLocation();\n  const key = useModularUIKey(modelKey, url);\n  const modelEntry = useSelector((state) => state.modularui[key]);\n\n  if (modelEntry) {\n    const reload = location.state?.reload || 0;\n    if (reload > 0) {\n      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n      const lastModification = modelEntry?.lastModification ?? 0;\n      if (isFullyLoaded && lastModification < reload) {\n        return true;\n      }\n    }\n  }\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/hooks/useModularUIKey.js

@@ -0,0 +1,11 @@
+import { useLocale } from "./useI18n";
+import { useMemo } from "react";
+
+/**
+ * Generates the key that is used in the modular ui reducer of redux
+ */
+export const useModularUIKey = (modelKey, url) => {
+  const locale = useLocale();
+  return useMemo(() => `${modelKey}(${url.split("?")[0]})(${locale})`, [modelKey, url, locale]);
+};
+//# sourceMappingURL=useModularUIKey.js.map

package/esm/hooks/useModularUIKey.js.flow

@@ -0,0 +1,14 @@
+// @flow
+import { useLocale } from "./useI18n";
+import { useMemo } from "react";
+
+/**
+ * Generates the key that is used in the modular ui reducer of redux
+ */
+export const useModularUIKey = (modelKey: string, url: string): string => {
+  const locale = useLocale();
+  return useMemo(
+    () => `${modelKey}(${url.split("?")[0]})(${locale})`,
+    [modelKey, url, locale],
+  );
+};

package/esm/hooks/useModularUIKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useModularUIKey.js","names":["useLocale","useMemo","useModularUIKey","modelKey","url","locale","split"],"sources":["../../src/hooks/useModularUIKey.js"],"sourcesContent":["// @flow\nimport { useLocale } from \"./useI18n\";\nimport { useMemo } from \"react\";\n\n/**\n * Generates the key that is used in the modular ui reducer of redux\n */\nexport const useModularUIKey = (modelKey: string, url: string): string => {\n  const locale = useLocale();\n  return useMemo(\n    () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n    [modelKey, url, locale],\n  );\n};\n"],"mappings":"AACA,SAASA,SAAS,QAAQ,WAAW;AACrC,SAASC,OAAO,QAAQ,OAAO;;AAE/B;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAACC,QAAgB,EAAEC,GAAW,KAAa;EACxE,MAAMC,MAAM,GAAGL,SAAS,CAAC,CAAC;EAC1B,OAAOC,OAAO,CACZ,MAAM,GAAGE,QAAQ,IAAIC,GAAG,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKD,MAAM,GAAG,EACpD,CAACF,QAAQ,EAAEC,GAAG,EAAEC,MAAM,CACxB,CAAC;AACH,CAAC","ignoreList":[]}

package/esm/hooks/usePanel.js

@@ -38,11 +38,16 @@ const useUrl = (href, fromRoute = false) => {
 /**
  */
 export const usePanel = (href, options) => {
-  const url = useUrl(href, options?.fromRoute || false);
+  const {
+    fromRoute,
+    ...hookOptions
+  } = options || {
+    fromRoute: false
+  };
+  const url = useUrl(href, fromRoute || false);
   const basicOptions = {
     expectedModels: ["List", "GroupingPanel", "Detail"],
-    origin: options?.origin,
-    contextPath: options?.contextPath
+    ...hookOptions
   };
   return useModularUIBasic("panel", url, basicOptions);
 };

package/esm/hooks/usePanel.js.flow

@@ -65,11 +65,12 @@ export const usePanel = (
   href?: string | Href,
   options?: HookOptions & { fromRoute?: boolean },
 ): ListModel | GroupingPanelModel | DetailModel | null => {
-  const url = useUrl(href, options?.fromRoute || false);
+  const { fromRoute, ...hookOptions } = options || { fromRoute: false };
+
+  const url = useUrl(href, fromRoute || false);
   const basicOptions = {
     expectedModels: ["List", "GroupingPanel", "Detail"],
-    origin: options?.origin,
-    contextPath: options?.contextPath,
+    ...(hookOptions: HookOptions),
   };
 
   return useModularUIBasic("panel", url, basicOptions);

package/esm/hooks/usePanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePanel.js","names":["useState","useMemo","useLocation","useRouteMatch","Href","useModularUIBasic","useUrl","href","fromRoute","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","location","_context","url","isExact","addParametersFromString","search","equalsWithParameters","shouldUpdate","Function","call","bind","_startsWithInstanceProperty","usePanel","options","basicOptions","expectedModels","origin","contextPath"],"sources":["../../src/hooks/usePanel.js"],"sourcesContent":["// @flow\nimport { useState, useMemo } from \"react\";\nimport { useLocation, useRouteMatch } from \"react-router\";\nimport Href from \"../models/href/Href\";\nimport { useModularUIBasic } from \"./useModularUIBasic\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type GroupingPanelModel from \"../models/panels/GroupingPanelModel\";\nimport type ListModel from \"../models/list/ListModel\";\nimport type DetailModel from \"../models/detail/DetailModel\";\n\nconst useUrl = (href?: string | Href, fromRoute: boolean = false) => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const match = useRouteMatch();\n  const location = useLocation();\n\n  return useMemo(() => {\n    if (href == null && previousUrl == null) {\n      return new Href(\"\");\n    }\n\n    const url = href instanceof Href ? href : new Href(href);\n\n    if (!fromRoute) {\n      return url;\n    }\n\n    if (match.isExact) {\n      url.addParametersFromString(location.search);\n    }\n\n    // Check equality to prevent unnecessary state updates\n    if (url.equalsWithParameters(previousUrl)) {\n      return previousUrl || url;\n    }\n\n    const shouldUpdate =\n      match.isExact === true ||\n      previousExact === match.isExact ||\n      !previousUrl?.startsWith(match.url);\n\n    if (shouldUpdate) {\n      setPreviousUrl(url);\n      setPreviousExact(match.isExact);\n      return url;\n    }\n\n    return previousUrl || new Href(\"\");\n  }, [\n    href,\n    previousUrl,\n    fromRoute,\n    match.isExact,\n    match.url,\n    previousExact,\n    location.search,\n  ]);\n};\n\n/**\n */\nexport const usePanel = (\n  href?: string | Href,\n  options?: HookOptions & { fromRoute?: boolean },\n): ListModel | GroupingPanelModel | DetailModel | null => {\n  const url = useUrl(href, options?.fromRoute || false);\n  const basicOptions = {\n    expectedModels: [\"List\", \"GroupingPanel\", \"Detail\"],\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n  };\n\n  return useModularUIBasic(\"panel\", url, basicOptions);\n};\n"],"mappings":";AACA,SAASA,QAAQ,EAAEC,OAAO,QAAQ,OAAO;AACzC,SAASC,WAAW,EAAEC,aAAa,QAAQ,cAAc;AACzD,OAAOC,IAAI,MAAM,qBAAqB;AACtC,SAASC,iBAAiB,QAAQ,qBAAqB;AAOvD,MAAMC,MAAM,GAAGA,CAACC,IAAoB,EAAEC,SAAkB,GAAG,KAAK,KAAK;EACnE,MAAM,CAACC,WAAW,EAAEC,cAAc,CAAC,GAAGV,QAAQ,CAAC,IAAI,CAAC;EACpD,MAAM,CAACW,aAAa,EAAEC,gBAAgB,CAAC,GAAGZ,QAAQ,CAAC,KAAK,CAAC;EAEzD,MAAMa,KAAK,GAAGV,aAAa,CAAC,CAAC;EAC7B,MAAMW,QAAQ,GAAGZ,WAAW,CAAC,CAAC;EAE9B,OAAOD,OAAO,CAAC,MAAM;IAAA,IAAAc,QAAA;IACnB,IAAIR,IAAI,IAAI,IAAI,IAAIE,WAAW,IAAI,IAAI,EAAE;MACvC,OAAO,IAAIL,IAAI,CAAC,EAAE,CAAC;IACrB;IAEA,MAAMY,GAAG,GAAGT,IAAI,YAAYH,IAAI,GAAGG,IAAI,GAAG,IAAIH,IAAI,CAACG,IAAI,CAAC;IAExD,IAAI,CAACC,SAAS,EAAE;MACd,OAAOQ,GAAG;IACZ;IAEA,IAAIH,KAAK,CAACI,OAAO,EAAE;MACjBD,GAAG,CAACE,uBAAuB,CAACJ,QAAQ,CAACK,MAAM,CAAC;IAC9C;;IAEA;IACA,IAAIH,GAAG,CAACI,oBAAoB,CAACX,WAAW,CAAC,EAAE;MACzC,OAAOA,WAAW,IAAIO,GAAG;IAC3B;IAEA,MAAMK,YAAY,GAChBR,KAAK,CAACI,OAAO,KAAK,IAAI,IACtBN,aAAa,KAAKE,KAAK,CAACI,OAAO,IAC/B,CAAC,EAAAF,QAAA,GAAAN,WAAW,qBAAAa,QAAA,CAAAC,IAAA,CAAAC,IAAA,CAAAC,2BAAA,CAAAV,QAAA,GAAAA,QAAA,KAAaF,KAAK,CAACG,GAAG,CAAC;IAErC,IAAIK,YAAY,EAAE;MAChBX,cAAc,CAACM,GAAG,CAAC;MACnBJ,gBAAgB,CAACC,KAAK,CAACI,OAAO,CAAC;MAC/B,OAAOD,GAAG;IACZ;IAEA,OAAOP,WAAW,IAAI,IAAIL,IAAI,CAAC,EAAE,CAAC;EACpC,CAAC,EAAE,CACDG,IAAI,EACJE,WAAW,EACXD,SAAS,EACTK,KAAK,CAACI,OAAO,EACbJ,KAAK,CAACG,GAAG,EACTL,aAAa,EACbG,QAAQ,CAACK,MAAM,CAChB,CAAC;AACJ,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,QAAQ,GAAGA,CACtBnB,IAAoB,EACpBoB,OAA+C,KACS;EACxD,MAAMX,GAAG,GAAGV,MAAM,CAACC,IAAI,EAAEoB,OAAO,EAAEnB,SAAS,IAAI,KAAK,CAAC;EACrD,MAAMoB,YAAY,GAAG;IACnBC,cAAc,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC;IACnDC,MAAM,EAAEH,OAAO,EAAEG,MAAM;IACvBC,WAAW,EAAEJ,OAAO,EAAEI;EACxB,CAAC;EAED,OAAO1B,iBAAiB,CAAC,OAAO,EAAEW,GAAG,EAAEY,YAAY,CAAC;AACtD,CAAC","ignoreList":[]}
+{"version":3,"file":"usePanel.js","names":["useState","useMemo","useLocation","useRouteMatch","Href","useModularUIBasic","useUrl","href","fromRoute","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","location","_context","url","isExact","addParametersFromString","search","equalsWithParameters","shouldUpdate","Function","call","bind","_startsWithInstanceProperty","usePanel","options","hookOptions","basicOptions","expectedModels"],"sources":["../../src/hooks/usePanel.js"],"sourcesContent":["// @flow\nimport { useState, useMemo } from \"react\";\nimport { useLocation, useRouteMatch } from \"react-router\";\nimport Href from \"../models/href/Href\";\nimport { useModularUIBasic } from \"./useModularUIBasic\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type GroupingPanelModel from \"../models/panels/GroupingPanelModel\";\nimport type ListModel from \"../models/list/ListModel\";\nimport type DetailModel from \"../models/detail/DetailModel\";\n\nconst useUrl = (href?: string | Href, fromRoute: boolean = false) => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const match = useRouteMatch();\n  const location = useLocation();\n\n  return useMemo(() => {\n    if (href == null && previousUrl == null) {\n      return new Href(\"\");\n    }\n\n    const url = href instanceof Href ? href : new Href(href);\n\n    if (!fromRoute) {\n      return url;\n    }\n\n    if (match.isExact) {\n      url.addParametersFromString(location.search);\n    }\n\n    // Check equality to prevent unnecessary state updates\n    if (url.equalsWithParameters(previousUrl)) {\n      return previousUrl || url;\n    }\n\n    const shouldUpdate =\n      match.isExact === true ||\n      previousExact === match.isExact ||\n      !previousUrl?.startsWith(match.url);\n\n    if (shouldUpdate) {\n      setPreviousUrl(url);\n      setPreviousExact(match.isExact);\n      return url;\n    }\n\n    return previousUrl || new Href(\"\");\n  }, [\n    href,\n    previousUrl,\n    fromRoute,\n    match.isExact,\n    match.url,\n    previousExact,\n    location.search,\n  ]);\n};\n\n/**\n */\nexport const usePanel = (\n  href?: string | Href,\n  options?: HookOptions & { fromRoute?: boolean },\n): ListModel | GroupingPanelModel | DetailModel | null => {\n  const { fromRoute, ...hookOptions } = options || { fromRoute: false };\n\n  const url = useUrl(href, fromRoute || false);\n  const basicOptions = {\n    expectedModels: [\"List\", \"GroupingPanel\", \"Detail\"],\n    ...(hookOptions: HookOptions),\n  };\n\n  return useModularUIBasic(\"panel\", url, basicOptions);\n};\n"],"mappings":";AACA,SAASA,QAAQ,EAAEC,OAAO,QAAQ,OAAO;AACzC,SAASC,WAAW,EAAEC,aAAa,QAAQ,cAAc;AACzD,OAAOC,IAAI,MAAM,qBAAqB;AACtC,SAASC,iBAAiB,QAAQ,qBAAqB;AAOvD,MAAMC,MAAM,GAAGA,CAACC,IAAoB,EAAEC,SAAkB,GAAG,KAAK,KAAK;EACnE,MAAM,CAACC,WAAW,EAAEC,cAAc,CAAC,GAAGV,QAAQ,CAAC,IAAI,CAAC;EACpD,MAAM,CAACW,aAAa,EAAEC,gBAAgB,CAAC,GAAGZ,QAAQ,CAAC,KAAK,CAAC;EAEzD,MAAMa,KAAK,GAAGV,aAAa,CAAC,CAAC;EAC7B,MAAMW,QAAQ,GAAGZ,WAAW,CAAC,CAAC;EAE9B,OAAOD,OAAO,CAAC,MAAM;IAAA,IAAAc,QAAA;IACnB,IAAIR,IAAI,IAAI,IAAI,IAAIE,WAAW,IAAI,IAAI,EAAE;MACvC,OAAO,IAAIL,IAAI,CAAC,EAAE,CAAC;IACrB;IAEA,MAAMY,GAAG,GAAGT,IAAI,YAAYH,IAAI,GAAGG,IAAI,GAAG,IAAIH,IAAI,CAACG,IAAI,CAAC;IAExD,IAAI,CAACC,SAAS,EAAE;MACd,OAAOQ,GAAG;IACZ;IAEA,IAAIH,KAAK,CAACI,OAAO,EAAE;MACjBD,GAAG,CAACE,uBAAuB,CAACJ,QAAQ,CAACK,MAAM,CAAC;IAC9C;;IAEA;IACA,IAAIH,GAAG,CAACI,oBAAoB,CAACX,WAAW,CAAC,EAAE;MACzC,OAAOA,WAAW,IAAIO,GAAG;IAC3B;IAEA,MAAMK,YAAY,GAChBR,KAAK,CAACI,OAAO,KAAK,IAAI,IACtBN,aAAa,KAAKE,KAAK,CAACI,OAAO,IAC/B,CAAC,EAAAF,QAAA,GAAAN,WAAW,qBAAAa,QAAA,CAAAC,IAAA,CAAAC,IAAA,CAAAC,2BAAA,CAAAV,QAAA,GAAAA,QAAA,KAAaF,KAAK,CAACG,GAAG,CAAC;IAErC,IAAIK,YAAY,EAAE;MAChBX,cAAc,CAACM,GAAG,CAAC;MACnBJ,gBAAgB,CAACC,KAAK,CAACI,OAAO,CAAC;MAC/B,OAAOD,GAAG;IACZ;IAEA,OAAOP,WAAW,IAAI,IAAIL,IAAI,CAAC,EAAE,CAAC;EACpC,CAAC,EAAE,CACDG,IAAI,EACJE,WAAW,EACXD,SAAS,EACTK,KAAK,CAACI,OAAO,EACbJ,KAAK,CAACG,GAAG,EACTL,aAAa,EACbG,QAAQ,CAACK,MAAM,CAChB,CAAC;AACJ,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,QAAQ,GAAGA,CACtBnB,IAAoB,EACpBoB,OAA+C,KACS;EACxD,MAAM;IAAEnB,SAAS;IAAE,GAAGoB;EAAY,CAAC,GAAGD,OAAO,IAAI;IAAEnB,SAAS,EAAE;EAAM,CAAC;EAErE,MAAMQ,GAAG,GAAGV,MAAM,CAACC,IAAI,EAAEC,SAAS,IAAI,KAAK,CAAC;EAC5C,MAAMqB,YAAY,GAAG;IACnBC,cAAc,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC;IACnD,GAAIF;EACN,CAAC;EAED,OAAOvB,iBAAiB,CAAC,OAAO,EAAEW,GAAG,EAAEa,YAAY,CAAC;AACtD,CAAC","ignoreList":[]}

package/esm/redux/actions/SignIn.js

@@ -1,8 +1,6 @@
-import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
-import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { push } from "../_router/RouterActions";
@@ -51,9 +49,11 @@ export const changePassword = () => (dispatch, getState) => {
 
 /**
  */
-export const login = (username, password) => (dispatch, getState) => {
+export const login = (username, password) => async (dispatch, getState) => {
   dispatch(startProgress());
-  return new Authenticate().login(username, password).then(() => dispatch(reloadApplication())).then(() => {
+  try {
+    const response = await new Authenticate().login(username, password);
+    await dispatch(reloadApplication());
     Cache.addItem("auth", true);
     const application = getApplication(getState());
     if (application?.userMustChangePassword) {
@@ -61,18 +61,18 @@ export const login = (username, password) => (dispatch, getState) => {
     } else {
       dispatch(loginSuccess());
     }
-    return dispatch(finishProgress());
-  }).catch(error => {
+    dispatch(finishProgress());
+    return response;
+  } catch (error) {
     if (error.id === "Error.ChangePasswordRequired") {
-      const dispatchedReloadApplication = dispatch(reloadApplication());
-      return _Promise.resolve(dispatchedReloadApplication).then(() => {
-        Cache.addItem("auth", true);
-        dispatch(changePassword());
-        return dispatch(finishProgress());
-      });
+      await dispatch(reloadApplication());
+      Cache.addItem("auth", true);
+      dispatch(changePassword());
+    } else {
+      dispatch(loginFailed(error.id));
     }
-    dispatch(loginFailed(error.id));
-    return dispatch(handleError(error));
-  });
+    dispatch(finishProgress());
+    return error;
+  }
 };
 //# sourceMappingURL=SignIn.js.map

package/esm/redux/actions/SignIn.js.flow

@@ -3,7 +3,6 @@ import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
 
-import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 
@@ -70,34 +69,34 @@ export const changePassword = (): ThunkAction => (dispatch, getState) => {
  */
 export const login =
   (username: string, password: string): ThunkAction =>
-  (dispatch, getState) => {
+  async (dispatch, getState) => {
     dispatch(startProgress());
 
-    return new Authenticate()
-      .login(username, password)
-      .then(() => dispatch(reloadApplication()))
-      .then(() => {
-        Cache.addItem("auth", true);
-        const application = getApplication(getState());
-        if (application?.userMustChangePassword) {
-          dispatch(changePassword());
-        } else {
-          dispatch(loginSuccess());
-        }
-        return dispatch(finishProgress());
-      })
-      .catch((error) => {
-        if (error.id === "Error.ChangePasswordRequired") {
-          const dispatchedReloadApplication = dispatch(reloadApplication());
+    try {
+      const response = await new Authenticate().login(username, password);
+
+      await dispatch(reloadApplication());
 
-          return Promise.resolve(dispatchedReloadApplication).then(() => {
-            Cache.addItem("auth", true);
-            dispatch(changePassword());
-            return dispatch(finishProgress());
-          });
-        }
+      Cache.addItem("auth", true);
+      const application = getApplication(getState());
 
+      if (application?.userMustChangePassword) {
+        dispatch(changePassword());
+      } else {
+        dispatch(loginSuccess());
+      }
+
+      dispatch(finishProgress());
+      return response;
+    } catch (error) {
+      if (error.id === "Error.ChangePasswordRequired") {
+        await dispatch(reloadApplication());
+        Cache.addItem("auth", true);
+        dispatch(changePassword());
+      } else {
         dispatch(loginFailed(error.id));
-        return dispatch(handleError(error));
-      });
+      }
+      dispatch(finishProgress());
+      return error;
+    }
   };

package/esm/redux/actions/SignIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","getApplication","handleError","reloadApplication","startProgress","finishProgress","push","CHANGEPASSWORD_PATH","loginFailed","errorMessage","sendAuthenticationError","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","login","username","password","then","addItem","application","userMustChangePassword","catch","error","id","dispatchedReloadApplication","_Promise","resolve"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { handleError } from \"./Error\";\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch, getState) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        const application = getApplication(getState());\n        if (application?.userMustChangePassword) {\n          dispatch(changePassword());\n        } else {\n          dispatch(loginSuccess());\n        }\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            dispatch(changePassword());\n            return dispatch(finishProgress());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(handleError(error));\n      });\n  };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","getApplication","reloadApplication","startProgress","finishProgress","push","CHANGEPASSWORD_PATH","loginFailed","errorMessage","sendAuthenticationError","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","login","username","password","response","addItem","application","userMustChangePassword","error","id"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  async (dispatch, getState) => {\n    dispatch(startProgress());\n\n    try {\n      const response = await new Authenticate().login(username, password);\n\n      await dispatch(reloadApplication());\n\n      Cache.addItem(\"auth\", true);\n      const application = getApplication(getState());\n\n      if (application?.userMustChangePassword) {\n        dispatch(changePassword());\n      } else {\n        dispatch(loginSuccess());\n      }\n\n      dispatch(finishProgress());\n      return response;\n    } catch (error) {\n      if (error.id === \"Error.ChangePasswordRequired\") {\n        await dispatch(reloadApplication());\n        Cache.addItem(\"auth\", true);\n        dispatch(changePassword());\n      } else {\n        dispatch(loginFailed(error.id));\n      }\n      dispatch(finishProgress());\n      return error;\n    }\n  };\n"],"mappings":"AACA,OAAOA,KAAK,MAAM,2BAA2B;AAC7C,OAAOC,YAAY,MAAM,8BAA8B;AACvD,SAASC,cAAc,QAAQ,kCAAkC;AAEjE,SAASC,iBAAiB,QAAQ,eAAe;AACjD,SAASC,aAAa,EAAEC,cAAc,QAAQ,qBAAqB;AAEnE,SAASC,IAAI,QAAQ,0BAA0B;AAC/C,SAASC,mBAAmB,QAAQ,2BAA2B;AAS/D;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GACtBC,YAAoB,IACcC,uBAAuB,CAACD,YAAY,CAAC;;AAEzE;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAClCD,YAAoB,KACe;EACnCE,IAAI,EAAE,sBAAsB;EAC5BC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMI,eAAe,GAAGA,CAAA,MAA8B;EAC3DF,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMG,YAAY,GAAGA,CAAA,MAA2B;EACrDH,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMI,cAAc,GAAGA,CAAA,KAAmB,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EACvED,QAAQ,CAAC;IACPL,IAAI,EAAE;EACR,CAAC,CAAC;EAEF,MAAMO,OAAO,GAAGD,QAAQ,CAAC,CAAC,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEC,KAAK;EACxD,MAAMC,YAAY,GAAGN,QAAQ,CAAC,CAAC,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEG,IAAI;EAC5D,OAAOR,QAAQ,CACbV,IAAI,CAACC,mBAAmB,EAAE;IACxBiB,IAAI,EAAED,YAAY,GAAGA,YAAY,GAAGN,QAAQ,CAAC,CAAC,CAACE,MAAM,CAACC,QAAQ;IAC9DE,KAAK,EAAEJ;EACT,CAAC,CACH,CAAC;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,KAAK,GAChBA,CAACC,QAAgB,EAAEC,QAAgB,KACnC,OAAOX,QAAQ,EAAEC,QAAQ,KAAK;EAC5BD,QAAQ,CAACZ,aAAa,CAAC,CAAC,CAAC;EAEzB,IAAI;IACF,MAAMwB,QAAQ,GAAG,MAAM,IAAI3B,YAAY,CAAC,CAAC,CAACwB,KAAK,CAACC,QAAQ,EAAEC,QAAQ,CAAC;IAEnE,MAAMX,QAAQ,CAACb,iBAAiB,CAAC,CAAC,CAAC;IAEnCH,KAAK,CAAC6B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;IAC3B,MAAMC,WAAW,GAAG5B,cAAc,CAACe,QAAQ,CAAC,CAAC,CAAC;IAE9C,IAAIa,WAAW,EAAEC,sBAAsB,EAAE;MACvCf,QAAQ,CAACD,cAAc,CAAC,CAAC,CAAC;IAC5B,CAAC,MAAM;MACLC,QAAQ,CAACF,YAAY,CAAC,CAAC,CAAC;IAC1B;IAEAE,QAAQ,CAACX,cAAc,CAAC,CAAC,CAAC;IAC1B,OAAOuB,QAAQ;EACjB,CAAC,CAAC,OAAOI,KAAK,EAAE;IACd,IAAIA,KAAK,CAACC,EAAE,KAAK,8BAA8B,EAAE;MAC/C,MAAMjB,QAAQ,CAACb,iBAAiB,CAAC,CAAC,CAAC;MACnCH,KAAK,CAAC6B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;MAC3Bb,QAAQ,CAACD,cAAc,CAAC,CAAC,CAAC;IAC5B,CAAC,MAAM;MACLC,QAAQ,CAACR,WAAW,CAACwB,KAAK,CAACC,EAAE,CAAC,CAAC;IACjC;IACAjB,QAAQ,CAACX,cAAc,CAAC,CAAC,CAAC;IAC1B,OAAO2B,KAAK;EACd;AACF,CAAC","ignoreList":[]}