@beinformed/ui 1.57.0-contextpath.0 → 1.57.0

package/esm/modularui/UploadRequest.js

@@ -1,18 +1,22 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
-import { getUploadPath, HTTP_METHODS } from "../constants";
+import { getBasePath, getUploadPath, HTTP_METHODS } from "../constants";
 import xhr from "../utils/fetch/xhr";
 import ErrorModel from "../models/error/ErrorModel";
 /**
  * Upload a file to the upload file service of Be Informed
  */
 class UploadRequest {
-  constructor(uploadConstraints, progressHandler) {
+  constructor(uploadConstraints, progressHandler, options) {
     _defineProperty(this, "_uploadConstraints", void 0);
     _defineProperty(this, "_progressHandler", void 0);
+    _defineProperty(this, "_origin", "");
+    _defineProperty(this, "_contextPath", getBasePath());
     this._uploadConstraints = uploadConstraints;
     this._progressHandler = progressHandler;
+    this._origin = options?.origin || "";
+    this._contextPath = options?.contextPath || getBasePath();
   }
 
   /**
@@ -64,7 +68,7 @@ class UploadRequest {
       }, true));
     }
     return xhr({
-      url: getUploadPath(),
+      url: getUploadPath(this._contextPath, this._origin),
       method: HTTP_METHODS.POST,
       headers: {
         "Content-Type": file.type,

package/esm/modularui/UploadRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"UploadRequest.js","names":["getUploadPath","HTTP_METHODS","xhr","ErrorModel","UploadRequest","constructor","uploadConstraints","progressHandler","_defineProperty","_uploadConstraints","_progressHandler","getFileExtension","file","name","split","pop","toLowerCase","isNotAllowedFileType","allowedFileTypes","fileTypes","length","fileExtension","some","fileType","_context","_includesInstanceProperty","extensions","call","exceedsMaxFileSize","maxFileSize","fileSize","size","uploadFile","error","_Promise","reject","extension","join","url","method","POST","headers","type","encodeURIComponent","toString","onProgress","e","lengthComputable","progress","Math","ceil","loaded","total","data","then","response","token"],"sources":["../../src/modularui/UploadRequest.js"],"sourcesContent":["// @flow\nimport { getUploadPath, HTTP_METHODS } from \"../constants\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport type {\n  FilesizeConstraintsType,\n  FiletypeConstraintsType,\n} from \"../models\";\nimport ErrorModel from \"../models/error/ErrorModel\";\n\ntype ProgressHandler = (file: File, uploadInfo: Object) => void;\n\ntype UploadResponse = {\n  token: string,\n};\n\n/**\n * Upload a file to the upload file service of Be Informed\n */\nclass UploadRequest {\n  _uploadConstraints: {\n    fileTypes: FiletypeConstraintsType,\n    maxFileSize: FilesizeConstraintsType,\n    acceptedFiles: Array<string>,\n  };\n  _progressHandler: ProgressHandler;\n\n  constructor(\n    uploadConstraints: {\n      fileTypes: FiletypeConstraintsType,\n      maxFileSize: FilesizeConstraintsType,\n      acceptedFiles: Array<string>,\n    },\n    progressHandler: ProgressHandler,\n  ) {\n    this._uploadConstraints = uploadConstraints;\n    this._progressHandler = progressHandler;\n  }\n\n  /**\n   */\n  getFileExtension(file: File): string {\n    return file.name.split(\".\").pop().toLowerCase();\n  }\n\n  /**\n   */\n  isNotAllowedFileType(file: File): boolean {\n    const allowedFileTypes = this._uploadConstraints.fileTypes;\n\n    if (allowedFileTypes.length > 0) {\n      const fileExtension = this.getFileExtension(file);\n\n      return !allowedFileTypes.some((fileType) =>\n        fileType.extensions.includes(fileExtension),\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  exceedsMaxFileSize(file: File): boolean {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n    return maxFileSize > -1 && file.size > maxFileSize;\n  }\n\n  /**\n   */\n  uploadFile(file: File): Promise<UploadResponse> {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n\n    if (this.exceedsMaxFileSize(file)) {\n      this._progressHandler(file, { error: \"errorExceedsMaxFileSize\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.MaxFileSizeExceeded\",\n          \"Maximum file upload size is ${max-filesize}\",\n          {\n            \"max-filesize\": maxFileSize,\n          },\n          true,\n        ),\n      );\n    }\n\n    if (this.isNotAllowedFileType(file)) {\n      this._progressHandler(file, { error: \"errorExtensionNotAllowed\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.InvalidExtension\",\n          \"Allowed extensions are: ${extensions}\",\n          {\n            extension: this.getFileExtension(file),\n            extensions: this._uploadConstraints.fileTypes.join(\", \"),\n          },\n          true,\n        ),\n      );\n    }\n\n    return xhr({\n      url: getUploadPath(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        \"Content-Type\": file.type,\n        \"x-filename\": encodeURIComponent(file.name),\n        \"x-filesize\": file.size.toString(),\n      },\n      onProgress: (e: ProgressEvent) => {\n        if (this._progressHandler && e.lengthComputable) {\n          this._progressHandler(file, {\n            progress: Math.ceil((e.loaded / e.total) * 100),\n          });\n        }\n      },\n      data: file,\n    }).then((response) => {\n      this._progressHandler(file, { progress: 100, token: response.token });\n      return response;\n    });\n  }\n}\n\nexport default UploadRequest;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"UploadRequest.js","names":["getBasePath","getUploadPath","HTTP_METHODS","xhr","ErrorModel","UploadRequest","constructor","uploadConstraints","progressHandler","options","_defineProperty","_uploadConstraints","_progressHandler","_origin","origin","_contextPath","contextPath","getFileExtension","file","name","split","pop","toLowerCase","isNotAllowedFileType","allowedFileTypes","fileTypes","length","fileExtension","some","fileType","_context","_includesInstanceProperty","extensions","call","exceedsMaxFileSize","maxFileSize","fileSize","size","uploadFile","error","_Promise","reject","extension","join","url","method","POST","headers","type","encodeURIComponent","toString","onProgress","e","lengthComputable","progress","Math","ceil","loaded","total","data","then","response","token"],"sources":["../../src/modularui/UploadRequest.js"],"sourcesContent":["// @flow\nimport { getBasePath, getUploadPath, HTTP_METHODS } from \"../constants\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport type {\n  FilesizeConstraintsType,\n  FiletypeConstraintsType,\n} from \"../models\";\nimport ErrorModel from \"../models/error/ErrorModel\";\n\ntype ProgressHandler = (file: File, uploadInfo: Object) => void;\n\ntype UploadRequestOptions = {\n  origin?: string,\n  contextPath?: string,\n};\n\ntype UploadResponse = {\n  token: string,\n};\n\n/**\n * Upload a file to the upload file service of Be Informed\n */\nclass UploadRequest {\n  _uploadConstraints: {\n    fileTypes: FiletypeConstraintsType,\n    maxFileSize: FilesizeConstraintsType,\n    acceptedFiles: Array<string>,\n  };\n  _progressHandler: ProgressHandler;\n  _origin: string = \"\";\n  _contextPath: string = getBasePath();\n\n  constructor(\n    uploadConstraints: {\n      fileTypes: FiletypeConstraintsType,\n      maxFileSize: FilesizeConstraintsType,\n      acceptedFiles: Array<string>,\n    },\n    progressHandler: ProgressHandler,\n    options?: UploadRequestOptions,\n  ) {\n    this._uploadConstraints = uploadConstraints;\n    this._progressHandler = progressHandler;\n    this._origin = options?.origin || \"\";\n    this._contextPath = options?.contextPath || getBasePath();\n  }\n\n  /**\n   */\n  getFileExtension(file: File): string {\n    return file.name.split(\".\").pop().toLowerCase();\n  }\n\n  /**\n   */\n  isNotAllowedFileType(file: File): boolean {\n    const allowedFileTypes = this._uploadConstraints.fileTypes;\n\n    if (allowedFileTypes.length > 0) {\n      const fileExtension = this.getFileExtension(file);\n\n      return !allowedFileTypes.some((fileType) =>\n        fileType.extensions.includes(fileExtension),\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  exceedsMaxFileSize(file: File): boolean {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n    return maxFileSize > -1 && file.size > maxFileSize;\n  }\n\n  /**\n   */\n  uploadFile(file: File): Promise<UploadResponse> {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n\n    if (this.exceedsMaxFileSize(file)) {\n      this._progressHandler(file, { error: \"errorExceedsMaxFileSize\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.MaxFileSizeExceeded\",\n          \"Maximum file upload size is ${max-filesize}\",\n          {\n            \"max-filesize\": maxFileSize,\n          },\n          true,\n        ),\n      );\n    }\n\n    if (this.isNotAllowedFileType(file)) {\n      this._progressHandler(file, { error: \"errorExtensionNotAllowed\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.InvalidExtension\",\n          \"Allowed extensions are: ${extensions}\",\n          {\n            extension: this.getFileExtension(file),\n            extensions: this._uploadConstraints.fileTypes.join(\", \"),\n          },\n          true,\n        ),\n      );\n    }\n\n    return xhr({\n      url: getUploadPath(this._contextPath, this._origin),\n      method: HTTP_METHODS.POST,\n      headers: {\n        \"Content-Type\": file.type,\n        \"x-filename\": encodeURIComponent(file.name),\n        \"x-filesize\": file.size.toString(),\n      },\n      onProgress: (e: ProgressEvent) => {\n        if (this._progressHandler && e.lengthComputable) {\n          this._progressHandler(file, {\n            progress: Math.ceil((e.loaded / e.total) * 100),\n          });\n        }\n      },\n      data: file,\n    }).then((response) => {\n      this._progressHandler(file, { progress: 100, token: response.token });\n      return response;\n    });\n  }\n}\n\nexport default UploadRequest;\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIActions.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIActions.js","names":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","origin","contextPath","method","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","dispatch","LOADING","loadModelPromise","_Promise","resolve","then","response","FINISHED","catch","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    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":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","origin","contextPath","method","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","dispatch","getState","modularuiStore","modularui","LOADING","loadModelPromise","_Promise","resolve","then","catch","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key,\n    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/esm/redux/_modularui/ModularUIMiddleware.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIMiddleware.js","names":["ModularUIRequest","HTTP_METHODS","startProgress","finishProgress","handleError","createRequest","modularui","request","href","method","GET","data","locale","childmodels","isReload","cache","origin","contextPath","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_Promise","then","result","catch","error","Error","errorHandler","errorAction","err","errorResult","handleFetch","action","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  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":";AACA,OAAOA,gBAAgB,MAAM,kCAAkC;AAC/D,SAASC,YAAY,QAAQ,2BAA2B;AAExD,SAASC,aAAa,EAAEC,cAAc,QAAQ,8BAA8B;AAE5E,SAASC,WAAW,QAAQ,kBAAkB;AA4B9C;AACA;AACA;AACA,MAAMC,aAAa,GAAIC,SAAyB,IAAuB;EACrE,MAAMC,OAAO,GAAG,IAAIP,gBAAgB,CAACM,SAAS,CAACE,IAAI,EAAE;IACnDC,MAAM,EAAEH,SAAS,CAACG,MAAM,IAAIR,YAAY,CAACS,GAAG;IAC5CC,IAAI,EAAEL,SAAS,CAACK,IAAI,IAAI,CAAC,CAAC;IAC1BC,MAAM,EAAEN,SAAS,CAACM,MAAM;IACxBC,WAAW,EAAEP,SAAS,CAACO,WAAW,IAAI,IAAI;IAC1CC,QAAQ,EAAER,SAAS,CAACQ,QAAQ;IAC5BC,KAAK,EAAET,SAAS,CAACS;EACnB,CAAC,CAAC;EAEF,IAAIT,SAAS,CAACU,MAAM,EAAE;IACpBT,OAAO,CAACS,MAAM,GAAGV,SAAS,CAACU,MAAM;EACnC;EAEA,IAAIV,SAAS,CAACW,WAAW,EAAE;IACzBV,OAAO,CAACU,WAAW,GAAGX,SAAS,CAACW,WAAW;EAC7C;EAEA,IAAIX,SAAS,CAACY,WAAW,EAAE;IACzBX,OAAO,CAACW,WAAW,GAAGZ,SAAS,CAACY,WAAW;IAC3CX,OAAO,CAACY,gBAAgB,GAAGb,SAAS,CAACa,gBAAgB,IAAI,KAAK;EAChE;EAEA,OAAOZ,OAAO;AAChB,CAAC;;AAED;AACA;AACA,MAAMa,eAAe,GAAGA,CACtBC,IAAc,EACdC,QAAkB,EAClBC,aAA4B,EAC5BC,KAAqB,KAClB;EACH,IAAID,aAAa,EAAE;IACjB,MAAME,aAAa,GAAGF,aAAa,CAACC,KAAK,CAAC;IAE1C,IAAIC,aAAa,YAAAC,QAAmB,EAAE;MACpCD,aAAa,CACVE,IAAI,CAAEC,MAAM,IAAK;QAChBN,QAAQ,CAACM,MAAM,CAAC;MAClB,CAAC,CAAC,CACDC,KAAK,CAAEC,KAAK,IAAK;QAChBT,IAAI,CAACjB,WAAW,CAAC0B,KAAK,CAAC,CAAC;MAC1B,CAAC,CAAC;IACN,CAAC,MAAM;MACL,IAAI;QACFR,QAAQ,CAACG,aAAa,CAAC;MACzB,CAAC,CAAC,OAAOK,KAAK,EAAE;QACd,MAAM,IAAIC,KAAK,CACb,wDAAwDD,KAAK,EAC/D,CAAC;MACH;IACF;EACF;EAEA,OAAOT,IAAI,CAAClB,cAAc,CAAC,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA,MAAM6B,YAAY,GAAGA,CACnBX,IAAc,EACdC,QAAkB,EAClBW,WAAyB,EACzBC,GAAQ,KACL;EACHZ,QAAQ,CAACnB,cAAc,CAAC,CAAC,CAAC;EAE1B,IAAI8B,WAAW,EAAE;IACf,MAAME,WAAW,GAAGF,WAAW,CAACC,GAAG,CAAC;IAEpC,IAAIC,WAAW,YAAAT,QAAmB,EAAE;MAClCS,WAAW,CAACR,IAAI,CAAEC,MAAM,IAAKN,QAAQ,CAACM,MAAM,CAAC,CAAC;IAChD,CAAC,MAAM;MACLN,QAAQ,CAACa,WAAW,CAAC;IACvB;EACF;EAEA,OAAOd,IAAI,CAACjB,WAAW,CAAC8B,GAAG,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA,MAAME,WAAW,GAAGA,CAClBC,MAAuB,EACvBzB,MAAc,EACdU,QAAkB,EAClBD,IAAc,KACX;EACHC,QAAQ,CAACpB,aAAa,CAAC,CAAC,CAAC;EAEzB,MAAM;IAAEqB,aAAa;IAAEU,WAAW;IAAE,GAAGK;EAAe,CAAC,GAAGD,MAAM,CAACE,OAAO;EACxED,cAAc,CAAC1B,MAAM,GAAGA,MAAM;EAE9B,MAAM4B,gBAAgB,GAAGnC,aAAa,CAACiC,cAAc,CAAC;EAEtD,OAAOE,gBAAgB,CACpBC,KAAK,CAAC,CAAC,CACPd,IAAI,CAAEH,KAAK,IAAKJ,eAAe,CAACC,IAAI,EAAEC,QAAQ,EAAEC,aAAa,EAAEC,KAAK,CAAC,CAAC,CACtEK,KAAK,CAAEC,KAAK,IAAKE,YAAY,CAACX,IAAI,EAAEC,QAAQ,EAAEW,WAAW,EAAEH,KAAK,CAAC,CAAC;AACvE,CAAC;;AAED;AACA;AACA,OAAO,MAAMY,mBAIZ,GACEC,GAAqD,IACrDtB,IAAc,IACdgB,MAAsB,IAAK;EAC1B,IAAIA,MAAM,CAACO,IAAI,KAAK,iBAAiB,EAAE;IACrC,OAAOR,WAAW;IAChB;IACAC,MAAM,EACNM,GAAG,CAACE,QAAQ,CAAC,CAAC,CAACC,IAAI,CAAClC,MAAM,EAC1B+B,GAAG,CAACrB,QAAQ,EACZD,IACF,CAAC;EACH;EAEA,OAAOA,IAAI,CAACgB,MAAM,CAAC;AACrB,CAAC","ignoreList":[]}
+{"version":3,"file":"ModularUIMiddleware.js","names":["ModularUIRequest","HTTP_METHODS","MODULARUI_STATUS","startProgress","finishProgress","handleError","updateStatus","createRequest","modularui","request","href","method","GET","data","locale","childmodels","isReload","cache","origin","contextPath","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_Promise","then","result","catch","error","Error","errorHandler","errorAction","err","errorResult","handleFetch","action","key","requestOptions","payload","modularuiRequest","LOADING","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport { updateStatus } from \"./ModularUIActions\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  origin?: string,\n  contextPath?: string,\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  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/esm/redux/_modularui/ModularUIReducer.js

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

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

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

package/esm/redux/_modularui/ModularUISelectors.js

@@ -4,8 +4,7 @@ import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
-import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
-import { createSelectorCreator, defaultMemoize } from "reselect";
+import { createSelector, createSelectorCreator, defaultMemoize } from "reselect";
 import { has } from "../../utils/helpers/objects";
 import Href from "../../models/href/Href";
 import ContentModel from "../../models/content/ContentModel";
@@ -14,6 +13,8 @@ import ApplicationModel from "../../models/application/ApplicationModel";
 import TabModel from "../../models/tab/TabModel";
 import CaseViewModel from "../../models/caseview/CaseViewModel";
 import FormModel from "../../models/form/FormModel";
+import { MODULARUI_STATUS } from "../../constants";
+
 /**
  */
 export const getAllModelsByInstance = (state, instance) => {
@@ -241,11 +242,11 @@ export const getModelsByType = (state, type) => {
 
 /**
  */
-export const getAllFinishedModels = state => {
-  if (state && state.modularui) {
+export const getAllFinishedModels = createSelector(state => state.modularui, modularui => {
+  if (modularui) {
     var _context10, _context11;
-    return _mapInstanceProperty(_context10 = _filterInstanceProperty(_context11 = _Object$values(state.modularui)).call(_context11, entry => entry.status === "FINISHED")).call(_context10, entry => entry.model);
+    return _mapInstanceProperty(_context10 = _filterInstanceProperty(_context11 = _Object$keys(modularui)).call(_context11, key => modularui[key] && modularui[key].status === MODULARUI_STATUS.FINISHED)).call(_context10, key => modularui[key].model);
   }
   return [];
-};
+});
 //# sourceMappingURL=ModularUISelectors.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUISelectors.js","names":["createSelectorCreator","defaultMemoize","has","Href","ContentModel","ContentTOCModel","ApplicationModel","TabModel","CaseViewModel","FormModel","getAllModelsByInstance","state","instance","locale","i18n","modularui","_context","_context2","_mapInstanceProperty","_filterInstanceProperty","_Object$keys","call","key","model","getFirstModelByInstance","_context3","_findInstanceProperty","getActiveModelByInstance","location","getLocation","_context4","_startsWithInstanceProperty","selfhref","path","getApplication","getTab","getCaseView","getForm","modelByHref","href","_context5","findHref","modelConfigKey","equals","keyByHref","_context6","allKeysByHref","_context7","router","pathname","getModels","models","forEach","modelKey","modelEntry","label","type","modelInfo","selfContentLink","push","getActiveModels","value","other","_JSON$stringify","contextModels","locationParts","split","reduce","accumulator","current","comparePath","decodeURIComponent","replace","foundEntry","encodedHref","toString","getPreference","preferenceName","preferences","getModelsByType","_context8","_context9","getAllFinishedModels","_context10","_context11","_Object$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":["createSelector","createSelectorCreator","defaultMemoize","has","Href","ContentModel","ContentTOCModel","ApplicationModel","TabModel","CaseViewModel","FormModel","MODULARUI_STATUS","getAllModelsByInstance","state","instance","locale","i18n","modularui","_context","_context2","_mapInstanceProperty","_filterInstanceProperty","_Object$keys","call","key","model","getFirstModelByInstance","_context3","_findInstanceProperty","getActiveModelByInstance","location","getLocation","_context4","_startsWithInstanceProperty","selfhref","path","getApplication","getTab","getCaseView","getForm","modelByHref","href","_context5","findHref","modelConfigKey","equals","keyByHref","_context6","allKeysByHref","_context7","router","pathname","getModels","models","forEach","modelKey","modelEntry","label","type","modelInfo","selfContentLink","push","getActiveModels","value","other","_JSON$stringify","contextModels","locationParts","split","reduce","accumulator","current","comparePath","decodeURIComponent","replace","foundEntry","encodedHref","toString","getPreference","preferenceName","preferences","getModelsByType","_context8","_context9","getAllFinishedModels","_context10","_context11","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/esm/redux/_modularui/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    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/esm/redux/actions/Application.js

@@ -1,18 +1,23 @@
 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";
 /**
  */
 export const reloadApplication = () => (dispatch, 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())})`;
-  return dispatch(loadModularUI(modelKey, new Href("/", "Application"), {
+  const modelKey = `application(/)(${getLocale(state)})`;
+  return dispatch(loadModularUI(modelKey, applicationHref, {
     targetModel: ApplicationModel
   }));
 };

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

@@ -1 +1 @@
-{"version":3,"file":"Application.js","names":["loadModularUI","removeModelByKey","allKeysByHref","ApplicationModel","Href","getLocale","reloadApplication","dispatch","getState","allKeys","key","modelKey","targetModel"],"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,SACEA,aAAa,EACbC,gBAAgB,QACX,gCAAgC;AACvC,SAASC,aAAa,QAAQ,kCAAkC;AAChE,SAASC,gBAAgB,EAAEC,IAAI,QAAQ,cAAc;AACrD,SAASC,SAAS,QAAQ,mBAAmB;AAI7C;AACA;AACA,OAAO,MAAMC,iBAAiB,GAC5BA,CAAA,KAAmB,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC7D,MAAMC,OAAO,GAAGP,aAAa,CAACM,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;EAC9C,KAAK,MAAME,GAAG,IAAID,OAAO,EAAE;IACzBF,QAAQ,CAACN,gBAAgB,CAACS,GAAG,CAAC,CAAC;EACjC;;EAEA;EACA,MAAMC,QAAQ,GAAG,kBAAkBN,SAAS,CAACG,QAAQ,CAAC,CAAC,CAAC,GAAG;EAC3D,OAAOD,QAAQ,CACbP,aAAa,CAACW,QAAQ,EAAE,IAAIP,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE;IACpDQ,WAAW,EAAET;EACf,CAAC,CACH,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"file":"Application.js","names":["loadModularUI","removeModelByKey","allKeysByHref","getApplication","ApplicationModel","Href","getLocale","reloadApplication","dispatch","getState","state","applicationHref","application","contextPath","origin","allKeys","key","modelKey","targetModel"],"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,SACEA,aAAa,EACbC,gBAAgB,QACX,gCAAgC;AACvC,SACEC,aAAa,EACbC,cAAc,QACT,kCAAkC;AACzC,SAASC,gBAAgB,EAAEC,IAAI,QAAQ,cAAc;AACrD,SAASC,SAAS,QAAQ,mBAAmB;AAI7C;AACA;AACA,OAAO,MAAMC,iBAAiB,GAC5BA,CAAA,KAAmB,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC7D,MAAMC,KAAK,GAAGD,QAAQ,CAAC,CAAC;EAExB,IAAIE,eAAe,GAAG,IAAIN,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC;EAClD,MAAMO,WAAW,GAAGT,cAAc,CAACO,KAAK,CAAC;EACzC,IAAIE,WAAW,EAAE;IACfD,eAAe,CAACE,WAAW,GAAGD,WAAW,CAACC,WAAW;IACrDF,eAAe,CAACG,MAAM,GAAGF,WAAW,CAACE,MAAM;EAC7C;EAEA,MAAMC,OAAO,GAAGb,aAAa,CAACQ,KAAK,EAAEC,eAAe,CAAC;EACrD,KAAK,MAAMK,GAAG,IAAID,OAAO,EAAE;IACzBP,QAAQ,CAACP,gBAAgB,CAACe,GAAG,CAAC,CAAC;EACjC;EAEA,MAAMC,QAAQ,GAAG,kBAAkBX,SAAS,CAACI,KAAK,CAAC,GAAG;EACtD,OAAOF,QAAQ,CACbR,aAAa,CAACiB,QAAQ,EAAEN,eAAe,EAAE;IACvCO,WAAW,EAAEd;EACf,CAAC,CACH,CAAC;AACH,CAAC","ignoreList":[]}

package/esm/redux/connectors/PanelRenderer.js

@@ -11,8 +11,6 @@ export const connectPanel = modularui("PanelRenderer", _ref => {
   if (!href && !match) {
     throw new Error("Cannot determine panel url because of missing href and match");
   }
-
-  // TODO SBO: origin and context?
   const panelHref = href ? new Href(href) : new Href(match.url);
   if (match && match.isExact) {
     panelHref.addParametersFromString(querystring);

package/esm/redux/connectors/PanelRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PanelRenderer.js","names":["modularui","Href","connectPanel","_ref","href","match","querystring","Error","panelHref","url","isExact","addParametersFromString","propName"],"sources":["../../../src/redux/connectors/PanelRenderer.js"],"sourcesContent":["// @flow\nimport modularui from \"../_modularui/ModularUIConnector\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ModularUIConnector } from \"../_modularui/types\";\n\n/**\n */\nexport const connectPanel: ModularUIConnector = modularui(\n  \"PanelRenderer\",\n  ({ href, match, querystring = \"\" }) => {\n    if (!href && !match) {\n      throw new Error(\n        \"Cannot determine panel url because of missing href and match\",\n      );\n    }\n\n    // TODO SBO: origin and context?\n    const panelHref = href ? new Href(href) : new Href(match.url);\n\n    if (match && match.isExact) {\n      panelHref.addParametersFromString(querystring);\n    }\n\n    return panelHref;\n  },\n  {\n    propName: \"panel\",\n  },\n);\n"],"mappings":"AACA,OAAOA,SAAS,MAAM,kCAAkC;AACxD,OAAOC,IAAI,MAAM,wBAAwB;AAIzC;AACA;AACA,OAAO,MAAMC,YAAgC,GAAGF,SAAS,CACvD,eAAe,EACfG,IAAA,IAAuC;EAAA,IAAtC;IAAEC,IAAI;IAAEC,KAAK;IAAEC,WAAW,GAAG;EAAG,CAAC,GAAAH,IAAA;EAChC,IAAI,CAACC,IAAI,IAAI,CAACC,KAAK,EAAE;IACnB,MAAM,IAAIE,KAAK,CACb,8DACF,CAAC;EACH;;EAEA;EACA,MAAMC,SAAS,GAAGJ,IAAI,GAAG,IAAIH,IAAI,CAACG,IAAI,CAAC,GAAG,IAAIH,IAAI,CAACI,KAAK,CAACI,GAAG,CAAC;EAE7D,IAAIJ,KAAK,IAAIA,KAAK,CAACK,OAAO,EAAE;IAC1BF,SAAS,CAACG,uBAAuB,CAACL,WAAW,CAAC;EAChD;EAEA,OAAOE,SAAS;AAClB,CAAC,EACD;EACEI,QAAQ,EAAE;AACZ,CACF,CAAC","ignoreList":[]}
+{"version":3,"file":"PanelRenderer.js","names":["modularui","Href","connectPanel","_ref","href","match","querystring","Error","panelHref","url","isExact","addParametersFromString","propName"],"sources":["../../../src/redux/connectors/PanelRenderer.js"],"sourcesContent":["// @flow\nimport modularui from \"../_modularui/ModularUIConnector\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ModularUIConnector } from \"../_modularui/types\";\n\n/**\n */\nexport const connectPanel: ModularUIConnector = modularui(\n  \"PanelRenderer\",\n  ({ href, match, querystring = \"\" }) => {\n    if (!href && !match) {\n      throw new Error(\n        \"Cannot determine panel url because of missing href and match\",\n      );\n    }\n\n    const panelHref = href ? new Href(href) : new Href(match.url);\n\n    if (match && match.isExact) {\n      panelHref.addParametersFromString(querystring);\n    }\n\n    return panelHref;\n  },\n  {\n    propName: \"panel\",\n  },\n);\n"],"mappings":"AACA,OAAOA,SAAS,MAAM,kCAAkC;AACxD,OAAOC,IAAI,MAAM,wBAAwB;AAIzC;AACA;AACA,OAAO,MAAMC,YAAgC,GAAGF,SAAS,CACvD,eAAe,EACfG,IAAA,IAAuC;EAAA,IAAtC;IAAEC,IAAI;IAAEC,KAAK;IAAEC,WAAW,GAAG;EAAG,CAAC,GAAAH,IAAA;EAChC,IAAI,CAACC,IAAI,IAAI,CAACC,KAAK,EAAE;IACnB,MAAM,IAAIE,KAAK,CACb,8DACF,CAAC;EACH;EAEA,MAAMC,SAAS,GAAGJ,IAAI,GAAG,IAAIH,IAAI,CAACG,IAAI,CAAC,GAAG,IAAIH,IAAI,CAACI,KAAK,CAACI,GAAG,CAAC;EAE7D,IAAIJ,KAAK,IAAIA,KAAK,CAACK,OAAO,EAAE;IAC1BF,SAAS,CAACG,uBAAuB,CAACL,WAAW,CAAC;EAChD;EAEA,OAAOE,SAAS;AAClB,CAAC,EACD;EACEI,QAAQ,EAAE;AACZ,CACF,CAAC","ignoreList":[]}

package/esm/utils/helpers/checkResource.js

@@ -9,7 +9,6 @@ import Href from "../../models/href/Href";
  * @returns {boolean}
  */
 export const resourceExists = url => {
-  // TODO SBO: origin and context?
   const fullUrl = new Href(url).absolutehref;
   const xhr = new XMLHttpRequest();
   xhr.open("HEAD", fullUrl, false);
@@ -26,7 +25,6 @@ export const resourceExists = url => {
  * @returns {boolean}
  */
 export const resourceRedirectsToSecureLogin = url => {
-  // TODO SBO: origin and context?
   const fullUrl = new Href(url).absolutehref;
   const xhr = new XMLHttpRequest();
   xhr.open("HEAD", fullUrl, false);

package/esm/utils/helpers/checkResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkResource.js","names":["Href","resourceExists","url","fullUrl","absolutehref","xhr","XMLHttpRequest","open","setRequestHeader","send","status","resourceRedirectsToSecureLogin","responseURL","_endsWithInstanceProperty","call"],"sources":["../../../src/utils/helpers/checkResource.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\n/**\n * Checks if a given url to a modular ui resource exists using a HEAD request to the resource (synchronous)\n * When the resource returns a 404, the resource does not exists and the method returns false\n *\n * @param url\n * @returns {boolean}\n */\nexport const resourceExists = (url: string | Href): boolean => {\n  // TODO SBO: origin and context?\n  const fullUrl = new Href(url).absolutehref;\n\n  const xhr = new XMLHttpRequest();\n  xhr.open(\"HEAD\", fullUrl, false);\n  xhr.setRequestHeader(\"Accept\", \"application/json\");\n  xhr.setRequestHeader(\"Content-Type\", \"application/json\");\n  xhr.setRequestHeader(\"X-Requested-With\", \"XMLHttpRequest\");\n\n  xhr.send();\n\n  return xhr.status !== 404;\n};\n\n/**\n * Indicates if a request to the given url resuls in a redirect to /secureRedirect\n * @param url\n * @returns {boolean}\n */\nexport const resourceRedirectsToSecureLogin = (url: string | Href): boolean => {\n  // TODO SBO: origin and context?\n  const fullUrl = new Href(url).absolutehref;\n\n  const xhr = new XMLHttpRequest();\n  xhr.open(\"HEAD\", fullUrl, false);\n  xhr.setRequestHeader(\"Accept\", \"application/json\");\n  xhr.setRequestHeader(\"Content-Type\", \"application/json\");\n  xhr.setRequestHeader(\"X-Requested-With\", \"XMLHttpRequest\");\n  xhr.send();\n\n  const responseURL = xhr.responseURL ?? \"\";\n\n  return xhr.status === 400 && responseURL.endsWith(\"/secureLogin\");\n};\n"],"mappings":";AACA,OAAOA,IAAI,MAAM,wBAAwB;;AAEzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAIC,GAAkB,IAAc;EAC7D;EACA,MAAMC,OAAO,GAAG,IAAIH,IAAI,CAACE,GAAG,CAAC,CAACE,YAAY;EAE1C,MAAMC,GAAG,GAAG,IAAIC,cAAc,CAAC,CAAC;EAChCD,GAAG,CAACE,IAAI,CAAC,MAAM,EAAEJ,OAAO,EAAE,KAAK,CAAC;EAChCE,GAAG,CAACG,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC;EAClDH,GAAG,CAACG,gBAAgB,CAAC,cAAc,EAAE,kBAAkB,CAAC;EACxDH,GAAG,CAACG,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;EAE1DH,GAAG,CAACI,IAAI,CAAC,CAAC;EAEV,OAAOJ,GAAG,CAACK,MAAM,KAAK,GAAG;AAC3B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,8BAA8B,GAAIT,GAAkB,IAAc;EAC7E;EACA,MAAMC,OAAO,GAAG,IAAIH,IAAI,CAACE,GAAG,CAAC,CAACE,YAAY;EAE1C,MAAMC,GAAG,GAAG,IAAIC,cAAc,CAAC,CAAC;EAChCD,GAAG,CAACE,IAAI,CAAC,MAAM,EAAEJ,OAAO,EAAE,KAAK,CAAC;EAChCE,GAAG,CAACG,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC;EAClDH,GAAG,CAACG,gBAAgB,CAAC,cAAc,EAAE,kBAAkB,CAAC;EACxDH,GAAG,CAACG,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;EAC1DH,GAAG,CAACI,IAAI,CAAC,CAAC;EAEV,MAAMG,WAAW,GAAGP,GAAG,CAACO,WAAW,IAAI,EAAE;EAEzC,OAAOP,GAAG,CAACK,MAAM,KAAK,GAAG,IAAIG,yBAAA,CAAAD,WAAW,EAAAE,IAAA,CAAXF,WAAW,EAAU,cAAc,CAAC;AACnE,CAAC","ignoreList":[]}
+{"version":3,"file":"checkResource.js","names":["Href","resourceExists","url","fullUrl","absolutehref","xhr","XMLHttpRequest","open","setRequestHeader","send","status","resourceRedirectsToSecureLogin","responseURL","_endsWithInstanceProperty","call"],"sources":["../../../src/utils/helpers/checkResource.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\n/**\n * Checks if a given url to a modular ui resource exists using a HEAD request to the resource (synchronous)\n * When the resource returns a 404, the resource does not exists and the method returns false\n *\n * @param url\n * @returns {boolean}\n */\nexport const resourceExists = (url: string | Href): boolean => {\n  const fullUrl = new Href(url).absolutehref;\n\n  const xhr = new XMLHttpRequest();\n  xhr.open(\"HEAD\", fullUrl, false);\n  xhr.setRequestHeader(\"Accept\", \"application/json\");\n  xhr.setRequestHeader(\"Content-Type\", \"application/json\");\n  xhr.setRequestHeader(\"X-Requested-With\", \"XMLHttpRequest\");\n\n  xhr.send();\n\n  return xhr.status !== 404;\n};\n\n/**\n * Indicates if a request to the given url resuls in a redirect to /secureRedirect\n * @param url\n * @returns {boolean}\n */\nexport const resourceRedirectsToSecureLogin = (url: string | Href): boolean => {\n  const fullUrl = new Href(url).absolutehref;\n\n  const xhr = new XMLHttpRequest();\n  xhr.open(\"HEAD\", fullUrl, false);\n  xhr.setRequestHeader(\"Accept\", \"application/json\");\n  xhr.setRequestHeader(\"Content-Type\", \"application/json\");\n  xhr.setRequestHeader(\"X-Requested-With\", \"XMLHttpRequest\");\n  xhr.send();\n\n  const responseURL = xhr.responseURL ?? \"\";\n\n  return xhr.status === 400 && responseURL.endsWith(\"/secureLogin\");\n};\n"],"mappings":";AACA,OAAOA,IAAI,MAAM,wBAAwB;;AAEzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAIC,GAAkB,IAAc;EAC7D,MAAMC,OAAO,GAAG,IAAIH,IAAI,CAACE,GAAG,CAAC,CAACE,YAAY;EAE1C,MAAMC,GAAG,GAAG,IAAIC,cAAc,CAAC,CAAC;EAChCD,GAAG,CAACE,IAAI,CAAC,MAAM,EAAEJ,OAAO,EAAE,KAAK,CAAC;EAChCE,GAAG,CAACG,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC;EAClDH,GAAG,CAACG,gBAAgB,CAAC,cAAc,EAAE,kBAAkB,CAAC;EACxDH,GAAG,CAACG,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;EAE1DH,GAAG,CAACI,IAAI,CAAC,CAAC;EAEV,OAAOJ,GAAG,CAACK,MAAM,KAAK,GAAG;AAC3B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,8BAA8B,GAAIT,GAAkB,IAAc;EAC7E,MAAMC,OAAO,GAAG,IAAIH,IAAI,CAACE,GAAG,CAAC,CAACE,YAAY;EAE1C,MAAMC,GAAG,GAAG,IAAIC,cAAc,CAAC,CAAC;EAChCD,GAAG,CAACE,IAAI,CAAC,MAAM,EAAEJ,OAAO,EAAE,KAAK,CAAC;EAChCE,GAAG,CAACG,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC;EAClDH,GAAG,CAACG,gBAAgB,CAAC,cAAc,EAAE,kBAAkB,CAAC;EACxDH,GAAG,CAACG,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;EAC1DH,GAAG,CAACI,IAAI,CAAC,CAAC;EAEV,MAAMG,WAAW,GAAGP,GAAG,CAACO,WAAW,IAAI,EAAE;EAEzC,OAAOP,GAAG,CAACK,MAAM,KAAK,GAAG,IAAIG,yBAAA,CAAAD,WAAW,EAAAE,IAAA,CAAXF,WAAW,EAAU,cAAc,CAAC;AACnE,CAAC","ignoreList":[]}

package/esm/utils/helpers/repositoryResource.js

@@ -5,14 +5,15 @@ import { getBasePath, RESOURCE_PATH } from "../../constants";
  * Creates an url to a resource in the Be Informed repository
  * Only possible when serving using the UI Servlet of Be Informed
  */
-export const getRepositoryResourceUrl = resourceUrl => {
-  const basePath = getBasePath();
-  if (_startsWithInstanceProperty(resourceUrl).call(resourceUrl, basePath)) {
+export const getRepositoryResourceUrl = function (resourceUrl) {
+  let contextPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : getBasePath();
+  let origin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
+  if (_startsWithInstanceProperty(resourceUrl).call(resourceUrl, origin + contextPath)) {
     return resourceUrl;
   }
   if (_startsWithInstanceProperty(resourceUrl).call(resourceUrl, RESOURCE_PATH)) {
-    return `${basePath}${resourceUrl}`;
+    return `${origin}${contextPath}${resourceUrl}`;
   }
-  return `${basePath}${RESOURCE_PATH}${resourceUrl}`;
+  return `${origin}${contextPath}${RESOURCE_PATH}${resourceUrl}`;
 };
 //# sourceMappingURL=repositoryResource.js.map

package/esm/utils/helpers/repositoryResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"repositoryResource.js","names":["getBasePath","RESOURCE_PATH","getRepositoryResourceUrl","resourceUrl","basePath","_startsWithInstanceProperty","call"],"sources":["../../../src/utils/helpers/repositoryResource.js"],"sourcesContent":["// @flow\nimport { getBasePath, RESOURCE_PATH } from \"../../constants\";\n\n/**\n * Creates an url to a resource in the Be Informed repository\n * Only possible when serving using the UI Servlet of Be Informed\n */\nexport const getRepositoryResourceUrl = (resourceUrl: string): string => {\n  const basePath = getBasePath();\n\n  if (resourceUrl.startsWith(basePath)) {\n    return resourceUrl;\n  }\n\n  if (resourceUrl.startsWith(RESOURCE_PATH)) {\n    return `${basePath}${resourceUrl}`;\n  }\n\n  return `${basePath}${RESOURCE_PATH}${resourceUrl}`;\n};\n"],"mappings":";AACA,SAASA,WAAW,EAAEC,aAAa,QAAQ,iBAAiB;;AAE5D;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAIC,WAAmB,IAAa;EACvE,MAAMC,QAAQ,GAAGJ,WAAW,CAAC,CAAC;EAE9B,IAAIK,2BAAA,CAAAF,WAAW,EAAAG,IAAA,CAAXH,WAAW,EAAYC,QAAQ,CAAC,EAAE;IACpC,OAAOD,WAAW;EACpB;EAEA,IAAIE,2BAAA,CAAAF,WAAW,EAAAG,IAAA,CAAXH,WAAW,EAAYF,aAAa,CAAC,EAAE;IACzC,OAAO,GAAGG,QAAQ,GAAGD,WAAW,EAAE;EACpC;EAEA,OAAO,GAAGC,QAAQ,GAAGH,aAAa,GAAGE,WAAW,EAAE;AACpD,CAAC","ignoreList":[]}
+{"version":3,"file":"repositoryResource.js","names":["getBasePath","RESOURCE_PATH","getRepositoryResourceUrl","resourceUrl","contextPath","arguments","length","undefined","origin","_startsWithInstanceProperty","call"],"sources":["../../../src/utils/helpers/repositoryResource.js"],"sourcesContent":["// @flow\nimport { getBasePath, RESOURCE_PATH } from \"../../constants\";\n\n/**\n * Creates an url to a resource in the Be Informed repository\n * Only possible when serving using the UI Servlet of Be Informed\n */\nexport const getRepositoryResourceUrl = (\n  resourceUrl: string,\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => {\n  if (resourceUrl.startsWith(origin + contextPath)) {\n    return resourceUrl;\n  }\n\n  if (resourceUrl.startsWith(RESOURCE_PATH)) {\n    return `${origin}${contextPath}${resourceUrl}`;\n  }\n\n  return `${origin}${contextPath}${RESOURCE_PATH}${resourceUrl}`;\n};\n"],"mappings":";AACA,SAASA,WAAW,EAAEC,aAAa,QAAQ,iBAAiB;;AAE5D;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAG,SAAAA,CACtCC,WAAmB,EAGR;EAAA,IAFXC,WAAmB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGL,WAAW,CAAC,CAAC;EAAA,IACnCQ,MAAc,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEnB,IAAII,2BAAA,CAAAN,WAAW,EAAAO,IAAA,CAAXP,WAAW,EAAYK,MAAM,GAAGJ,WAAW,CAAC,EAAE;IAChD,OAAOD,WAAW;EACpB;EAEA,IAAIM,2BAAA,CAAAN,WAAW,EAAAO,IAAA,CAAXP,WAAW,EAAYF,aAAa,CAAC,EAAE;IACzC,OAAO,GAAGO,MAAM,GAAGJ,WAAW,GAAGD,WAAW,EAAE;EAChD;EAEA,OAAO,GAAGK,MAAM,GAAGJ,WAAW,GAAGH,aAAa,GAAGE,WAAW,EAAE;AAChE,CAAC","ignoreList":[]}

package/lib/constants/Settings.js

@@ -124,13 +124,21 @@ const getBasePath = () => getSetting("CONTEXT_PATH", "/BeInformed");
  * Path to upload service
  */
 exports.getBasePath = getBasePath;
-const getUploadPath = () => `${getBasePath()}${_Constants.UPLOAD_PATH}`;
+const getUploadPath = function () {
+  let contextPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getBasePath();
+  let origin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+  return `${origin}${contextPath}${_Constants.UPLOAD_PATH}`;
+};
 
 /**
  * Path to captcha service
  */
 exports.getUploadPath = getUploadPath;
-const getCaptchaPath = () => `${getBasePath()}${_Constants.CAPTCHA_PATH}`;
+const getCaptchaPath = function () {
+  let contextPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getBasePath();
+  let origin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+  return `${origin}${contextPath}${_Constants.CAPTCHA_PATH}`;
+};
 
 /**
  */