@beinformed/ui 1.60.4 → 1.60.6

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

package/lib/redux/_modularui/ModularUIMiddleware.js

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

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

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

package/lib/redux/_modularui/ModularUIReducer.js

@@ -15,7 +15,8 @@ var _models = require("../../models");
 const updateStatus = (state, _ref) => {
   let {
     key,
-    status
+    status,
+    requestOptions
   } = _ref;
   // model should always be available when status is not loading
   if (status !== _Constants.MODULARUI_STATUS.LOADING && !state[key]) {
@@ -26,7 +27,8 @@ const updateStatus = (state, _ref) => {
     [key]: {
       ...state[key],
       status,
-      lastModification: Date.now()
+      lastModification: Date.now(),
+      requestOptions: requestOptions || state[key]?.requestOptions
     }
   };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIReducer.js","names":["_Constants","require","_models","updateStatus","state","_ref","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","_ref2","model","FINISHED","console","debug","initModularUI","models","newState","_assign","default","forEach","_ref3","getModelKey","_context","_find","_keys","call","connectKey","updateModel","modelKey","removeKey","resetModularUI","ApplicationModel","initialState","ModularUIReducer","arguments","length","undefined","action","type","payload","exports"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\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  // eslint-disable-next-line no-console\n  console.debug(\"No model for setModel\");\n  return state;\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  // eslint-disable-next-line no-console\n  console.debug(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`,\n  );\n  return state;\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":["_Constants","require","_models","updateStatus","state","_ref","key","status","requestOptions","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","_ref2","model","FINISHED","console","debug","initModularUI","models","newState","_assign","default","forEach","_ref3","getModelKey","_context","_find","_keys","call","connectKey","updateModel","modelKey","removeKey","resetModularUI","ApplicationModel","initialState","ModularUIReducer","arguments","length","undefined","action","type","payload","exports"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\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  {\n    key,\n    status,\n    requestOptions,\n  }: {\n    key: string,\n    status: $Keys<typeof MODULARUI_STATUS>,\n    requestOptions: any,\n  },\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      requestOptions: requestOptions || state[key]?.requestOptions,\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  // eslint-disable-next-line no-console\n  console.debug(\"No model for setModel\");\n  return state;\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  // eslint-disable-next-line no-console\n  console.debug(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`,\n  );\n  return state;\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/ModularUIUtils.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useUrl = exports.useReload = exports.getKey = void 0;
+var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _react = require("react");
 var _utils = require("../../react/utils");
 var _Constants = require("../../constants/Constants");
@@ -23,6 +24,7 @@ const getUrl = (resource, props) => {
 /**
  */
 const useUrl = (resource, props) => {
+  var _context;
   const [previousUrl, setPreviousUrl] = (0, _react.useState)(null);
   const [previousExact, setPreviousExact] = (0, _react.useState)(false);
   const url = getUrl(resource, props);
@@ -45,7 +47,7 @@ const useUrl = (resource, props) => {
   // Always create an url when the match is exact
   // Or when the match is not exact AND the original match also was not exact
   // Or when the new start uri is different from the previous url --> different resource for same panel
-  if (match.isExact === true || previousExact === match.isExact || !previousUrl?.startsWith(match.url)) {
+  if (match.isExact === true || previousExact === match.isExact || !((_context = previousUrl) == null ? void 0 : Function.call.bind((0, _startsWith.default)(_context), _context))?.(match.url)) {
     setPreviousUrl(url);
     setPreviousExact(match.isExact);
     return url;

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIUtils.js","names":["_react","require","_utils","_Constants","_Href","_interopRequireDefault","getUrl","resource","props","url","Href","useUrl","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","equalsWithParameters","isExact","startsWith","exports","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function | Href, props: Object): Href => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url;\n  }\n\n  return new Href(url);\n};\n\n/**\n */\nexport const useUrl = (\n  resource: string | Function | Href,\n  props: Object,\n): Href => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  if (url == null && previousUrl == null) {\n    return new Href(\"\");\n  }\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  if (url.equalsWithParameters(previousUrl)) {\n    return previousUrl || url;\n  }\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url --> different resource for same panel\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    !previousUrl?.startsWith(match.url)\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl || new Href(\"\");\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAIA;AACA;AACA;AACA,MAAMK,MAAM,GAAGA,CAACC,QAAkC,EAAEC,KAAa,KAAW;EAC1E,MAAMC,GAAG,GAAG,OAAOF,QAAQ,KAAK,UAAU,GAAGA,QAAQ,CAACC,KAAK,CAAC,GAAGD,QAAQ;EAEvE,IAAIE,GAAG,YAAYC,aAAI,EAAE;IACvB,OAAOD,GAAG;EACZ;EAEA,OAAO,IAAIC,aAAI,CAACD,GAAG,CAAC;AACtB,CAAC;;AAED;AACA;AACO,MAAME,MAAM,GAAGA,CACpBJ,QAAkC,EAClCC,KAAa,KACJ;EACT,MAAM,CAACI,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAC,eAAQ,EAAC,IAAI,CAAC;EACpD,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAF,eAAQ,EAAC,KAAK,CAAC;EAEzD,MAAML,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,IAAIC,GAAG,IAAI,IAAI,IAAIG,WAAW,IAAI,IAAI,EAAE;IACtC,OAAO,IAAIF,aAAI,CAAC,EAAE,CAAC;EACrB;EAEA,MAAM;IAAEO;EAAM,CAAC,GAAGT,KAAK;;EAEvB;EACA;EACA,IAAI,CAACS,KAAK,EAAE;IACV,OAAOR,GAAG;EACZ;EAEA,IAAIA,GAAG,CAACS,oBAAoB,CAACN,WAAW,CAAC,EAAE;IACzC,OAAOA,WAAW,IAAIH,GAAG;EAC3B;;EAEA;EACA;EACA;EACA,IACEQ,KAAK,CAACE,OAAO,KAAK,IAAI,IACtBJ,aAAa,KAAKE,KAAK,CAACE,OAAO,IAC/B,CAACP,WAAW,EAAEQ,UAAU,CAACH,KAAK,CAACR,GAAG,CAAC,EACnC;IACAI,cAAc,CAACJ,GAAG,CAAC;IACnBO,gBAAgB,CAACC,KAAK,CAACE,OAAO,CAAC;IAE/B,OAAOV,GAAG;EACZ;EAEA,OAAOG,WAAW,IAAI,IAAIF,aAAI,CAAC,EAAE,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AAFAW,OAAA,CAAAV,MAAA,GAAAA,MAAA;AAGO,MAAMW,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZf,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAG,IAAAgB,qBAAc,EAACF,gBAAgB,EAAEC,IAAI,CAAC,IAAIf,GAAG,CAACiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAO,IAAAD,qBAAc,EAACF,gBAAgB,EAAEC,IAAI,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AAFAH,OAAA,CAAAC,MAAA,GAAAA,MAAA;AAGO,MAAMK,SAAS,GAAG,SAAAA,CAACC,UAAkB,EAAkC;EAAA,IAAhCC,MAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAC9D,IAAID,MAAM,GAAG,CAAC,EAAE;IACd,MAAMI,aAAa,GAAGL,UAAU,EAAEM,MAAM,KAAKC,2BAAgB,CAACC,QAAQ;IACtE,MAAMC,gBAAgB,GAAGT,UAAU,EAAES,gBAAgB,IAAI,CAAC;IAE1D,IAAIJ,aAAa,IAAII,gBAAgB,GAAGR,MAAM,EAAE;MAC9C,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC;AAACR,OAAA,CAAAM,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"file":"ModularUIUtils.js","names":["_react","require","_utils","_Constants","_Href","_interopRequireDefault","getUrl","resource","props","url","Href","useUrl","_context","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","equalsWithParameters","isExact","Function","call","bind","_startsWith","default","exports","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function | Href, props: Object): Href => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url;\n  }\n\n  return new Href(url);\n};\n\n/**\n */\nexport const useUrl = (\n  resource: string | Function | Href,\n  props: Object,\n): Href => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  if (url == null && previousUrl == null) {\n    return new Href(\"\");\n  }\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  if (url.equalsWithParameters(previousUrl)) {\n    return previousUrl || url;\n  }\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url --> different resource for same panel\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    !previousUrl?.startsWith(match.url)\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl || new Href(\"\");\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/_modularui/types.d.ts

@@ -77,6 +77,7 @@ type UpdateStatusAction = {
     payload: {
         key: string;
         status: $Keys<MODULARUI_STATUS>;
+        requestOptions: any;
     };
 };
 type ModularUIConnector = (Component: ComponentType<any>) => ComponentType<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    key: string,\n    origin?: string,\n    contextPath?: string,\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    params?: string,\n    data?: any,\n    timeout?: number,\n    headers?: {\n      [headerName: string]: string,\n      Accept?: string,\n      \"Accept-Language\"?: string,\n      \"Content-Type\"?: string,\n      \"x-filename\"?: string,\n      \"x-filesize\"?: string,\n    },\n    events?: { [eventName: string]: () => void },\n    onProgress?: ProgressEventHandler,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    isReload?: boolean,\n    withCredentials?: 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  +requestOptions?: any,\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    origin?: string,\n    contextPath?: string,\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    params?: string,\n    data?: any,\n    timeout?: number,\n    headers?: {\n      [headerName: string]: string,\n      Accept?: string,\n      \"Accept-Language\"?: string,\n      \"Content-Type\"?: string,\n      \"x-filename\"?: string,\n      \"x-filesize\"?: string,\n    },\n    events?: { [eventName: string]: () => void },\n    onProgress?: ProgressEventHandler,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    isReload?: boolean,\n    withCredentials?: 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    requestOptions: any,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.60.4",
+  "version": "1.60.6",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -68,7 +68,7 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.26.9",
+    "@babel/runtime-corejs3": "^7.27.0",
     "@date-fns/tz": "^1.2.0",
     "big.js": "^6.2.2",
     "date-fns": "^4.1.0",
@@ -76,7 +76,7 @@
     "dequal": "^2.0.3",
     "file-size": "^1.0.0",
     "format-message": "^6.2.4",
-    "html-entities": "^2.5.2",
+    "html-entities": "^2.6.0",
     "iban": "^0.0.14",
     "js-cookie": "^3.0.5",
     "klona": "^2.0.6",
@@ -86,62 +86,62 @@
     "timezone-soft": "^1.5.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.9",
-    "@babel/eslint-parser": "^7.26.8",
-    "@babel/eslint-plugin": "^7.25.9",
+    "@babel/cli": "^7.27.0",
+    "@babel/core": "^7.26.10",
+    "@babel/eslint-parser": "^7.27.0",
+    "@babel/eslint-plugin": "^7.27.0",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.26.9",
+    "@babel/plugin-transform-runtime": "^7.26.10",
     "@babel/preset-env": "^7.26.9",
     "@babel/preset-flow": "^7.25.9",
     "@babel/preset-react": "^7.26.3",
-    "@commitlint/cli": "^19.7.1",
-    "@commitlint/config-conventional": "^19.7.1",
+    "@commitlint/cli": "^19.8.0",
+    "@commitlint/config-conventional": "^19.8.0",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^16.3.0",
     "auditjs": "^4.0.46",
     "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
     "cherry-pick": "^0.5.0",
-    "commit-and-tag-version": "^12.5.0",
+    "commit-and-tag-version": "^12.5.1",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
     "eslint": "^8.57.0",
-    "eslint-config-prettier": "^10.0.2",
+    "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-jest": "^28.11.0",
-    "eslint-plugin-jsdoc": "^50.6.3",
-    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-jsdoc": "^50.6.9",
+    "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.9.0",
-    "hermes-eslint": "^0.26.0",
+    "hermes-eslint": "^0.28.0",
     "history": "^4.0.0",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
-    "jscodeshift": "^17.1.2",
-    "lint-staged": "^15.4.3",
+    "jscodeshift": "^17.3.0",
+    "lint-staged": "^15.5.1",
     "polished": "^4.0.0",
     "prettier": "^3.5.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "react-helmet-async": "^2.0.5",
     "react-redux": "^8.1.3",
     "react-router": "^5.0.0",
-    "react-test-renderer": "^19.0.0",
+    "react-test-renderer": "^19.1.0",
     "redux": "^4.2.1",
     "redux-mock-store": "^1.5.5",
     "redux-thunk": "^2.4.2",
     "rimraf": "^6.0.1",
     "styled-components": "^5.3.11",
-    "typescript": "^5.8.2",
+    "typescript": "^5.8.3",
     "xhr-mock": "^2.5.1"
   },
   "scarfSettings": {

package/src/redux/_modularui/ModularUIActions.js

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

package/src/redux/_modularui/ModularUIMiddleware.js

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

package/src/redux/_modularui/ModularUIReducer.js

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

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

@@ -72,7 +72,11 @@ describe("modularui actions", () => {
     expect(store.getActions()).toStrictEqual([
       {
         type: "MODULARUI/STATUS",
-        payload: { key: "application", status: MODULARUI_STATUS.LOADING },
+        payload: {
+          key: "application",
+          status: MODULARUI_STATUS.LOADING,
+          requestOptions: undefined,
+        },
       },
     ]);
   });

package/src/redux/_modularui/types.js

@@ -21,6 +21,7 @@ export type ModelEntry = {
   +status: string,
   +model: ModularUIModel,
   +lastModification: number,
+  +requestOptions?: any,
 };
 
 export type ModularUIState = {
@@ -111,6 +112,7 @@ export type UpdateStatusAction = {
   payload: {
     key: string,
     status: $Keys<MODULARUI_STATUS>,
+    requestOptions: any,
   },
 };