@beinformed/ui 1.56.4 → 1.56.5

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.56.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.56.4...v1.56.5) (2024-10-17)
+
+
+### Bug Fixes
+
+* **modularui:** don't start request if existing request for same model exists ([40dc861](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/40dc86188e37ca3d8c3b99ea547b30cb500d284e))
+
 ## [1.56.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.56.3...v1.56.4) (2024-10-16)
 
 

package/esm/redux/_modularui/ModularUIActions.js

@@ -78,6 +78,7 @@ const loadModelSuccessAction = (key, model, updateHandler) => {
 export const loadModel = (key, href, options) => ({
   type: "MODULARUI/FETCH",
   payload: {
+    key,
     href: href instanceof Href ? href : new Href(href),
     method: options?.method ?? HTTP_METHODS.GET,
     data: options?.data,
@@ -107,16 +108,17 @@ export const loadModel = (key, href, options) => ({
 
 /**
  */
-export const loadModularUI = (key, href, options) => dispatch => {
-  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+export const loadModularUI = (key, href, options) => (dispatch, getState) => {
+  const modularuiStore = getState()?.modularui;
+  if (modularuiStore && modularuiStore[key]?.status === MODULARUI_STATUS.LOADING) {
+    // don't create duplicate requests during loading
+    return dispatch({
+      type: "NO_ACTION"
+    });
+  }
   dispatch(startProgress());
   const loadModelPromise = dispatch(loadModel(key, href, options));
-  return _Promise.resolve(loadModelPromise).then(response => {
-    if (response?.type === "FINISH_PROGRESS") {
-      dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
-    }
-    return dispatch(finishProgress());
-  }).catch(error => dispatch(handleError(error)));
+  return _Promise.resolve(loadModelPromise).then(() => dispatch(finishProgress())).catch(error => dispatch(handleError(error)));
 };
 
 /**

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","loadModel","href","options","method","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","dispatch","LOADING","loadModelPromise","_Promise","resolve","then","response","FINISHED","catch","reloadModel","selfhref","isReload"],"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 * 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    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\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) => {\n    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then((response) => {\n        if (response?.type === \"FINISH_PROGRESS\") {\n          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n        }\n\n        return dispatch(finishProgress());\n      })\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","loadModelSuccessAction","updateHandler","loadModel","href","options","method","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","dispatch","getState","modularuiStore","modularui","LOADING","loadModelPromise","_Promise","resolve","then","catch","reloadModel","selfhref","isReload"],"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 * 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    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\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      // don't create duplicate requests during loading\n      return dispatch({\n        type: \"NO_ACTION\",\n      });\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":";AACA,SAASA,YAAY,EAAEC,gBAAgB,QAAQ,2BAA2B;AAC1E,OAAOC,IAAI,MAAM,wBAAwB;AACzC,OAAOC,aAAa,MAAM,kCAAkC;AAC5D,SAASC,cAAc,EAAEC,aAAa,QAAQ,8BAA8B;AAC5E,SAASC,WAAW,QAAQ,kBAAkB;AAmB9C;AACA;AACA,OAAO,MAAMC,QAAQ,GAAGA,CACtBC,GAAW,EACXC,KAAqB,KACF;EACnB;EACAA,KAAK,CAACC,UAAU,GAAGF,GAAG;EACtB,OAAO;IACLG,IAAI,EAAE,eAAe;IACrBC,OAAO,EAAE;MACPJ,GAAG;MACHC;IACF;EACF,CAAC;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMI,UAAU,GACrBC,MAAqD,KAChC;EACrBH,IAAI,EAAE,gBAAgB;EACtBC,OAAO,EAAEE;AACX,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMC,WAAW,GAAIN,KAAqB,KAAyB;EACxEE,IAAI,EAAE,kBAAkB;EACxBC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMO,UAAU,GAAIP,KAAqB,KAAwB;EACtEE,IAAI,EAAE,uBAAuB;EAC7BC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMQ,gBAAgB,GAAIT,GAAW,KAA8B;EACxEG,IAAI,EAAE,sBAAsB;EAC5BC,OAAO,EAAEJ;AACX,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMU,cAAc,GAAGA,CAAA,MAA6B;EACzDP,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMQ,YAAY,GAAGA,CAC1BX,GAAW,EACXY,MAAsC,MACd;EACxBT,IAAI,EAAE,kBAAkB;EACxBC,OAAO,EAAE;IAAEJ,GAAG;IAAEY;EAAO;AACzB,CAAC,CAAC;;AAEF;AACA;AACA,MAAMC,sBAAsB,GAAGA,CAC7Bb,GAAW,EACXC,KAAqB,EACrBa,aAAmC,KACI;EACvC,IAAIA,aAAa,EAAE;IACjB,OAAOP,WAAW,CAACO,aAAa,CAACb,KAAK,CAAC,CAAC;EAC1C;EACA,OAAOF,QAAQ,CAACC,GAAG,EAAEC,KAAK,CAAC;AAC7B,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMc,SAAS,GAAGA,CACvBf,GAAW,EACXgB,IAAmB,EACnBC,OAAiC,MACZ;EACrBd,IAAI,EAAE,iBAAiB;EACvBC,OAAO,EAAE;IACPJ,GAAG;IACHgB,IAAI,EAAEA,IAAI,YAAYtB,IAAI,GAAGsB,IAAI,GAAG,IAAItB,IAAI,CAACsB,IAAI,CAAC;IAClDE,MAAM,EAAED,OAAO,EAAEC,MAAM,IAAI1B,YAAY,CAAC2B,GAAG;IAC3CC,IAAI,EAAEH,OAAO,EAAEG,IAAI;IACnBC,MAAM,EAAEJ,OAAO,EAAEI,MAAM,IAAI,IAAI;IAC/BC,WAAW,EAAEL,OAAO,EAAEK,WAAW;IACjCC,WAAW,EAAEN,OAAO,EAAEM,WAAW;IACjCC,gBAAgB,EAAEP,OAAO,EAAEO,gBAAgB;IAC3CC,KAAK,EAAER,OAAO,EAAEQ,KAAK;IACrB;AACJ;IACIC,aAAa,EAAGzB,KAAK,IACnBY,sBAAsB,CAACb,GAAG,EAAEC,KAAK,EAAEgB,OAAO,EAAEH,aAAa,CAAC;IAC5D;AACJ;IACIa,WAAW,EAAGC,KAAK,IAAK;MACtB,MAAMC,aAAa,GAAG,IAAIlC,aAAa,CAACiC,KAAK,EAAE5B,GAAG,CAAC;MACnD,IAAI6B,aAAa,CAACC,gBAAgB,EAAE;QAClC,OAAO;UACL3B,IAAI,EAAE;QACR,CAAC;MACH,CAAC,MAAM,IAAI0B,aAAa,CAACE,6BAA6B,EAAE;QACtD,OAAOtB,gBAAgB,CAACT,GAAG,CAAC;MAC9B;MAEA,OAAOW,YAAY,CAACX,GAAG,EAAEP,gBAAgB,CAACuC,KAAK,CAAC;IAClD;EACF;AACF,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMC,aAAa,GACxBA,CACEjC,GAAW,EACXgB,IAAmB,EACnBC,OAAiC,KAEnC,CAACiB,QAAkB,EAAEC,QAAQ,KAAK;EAChC,MAAMC,cAAc,GAAGD,QAAQ,CAAC,CAAC,EAAEE,SAAS;EAC5C,IACED,cAAc,IACdA,cAAc,CAACpC,GAAG,CAAC,EAAEY,MAAM,KAAKnB,gBAAgB,CAAC6C,OAAO,EACxD;IACA;IACA,OAAOJ,QAAQ,CAAC;MACd/B,IAAI,EAAE;IACR,CAAC,CAAC;EACJ;EAEA+B,QAAQ,CAACrC,aAAa,CAAC,CAAC,CAAC;EAEzB,MAAM0C,gBAAgB,GAAGL,QAAQ,CAACnB,SAAS,CAACf,GAAG,EAAEgB,IAAI,EAAEC,OAAO,CAAC,CAAC;EAEhE,OAAOuB,QAAA,CAAQC,OAAO,CAACF,gBAAgB,CAAC,CACrCG,IAAI,CAAC,MAAMR,QAAQ,CAACtC,cAAc,CAAC,CAAC,CAAC,CAAC,CACtC+C,KAAK,CAAEf,KAAK,IAAKM,QAAQ,CAACpC,WAAW,CAAC8B,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC;;AAEH;AACA;AACA,OAAO,MAAMgB,WAAW,GAAGA,CACzB3C,KAAqB,EACrBgB,OAAiC,KAEjCgB,aAAa,CAAChC,KAAK,CAACC,UAAU,EAAED,KAAK,CAAC4C,QAAQ,EAAE;EAC9C,GAAG5B,OAAO;EACV6B,QAAQ,EAAE;AACZ,CAAC,CAAC","ignoreList":[]}

package/esm/redux/_modularui/ModularUIMiddleware.js

@@ -1,8 +1,9 @@
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import ModularUIRequest from "../../modularui/ModularUIRequest";
-import { HTTP_METHODS } from "../../constants/Constants";
+import { HTTP_METHODS, MODULARUI_STATUS } from "../../constants/Constants";
 import { startProgress, finishProgress } from "../actions/ProgressIndicator";
 import { handleError } from "../actions/Error";
+import { updateStatus } from "./ModularUIActions";
 /**
  * Symbol key that carries API call info interpreted by this Redux middleware.
  */
@@ -64,12 +65,14 @@ const errorHandler = (next, dispatch, errorAction, err) => {
 const handleFetch = (action, locale, dispatch, next) => {
   dispatch(startProgress());
   const {
+    key,
     successAction,
     errorAction,
     ...requestOptions
   } = action.payload;
   requestOptions.locale = locale;
   const modularuiRequest = createRequest(requestOptions);
+  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
   return modularuiRequest.fetch().then(model => responseHandler(next, dispatch, successAction, model)).catch(error => errorHandler(next, dispatch, errorAction, error));
 };
 

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIMiddleware.js","names":["ModularUIRequest","HTTP_METHODS","startProgress","finishProgress","handleError","createRequest","modularui","request","href","method","GET","data","locale","childmodels","isReload","cache","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_Promise","then","result","catch","error","Error","errorHandler","errorAction","err","errorResult","handleFetch","action","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\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  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: any,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: 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    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\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 { successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(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":";AACA,OAAOA,gBAAgB,MAAM,kCAAkC;AAC/D,SAASC,YAAY,QAAQ,2BAA2B;AAExD,SAASC,aAAa,EAAEC,cAAc,QAAQ,8BAA8B;AAE5E,SAASC,WAAW,QAAQ,kBAAkB;AA0B9C;AACA;AACA;AACA,MAAMC,aAAa,GAAIC,SAAyB,IAAuB;EACrE,MAAMC,OAAO,GAAG,IAAIP,gBAAgB,CAACM,SAAS,CAACE,IAAI,EAAE;IACnDC,MAAM,EAAEH,SAAS,CAACG,MAAM,IAAIR,YAAY,CAACS,GAAG;IAC5CC,IAAI,EAAEL,SAAS,CAACK,IAAI,IAAI,CAAC,CAAC;IAC1BC,MAAM,EAAEN,SAAS,CAACM,MAAM;IACxBC,WAAW,EAAEP,SAAS,CAACO,WAAW,IAAI,IAAI;IAC1CC,QAAQ,EAAER,SAAS,CAACQ,QAAQ;IAC5BC,KAAK,EAAET,SAAS,CAACS;EACnB,CAAC,CAAC;EAEF,IAAIT,SAAS,CAACU,WAAW,EAAE;IACzBT,OAAO,CAACS,WAAW,GAAGV,SAAS,CAACU,WAAW;IAC3CT,OAAO,CAACU,gBAAgB,GAAGX,SAAS,CAACW,gBAAgB,IAAI,KAAK;EAChE;EAEA,OAAOV,OAAO;AAChB,CAAC;;AAED;AACA;AACA,MAAMW,eAAe,GAAGA,CACtBC,IAAc,EACdC,QAAkB,EAClBC,aAA4B,EAC5BC,KAAqB,KAClB;EACH,IAAID,aAAa,EAAE;IACjB,MAAME,aAAa,GAAGF,aAAa,CAACC,KAAK,CAAC;IAE1C,IAAIC,aAAa,YAAAC,QAAmB,EAAE;MACpCD,aAAa,CACVE,IAAI,CAAEC,MAAM,IAAK;QAChBN,QAAQ,CAACM,MAAM,CAAC;MAClB,CAAC,CAAC,CACDC,KAAK,CAAEC,KAAK,IAAK;QAChBT,IAAI,CAACf,WAAW,CAACwB,KAAK,CAAC,CAAC;MAC1B,CAAC,CAAC;IACN,CAAC,MAAM;MACL,IAAI;QACFR,QAAQ,CAACG,aAAa,CAAC;MACzB,CAAC,CAAC,OAAOK,KAAK,EAAE;QACd,MAAM,IAAIC,KAAK,CACb,wDAAwDD,KAAK,EAC/D,CAAC;MACH;IACF;EACF;EAEA,OAAOT,IAAI,CAAChB,cAAc,CAAC,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA,MAAM2B,YAAY,GAAGA,CACnBX,IAAc,EACdC,QAAkB,EAClBW,WAAyB,EACzBC,GAAQ,KACL;EACHZ,QAAQ,CAACjB,cAAc,CAAC,CAAC,CAAC;EAE1B,IAAI4B,WAAW,EAAE;IACf,MAAME,WAAW,GAAGF,WAAW,CAACC,GAAG,CAAC;IAEpC,IAAIC,WAAW,YAAAT,QAAmB,EAAE;MAClCS,WAAW,CAACR,IAAI,CAAEC,MAAM,IAAKN,QAAQ,CAACM,MAAM,CAAC,CAAC;IAChD,CAAC,MAAM;MACLN,QAAQ,CAACa,WAAW,CAAC;IACvB;EACF;EAEA,OAAOd,IAAI,CAACf,WAAW,CAAC4B,GAAG,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA,MAAME,WAAW,GAAGA,CAClBC,MAAuB,EACvBvB,MAAc,EACdQ,QAAkB,EAClBD,IAAc,KACX;EACHC,QAAQ,CAAClB,aAAa,CAAC,CAAC,CAAC;EAEzB,MAAM;IAAEmB,aAAa;IAAEU,WAAW;IAAE,GAAGK;EAAe,CAAC,GAAGD,MAAM,CAACE,OAAO;EACxED,cAAc,CAACxB,MAAM,GAAGA,MAAM;EAE9B,MAAM0B,gBAAgB,GAAGjC,aAAa,CAAC+B,cAAc,CAAC;EAEtD,OAAOE,gBAAgB,CACpBC,KAAK,CAAC,CAAC,CACPd,IAAI,CAAEH,KAAK,IAAKJ,eAAe,CAACC,IAAI,EAAEC,QAAQ,EAAEC,aAAa,EAAEC,KAAK,CAAC,CAAC,CACtEK,KAAK,CAAEC,KAAK,IAAKE,YAAY,CAACX,IAAI,EAAEC,QAAQ,EAAEW,WAAW,EAAEH,KAAK,CAAC,CAAC;AACvE,CAAC;;AAED;AACA;AACA,OAAO,MAAMY,mBAIZ,GACEC,GAAqD,IACrDtB,IAAc,IACdgB,MAAsB,IAAK;EAC1B,IAAIA,MAAM,CAACO,IAAI,KAAK,iBAAiB,EAAE;IACrC,OAAOR,WAAW;IAChB;IACAC,MAAM,EACNM,GAAG,CAACE,QAAQ,CAAC,CAAC,CAACC,IAAI,CAAChC,MAAM,EAC1B6B,GAAG,CAACrB,QAAQ,EACZD,IACF,CAAC;EACH;EAEA,OAAOA,IAAI,CAACgB,MAAM,CAAC;AACrB,CAAC","ignoreList":[]}
+{"version":3,"file":"ModularUIMiddleware.js","names":["ModularUIRequest","HTTP_METHODS","MODULARUI_STATUS","startProgress","finishProgress","handleError","updateStatus","createRequest","modularui","request","href","method","GET","data","locale","childmodels","isReload","cache","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  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: any,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: 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    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\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":[]}

package/esm/redux/_modularui/ModularUIReducer.js

@@ -41,7 +41,8 @@ const setModel = (state, _ref2) => {
       [key]: {
         ...state[key],
         model,
-        lastModification: Date.now()
+        lastModification: Date.now(),
+        status: MODULARUI_STATUS.FINISHED
       }
     };
   }

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIReducer.js","names":["IllegalArgumentException","MODULARUI_STATUS","ApplicationModel","updateStatus","state","_ref","key","status","LOADING","lastModification","Date","now","setModel","_ref2","model","initModularUI","models","newState","_Object$assign","forEach","_ref3","FINISHED","getModelKey","_context","_findInstanceProperty","_Object$keys","call","connectKey","updateModel","modelKey","Error","removeKey","resetModularUI","initialState","ModularUIReducer","arguments","length","undefined","action","type","payload"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n */\nconst updateStatus = (\n  state: ModularUIState,\n  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> },\n) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (\n  state: ModularUIState,\n  { key, model }: { key: string, model: ?ModularUIModel },\n) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst initModularUI = (\n  state: ModularUIState,\n  models: Array<{ key: string, model: ModularUIModel }>,\n) => {\n  const newState = Object.assign({}, state);\n\n  models.forEach(({ key, model }) => {\n    newState[key] = {\n      status: MODULARUI_STATUS.FINISHED,\n      lastModification: Date.now(),\n      model,\n    };\n  });\n\n  return newState;\n};\n\n/**\n */\nconst getModelKey = (state: ModularUIState, model: ModularUIModel) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state: ModularUIState, model: ModularUIModel) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`,\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  const newState = Object.assign({}, state);\n  delete newState[modelKey];\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState: ModularUIState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action,\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/INIT\":\n      return initModularUI(state, action.payload);\n\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n    case \"MODULARUI/UPDATE_FORM\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIReducer.js","names":["IllegalArgumentException","MODULARUI_STATUS","ApplicationModel","updateStatus","state","_ref","key","status","LOADING","lastModification","Date","now","setModel","_ref2","model","FINISHED","initModularUI","models","newState","_Object$assign","forEach","_ref3","getModelKey","_context","_findInstanceProperty","_Object$keys","call","connectKey","updateModel","modelKey","Error","removeKey","resetModularUI","initialState","ModularUIReducer","arguments","length","undefined","action","type","payload"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n */\nconst updateStatus = (\n  state: ModularUIState,\n  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> },\n) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (\n  state: ModularUIState,\n  { key, model }: { key: string, model: ?ModularUIModel },\n) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n        status: MODULARUI_STATUS.FINISHED,\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst initModularUI = (\n  state: ModularUIState,\n  models: Array<{ key: string, model: ModularUIModel }>,\n) => {\n  const newState = Object.assign({}, state);\n\n  models.forEach(({ key, model }) => {\n    newState[key] = {\n      status: MODULARUI_STATUS.FINISHED,\n      lastModification: Date.now(),\n      model,\n    };\n  });\n\n  return newState;\n};\n\n/**\n */\nconst getModelKey = (state: ModularUIState, model: ModularUIModel) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state: ModularUIState, model: ModularUIModel) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`,\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  const newState = Object.assign({}, state);\n  delete newState[modelKey];\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState: ModularUIState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action,\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/INIT\":\n      return initModularUI(state, action.payload);\n\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n    case \"MODULARUI/UPDATE_FORM\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    successAction: (\n      model: ModularUIModel,\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key: string,\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    successAction: (\n      model: ModularUIModel,\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}

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

@@ -71,14 +71,11 @@ describe("modularui hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `${key}(${url})(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: `${key}(${url})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,

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

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

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

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

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

@@ -64,14 +64,11 @@ describe("modelcatalog hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `${key}(${url})(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: `${key}(${url})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,

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

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

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

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

package/lib/redux/_modularui/ModularUIActions.js

@@ -92,6 +92,7 @@ const loadModelSuccessAction = (key, model, updateHandler) => {
 const loadModel = (key, href, options) => ({
   type: "MODULARUI/FETCH",
   payload: {
+    key,
     href: href instanceof _Href.default ? href : new _Href.default(href),
     method: options?.method ?? _Constants.HTTP_METHODS.GET,
     data: options?.data,
@@ -122,16 +123,17 @@ const loadModel = (key, href, options) => ({
 /**
  */
 exports.loadModel = loadModel;
-const loadModularUI = (key, href, options) => dispatch => {
-  dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.LOADING));
+const loadModularUI = (key, href, options) => (dispatch, getState) => {
+  const modularuiStore = getState()?.modularui;
+  if (modularuiStore && modularuiStore[key]?.status === _Constants.MODULARUI_STATUS.LOADING) {
+    // don't create duplicate requests during loading
+    return dispatch({
+      type: "NO_ACTION"
+    });
+  }
   dispatch((0, _ProgressIndicator.startProgress)());
   const loadModelPromise = dispatch(loadModel(key, href, options));
-  return _promise.default.resolve(loadModelPromise).then(response => {
-    if (response?.type === "FINISH_PROGRESS") {
-      dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.FINISHED));
-    }
-    return dispatch((0, _ProgressIndicator.finishProgress)());
-  }).catch(error => dispatch((0, _Error.handleError)(error)));
+  return _promise.default.resolve(loadModelPromise).then(() => dispatch((0, _ProgressIndicator.finishProgress)())).catch(error => dispatch((0, _Error.handleError)(error)));
 };
 
 /**

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

@@ -109,6 +109,7 @@ export const loadModel = (
 ): ModularUIAction => ({
   type: "MODULARUI/FETCH",
   payload: {
+    key,
     href: href instanceof Href ? href : new Href(href),
     method: options?.method ?? HTTP_METHODS.GET,
     data: options?.data,
@@ -146,20 +147,24 @@ export const loadModularUI =
     href: Href | string,
     options?: RequestModularUIOptions,
   ): ThunkAction =>
-  (dispatch: Dispatch) => {
-    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+  (dispatch: Dispatch, getState) => {
+    const modularuiStore = getState()?.modularui;
+    if (
+      modularuiStore &&
+      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING
+    ) {
+      // don't create duplicate requests during loading
+      return dispatch({
+        type: "NO_ACTION",
+      });
+    }
+
     dispatch(startProgress());
 
     const loadModelPromise = dispatch(loadModel(key, href, options));
 
     return Promise.resolve(loadModelPromise)
-      .then((response) => {
-        if (response?.type === "FINISH_PROGRESS") {
-          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
-        }
-
-        return dispatch(finishProgress());
-      })
+      .then(() => dispatch(finishProgress()))
       .catch((error) => dispatch(handleError(error)));
   };
 

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIActions.js","names":["_Constants","require","_Href","_interopRequireDefault","_ErrorResponse","_ProgressIndicator","_Error","setModel","key","model","connectKey","type","payload","exports","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","startProgress","loadModelPromise","_promise","default","resolve","then","response","FINISHED","finishProgress","catch","handleError","reloadModel","selfhref","isReload"],"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 * 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    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\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) => {\n    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then((response) => {\n        if (response?.type === \"FINISH_PROGRESS\") {\n          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n        }\n\n        return dispatch(finishProgress());\n      })\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":["_Constants","require","_Href","_interopRequireDefault","_ErrorResponse","_ProgressIndicator","_Error","setModel","key","model","connectKey","type","payload","exports","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","getState","modularuiStore","modularui","LOADING","startProgress","loadModelPromise","_promise","default","resolve","then","finishProgress","catch","handleError","reloadModel","selfhref","isReload"],"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 * 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    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\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      // don't create duplicate requests during loading\n      return dispatch({\n        type: \"NO_ACTION\",\n      });\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/lib/redux/_modularui/ModularUIMiddleware.js

@@ -10,6 +10,7 @@ var _ModularUIRequest = _interopRequireDefault(require("../../modularui/ModularU
 var _Constants = require("../../constants/Constants");
 var _ProgressIndicator = require("../actions/ProgressIndicator");
 var _Error = require("../actions/Error");
+var _ModularUIActions = require("./ModularUIActions");
 /**
  * Symbol key that carries API call info interpreted by this Redux middleware.
  */
@@ -71,12 +72,14 @@ const errorHandler = (next, dispatch, errorAction, err) => {
 const handleFetch = (action, locale, dispatch, next) => {
   dispatch((0, _ProgressIndicator.startProgress)());
   const {
+    key,
     successAction,
     errorAction,
     ...requestOptions
   } = action.payload;
   requestOptions.locale = locale;
   const modularuiRequest = createRequest(requestOptions);
+  dispatch((0, _ModularUIActions.updateStatus)(key, _Constants.MODULARUI_STATUS.LOADING));
   return modularuiRequest.fetch().then(model => responseHandler(next, dispatch, successAction, model)).catch(error => errorHandler(next, dispatch, errorAction, error));
 };
 

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

@@ -1,11 +1,12 @@
 // @flow
 import ModularUIRequest from "../../modularui/ModularUIRequest";
-import { HTTP_METHODS } from "../../constants/Constants";
+import { HTTP_METHODS, MODULARUI_STATUS } from "../../constants/Constants";
 
 import { startProgress, finishProgress } from "../actions/ProgressIndicator";
-
 import { handleError } from "../actions/Error";
 
+import { updateStatus } from "./ModularUIActions";
+
 import type { Middleware, MiddlewareAPI } from "redux";
 import type {
   ReduxAction,
@@ -117,11 +118,13 @@ const handleFetch = (
 ) => {
   dispatch(startProgress());
 
-  const { successAction, errorAction, ...requestOptions } = action.payload;
+  const { key, successAction, errorAction, ...requestOptions } = action.payload;
   requestOptions.locale = locale;
 
   const modularuiRequest = createRequest(requestOptions);
 
+  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+
   return modularuiRequest
     .fetch()
     .then((model) => responseHandler(next, dispatch, successAction, model))

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIMiddleware.js","names":["_ModularUIRequest","_interopRequireDefault","require","_Constants","_ProgressIndicator","_Error","createRequest","modularui","request","ModularUIRequest","href","method","HTTP_METHODS","GET","data","locale","childmodels","isReload","cache","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_promise","default","then","result","catch","error","handleError","Error","finishProgress","errorHandler","errorAction","err","errorResult","handleFetch","action","startProgress","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n","exports"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\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  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: any,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: 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    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\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 { successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(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":[]}
+{"version":3,"file":"ModularUIMiddleware.js","names":["_ModularUIRequest","_interopRequireDefault","require","_Constants","_ProgressIndicator","_Error","_ModularUIActions","createRequest","modularui","request","ModularUIRequest","href","method","HTTP_METHODS","GET","data","locale","childmodels","isReload","cache","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_promise","default","then","result","catch","error","handleError","Error","finishProgress","errorHandler","errorAction","err","errorResult","handleFetch","action","startProgress","key","requestOptions","payload","modularuiRequest","updateStatus","MODULARUI_STATUS","LOADING","fetch","modularUIMiddleware","api","type","getState","i18n","exports"],"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  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: any,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: 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    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\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":[]}

package/lib/redux/_modularui/ModularUIReducer.js

@@ -48,7 +48,8 @@ const setModel = (state, _ref2) => {
       [key]: {
         ...state[key],
         model,
-        lastModification: Date.now()
+        lastModification: Date.now(),
+        status: _Constants.MODULARUI_STATUS.FINISHED
       }
     };
   }

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

@@ -46,6 +46,7 @@ const setModel = (
         ...state[key],
         model,
         lastModification: Date.now(),
+        status: MODULARUI_STATUS.FINISHED,
       },
     };
   }

package/lib/redux/_modularui/ModularUIReducer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIReducer.js","names":["_exceptions","require","_Constants","_models","updateStatus","state","_ref","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","_ref2","model","IllegalArgumentException","initModularUI","models","newState","_assign","default","forEach","_ref3","FINISHED","getModelKey","_context","_find","_keys","call","connectKey","updateModel","modelKey","Error","removeKey","resetModularUI","ApplicationModel","initialState","ModularUIReducer","arguments","length","undefined","action","type","payload","exports"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n */\nconst updateStatus = (\n  state: ModularUIState,\n  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> },\n) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (\n  state: ModularUIState,\n  { key, model }: { key: string, model: ?ModularUIModel },\n) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst initModularUI = (\n  state: ModularUIState,\n  models: Array<{ key: string, model: ModularUIModel }>,\n) => {\n  const newState = Object.assign({}, state);\n\n  models.forEach(({ key, model }) => {\n    newState[key] = {\n      status: MODULARUI_STATUS.FINISHED,\n      lastModification: Date.now(),\n      model,\n    };\n  });\n\n  return newState;\n};\n\n/**\n */\nconst getModelKey = (state: ModularUIState, model: ModularUIModel) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state: ModularUIState, model: ModularUIModel) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`,\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  const newState = Object.assign({}, state);\n  delete newState[modelKey];\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState: ModularUIState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action,\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/INIT\":\n      return initModularUI(state, action.payload);\n\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n    case \"MODULARUI/UPDATE_FORM\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIReducer.js","names":["_exceptions","require","_Constants","_models","updateStatus","state","_ref","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","_ref2","model","FINISHED","IllegalArgumentException","initModularUI","models","newState","_assign","default","forEach","_ref3","getModelKey","_context","_find","_keys","call","connectKey","updateModel","modelKey","Error","removeKey","resetModularUI","ApplicationModel","initialState","ModularUIReducer","arguments","length","undefined","action","type","payload","exports"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n */\nconst updateStatus = (\n  state: ModularUIState,\n  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> },\n) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (\n  state: ModularUIState,\n  { key, model }: { key: string, model: ?ModularUIModel },\n) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n        status: MODULARUI_STATUS.FINISHED,\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst initModularUI = (\n  state: ModularUIState,\n  models: Array<{ key: string, model: ModularUIModel }>,\n) => {\n  const newState = Object.assign({}, state);\n\n  models.forEach(({ key, model }) => {\n    newState[key] = {\n      status: MODULARUI_STATUS.FINISHED,\n      lastModification: Date.now(),\n      model,\n    };\n  });\n\n  return newState;\n};\n\n/**\n */\nconst getModelKey = (state: ModularUIState, model: ModularUIModel) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state: ModularUIState, model: ModularUIModel) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`,\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  const newState = Object.assign({}, state);\n  delete newState[modelKey];\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState: ModularUIState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action,\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/INIT\":\n      return initModularUI(state, action.payload);\n\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n    case \"MODULARUI/UPDATE_FORM\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/_modularui/__tests__/actions.spec.js.flow

@@ -134,16 +134,13 @@ describe("modularui actions", () => {
     await store.dispatch(loadModularUI("application", "/", {}));
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application", status: MODULARUI_STATUS.LOADING },
-      },
       {
         type: "START_PROGRESS",
       },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application",
           href: new Href("/"),
           method: HTTP_METHODS.GET,
           data: undefined,

package/lib/redux/_modularui/types.js.flow

@@ -65,6 +65,7 @@ export type ErrorAction = (
 export type ModularUIAction = {
   type: "MODULARUI/FETCH",
   payload: {
+    key: string,
     href: Href,
     method?: $Keys<HTTP_METHODS>,
     data?: any,

package/lib/redux/_modularui/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    successAction: (\n      model: ModularUIModel,\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key: string,\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    successAction: (\n      model: ModularUIModel,\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}

package/lib/redux/actions/__tests__/Application.spec.js.flow

@@ -16,14 +16,11 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
         }),
       }),
@@ -43,10 +40,6 @@ describe("application actions", () => {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",
       },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",

package/lib/redux/actions/__tests__/Authorization.spec.js.flow

@@ -43,10 +43,6 @@ describe("authorization actions", () => {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",
       },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       {
         type: "START_PROGRESS",
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.56.4",
+  "version": "1.56.5",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -29,7 +29,7 @@
     "flow": "flow",
     "flow:ci": "flow check",
     "flow-typed-install": "flow-typed install -l .flow/flow-typed/ --ignoreDeps peer --overwrite",
-    "test": "jest",
+    "test": "jest --bail",
     "test:ci": "jest --ci",
     "test:changed": "jest --onlyChanged",
     "upgrade-interactive": "npm-check -u",
@@ -99,13 +99,13 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",
-    "@babel/core": "^7.25.7",
-    "@babel/eslint-parser": "^7.25.7",
+    "@babel/core": "^7.25.8",
+    "@babel/eslint-parser": "^7.25.8",
     "@babel/eslint-plugin": "^7.25.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.25.7",
-    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-env": "^7.25.8",
     "@babel/preset-flow": "^7.25.7",
     "@babel/preset-react": "^7.25.7",
     "@commitlint/cli": "^19.5.0",
@@ -115,7 +115,7 @@
     "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
     "cherry-pick": "^0.5.0",
-    "commit-and-tag-version": "^12.4.4",
+    "commit-and-tag-version": "^12.5.0",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
     "eslint": "^8.57.0",
@@ -124,21 +124,21 @@
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.8.3",
-    "eslint-plugin-jsdoc": "^50.3.1",
+    "eslint-plugin-jsdoc": "^50.4.3",
     "eslint-plugin-react": "^7.37.1",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.9.0",
-    "hermes-eslint": "^0.24.0",
+    "hermes-eslint": "^0.25.0",
     "history": "^4.0.0",
     "husky": "^9.1.6",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
-    "jscodeshift": "^0.16.1",
+    "jscodeshift": "^17.0.0",
     "lint-staged": "^15.2.10",
     "polished": "^4.0.0",
     "prettier": "^3.3.3",

package/src/hooks/__tests__/UseModularUIModel.spec.js

@@ -71,14 +71,11 @@ describe("modularui hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `${key}(${url})(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: `${key}(${url})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,

package/src/hooks/__tests__/useAuthentication.spec.js

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

package/src/hooks/__tests__/useForm.spec.js

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

package/src/hooks/__tests__/useModelCatalog.spec.js

@@ -64,14 +64,11 @@ describe("modelcatalog hooks", () => {
     expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: `${key}(${url})(en)`, status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: `${key}(${url})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,

package/src/hooks/__tests__/useModels.spec.js

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

package/src/hooks/__tests__/useModularUIBasic.spec.js

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

package/src/redux/_modularui/ModularUIActions.js

@@ -109,6 +109,7 @@ export const loadModel = (
 ): ModularUIAction => ({
   type: "MODULARUI/FETCH",
   payload: {
+    key,
     href: href instanceof Href ? href : new Href(href),
     method: options?.method ?? HTTP_METHODS.GET,
     data: options?.data,
@@ -146,20 +147,24 @@ export const loadModularUI =
     href: Href | string,
     options?: RequestModularUIOptions,
   ): ThunkAction =>
-  (dispatch: Dispatch) => {
-    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+  (dispatch: Dispatch, getState) => {
+    const modularuiStore = getState()?.modularui;
+    if (
+      modularuiStore &&
+      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING
+    ) {
+      // don't create duplicate requests during loading
+      return dispatch({
+        type: "NO_ACTION",
+      });
+    }
+
     dispatch(startProgress());
 
     const loadModelPromise = dispatch(loadModel(key, href, options));
 
     return Promise.resolve(loadModelPromise)
-      .then((response) => {
-        if (response?.type === "FINISH_PROGRESS") {
-          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
-        }
-
-        return dispatch(finishProgress());
-      })
+      .then(() => dispatch(finishProgress()))
       .catch((error) => dispatch(handleError(error)));
   };
 

package/src/redux/_modularui/ModularUIMiddleware.js

@@ -1,11 +1,12 @@
 // @flow
 import ModularUIRequest from "../../modularui/ModularUIRequest";
-import { HTTP_METHODS } from "../../constants/Constants";
+import { HTTP_METHODS, MODULARUI_STATUS } from "../../constants/Constants";
 
 import { startProgress, finishProgress } from "../actions/ProgressIndicator";
-
 import { handleError } from "../actions/Error";
 
+import { updateStatus } from "./ModularUIActions";
+
 import type { Middleware, MiddlewareAPI } from "redux";
 import type {
   ReduxAction,
@@ -117,11 +118,13 @@ const handleFetch = (
 ) => {
   dispatch(startProgress());
 
-  const { successAction, errorAction, ...requestOptions } = action.payload;
+  const { key, successAction, errorAction, ...requestOptions } = action.payload;
   requestOptions.locale = locale;
 
   const modularuiRequest = createRequest(requestOptions);
 
+  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+
   return modularuiRequest
     .fetch()
     .then((model) => responseHandler(next, dispatch, successAction, model))

package/src/redux/_modularui/ModularUIReducer.js

@@ -46,6 +46,7 @@ const setModel = (
         ...state[key],
         model,
         lastModification: Date.now(),
+        status: MODULARUI_STATUS.FINISHED,
       },
     };
   }

package/src/redux/_modularui/__tests__/actions.spec.js

@@ -134,16 +134,13 @@ describe("modularui actions", () => {
     await store.dispatch(loadModularUI("application", "/", {}));
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application", status: MODULARUI_STATUS.LOADING },
-      },
       {
         type: "START_PROGRESS",
       },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application",
           href: new Href("/"),
           method: HTTP_METHODS.GET,
           data: undefined,

package/src/redux/_modularui/types.js

@@ -65,6 +65,7 @@ export type ErrorAction = (
 export type ModularUIAction = {
   type: "MODULARUI/FETCH",
   payload: {
+    key: string,
     href: Href,
     method?: $Keys<HTTP_METHODS>,
     data?: any,

package/src/redux/actions/__tests__/Application.spec.js

@@ -16,14 +16,11 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
         }),
       }),
@@ -43,10 +40,6 @@ describe("application actions", () => {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",
       },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",

package/src/redux/actions/__tests__/Authorization.spec.js

@@ -43,10 +43,6 @@ describe("authorization actions", () => {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",
       },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       {
         type: "START_PROGRESS",
       },