@beinformed/ui 1.57.0-contextpath.0 → 1.57.0

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

@@ -109,6 +109,7 @@ export const loadModel = (
 ): ModularUIAction => ({
   type: "MODULARUI/FETCH",
   payload: {
+    key,
     origin: options?.origin,
     contextPath: options?.contextPath,
     href:
@@ -129,7 +130,12 @@ export const loadModel = (
     /**
      */
     errorAction: (error) => {
-      const errorResponse = new ErrorResponse(error, key);
+      const errorResponse = new ErrorResponse(
+        error,
+        key,
+        options?.origin,
+        options?.contextPath,
+      );
       if (errorResponse.isChangePassword) {
         return {
           type: "NO_ACTION",
@@ -151,20 +157,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","origin","contextPath","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    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", options?.origin, options?.contextPath),\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","origin","contextPath","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    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", options?.origin, options?.contextPath),\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(\n        error,\n        key,\n        options?.origin,\n        options?.contextPath,\n      );\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.
  */
@@ -77,12 +78,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,
@@ -127,11 +128,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","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","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  origin?: string,\n  contextPath?: string,\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.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 { 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","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  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.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":[]}

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/ModularUISelectors.js

@@ -11,7 +11,6 @@ var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
-var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
 var _reselect = require("reselect");
 var _objects = require("../../utils/helpers/objects");
 var _Href = _interopRequireDefault(require("../../models/href/Href"));
@@ -21,6 +20,7 @@ var _ApplicationModel = _interopRequireDefault(require("../../models/application
 var _TabModel = _interopRequireDefault(require("../../models/tab/TabModel"));
 var _CaseViewModel = _interopRequireDefault(require("../../models/caseview/CaseViewModel"));
 var _FormModel = _interopRequireDefault(require("../../models/form/FormModel"));
+var _constants = require("../../constants");
 /**
  */
 const getAllModelsByInstance = (state, instance) => {
@@ -260,12 +260,11 @@ const getModelsByType = (state, type) => {
 /**
  */
 exports.getModelsByType = getModelsByType;
-const getAllFinishedModels = state => {
-  if (state && state.modularui) {
+const getAllFinishedModels = exports.getAllFinishedModels = (0, _reselect.createSelector)(state => state.modularui, modularui => {
+  if (modularui) {
     var _context10, _context11;
-    return (0, _map.default)(_context10 = (0, _filter.default)(_context11 = (0, _values.default)(state.modularui)).call(_context11, entry => entry.status === "FINISHED")).call(_context10, entry => entry.model);
+    return (0, _map.default)(_context10 = (0, _filter.default)(_context11 = (0, _keys.default)(modularui)).call(_context11, key => modularui[key] && modularui[key].status === _constants.MODULARUI_STATUS.FINISHED)).call(_context10, key => modularui[key].model);
   }
   return [];
-};
-exports.getAllFinishedModels = getAllFinishedModels;
+});
 //# sourceMappingURL=ModularUISelectors.js.map

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

@@ -1,5 +1,9 @@
 // @flow
-import { createSelectorCreator, defaultMemoize } from "reselect";
+import {
+  createSelector,
+  createSelectorCreator,
+  defaultMemoize,
+} from "reselect";
 import { has } from "../../utils/helpers/objects";
 
 import Href from "../../models/href/Href";
@@ -12,6 +16,7 @@ import FormModel from "../../models/form/FormModel";
 
 import type { ReduxState, PreferenceValue } from "../types";
 import type { ModularUIModel } from "../../models/types";
+import { MODULARUI_STATUS } from "../../constants";
 
 /**
  */
@@ -298,13 +303,20 @@ export const getModelsByType = (
 
 /**
  */
-export const getAllFinishedModels = (
+export const getAllFinishedModels: (
   state: ReduxState,
-): Array<ModularUIModel> => {
-  if (state && state.modularui) {
-    return Object.values(state.modularui)
-      .filter((entry) => entry.status === "FINISHED")
-      .map((entry) => entry.model);
-  }
-  return [];
-};
+) => Array<ModularUIModel> = createSelector(
+  (state: ReduxState) => state.modularui,
+  (modularui): Array<ModularUIModel> => {
+    if (modularui) {
+      return Object.keys(modularui)
+        .filter(
+          (key) =>
+            modularui[key] &&
+            modularui[key].status === MODULARUI_STATUS.FINISHED,
+        )
+        .map((key) => modularui[key].model);
+    }
+    return [];
+  },
+);

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUISelectors.js","names":["_reselect","require","_objects","_Href","_interopRequireDefault","_ContentModel","_ContentTOCModel","_ApplicationModel","_TabModel","_CaseViewModel","_FormModel","getAllModelsByInstance","state","instance","locale","i18n","modularui","_context","_context2","_map","default","_filter","_keys","call","key","model","exports","getFirstModelByInstance","_context3","_find","getActiveModelByInstance","location","getLocation","_context4","_startsWith","selfhref","path","getApplication","ApplicationModel","getTab","TabModel","getCaseView","CaseViewModel","getForm","FormModel","modelByHref","href","_context5","findHref","Href","modelConfigKey","equals","keyByHref","_context6","allKeysByHref","_context7","router","pathname","getModels","models","forEach","modelKey","modelEntry","has","label","type","modelInfo","selfContentLink","ContentModel","ContentTOCModel","push","getActiveModels","createSelectorCreator","defaultMemoize","value","other","_stringify","contextModels","locationParts","split","reduce","accumulator","current","comparePath","decodeURIComponent","replace","foundEntry","encodedHref","toString","getPreference","preferenceName","preferences","getModelsByType","_context8","_context9","getAllFinishedModels","_context10","_context11","_values","entry","status"],"sources":["../../../src/redux/_modularui/ModularUISelectors.js"],"sourcesContent":["// @flow\nimport { createSelectorCreator, defaultMemoize } from \"reselect\";\nimport { has } from \"../../utils/helpers/objects\";\n\nimport Href from \"../../models/href/Href\";\nimport ContentModel from \"../../models/content/ContentModel\";\nimport ContentTOCModel from \"../../models/content/ContentTOCModel\";\nimport ApplicationModel from \"../../models/application/ApplicationModel\";\nimport TabModel from \"../../models/tab/TabModel\";\nimport CaseViewModel from \"../../models/caseview/CaseViewModel\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ReduxState, PreferenceValue } from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\n\n/**\n */\nexport const getAllModelsByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): Array<ModularUIModel> => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    return Object.keys(modularui)\n      .filter((key) => {\n        const { model } = modularui[key];\n        return model instanceof instance && model.locale === locale;\n      })\n      .map((key) => modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getFirstModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return model instanceof instance && model.locale === locale;\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n */\nexport const getActiveModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const location = getLocation(state);\n\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return (\n        model instanceof instance &&\n        model.locale === locale &&\n        location.startsWith(model.selfhref.path)\n      );\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n * Get the application model, which is the model with selfhref '/'\n */\nexport const getApplication = (state: ReduxState): null | ApplicationModel =>\n  getFirstModelByInstance(state, ApplicationModel);\n\n/**\n */\nexport const getTab = (state: ReduxState): null | TabModel =>\n  getFirstModelByInstance(state, TabModel);\n\n/**\n */\nexport const getCaseView = (state: ReduxState): null | CaseViewModel =>\n  getFirstModelByInstance(state, CaseViewModel);\n\n/**\n */\nexport const getForm = (state: ReduxState): null | FormModel =>\n  getFirstModelByInstance(state, FormModel);\n\n/**\n * Get the model by it's href\n */\nexport const modelByHref = (\n  state: ReduxState,\n  href: Href | string,\n): null | ModularUIModel => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    const modelConfigKey = Object.keys(state.modularui).find((key) => {\n      const model = state.modularui[key];\n\n      return (\n        model.model &&\n        model.model.selfhref &&\n        model.model.selfhref.equals(findHref)\n      );\n    });\n\n    if (modelConfigKey) {\n      return state.modularui[modelConfigKey].model;\n    }\n  }\n\n  return null;\n};\n\n/**\n * Return the key of a model by the selfhref the model is saved in the reducer\n */\nexport const keyByHref = (state: ReduxState, href: Href | string): ?string => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).find((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return null;\n};\n\n/**\n * Returns all model keys found in the store, restrict on href\n */\nexport const allKeysByHref = (\n  state: ReduxState,\n  href: Href | string,\n): Array<string> => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).filter((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return [];\n};\n\n/**\n */\nconst getLocation = (state: ReduxState): string =>\n  state?.router?.location.pathname;\n\n/**\n */\nconst getModels = (state: ReduxState) => {\n  const models = [];\n\n  Object.keys(state.modularui).forEach((modelKey: string) => {\n    const modelEntry = state.modularui[modelKey];\n\n    if (has(modelEntry, \"model\")) {\n      const { key, selfhref, label, type } = modelEntry.model;\n\n      const modelInfo = {\n        key,\n        selfhref,\n        label,\n        type,\n        selfContentLink: null,\n      };\n\n      if (\n        modelEntry.model instanceof ContentModel ||\n        modelEntry.model instanceof ContentTOCModel\n      ) {\n        models.push({\n          ...modelInfo,\n          selfContentLink: modelEntry.model.selfContentLink,\n        });\n      } else {\n        models.push(modelInfo);\n      }\n    }\n  });\n\n  return models;\n};\n\nexport const getActiveModels: (state: ReduxState) => Array<{\n  key: string,\n  href: Href,\n  label: string,\n  type: string,\n}> = createSelectorCreator(\n  defaultMemoize,\n  (value, other) => JSON.stringify(value) === JSON.stringify(other),\n)([getLocation, getModels], (location, models) => {\n  const contextModels = [];\n\n  if (location) {\n    const locationParts = location.split(\"/\");\n\n    locationParts.reduce((accumulator, current) => {\n      const path = `${accumulator}/${current}`;\n\n      // Remove modelcatalog part to match breadcrumb parts\n      const comparePath = decodeURIComponent(path).replace(\n        \"/modelcatalog/\",\n        \"/\",\n      );\n\n      const foundEntry = models.find(\n        (model) => model.selfhref && model.selfhref.equals(comparePath),\n      );\n\n      if (foundEntry) {\n        const { key, label, type, selfhref, selfContentLink } = foundEntry;\n\n        const href =\n          path.startsWith(\"/modelcatalog/\") && selfContentLink\n            ? new Href(`/modelcatalog${selfContentLink.encodedHref.toString()}`)\n            : selfhref;\n\n        contextModels.push({ key, href, label, type });\n      }\n\n      return path;\n    });\n  }\n\n  return contextModels;\n});\n\n/**\n */\nexport const getPreference = (\n  state: ReduxState,\n  preferenceName: string,\n): null | PreferenceValue => {\n  if (state && state.preferences) {\n    return state.preferences[preferenceName];\n  }\n\n  return null;\n};\n\n/**\n * @deprecated - Use getFirstModelByInstance or the appropriate getter for the model type: getApplication, getTab, etc\n */\nexport const getModelsByType = (\n  state: ReduxState,\n  type: string,\n): Array<ModularUIModel> => {\n  if (state && state.modularui) {\n    return Object.keys(state.modularui)\n      .filter(\n        (key) =>\n          state.modularui[key] &&\n          state.modularui[key].model &&\n          state.modularui[key].model.type === type,\n      )\n      .map((key) => state.modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getAllFinishedModels = (\n  state: ReduxState,\n): Array<ModularUIModel> => {\n  if (state && state.modularui) {\n    return Object.values(state.modularui)\n      .filter((entry) => entry.status === \"FINISHED\")\n      .map((entry) => entry.model);\n  }\n  return [];\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUISelectors.js","names":["_reselect","require","_objects","_Href","_interopRequireDefault","_ContentModel","_ContentTOCModel","_ApplicationModel","_TabModel","_CaseViewModel","_FormModel","_constants","getAllModelsByInstance","state","instance","locale","i18n","modularui","_context","_context2","_map","default","_filter","_keys","call","key","model","exports","getFirstModelByInstance","_context3","_find","getActiveModelByInstance","location","getLocation","_context4","_startsWith","selfhref","path","getApplication","ApplicationModel","getTab","TabModel","getCaseView","CaseViewModel","getForm","FormModel","modelByHref","href","_context5","findHref","Href","modelConfigKey","equals","keyByHref","_context6","allKeysByHref","_context7","router","pathname","getModels","models","forEach","modelKey","modelEntry","has","label","type","modelInfo","selfContentLink","ContentModel","ContentTOCModel","push","getActiveModels","createSelectorCreator","defaultMemoize","value","other","_stringify","contextModels","locationParts","split","reduce","accumulator","current","comparePath","decodeURIComponent","replace","foundEntry","encodedHref","toString","getPreference","preferenceName","preferences","getModelsByType","_context8","_context9","getAllFinishedModels","createSelector","_context10","_context11","status","MODULARUI_STATUS","FINISHED"],"sources":["../../../src/redux/_modularui/ModularUISelectors.js"],"sourcesContent":["// @flow\nimport {\n  createSelector,\n  createSelectorCreator,\n  defaultMemoize,\n} from \"reselect\";\nimport { has } from \"../../utils/helpers/objects\";\n\nimport Href from \"../../models/href/Href\";\nimport ContentModel from \"../../models/content/ContentModel\";\nimport ContentTOCModel from \"../../models/content/ContentTOCModel\";\nimport ApplicationModel from \"../../models/application/ApplicationModel\";\nimport TabModel from \"../../models/tab/TabModel\";\nimport CaseViewModel from \"../../models/caseview/CaseViewModel\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ReduxState, PreferenceValue } from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport { MODULARUI_STATUS } from \"../../constants\";\n\n/**\n */\nexport const getAllModelsByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): Array<ModularUIModel> => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    return Object.keys(modularui)\n      .filter((key) => {\n        const { model } = modularui[key];\n        return model instanceof instance && model.locale === locale;\n      })\n      .map((key) => modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getFirstModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return model instanceof instance && model.locale === locale;\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n */\nexport const getActiveModelByInstance = <T>(\n  state: ReduxState,\n  instance: Class<T>,\n): T | null => {\n  const location = getLocation(state);\n\n  const locale = state?.i18n?.locale || \"en\";\n  const modularui = state?.modularui;\n\n  if (modularui) {\n    const key = Object.keys(modularui).find((key) => {\n      const { model } = modularui[key];\n      return (\n        model instanceof instance &&\n        model.locale === locale &&\n        location.startsWith(model.selfhref.path)\n      );\n    });\n\n    if (key) {\n      const { model } = modularui[key];\n      if (model instanceof instance) {\n        return model;\n      }\n    }\n  }\n\n  return null;\n};\n\n/**\n * Get the application model, which is the model with selfhref '/'\n */\nexport const getApplication = (state: ReduxState): null | ApplicationModel =>\n  getFirstModelByInstance(state, ApplicationModel);\n\n/**\n */\nexport const getTab = (state: ReduxState): null | TabModel =>\n  getFirstModelByInstance(state, TabModel);\n\n/**\n */\nexport const getCaseView = (state: ReduxState): null | CaseViewModel =>\n  getFirstModelByInstance(state, CaseViewModel);\n\n/**\n */\nexport const getForm = (state: ReduxState): null | FormModel =>\n  getFirstModelByInstance(state, FormModel);\n\n/**\n * Get the model by it's href\n */\nexport const modelByHref = (\n  state: ReduxState,\n  href: Href | string,\n): null | ModularUIModel => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    const modelConfigKey = Object.keys(state.modularui).find((key) => {\n      const model = state.modularui[key];\n\n      return (\n        model.model &&\n        model.model.selfhref &&\n        model.model.selfhref.equals(findHref)\n      );\n    });\n\n    if (modelConfigKey) {\n      return state.modularui[modelConfigKey].model;\n    }\n  }\n\n  return null;\n};\n\n/**\n * Return the key of a model by the selfhref the model is saved in the reducer\n */\nexport const keyByHref = (state: ReduxState, href: Href | string): ?string => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).find((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return null;\n};\n\n/**\n * Returns all model keys found in the store, restrict on href\n */\nexport const allKeysByHref = (\n  state: ReduxState,\n  href: Href | string,\n): Array<string> => {\n  if (state && state.modularui) {\n    const findHref = href instanceof Href ? href : new Href(href);\n\n    return Object.keys(state.modularui).filter((key) => {\n      const { model } = state.modularui[key];\n      return model && model.selfhref && model.selfhref.equals(findHref);\n    });\n  }\n\n  return [];\n};\n\n/**\n */\nconst getLocation = (state: ReduxState): string =>\n  state?.router?.location.pathname;\n\n/**\n */\nconst getModels = (state: ReduxState) => {\n  const models = [];\n\n  Object.keys(state.modularui).forEach((modelKey: string) => {\n    const modelEntry = state.modularui[modelKey];\n\n    if (has(modelEntry, \"model\")) {\n      const { key, selfhref, label, type } = modelEntry.model;\n\n      const modelInfo = {\n        key,\n        selfhref,\n        label,\n        type,\n        selfContentLink: null,\n      };\n\n      if (\n        modelEntry.model instanceof ContentModel ||\n        modelEntry.model instanceof ContentTOCModel\n      ) {\n        models.push({\n          ...modelInfo,\n          selfContentLink: modelEntry.model.selfContentLink,\n        });\n      } else {\n        models.push(modelInfo);\n      }\n    }\n  });\n\n  return models;\n};\n\nexport const getActiveModels: (state: ReduxState) => Array<{\n  key: string,\n  href: Href,\n  label: string,\n  type: string,\n}> = createSelectorCreator(\n  defaultMemoize,\n  (value, other) => JSON.stringify(value) === JSON.stringify(other),\n)([getLocation, getModels], (location, models) => {\n  const contextModels = [];\n\n  if (location) {\n    const locationParts = location.split(\"/\");\n\n    locationParts.reduce((accumulator, current) => {\n      const path = `${accumulator}/${current}`;\n\n      // Remove modelcatalog part to match breadcrumb parts\n      const comparePath = decodeURIComponent(path).replace(\n        \"/modelcatalog/\",\n        \"/\",\n      );\n\n      const foundEntry = models.find(\n        (model) => model.selfhref && model.selfhref.equals(comparePath),\n      );\n\n      if (foundEntry) {\n        const { key, label, type, selfhref, selfContentLink } = foundEntry;\n\n        const href =\n          path.startsWith(\"/modelcatalog/\") && selfContentLink\n            ? new Href(`/modelcatalog${selfContentLink.encodedHref.toString()}`)\n            : selfhref;\n\n        contextModels.push({ key, href, label, type });\n      }\n\n      return path;\n    });\n  }\n\n  return contextModels;\n});\n\n/**\n */\nexport const getPreference = (\n  state: ReduxState,\n  preferenceName: string,\n): null | PreferenceValue => {\n  if (state && state.preferences) {\n    return state.preferences[preferenceName];\n  }\n\n  return null;\n};\n\n/**\n * @deprecated - Use getFirstModelByInstance or the appropriate getter for the model type: getApplication, getTab, etc\n */\nexport const getModelsByType = (\n  state: ReduxState,\n  type: string,\n): Array<ModularUIModel> => {\n  if (state && state.modularui) {\n    return Object.keys(state.modularui)\n      .filter(\n        (key) =>\n          state.modularui[key] &&\n          state.modularui[key].model &&\n          state.modularui[key].model.type === type,\n      )\n      .map((key) => state.modularui[key].model);\n  }\n\n  return [];\n};\n\n/**\n */\nexport const getAllFinishedModels: (\n  state: ReduxState,\n) => Array<ModularUIModel> = createSelector(\n  (state: ReduxState) => state.modularui,\n  (modularui): Array<ModularUIModel> => {\n    if (modularui) {\n      return Object.keys(modularui)\n        .filter(\n          (key) =>\n            modularui[key] &&\n            modularui[key].status === MODULARUI_STATUS.FINISHED,\n        )\n        .map((key) => modularui[key].model);\n    }\n    return [];\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,
     origin?: string,
     contextPath?: string,
     href: Href,

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    origin?: string,\n    contextPath?: 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":[]}
+{"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    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/Application.js

@@ -11,14 +11,19 @@ var _i18n = require("../selectors/i18n");
 /**
  */
 const reloadApplication = () => (dispatch, getState) => {
-  const allKeys = (0, _ModularUISelectors.allKeysByHref)(getState(), "/");
+  const state = getState();
+  let applicationHref = new _models.Href("/", "Application");
+  const application = (0, _ModularUISelectors.getApplication)(state);
+  if (application) {
+    applicationHref.contextPath = application.contextPath;
+    applicationHref.origin = application.origin;
+  }
+  const allKeys = (0, _ModularUISelectors.allKeysByHref)(state, applicationHref);
   for (const key of allKeys) {
     dispatch((0, _ModularUIActions.removeModelByKey)(key));
   }
-
-  // TODO SBO: origin and context
-  const modelKey = `application(/)(${(0, _i18n.getLocale)(getState())})`;
-  return dispatch((0, _ModularUIActions.loadModularUI)(modelKey, new _models.Href("/", "Application"), {
+  const modelKey = `application(/)(${(0, _i18n.getLocale)(state)})`;
+  return dispatch((0, _ModularUIActions.loadModularUI)(modelKey, applicationHref, {
     targetModel: _models.ApplicationModel
   }));
 };

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

@@ -3,7 +3,10 @@ import {
   loadModularUI,
   removeModelByKey,
 } from "../_modularui/ModularUIActions";
-import { allKeysByHref } from "../_modularui/ModularUISelectors";
+import {
+  allKeysByHref,
+  getApplication,
+} from "../_modularui/ModularUISelectors";
 import { ApplicationModel, Href } from "../../models";
 import { getLocale } from "../selectors/i18n";
 
@@ -13,15 +16,23 @@ import type { Dispatch, GetState, ThunkAction } from "../types";
  */
 export const reloadApplication =
   (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {
-    const allKeys = allKeysByHref(getState(), "/");
+    const state = getState();
+
+    let applicationHref = new Href("/", "Application");
+    const application = getApplication(state);
+    if (application) {
+      applicationHref.contextPath = application.contextPath;
+      applicationHref.origin = application.origin;
+    }
+
+    const allKeys = allKeysByHref(state, applicationHref);
     for (const key of allKeys) {
       dispatch(removeModelByKey(key));
     }
 
-    // TODO SBO: origin and context
-    const modelKey = `application(/)(${getLocale(getState())})`;
+    const modelKey = `application(/)(${getLocale(state)})`;
     return dispatch(
-      loadModularUI(modelKey, new Href("/", "Application"), {
+      loadModularUI(modelKey, applicationHref, {
         targetModel: ApplicationModel,
       }),
     );

package/lib/redux/actions/Application.js.map

@@ -1 +1 @@
-{"version":3,"file":"Application.js","names":["_ModularUIActions","require","_ModularUISelectors","_models","_i18n","reloadApplication","dispatch","getState","allKeys","allKeysByHref","key","removeModelByKey","modelKey","getLocale","loadModularUI","Href","targetModel","ApplicationModel","exports"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../_modularui/ModularUIActions\";\nimport { allKeysByHref } from \"../_modularui/ModularUISelectors\";\nimport { ApplicationModel, Href } from \"../../models\";\nimport { getLocale } from \"../selectors/i18n\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    const allKeys = allKeysByHref(getState(), \"/\");\n    for (const key of allKeys) {\n      dispatch(removeModelByKey(key));\n    }\n\n    // TODO SBO: origin and context\n    const modelKey = `application(/)(${getLocale(getState())})`;\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      }),\n    );\n  };\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAIA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAIA;AACA;AACO,MAAMI,iBAAiB,GAC5BA,CAAA,KAAmB,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC7D,MAAMC,OAAO,GAAG,IAAAC,iCAAa,EAACF,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;EAC9C,KAAK,MAAMG,GAAG,IAAIF,OAAO,EAAE;IACzBF,QAAQ,CAAC,IAAAK,kCAAgB,EAACD,GAAG,CAAC,CAAC;EACjC;;EAEA;EACA,MAAME,QAAQ,GAAG,kBAAkB,IAAAC,eAAS,EAACN,QAAQ,CAAC,CAAC,CAAC,GAAG;EAC3D,OAAOD,QAAQ,CACb,IAAAQ,+BAAa,EAACF,QAAQ,EAAE,IAAIG,YAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE;IACpDC,WAAW,EAAEC;EACf,CAAC,CACH,CAAC;AACH,CAAC;AAACC,OAAA,CAAAb,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"file":"Application.js","names":["_ModularUIActions","require","_ModularUISelectors","_models","_i18n","reloadApplication","dispatch","getState","state","applicationHref","Href","application","getApplication","contextPath","origin","allKeys","allKeysByHref","key","removeModelByKey","modelKey","getLocale","loadModularUI","targetModel","ApplicationModel","exports"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../_modularui/ModularUIActions\";\nimport {\n  allKeysByHref,\n  getApplication,\n} from \"../_modularui/ModularUISelectors\";\nimport { ApplicationModel, Href } from \"../../models\";\nimport { getLocale } from \"../selectors/i18n\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    const state = getState();\n\n    let applicationHref = new Href(\"/\", \"Application\");\n    const application = getApplication(state);\n    if (application) {\n      applicationHref.contextPath = application.contextPath;\n      applicationHref.origin = application.origin;\n    }\n\n    const allKeys = allKeysByHref(state, applicationHref);\n    for (const key of allKeys) {\n      dispatch(removeModelByKey(key));\n    }\n\n    const modelKey = `application(/)(${getLocale(state)})`;\n    return dispatch(\n      loadModularUI(modelKey, applicationHref, {\n        targetModel: ApplicationModel,\n      }),\n    );\n  };\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAIA,IAAAC,mBAAA,GAAAD,OAAA;AAIA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAIA;AACA;AACO,MAAMI,iBAAiB,GAC5BA,CAAA,KAAmB,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC7D,MAAMC,KAAK,GAAGD,QAAQ,CAAC,CAAC;EAExB,IAAIE,eAAe,GAAG,IAAIC,YAAI,CAAC,GAAG,EAAE,aAAa,CAAC;EAClD,MAAMC,WAAW,GAAG,IAAAC,kCAAc,EAACJ,KAAK,CAAC;EACzC,IAAIG,WAAW,EAAE;IACfF,eAAe,CAACI,WAAW,GAAGF,WAAW,CAACE,WAAW;IACrDJ,eAAe,CAACK,MAAM,GAAGH,WAAW,CAACG,MAAM;EAC7C;EAEA,MAAMC,OAAO,GAAG,IAAAC,iCAAa,EAACR,KAAK,EAAEC,eAAe,CAAC;EACrD,KAAK,MAAMQ,GAAG,IAAIF,OAAO,EAAE;IACzBT,QAAQ,CAAC,IAAAY,kCAAgB,EAACD,GAAG,CAAC,CAAC;EACjC;EAEA,MAAME,QAAQ,GAAG,kBAAkB,IAAAC,eAAS,EAACZ,KAAK,CAAC,GAAG;EACtD,OAAOF,QAAQ,CACb,IAAAe,+BAAa,EAACF,QAAQ,EAAEV,eAAe,EAAE;IACvCa,WAAW,EAAEC;EACf,CAAC,CACH,CAAC;AACH,CAAC;AAACC,OAAA,CAAAnB,iBAAA,GAAAA,iBAAA","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",
       },