@beinformed/ui 1.60.5 → 1.60.6

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.60.6](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.60.5...v1.60.6) (2025-04-15)
+
+
+### Bug Fixes
+
+* **modularui:** retry req when qs is changed but original req still loading ([1ffa2ee](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/1ffa2eeccf7520b941f346fc2583afd028118e23))
+
 ## [1.60.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.60.4...v1.60.5) (2025-04-14)
 
 

package/esm/hooks/__tests__/useForm.spec.js.flow

@@ -73,7 +73,7 @@ describe("form hooks", () => {
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
-          key: "form(/form?commit=false)(en)",
+          key: "form(/form)(en)",
           href: new Href("/form?commit=false"),
           locale: "en",
           targetModel: FormModel,

package/esm/hooks/useForm.js

@@ -2,11 +2,9 @@ import { useDispatch } from "react-redux";
 import Href from "../models/href/Href";
 import { getSetting, HTTP_METHODS } from "../constants";
 import { loadModularUI, removeModelByKey } from "../redux/_modularui";
-import { createKeyForModularUIStore, useModularUI } from "./useModularUI";
+import { useModularUI } from "./useModularUI";
 import { addRepeatableAttributeSet, cancelForm, cancelRepeatableAttributeSet, previousObject, removeRepeatableAttributeSet, showFormNotification, updateFormAttribute } from "../redux/actions";
 import FormModel from "../models/form/FormModel";
-const FORM_MODEL_KEY = "form";
-
 /**
  * Load a form by href
  */
@@ -15,7 +13,7 @@ export const useForm = (href, data) => {
   if (!getSetting("ALWAYS_COMMIT_FORM")) {
     formHref.addParameter("commit", "false");
   }
-  const form = useModularUI(FORM_MODEL_KEY, formHref, {
+  const form = useModularUI("form", formHref, {
     method: HTTP_METHODS.POST,
     targetModel: FormModel,
     removeOnUnmount: true,
@@ -35,22 +33,19 @@ export const useFormNavigation = () => {
   const dispatch = useDispatch();
   const previous = form => dispatch(previousObject(form));
   const cancel = form => dispatch(cancelForm(form));
-  const submit = form => {
-    const connectKey = createKeyForModularUIStore(FORM_MODEL_KEY, form.selfhref.toString(), form.locale);
-    return dispatch(loadModularUI(connectKey, form.selfhref, {
-      method: HTTP_METHODS.POST,
-      data: form.formdata,
-      updateHandler: newModel => {
-        if (newModel instanceof FormModel) {
-          const clonedModel = form.clone();
-          clonedModel.update(newModel);
-          return clonedModel;
-        }
-        return newModel;
-      },
-      targetModel: FormModel
-    }));
-  };
+  const submit = form => dispatch(loadModularUI(form.connectKey, form.selfhref, {
+    method: HTTP_METHODS.POST,
+    data: form.formdata,
+    updateHandler: newModel => {
+      if (newModel instanceof FormModel) {
+        const clonedModel = form.clone();
+        clonedModel.update(newModel);
+        return clonedModel;
+      }
+      return newModel;
+    },
+    targetModel: FormModel
+  }));
   const remove = form => dispatch(removeModelByKey(form.connectKey));
   const showFormNotificationAction = form => dispatch(showFormNotification(form));
   return {

package/esm/hooks/useForm.js.flow

@@ -10,7 +10,7 @@ import type {
   UpdateFormAction,
 } from "../redux/_modularui";
 import { loadModularUI, removeModelByKey } from "../redux/_modularui";
-import { createKeyForModularUIStore, useModularUI } from "./useModularUI";
+import { useModularUI } from "./useModularUI";
 
 import {
   addRepeatableAttributeSet,
@@ -47,8 +47,6 @@ type AttributeUpdateHook = (
   options: UpdateFormOptions,
 ) => void;
 
-const FORM_MODEL_KEY = "form";
-
 /**
  * Load a form by href
  */
@@ -59,7 +57,7 @@ export const useForm = (href: string | Href, data?: Object): ?FormModel => {
     formHref.addParameter("commit", "false");
   }
 
-  const form = useModularUI(FORM_MODEL_KEY, formHref, {
+  const form = useModularUI("form", formHref, {
     method: HTTP_METHODS.POST,
     targetModel: FormModel,
     removeOnUnmount: true,
@@ -83,15 +81,9 @@ export const useFormNavigation = (): FormNavigationHook => {
 
   const cancel = (form: FormModel) => dispatch(cancelForm(form));
 
-  const submit = (form: FormModel) => {
-    const connectKey = createKeyForModularUIStore(
-      FORM_MODEL_KEY,
-      form.selfhref.toString(),
-      form.locale,
-    );
-
-    return dispatch(
-      loadModularUI(connectKey, form.selfhref, {
+  const submit = (form: FormModel) =>
+    dispatch(
+      loadModularUI(form.connectKey, form.selfhref, {
         method: HTTP_METHODS.POST,
         data: form.formdata,
         updateHandler: (newModel: ModularUIModel): ModularUIModel => {
@@ -105,7 +97,6 @@ export const useFormNavigation = (): FormNavigationHook => {
         targetModel: FormModel,
       }),
     );
-  };
 
   const remove = (form: FormModel) =>
     dispatch(removeModelByKey(form.connectKey));

package/esm/hooks/useForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useForm.js","names":["useDispatch","Href","getSetting","HTTP_METHODS","loadModularUI","removeModelByKey","createKeyForModularUIStore","useModularUI","addRepeatableAttributeSet","cancelForm","cancelRepeatableAttributeSet","previousObject","removeRepeatableAttributeSet","showFormNotification","updateFormAttribute","FormModel","FORM_MODEL_KEY","useForm","href","data","formHref","addParameter","form","method","POST","targetModel","removeOnUnmount","origin","contextPath","model","useFormNavigation","dispatch","previous","cancel","submit","connectKey","selfhref","toString","locale","formdata","updateHandler","newModel","clonedModel","clone","update","remove","showFormNotificationAction","useAttributeUpdate","object","attribute","value","options","useAttributeSet","save"],"sources":["../../src/hooks/useForm.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\n\nimport Href from \"../models/href/Href\";\n\nimport { getSetting, HTTP_METHODS } from \"../constants\";\n\nimport type {\n  RemoveModelByKeyAction,\n  UpdateFormAction,\n} from \"../redux/_modularui\";\nimport { loadModularUI, removeModelByKey } from \"../redux/_modularui\";\nimport { createKeyForModularUIStore, useModularUI } from \"./useModularUI\";\n\nimport {\n  addRepeatableAttributeSet,\n  cancelForm,\n  cancelRepeatableAttributeSet,\n  previousObject,\n  removeRepeatableAttributeSet,\n  showFormNotification,\n  updateFormAttribute,\n} from \"../redux/actions\";\n\nimport FormModel from \"../models/form/FormModel\";\n\nimport type { AttributeType, FormObjectModel, ModularUIModel } from \"../models\";\nimport type { UpdateFormOptions } from \"../redux/types\";\n\ntype FormNavigationHook = {\n  previous: (form: FormModel) => UpdateFormAction,\n  cancel: (form: FormModel) => void,\n  submit: (form: FormModel) => void,\n  showFormNotification: (form: FormModel) => void,\n  remove: (form: FormModel) => RemoveModelByKeyAction,\n};\n\ntype AttributeSetHook = {\n  save: () => UpdateFormAction,\n  cancel: (object: FormObjectModel) => UpdateFormAction,\n  remove: (object: FormObjectModel) => UpdateFormAction,\n};\n\ntype AttributeUpdateHook = (\n  attribute: AttributeType,\n  value: string,\n  options: UpdateFormOptions,\n) => void;\n\nconst FORM_MODEL_KEY = \"form\";\n\n/**\n * Load a form by href\n */\nexport const useForm = (href: string | Href, data?: Object): ?FormModel => {\n  const formHref = new Href(href);\n\n  if (!getSetting(\"ALWAYS_COMMIT_FORM\")) {\n    formHref.addParameter(\"commit\", \"false\");\n  }\n\n  const form = useModularUI(FORM_MODEL_KEY, formHref, {\n    method: HTTP_METHODS.POST,\n    targetModel: FormModel,\n    removeOnUnmount: true,\n    data,\n    origin: formHref.origin,\n    contextPath: formHref.contextPath,\n  });\n\n  if (form?.model) {\n    return form.model;\n  }\n};\n\n/**\n * Form navigation methods\n */\nexport const useFormNavigation = (): FormNavigationHook => {\n  const dispatch = useDispatch();\n\n  const previous = (form: FormModel) => dispatch(previousObject(form));\n\n  const cancel = (form: FormModel) => dispatch(cancelForm(form));\n\n  const submit = (form: FormModel) => {\n    const connectKey = createKeyForModularUIStore(\n      FORM_MODEL_KEY,\n      form.selfhref.toString(),\n      form.locale,\n    );\n\n    return dispatch(\n      loadModularUI(connectKey, form.selfhref, {\n        method: HTTP_METHODS.POST,\n        data: form.formdata,\n        updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n          if (newModel instanceof FormModel) {\n            const clonedModel: FormModel = form.clone();\n            clonedModel.update(newModel);\n            return clonedModel;\n          }\n          return newModel;\n        },\n        targetModel: FormModel,\n      }),\n    );\n  };\n\n  const remove = (form: FormModel) =>\n    dispatch(removeModelByKey(form.connectKey));\n\n  const showFormNotificationAction = (form: FormModel) =>\n    dispatch(showFormNotification(form));\n\n  return {\n    previous,\n    cancel,\n    submit,\n    remove,\n    showFormNotification: showFormNotificationAction,\n  };\n};\n\n/**\n * Hook that returns a function to update attributes of a form object.\n * <br >\n * The returned function accepts the following options:\n *\n * - autosubmit: Automatically submit the form after a change\n * - autosav: Automatically save the form (in the background) after a change\n * - autoupdate: Automatically update the current form object after a change\n * - forceUpdate: Force the update even if conditions are not met.\n * - validate: Activate/deactivate the form object validation by an update.\n */\nexport const useAttributeUpdate = (\n  form: FormModel,\n  object: FormObjectModel,\n): AttributeUpdateHook => {\n  const dispatch = useDispatch();\n\n  return (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions,\n  ) => dispatch(updateFormAttribute(form, object, attribute, value, options));\n};\n\n/**\n * Attributeset actions\n */\nexport const useAttributeSet = (form: FormModel): AttributeSetHook => {\n  const dispatch = useDispatch();\n\n  return {\n    save: () => dispatch(addRepeatableAttributeSet(form)),\n    cancel: (object: FormObjectModel) =>\n      dispatch(cancelRepeatableAttributeSet(form, object)),\n    remove: (object: FormObjectModel) =>\n      dispatch(removeRepeatableAttributeSet(form, object)),\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useForm.js","names":["useDispatch","Href","getSetting","HTTP_METHODS","loadModularUI","removeModelByKey","useModularUI","addRepeatableAttributeSet","cancelForm","cancelRepeatableAttributeSet","previousObject","removeRepeatableAttributeSet","showFormNotification","updateFormAttribute","FormModel","useForm","href","data","formHref","addParameter","form","method","POST","targetModel","removeOnUnmount","origin","contextPath","model","useFormNavigation","dispatch","previous","cancel","submit","connectKey","selfhref","formdata","updateHandler","newModel","clonedModel","clone","update","remove","showFormNotificationAction","useAttributeUpdate","object","attribute","value","options","useAttributeSet","save"],"sources":["../../src/hooks/useForm.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\n\nimport Href from \"../models/href/Href\";\n\nimport { getSetting, HTTP_METHODS } from \"../constants\";\n\nimport type {\n  RemoveModelByKeyAction,\n  UpdateFormAction,\n} from \"../redux/_modularui\";\nimport { loadModularUI, removeModelByKey } from \"../redux/_modularui\";\nimport { useModularUI } from \"./useModularUI\";\n\nimport {\n  addRepeatableAttributeSet,\n  cancelForm,\n  cancelRepeatableAttributeSet,\n  previousObject,\n  removeRepeatableAttributeSet,\n  showFormNotification,\n  updateFormAttribute,\n} from \"../redux/actions\";\n\nimport FormModel from \"../models/form/FormModel\";\n\nimport type { AttributeType, FormObjectModel, ModularUIModel } from \"../models\";\nimport type { UpdateFormOptions } from \"../redux/types\";\n\ntype FormNavigationHook = {\n  previous: (form: FormModel) => UpdateFormAction,\n  cancel: (form: FormModel) => void,\n  submit: (form: FormModel) => void,\n  showFormNotification: (form: FormModel) => void,\n  remove: (form: FormModel) => RemoveModelByKeyAction,\n};\n\ntype AttributeSetHook = {\n  save: () => UpdateFormAction,\n  cancel: (object: FormObjectModel) => UpdateFormAction,\n  remove: (object: FormObjectModel) => UpdateFormAction,\n};\n\ntype AttributeUpdateHook = (\n  attribute: AttributeType,\n  value: string,\n  options: UpdateFormOptions,\n) => void;\n\n/**\n * Load a form by href\n */\nexport const useForm = (href: string | Href, data?: Object): ?FormModel => {\n  const formHref = new Href(href);\n\n  if (!getSetting(\"ALWAYS_COMMIT_FORM\")) {\n    formHref.addParameter(\"commit\", \"false\");\n  }\n\n  const form = useModularUI(\"form\", formHref, {\n    method: HTTP_METHODS.POST,\n    targetModel: FormModel,\n    removeOnUnmount: true,\n    data,\n    origin: formHref.origin,\n    contextPath: formHref.contextPath,\n  });\n\n  if (form?.model) {\n    return form.model;\n  }\n};\n\n/**\n * Form navigation methods\n */\nexport const useFormNavigation = (): FormNavigationHook => {\n  const dispatch = useDispatch();\n\n  const previous = (form: FormModel) => dispatch(previousObject(form));\n\n  const cancel = (form: FormModel) => dispatch(cancelForm(form));\n\n  const submit = (form: FormModel) =>\n    dispatch(\n      loadModularUI(form.connectKey, form.selfhref, {\n        method: HTTP_METHODS.POST,\n        data: form.formdata,\n        updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n          if (newModel instanceof FormModel) {\n            const clonedModel: FormModel = form.clone();\n            clonedModel.update(newModel);\n            return clonedModel;\n          }\n          return newModel;\n        },\n        targetModel: FormModel,\n      }),\n    );\n\n  const remove = (form: FormModel) =>\n    dispatch(removeModelByKey(form.connectKey));\n\n  const showFormNotificationAction = (form: FormModel) =>\n    dispatch(showFormNotification(form));\n\n  return {\n    previous,\n    cancel,\n    submit,\n    remove,\n    showFormNotification: showFormNotificationAction,\n  };\n};\n\n/**\n * Hook that returns a function to update attributes of a form object.\n * <br >\n * The returned function accepts the following options:\n *\n * - autosubmit: Automatically submit the form after a change\n * - autosav: Automatically save the form (in the background) after a change\n * - autoupdate: Automatically update the current form object after a change\n * - forceUpdate: Force the update even if conditions are not met.\n * - validate: Activate/deactivate the form object validation by an update.\n */\nexport const useAttributeUpdate = (\n  form: FormModel,\n  object: FormObjectModel,\n): AttributeUpdateHook => {\n  const dispatch = useDispatch();\n\n  return (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions,\n  ) => dispatch(updateFormAttribute(form, object, attribute, value, options));\n};\n\n/**\n * Attributeset actions\n */\nexport const useAttributeSet = (form: FormModel): AttributeSetHook => {\n  const dispatch = useDispatch();\n\n  return {\n    save: () => dispatch(addRepeatableAttributeSet(form)),\n    cancel: (object: FormObjectModel) =>\n      dispatch(cancelRepeatableAttributeSet(form, object)),\n    remove: (object: FormObjectModel) =>\n      dispatch(removeRepeatableAttributeSet(form, object)),\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/hooks/useModularUI.d.ts

@@ -1,4 +1,3 @@
-export function createKeyForModularUIStore(modelKey: string, url: string, locale: string): string;
 export function useModularUI(modelKey: string, url: string | Href, options?: RequestModularUIOptions): any;
 import Href from "../models/href/Href";
 import { RequestModularUIOptions } from "../utils";

package/esm/hooks/useModularUI.js

@@ -8,17 +8,9 @@ import { useLocale } from "./useI18n";
 import Href from "../models/href/Href";
 /**
  */
-export const createKeyForModularUIStore = (modelKey, url, locale) => {
-  return `${modelKey}(${url})(${locale})`;
-};
-
-/**
- */
-const useKeyForHook = function (modelKey, url) {
-  let removeQuerystringFromKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+const useKeyForHook = (modelKey, url) => {
   const locale = useLocale();
-  const href = removeQuerystringFromKey ? url.split("?")[0] : url;
-  return useMemo(() => createKeyForModularUIStore(modelKey, href, locale), [modelKey, href, locale]);
+  return useMemo(() => `${modelKey}(${url.split("?")[0]})(${locale})`, [modelKey, url, locale]);
 };
 
 /**
@@ -31,7 +23,7 @@ export const useModularUI = function (modelKey, url) {
   };
   const dispatch = useDispatch();
   const href = useMemo(() => url?.toString() || "", [url]);
-  const key = useKeyForHook(modelKey, href, !options.method || options.method === HTTP_METHODS.GET);
+  const key = useKeyForHook(modelKey, href);
   const modelSelector = useMemo(() => state => state.modularui[key], [key]);
   const model = useSelector(modelSelector);
   if (url instanceof Href) {

package/esm/hooks/useModularUI.js.flow

@@ -18,26 +18,11 @@ import type { RequestModularUIOptions } from "../utils";
 
 /**
  */
-export const createKeyForModularUIStore = (
-  modelKey: string,
-  url: string,
-  locale: string,
-): string => {
-  return `${modelKey}(${url})(${locale})`;
-};
-
-/**
- */
-const useKeyForHook = (
-  modelKey: string,
-  url: string,
-  removeQuerystringFromKey: boolean = true,
-): string => {
+const useKeyForHook = (modelKey: string, url: string) => {
   const locale = useLocale();
-  const href = removeQuerystringFromKey ? url.split("?")[0] : url;
   return useMemo(
-    () => createKeyForModularUIStore(modelKey, href, locale),
-    [modelKey, href, locale],
+    () => `${modelKey}(${url.split("?")[0]})(${locale})`,
+    [modelKey, url, locale],
   );
 };
 
@@ -54,11 +39,7 @@ export const useModularUI = (
 ): any => {
   const dispatch = useDispatch();
   const href = useMemo(() => url?.toString() || "", [url]);
-  const key = useKeyForHook(
-    modelKey,
-    href,
-    !options.method || options.method === HTTP_METHODS.GET,
-  );
+  const key = useKeyForHook(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","createKeyForModularUIStore","modelKey","url","locale","useKeyForHook","removeQuerystringFromKey","arguments","length","undefined","href","split","useModularUI","options","method","GET","removeOnUnmount","dispatch","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 */\nexport const createKeyForModularUIStore = (\n  modelKey: string,\n  url: string,\n  locale: string,\n): string => {\n  return `${modelKey}(${url})(${locale})`;\n};\n\n/**\n */\nconst useKeyForHook = (\n  modelKey: string,\n  url: string,\n  removeQuerystringFromKey: boolean = true,\n): string => {\n  const locale = useLocale();\n  const href = removeQuerystringFromKey ? url.split(\"?\")[0] : url;\n  return useMemo(\n    () => createKeyForModularUIStore(modelKey, href, locale),\n    [modelKey, href, 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(\n    modelKey,\n    href,\n    !options.method || options.method === HTTP_METHODS.GET,\n  );\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","useLocale","Href","useKeyForHook","modelKey","url","locale","split","useModularUI","options","arguments","length","undefined","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":[]}

package/esm/redux/_modularui/ModularUIActions.d.ts

@@ -7,9 +7,9 @@ export function updateModel(model: ModularUIModel): UpdateModelAction;
 export function updateForm(model: ModularUIModel): UpdateFormAction;
 export function removeModelByKey(key: string): RemoveModelByKeyAction;
 export function resetModularUI(): ResetModularUIAction;
-export function updateStatus(key: string, status: $Keys<typeof MODULARUI_STATUS>): UpdateStatusAction;
+export function updateStatus(key: string, status: $Keys<typeof MODULARUI_STATUS>, requestOptions: any): UpdateStatusAction;
 export function loadModel(key: string, href: Href | string, options?: RequestModularUIOptions): ModularUIAction;
-export function loadModularUI(key: string, href: Href | string, options?: RequestModularUIOptions): ThunkAction;
+export function loadModularUI(key: string, href: Href | string, options?: RequestModularUIOptions, retryCount?: number, retryDelay?: number): ThunkAction;
 export function reloadModel(model: ModularUIModel, options?: RequestModularUIOptions): ThunkAction;
 import { ModularUIModel } from "../../models/types";
 import { SetModelAction } from "./types";

package/esm/redux/_modularui/ModularUIActions.js

@@ -55,11 +55,12 @@ export const resetModularUI = () => ({
 
 /**
  */
-export const updateStatus = (key, status) => ({
+export const updateStatus = (key, status, requestOptions) => ({
   type: "MODULARUI/STATUS",
   payload: {
     key,
-    status
+    status,
+    requestOptions
   }
 });
 
@@ -132,14 +133,30 @@ export const loadModel = (key, href, options) => ({
 
 /**
  */
-export const loadModularUI = (key, href, options) => (dispatch, getState) => {
-  const modularuiStore = getState()?.modularui;
-  if (modularuiStore && modularuiStore[key]?.status === MODULARUI_STATUS.LOADING) {
-    return _Promise.resolve();
-  }
-  dispatch(startProgress());
-  const loadModelPromise = dispatch(loadModel(key, href, options));
-  return _Promise.resolve(loadModelPromise).then(() => dispatch(finishProgress())).catch(error => dispatch(handleError(error)));
+export const loadModularUI = function (key, href, options) {
+  let retryCount = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3;
+  let retryDelay = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 200;
+  return (dispatch, getState) => {
+    const modularuiStore = getState()?.modularui;
+    const currentRequest = modularuiStore?.[key];
+    const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;
+    if (isLoading) {
+      const isDifferentRequest = currentRequest.requestOptions?.href?.toString() !== href.toString();
+      if (isDifferentRequest && retryCount > 0) {
+        return new _Promise(resolve => {
+          setTimeout(() => {
+            resolve(dispatch(loadModularUI(key, href, options, retryCount - 1, retryDelay)));
+          }, retryDelay);
+        });
+      }
+
+      // Same request is already loading — do nothing
+      return _Promise.resolve();
+    }
+    dispatch(startProgress());
+    const loadModelPromise = dispatch(loadModel(key, href, options));
+    return _Promise.resolve(loadModelPromise).then(() => dispatch(finishProgress())).catch(error => dispatch(handleError(error)));
+  };
 };
 
 /**

package/esm/redux/_modularui/ModularUIActions.js.flow

@@ -81,9 +81,10 @@ export const resetModularUI = (): ResetModularUIAction => ({
 export const updateStatus = (
   key: string,
   status: $Keys<typeof MODULARUI_STATUS>,
+  requestOptions: any,
 ): UpdateStatusAction => ({
   type: "MODULARUI/STATUS",
-  payload: { key, status },
+  payload: { key, status, requestOptions },
 });
 
 /**
@@ -177,13 +178,31 @@ export const loadModularUI =
     key: string,
     href: Href | string,
     options?: RequestModularUIOptions,
+    retryCount: number = 3,
+    retryDelay: number = 200,
   ): ThunkAction =>
   (dispatch: Dispatch, getState) => {
     const modularuiStore = getState()?.modularui;
-    if (
-      modularuiStore &&
-      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING
-    ) {
+    const currentRequest = modularuiStore?.[key];
+
+    const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;
+
+    if (isLoading) {
+      const isDifferentRequest =
+        currentRequest.requestOptions?.href?.toString() !== href.toString();
+      if (isDifferentRequest && retryCount > 0) {
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            resolve(
+              dispatch(
+                loadModularUI(key, href, options, retryCount - 1, retryDelay),
+              ),
+            );
+          }, retryDelay);
+        });
+      }
+
+      // Same request is already loading — do nothing
       return Promise.resolve();
     }
 

package/esm/redux/_modularui/ModularUIActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIActions.js","names":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","getRequestLocale","optionLocale","navigator","language","split","loadModel","href","options","origin","contextPath","method","GET","params","data","timeout","headers","events","onProgress","locale","childmodels","targetModel","forceTargetModel","cache","isReload","withCredentials","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","dispatch","getState","modularuiStore","modularui","LOADING","_Promise","resolve","loadModelPromise","then","catch","reloadModel","selfhref"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * Retrieve the preferred language for this request, falls back to the browser language or english\n */\nconst getRequestLocale = (optionLocale: ?string): string => {\n  if (optionLocale) {\n    return optionLocale;\n  }\n\n  if (typeof navigator !== \"undefined\" && navigator?.language) {\n    return navigator.language.split(\"-\")[0] || \"en\";\n  }\n\n  return \"en\";\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key,\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", {\n            origin: options?.origin,\n            contextPath: options?.contextPath,\n          }),\n    method: options?.method ?? HTTP_METHODS.GET,\n    params: options?.params,\n    data: options?.data,\n    timeout: options?.timeout,\n    headers: options?.headers,\n    events: options?.events,\n    onProgress: options?.onProgress,\n    locale: getRequestLocale(options?.locale),\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    isReload: options?.isReload,\n    withCredentials: options?.withCredentials,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key, {\n        origin: options?.origin,\n        contextPath: options?.contextPath,\n      });\n      if (\n        errorResponse.isChangePassword ||\n        errorResponse.isResourceNotFoundAfterReload\n      ) {\n        return removeModelByKey(key);\n      }\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestModularUIOptions,\n  ): ThunkAction =>\n  (dispatch: Dispatch, getState) => {\n    const modularuiStore = getState()?.modularui;\n    if (\n      modularuiStore &&\n      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING\n    ) {\n      return Promise.resolve();\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIActions.js","names":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","requestOptions","loadModelSuccessAction","updateHandler","getRequestLocale","optionLocale","navigator","language","split","loadModel","href","options","origin","contextPath","method","GET","params","data","timeout","headers","events","onProgress","locale","childmodels","targetModel","forceTargetModel","cache","isReload","withCredentials","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","retryCount","arguments","length","undefined","retryDelay","dispatch","getState","modularuiStore","modularui","currentRequest","isLoading","LOADING","isDifferentRequest","toString","_Promise","resolve","setTimeout","loadModelPromise","then","catch","reloadModel","selfhref"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n  requestOptions: any,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status, requestOptions },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * Retrieve the preferred language for this request, falls back to the browser language or english\n */\nconst getRequestLocale = (optionLocale: ?string): string => {\n  if (optionLocale) {\n    return optionLocale;\n  }\n\n  if (typeof navigator !== \"undefined\" && navigator?.language) {\n    return navigator.language.split(\"-\")[0] || \"en\";\n  }\n\n  return \"en\";\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key,\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", {\n            origin: options?.origin,\n            contextPath: options?.contextPath,\n          }),\n    method: options?.method ?? HTTP_METHODS.GET,\n    params: options?.params,\n    data: options?.data,\n    timeout: options?.timeout,\n    headers: options?.headers,\n    events: options?.events,\n    onProgress: options?.onProgress,\n    locale: getRequestLocale(options?.locale),\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    isReload: options?.isReload,\n    withCredentials: options?.withCredentials,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key, {\n        origin: options?.origin,\n        contextPath: options?.contextPath,\n      });\n      if (\n        errorResponse.isChangePassword ||\n        errorResponse.isResourceNotFoundAfterReload\n      ) {\n        return removeModelByKey(key);\n      }\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestModularUIOptions,\n    retryCount: number = 3,\n    retryDelay: number = 200,\n  ): ThunkAction =>\n  (dispatch: Dispatch, getState) => {\n    const modularuiStore = getState()?.modularui;\n    const currentRequest = modularuiStore?.[key];\n\n    const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;\n\n    if (isLoading) {\n      const isDifferentRequest =\n        currentRequest.requestOptions?.href?.toString() !== href.toString();\n      if (isDifferentRequest && retryCount > 0) {\n        return new Promise((resolve) => {\n          setTimeout(() => {\n            resolve(\n              dispatch(\n                loadModularUI(key, href, options, retryCount - 1, retryDelay),\n              ),\n            );\n          }, retryDelay);\n        });\n      }\n\n      // Same request is already loading — do nothing\n      return Promise.resolve();\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIMiddleware.js

@@ -82,7 +82,7 @@ const handleFetch = (action, locale, dispatch, next) => {
   } = action.payload;
   requestOptions.locale = locale;
   const modularuiRequest = createRequest(requestOptions);
-  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING, requestOptions));
   return modularuiRequest.fetch().then(model => responseHandler(next, dispatch, successAction, model)).catch(error => errorHandler(next, dispatch, errorAction, error));
 };
 

package/esm/redux/_modularui/ModularUIMiddleware.js.flow

@@ -150,7 +150,7 @@ const handleFetch = (
 
   const modularuiRequest = createRequest(requestOptions);
 
-  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING, requestOptions));
 
   return modularuiRequest
     .fetch()

package/esm/redux/_modularui/ModularUIMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIMiddleware.js","names":["ModularUIRequest","HTTP_METHODS","MODULARUI_STATUS","startProgress","finishProgress","handleError","updateStatus","createRequest","modularui","request","href","method","GET","params","data","locale","childmodels","isReload","cache","headers","events","onProgress","origin","contextPath","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_Promise","then","result","catch","error","Error","errorHandler","errorAction","err","errorResult","handleFetch","action","key","requestOptions","payload","modularuiRequest","LOADING","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport { updateStatus } from \"./ModularUIActions\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  origin?: string,\n  contextPath?: string,\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  params?: string,\n  data?: any,\n  timeout?: number,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: boolean,\n  headers?: {\n    [headerName: string]: string,\n    Accept?: string,\n    \"Accept-Language\"?: string,\n    \"Content-Type\"?: string,\n    \"x-filename\"?: string,\n    \"x-filesize\"?: string,\n  },\n  events?: { [eventName: string]: () => void },\n  onProgress?: ProgressEventHandler,\n  withCredentials?: boolean,\n};\n\n/**\n * Symbol key that carries API call info interpreted by this Redux middleware.\n */\nconst createRequest = (modularui: RequestOptions): ModularUIRequest => {\n  const request = new ModularUIRequest(modularui.href, {\n    method: modularui.method || HTTP_METHODS.GET,\n    params: modularui.params || \"\",\n    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\n    headers: modularui.headers,\n    events: modularui.events,\n    onProgress: modularui.onProgress,\n  });\n\n  if (modularui.origin) {\n    request.origin = modularui.origin;\n  }\n\n  if (modularui.contextPath) {\n    request.contextPath = modularui.contextPath;\n  }\n\n  if (modularui.targetModel) {\n    request.targetModel = modularui.targetModel;\n    request.forceTargetModel = modularui.forceTargetModel ?? false;\n  }\n\n  return request;\n};\n\n/**\n */\nconst responseHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  successAction: SuccessAction,\n  model: ModularUIModel,\n) => {\n  if (successAction) {\n    const successResult = successAction(model);\n\n    if (successResult instanceof Promise) {\n      successResult\n        .then((result) => {\n          dispatch(result);\n        })\n        .catch((error) => {\n          next(handleError(error));\n        });\n    } else {\n      try {\n        dispatch(successResult);\n      } catch (error) {\n        throw new Error(\n          `Result of successResult is not a valid redux action: ${error}`,\n        );\n      }\n    }\n  }\n\n  return next(finishProgress());\n};\n\n/**\n */\nconst errorHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  errorAction: ?ErrorAction,\n  err: any,\n) => {\n  dispatch(finishProgress());\n\n  if (errorAction) {\n    const errorResult = errorAction(err);\n\n    if (errorResult instanceof Promise) {\n      errorResult.then((result) => dispatch(result));\n    } else {\n      dispatch(errorResult);\n    }\n  }\n\n  return next(handleError(err));\n};\n\n/**\n */\nconst handleFetch = (\n  action: ModularUIAction,\n  locale: string,\n  dispatch: Dispatch,\n  next: Dispatch,\n) => {\n  dispatch(startProgress());\n\n  const { key, successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(requestOptions);\n\n  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n\n  return modularuiRequest\n    .fetch()\n    .then((model) => responseHandler(next, dispatch, successAction, model))\n    .catch((error) => errorHandler(next, dispatch, errorAction, error));\n};\n\n/**\n */\nexport const modularUIMiddleware: Middleware<\n  ReduxState,\n  ReduxAction,\n  Dispatch,\n> =\n  (api: MiddlewareAPI<ReduxState, ReduxAction, Dispatch>) =>\n  (next: Dispatch) =>\n  (action: PossibleAction) => {\n    if (action.type === \"MODULARUI/FETCH\") {\n      return handleFetch(\n        // $FlowExpectedError[incompatible-exact]\n        action,\n        api.getState().i18n.locale,\n        api.dispatch,\n        next,\n      );\n    }\n\n    return next(action);\n  };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIMiddleware.js","names":["ModularUIRequest","HTTP_METHODS","MODULARUI_STATUS","startProgress","finishProgress","handleError","updateStatus","createRequest","modularui","request","href","method","GET","params","data","locale","childmodels","isReload","cache","headers","events","onProgress","origin","contextPath","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_Promise","then","result","catch","error","Error","errorHandler","errorAction","err","errorResult","handleFetch","action","key","requestOptions","payload","modularuiRequest","LOADING","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport { updateStatus } from \"./ModularUIActions\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  origin?: string,\n  contextPath?: string,\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  params?: string,\n  data?: any,\n  timeout?: number,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: boolean,\n  headers?: {\n    [headerName: string]: string,\n    Accept?: string,\n    \"Accept-Language\"?: string,\n    \"Content-Type\"?: string,\n    \"x-filename\"?: string,\n    \"x-filesize\"?: string,\n  },\n  events?: { [eventName: string]: () => void },\n  onProgress?: ProgressEventHandler,\n  withCredentials?: boolean,\n};\n\n/**\n * Symbol key that carries API call info interpreted by this Redux middleware.\n */\nconst createRequest = (modularui: RequestOptions): ModularUIRequest => {\n  const request = new ModularUIRequest(modularui.href, {\n    method: modularui.method || HTTP_METHODS.GET,\n    params: modularui.params || \"\",\n    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\n    headers: modularui.headers,\n    events: modularui.events,\n    onProgress: modularui.onProgress,\n  });\n\n  if (modularui.origin) {\n    request.origin = modularui.origin;\n  }\n\n  if (modularui.contextPath) {\n    request.contextPath = modularui.contextPath;\n  }\n\n  if (modularui.targetModel) {\n    request.targetModel = modularui.targetModel;\n    request.forceTargetModel = modularui.forceTargetModel ?? false;\n  }\n\n  return request;\n};\n\n/**\n */\nconst responseHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  successAction: SuccessAction,\n  model: ModularUIModel,\n) => {\n  if (successAction) {\n    const successResult = successAction(model);\n\n    if (successResult instanceof Promise) {\n      successResult\n        .then((result) => {\n          dispatch(result);\n        })\n        .catch((error) => {\n          next(handleError(error));\n        });\n    } else {\n      try {\n        dispatch(successResult);\n      } catch (error) {\n        throw new Error(\n          `Result of successResult is not a valid redux action: ${error}`,\n        );\n      }\n    }\n  }\n\n  return next(finishProgress());\n};\n\n/**\n */\nconst errorHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  errorAction: ?ErrorAction,\n  err: any,\n) => {\n  dispatch(finishProgress());\n\n  if (errorAction) {\n    const errorResult = errorAction(err);\n\n    if (errorResult instanceof Promise) {\n      errorResult.then((result) => dispatch(result));\n    } else {\n      dispatch(errorResult);\n    }\n  }\n\n  return next(handleError(err));\n};\n\n/**\n */\nconst handleFetch = (\n  action: ModularUIAction,\n  locale: string,\n  dispatch: Dispatch,\n  next: Dispatch,\n) => {\n  dispatch(startProgress());\n\n  const { key, successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(requestOptions);\n\n  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING, requestOptions));\n\n  return modularuiRequest\n    .fetch()\n    .then((model) => responseHandler(next, dispatch, successAction, model))\n    .catch((error) => errorHandler(next, dispatch, errorAction, error));\n};\n\n/**\n */\nexport const modularUIMiddleware: Middleware<\n  ReduxState,\n  ReduxAction,\n  Dispatch,\n> =\n  (api: MiddlewareAPI<ReduxState, ReduxAction, Dispatch>) =>\n  (next: Dispatch) =>\n  (action: PossibleAction) => {\n    if (action.type === \"MODULARUI/FETCH\") {\n      return handleFetch(\n        // $FlowExpectedError[incompatible-exact]\n        action,\n        api.getState().i18n.locale,\n        api.dispatch,\n        next,\n      );\n    }\n\n    return next(action);\n  };\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIReducer.js

@@ -8,7 +8,8 @@ import { ApplicationModel } from "../../models";
 const updateStatus = (state, _ref) => {
   let {
     key,
-    status
+    status,
+    requestOptions
   } = _ref;
   // model should always be available when status is not loading
   if (status !== MODULARUI_STATUS.LOADING && !state[key]) {
@@ -19,7 +20,8 @@ const updateStatus = (state, _ref) => {
     [key]: {
       ...state[key],
       status,
-      lastModification: Date.now()
+      lastModification: Date.now(),
+      requestOptions: requestOptions || state[key]?.requestOptions
     }
   };
 };

package/esm/redux/_modularui/ModularUIReducer.js.flow

@@ -11,7 +11,15 @@ import type { ModularUIModel } from "../../models";
  */
 const updateStatus = (
   state: ModularUIState,
-  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> },
+  {
+    key,
+    status,
+    requestOptions,
+  }: {
+    key: string,
+    status: $Keys<typeof MODULARUI_STATUS>,
+    requestOptions: any,
+  },
 ) => {
   // model should always be available when status is not loading
   if (status !== MODULARUI_STATUS.LOADING && !state[key]) {
@@ -24,6 +32,7 @@ const updateStatus = (
       ...state[key],
       status,
       lastModification: Date.now(),
+      requestOptions: requestOptions || state[key]?.requestOptions,
     },
   };
 };