@beinformed/ui 1.59.9 → 1.59.11

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.59.11](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.59.10...v1.59.11) (2024-12-17)
+
+
+### Bug Fixes
+
+* **contenttype-hook:** remove entrydate from href ([e2bf9f3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/e2bf9f3b7f5af2806433364eb0546e231cd1488c))
+
+## [1.59.10](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.59.9...v1.59.10) (2024-12-16)
+
+
+### Bug Fixes
+
+* **load-model:** remove load models that won't finish ([bd34d8f](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/bd34d8fdc207aa4f55261585df79ce92fe2d31b4))
+
 ## [1.59.9](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.59.8...v1.59.9) (2024-12-13)
 
 ## [1.59.8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.59.7...v1.59.8) (2024-12-12)

package/esm/hooks/useModelCatalog.js

@@ -105,10 +105,7 @@ export const useContent = function (contentSection) {
 export const useContentType = function (contentType) {
   let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "contenttypes";
   let options = arguments.length > 2 ? arguments[2] : undefined;
-  const {
-    entryDate
-  } = useEntryDate();
-  const href = createHref("contenttypes", contentType, entryDate, null, []);
+  const href = createHref("contenttypes", contentType, null, null, []);
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentType"],
     targetModel: ContentTypeModel,

package/esm/hooks/useModelCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModelCatalog.js","names":["useSelector","useDispatch","useLocation","createHref","filterParameters","ModelCatalogModel","ConceptIndexModel","ConceptDetailModel","default","BusinessScenarioModel","ContentIndexModel","ContentTOCModel","ContentModel","useModularUIBasic","ContentTypeModel","getEntryDate","updateEntryDate","useModelCatalog","options","expectedModels","targetModel","useConceptIndex","href","key","arguments","length","undefined","entryDate","useEntryDate","url","setParameter","useConceptDetail","concept","location","useContentIndex","useContentTOC","content","useContent","contentSection","useContentType","contentType","getSearchHref","uri","filters","filterString","_Object$keys","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch","dispatch","setEntryDate"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nimport { getEntryDate } from \"../redux/selectors/modelcatalog\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport type Href from \"../models/href/Href\";\nimport type { UseModularUIBasicOptions } from \"./useModularUIBasic\";\nimport type { UpdateEntryDateAction } from \"../redux\";\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  modelCategory?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (\n  options?: UseModularUIBasicOptions<ModelCatalogModel>,\n): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n    ...options,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string | Href,\n  key?: string = \"conceptindex\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const { entryDate } = useEntryDate();\n  const url = filterParameters(href, [\n    \"index\",\n    \"label\",\n    \"modelcategory\",\n    \"type\",\n  ]);\n  url.setParameter(\"entryDate\", entryDate);\n\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string | Href,\n  key?: string = \"conceptdetail\",\n  options?: UseModularUIBasicOptions<\n    ConceptDetailModel | BusinessScenarioModel,\n  >,\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string | Href,\n  key?: string = \"contentindex\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string | Href,\n  key?: string = \"contenttoc\",\n  options?: UseModularUIBasicOptions<ContentTOCModel>,\n): ?ContentTOCModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"content\", content, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string | Href,\n  key?: string = \"content\",\n  options?: UseModularUIBasicOptions<ContentModel>,\n): ?ContentModel => {\n  const { entryDate } = useEntryDate();\n\n  const href = createHref(\"content\", contentSection, entryDate, null, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string | Href,\n  key?: string = \"contenttypes\",\n  options?: UseModularUIBasicOptions<ContentTypeModel>,\n): ?ContentTypeModel => {\n  const { entryDate } = useEntryDate();\n\n  const href = createHref(\"contenttypes\", contentType, entryDate, null, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n    ...options,\n  });\n};\n\n/**\n */\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n  const filterString = [];\n\n  for (const key of Object.keys(filters)) {\n    const filterValue = filters[key];\n    if (filterValue) {\n      let value: string = Array.isArray(filterValue)\n        ? filterValue.join(\",\")\n        : filterValue;\n      if (key === \"type\") {\n        value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n      }\n      filterString.push(`${key}=${value}`);\n    }\n  }\n\n  return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/**\n */\nexport const useConceptSearch = (\n  filters: SearchFilter,\n  key?: string = \"conceptSearch\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key, options);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key, options);\n};\n\n/**\n * Retrieve and update the entrydate for the modelcatalog\n */\nexport const useEntryDate = (): ({\n  entryDate: ISO_DATE,\n  setEntryDate: (entryDate: ISO_DATE) => UpdateEntryDateAction,\n}) => {\n  const dispatch = useDispatch();\n  const entryDate = useSelector(getEntryDate);\n\n  return {\n    entryDate,\n    setEntryDate: (entryDate: ISO_DATE) => dispatch(updateEntryDate(entryDate)),\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModelCatalog.js","names":["useSelector","useDispatch","useLocation","createHref","filterParameters","ModelCatalogModel","ConceptIndexModel","ConceptDetailModel","default","BusinessScenarioModel","ContentIndexModel","ContentTOCModel","ContentModel","useModularUIBasic","ContentTypeModel","getEntryDate","updateEntryDate","useModelCatalog","options","expectedModels","targetModel","useConceptIndex","href","key","arguments","length","undefined","entryDate","useEntryDate","url","setParameter","useConceptDetail","concept","location","useContentIndex","useContentTOC","content","useContent","contentSection","useContentType","contentType","getSearchHref","uri","filters","filterString","_Object$keys","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch","dispatch","setEntryDate"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nimport { getEntryDate } from \"../redux/selectors/modelcatalog\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport type Href from \"../models/href/Href\";\nimport type { UseModularUIBasicOptions } from \"./useModularUIBasic\";\nimport type { UpdateEntryDateAction } from \"../redux\";\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  modelCategory?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (\n  options?: UseModularUIBasicOptions<ModelCatalogModel>,\n): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n    ...options,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string | Href,\n  key?: string = \"conceptindex\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const { entryDate } = useEntryDate();\n  const url = filterParameters(href, [\n    \"index\",\n    \"label\",\n    \"modelcategory\",\n    \"type\",\n  ]);\n  url.setParameter(\"entryDate\", entryDate);\n\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string | Href,\n  key?: string = \"conceptdetail\",\n  options?: UseModularUIBasicOptions<\n    ConceptDetailModel | BusinessScenarioModel,\n  >,\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string | Href,\n  key?: string = \"contentindex\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string | Href,\n  key?: string = \"contenttoc\",\n  options?: UseModularUIBasicOptions<ContentTOCModel>,\n): ?ContentTOCModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"content\", content, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string | Href,\n  key?: string = \"content\",\n  options?: UseModularUIBasicOptions<ContentModel>,\n): ?ContentModel => {\n  const { entryDate } = useEntryDate();\n\n  const href = createHref(\"content\", contentSection, entryDate, null, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string | Href,\n  key?: string = \"contenttypes\",\n  options?: UseModularUIBasicOptions<ContentTypeModel>,\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, null, []);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n    ...options,\n  });\n};\n\n/**\n */\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n  const filterString = [];\n\n  for (const key of Object.keys(filters)) {\n    const filterValue = filters[key];\n    if (filterValue) {\n      let value: string = Array.isArray(filterValue)\n        ? filterValue.join(\",\")\n        : filterValue;\n      if (key === \"type\") {\n        value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n      }\n      filterString.push(`${key}=${value}`);\n    }\n  }\n\n  return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/**\n */\nexport const useConceptSearch = (\n  filters: SearchFilter,\n  key?: string = \"conceptSearch\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key, options);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key, options);\n};\n\n/**\n * Retrieve and update the entrydate for the modelcatalog\n */\nexport const useEntryDate = (): ({\n  entryDate: ISO_DATE,\n  setEntryDate: (entryDate: ISO_DATE) => UpdateEntryDateAction,\n}) => {\n  const dispatch = useDispatch();\n  const entryDate = useSelector(getEntryDate);\n\n  return {\n    entryDate,\n    setEntryDate: (entryDate: ISO_DATE) => dispatch(updateEntryDate(entryDate)),\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIActions.js

@@ -102,11 +102,7 @@ export const loadModel = (key, href, options) => ({
         origin: options?.origin,
         contextPath: options?.contextPath
       });
-      if (errorResponse.isChangePassword) {
-        return {
-          type: "NO_ACTION"
-        };
-      } else if (errorResponse.isResourceNotFoundAfterReload) {
+      if (errorResponse.isChangePassword || errorResponse.isResourceNotFoundAfterReload) {
         return removeModelByKey(key);
       }
       return updateStatus(key, MODULARUI_STATUS.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","getState","modularuiStore","modularui","LOADING","_Promise","resolve","loadModelPromise","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, \"\", {\n            origin: options?.origin,\n            contextPath: options?.contextPath,\n          }),\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        origin: options?.origin,\n        contextPath: 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      return Promise.resolve();\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIActions.js","names":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","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","_Promise","resolve","loadModelPromise","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, \"\", {\n            origin: options?.origin,\n            contextPath: options?.contextPath,\n          }),\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        origin: options?.origin,\n        contextPath: options?.contextPath,\n      });\n      if (\n        errorResponse.isChangePassword ||\n        errorResponse.isResourceNotFoundAfterReload\n      ) {\n        return removeModelByKey(key);\n      }\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestModularUIOptions,\n  ): ThunkAction =>\n  (dispatch: Dispatch, getState) => {\n    const modularuiStore = getState()?.modularui;\n    if (\n      modularuiStore &&\n      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING\n    ) {\n      return Promise.resolve();\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/actions/Application.js

@@ -21,4 +21,10 @@ export const reloadApplication = () => (dispatch, getState) => {
     targetModel: ApplicationModel
   }));
 };
+
+/**
+ */
+export const noAction = () => ({
+  type: "NO_ACTION"
+});
 //# sourceMappingURL=Application.js.map

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

@@ -1 +1 @@
-{"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":[]}
+{"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","noAction","type"],"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, NoAction } 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\n/**\n */\nexport const noAction = (): NoAction => ({\n  type: \"NO_ACTION\",\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;;AAEH;AACA;AACA,OAAO,MAAMe,QAAQ,GAAGA,CAAA,MAAiB;EACvCC,IAAI,EAAE;AACR,CAAC,CAAC","ignoreList":[]}

package/esm/redux/actions/Authorization.js

@@ -4,10 +4,9 @@ import { logoutSuccess } from "./SignOut";
 import Cache from "../../utils/browser/Cache";
 import { removeModelByKey } from "../_modularui/ModularUIActions";
 import { getApplication } from "../_modularui/ModularUISelectors";
-import { reloadApplication } from "./Application";
-import { getSetting } from "../../constants";
+import { noAction, reloadApplication } from "./Application";
 import { sendAuthenticationError } from "./SignIn";
-
+import { getSetting } from "../../constants";
 /**
  */
 export const handleUnauthorized = errorResponse => (dispatch, getState) => {
@@ -43,8 +42,6 @@ export const handleUnauthorized = errorResponse => (dispatch, getState) => {
       modal: false
     }));
   }
-  return {
-    type: "NO_ACTION"
-  };
+  return dispatch(noAction());
 };
 //# sourceMappingURL=Authorization.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Authorization.js","names":["ErrorResponse","replace","logoutSuccess","Cache","removeModelByKey","getApplication","reloadApplication","getSetting","sendAuthenticationError","handleUnauthorized","errorResponse","dispatch","getState","connectKey","response","error","window","location","reload","application","getItem","isLoggedIn","removeItem","isInvalidUsername","message","router","LOGIN_PATH","pathname","locationFrom","state","from","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/RouterActions\";\nimport { logoutSuccess } from \"./SignOut\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/ModularUIActions\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\nimport { sendAuthenticationError } from \"./SignIn\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged out\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      dispatch(sendAuthenticationError(errorResponse.message));\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        }),\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":"AACA,OAAOA,aAAa,MAAM,kCAAkC;AAE5D,SAASC,OAAO,QAAQ,0BAA0B;AAClD,SAASC,aAAa,QAAQ,WAAW;AAEzC,OAAOC,KAAK,MAAM,2BAA2B;AAE7C,SAASC,gBAAgB,QAAQ,gCAAgC;AACjE,SAASC,cAAc,QAAQ,kCAAkC;AACjE,SAASC,iBAAiB,QAAQ,eAAe;AAEjD,SAASC,UAAU,QAAQ,iBAAiB;AAG5C,SAASC,uBAAuB,QAAQ,UAAU;;AAElD;AACA;AACA,OAAO,MAAMC,kBAAkB,GAC5BC,aAA4B,IAC7B,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EACtB,IAAIF,aAAa,CAACG,UAAU,EAAE;IAC5BF,QAAQ,CAACP,gBAAgB,CAACM,aAAa,CAACG,UAAU,CAAC,CAAC;EACtD;EAEA,IACEN,UAAU,CAAC,mCAAmC,EAAE,KAAK,CAAC,IACtDG,aAAa,CAACI,QAAQ,EAAEC,KAAK,EAC7B;IACAC,MAAM,CAACC,QAAQ,CAACC,MAAM,CAAC,CAAC;IACxB;EACF;;EAEA;EACA,MAAMC,WAAW,GAAGd,cAAc,CAACO,QAAQ,CAAC,CAAC,CAAC;EAC9C,IAAIT,KAAK,CAACiB,OAAO,CAAC,MAAM,CAAC,IAAID,WAAW,EAAEE,UAAU,EAAE;IACpDV,QAAQ,CAACL,iBAAiB,CAAC,CAAC,CAAC;EAC/B;;EAEA;EACAK,QAAQ,CAACT,aAAa,CAAC,CAAC,CAAC;EAEzBC,KAAK,CAACmB,UAAU,CAAC,MAAM,CAAC;EAExB,IAAIZ,aAAa,CAACa,iBAAiB,EAAE;IACnCZ,QAAQ,CAACH,uBAAuB,CAACE,aAAa,CAACc,OAAO,CAAC,CAAC;EAC1D;;EAEA;EACA,MAAMP,QAAQ,GAAGL,QAAQ,CAAC,CAAC,CAACa,MAAM,CAACR,QAAQ;EAC3C,MAAMS,UAAU,GAAGnB,UAAU,CAAC,YAAY,EAAE,SAAS,CAAC;EACtD,IAAIU,QAAQ,EAAEU,QAAQ,KAAKD,UAAU,EAAE;IACrC,MAAME,YAAY,GAAGX,QAAQ,EAAEY,KAAK,EAAEC,IAAI;IAC1C,OAAOnB,QAAQ,CACbV,OAAO,CAACyB,UAAU,EAAE;MAClBI,IAAI,EAAEF,YAAY,GAAGA,YAAY,GAAGhB,QAAQ,CAAC,CAAC,CAACa,MAAM,CAACR,QAAQ;MAC9D;MACAc,KAAK,EAAE;IACT,CAAC,CACH,CAAC;EACH;EAEA,OAAO;IAAEC,IAAI,EAAE;EAAY,CAAC;AAC9B,CAAC","ignoreList":[]}
+{"version":3,"file":"Authorization.js","names":["ErrorResponse","replace","logoutSuccess","Cache","removeModelByKey","getApplication","noAction","reloadApplication","sendAuthenticationError","getSetting","handleUnauthorized","errorResponse","dispatch","getState","connectKey","response","error","window","location","reload","application","getItem","isLoggedIn","removeItem","isInvalidUsername","message","router","LOGIN_PATH","pathname","locationFrom","state","from","modal"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/RouterActions\";\nimport { logoutSuccess } from \"./SignOut\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/ModularUIActions\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\nimport { noAction, reloadApplication } from \"./Application\";\nimport { sendAuthenticationError } from \"./SignIn\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged out\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      dispatch(sendAuthenticationError(errorResponse.message));\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        }),\n      );\n    }\n\n    return dispatch(noAction());\n  };\n"],"mappings":"AACA,OAAOA,aAAa,MAAM,kCAAkC;AAE5D,SAASC,OAAO,QAAQ,0BAA0B;AAClD,SAASC,aAAa,QAAQ,WAAW;AAEzC,OAAOC,KAAK,MAAM,2BAA2B;AAE7C,SAASC,gBAAgB,QAAQ,gCAAgC;AACjE,SAASC,cAAc,QAAQ,kCAAkC;AACjE,SAASC,QAAQ,EAAEC,iBAAiB,QAAQ,eAAe;AAC3D,SAASC,uBAAuB,QAAQ,UAAU;AAElD,SAASC,UAAU,QAAQ,iBAAiB;AAI5C;AACA;AACA,OAAO,MAAMC,kBAAkB,GAC5BC,aAA4B,IAC7B,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EACtB,IAAIF,aAAa,CAACG,UAAU,EAAE;IAC5BF,QAAQ,CAACR,gBAAgB,CAACO,aAAa,CAACG,UAAU,CAAC,CAAC;EACtD;EAEA,IACEL,UAAU,CAAC,mCAAmC,EAAE,KAAK,CAAC,IACtDE,aAAa,CAACI,QAAQ,EAAEC,KAAK,EAC7B;IACAC,MAAM,CAACC,QAAQ,CAACC,MAAM,CAAC,CAAC;IACxB;EACF;;EAEA;EACA,MAAMC,WAAW,GAAGf,cAAc,CAACQ,QAAQ,CAAC,CAAC,CAAC;EAC9C,IAAIV,KAAK,CAACkB,OAAO,CAAC,MAAM,CAAC,IAAID,WAAW,EAAEE,UAAU,EAAE;IACpDV,QAAQ,CAACL,iBAAiB,CAAC,CAAC,CAAC;EAC/B;;EAEA;EACAK,QAAQ,CAACV,aAAa,CAAC,CAAC,CAAC;EAEzBC,KAAK,CAACoB,UAAU,CAAC,MAAM,CAAC;EAExB,IAAIZ,aAAa,CAACa,iBAAiB,EAAE;IACnCZ,QAAQ,CAACJ,uBAAuB,CAACG,aAAa,CAACc,OAAO,CAAC,CAAC;EAC1D;;EAEA;EACA,MAAMP,QAAQ,GAAGL,QAAQ,CAAC,CAAC,CAACa,MAAM,CAACR,QAAQ;EAC3C,MAAMS,UAAU,GAAGlB,UAAU,CAAC,YAAY,EAAE,SAAS,CAAC;EACtD,IAAIS,QAAQ,EAAEU,QAAQ,KAAKD,UAAU,EAAE;IACrC,MAAME,YAAY,GAAGX,QAAQ,EAAEY,KAAK,EAAEC,IAAI;IAC1C,OAAOnB,QAAQ,CACbX,OAAO,CAAC0B,UAAU,EAAE;MAClBI,IAAI,EAAEF,YAAY,GAAGA,YAAY,GAAGhB,QAAQ,CAAC,CAAC,CAACa,MAAM,CAACR,QAAQ;MAC9D;MACAc,KAAK,EAAE;IACT,CAAC,CACH,CAAC;EACH;EAEA,OAAOpB,QAAQ,CAACN,QAAQ,CAAC,CAAC,CAAC;AAC7B,CAAC","ignoreList":[]}

package/esm/redux/actions/Error.js

@@ -6,6 +6,7 @@ import { showXHRErrorNotification } from "./Notification";
 import { resetProgress } from "./ProgressIndicator";
 import { changePassword } from "./SignIn";
 import { handleUnauthorized } from "./Authorization";
+import { noAction } from "./Application";
 /**
  */
 const saveError = error => ({
@@ -17,9 +18,7 @@ const saveError = error => ({
  */
 const defaultErrorResponseHandler = error => dispatch => {
   if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {
-    return dispatch({
-      type: "NO_ACTION"
-    });
+    return dispatch(noAction());
   }
   if (error.isUnauthorized) {
     return dispatch(handleUnauthorized(error));

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

@@ -1 +1 @@
-{"version":3,"file":"Error.js","names":["IS_SERVER","getSetting","ErrorResponse","push","showXHRErrorNotification","resetProgress","changePassword","handleUnauthorized","saveError","error","type","payload","defaultErrorResponseHandler","dispatch","isResourceNotFoundAfterReload","isRemoteServiceException","isUnauthorized","isBlocked","isConcurrentUser","isInvalidUsername","LOGOUT_PATH","isChangePassword","setTimeout","customErrorResponseHandler","errorResponse","defaultHandler","setCustomErrorResponseHandler","handler","handleError"],"sources":["../../../src/redux/actions/Error.js"],"sourcesContent":["// @flow\nimport { IS_SERVER } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { showXHRErrorNotification } from \"./Notification\";\nimport { resetProgress } from \"./ProgressIndicator\";\nimport { changePassword } from \"./SignIn\";\nimport { handleUnauthorized } from \"./Authorization\";\n\nimport type { FetchException } from \"../../exceptions\";\nimport type { Dispatch, SaveErrorAction, ThunkAction } from \"../types\";\n\ntype DefaultErrorResponseHandler = (error: ErrorResponse) => ThunkAction;\ntype CustomErrorResponseHandler = (\n  errorResponse: ErrorResponse,\n  defaultHandler: DefaultErrorResponseHandler,\n) => ThunkAction;\n\n/**\n */\nconst saveError = (error: ErrorResponse): SaveErrorAction => ({\n  type: \"SAVE_ERROR\",\n  payload: error,\n});\n\n/**\n */\nconst defaultErrorResponseHandler: DefaultErrorResponseHandler =\n  (error: ErrorResponse): ThunkAction =>\n  (dispatch: Dispatch) => {\n    if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {\n      return dispatch({ type: \"NO_ACTION\" });\n    }\n\n    if (error.isUnauthorized) {\n      return dispatch(handleUnauthorized(error));\n    }\n\n    if (error.isBlocked || error.isConcurrentUser || error.isInvalidUsername) {\n      const LOGOUT_PATH = getSetting(\"LOGOUT_PATH\", \"/signout\");\n      dispatch(push(LOGOUT_PATH));\n    }\n\n    if (error.isChangePassword) {\n      return dispatch(changePassword());\n    }\n\n    if (IS_SERVER) {\n      return dispatch(saveError(error));\n    }\n\n    setTimeout(() => {\n      throw error.error;\n    });\n\n    return dispatch(showXHRErrorNotification(error));\n  };\n\n/**\n * Standard Custom error response, acts as a proxy and can be overwritten by {@link setCustomErrorResponseHandler}\n */\nlet customErrorResponseHandler: CustomErrorResponseHandler =\n  (errorResponse, defaultHandler) => (dispatch: Dispatch) =>\n    dispatch(defaultHandler(errorResponse));\n\n/**\n * Set a custom error response handler,\n * can be used when custom functionality is needed on certain (error) response\n * of the modular ui, for example when custom logic is needed when a user is unauthorized<br>\n * It receives an {@link ErrorResponse} and the {@link defaultErrorResponseHandler}\n */\nexport const setCustomErrorResponseHandler = (\n  handler: CustomErrorResponseHandler,\n) => {\n  customErrorResponseHandler = handler;\n};\n\n/**\n * Handle errors by sending an error notification message\n */\nexport const handleError =\n  (error: Error | FetchException): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(resetProgress());\n\n    const errorResponse = new ErrorResponse(error);\n\n    return dispatch(\n      customErrorResponseHandler(errorResponse, defaultErrorResponseHandler),\n    );\n  };\n"],"mappings":"AACA,SAASA,SAAS,QAAQ,2BAA2B;AACrD,SAASC,UAAU,QAAQ,0BAA0B;AAErD,OAAOC,aAAa,MAAM,kCAAkC;AAE5D,SAASC,IAAI,QAAQ,0BAA0B;AAC/C,SAASC,wBAAwB,QAAQ,gBAAgB;AACzD,SAASC,aAAa,QAAQ,qBAAqB;AACnD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,kBAAkB,QAAQ,iBAAiB;AAWpD;AACA;AACA,MAAMC,SAAS,GAAIC,KAAoB,KAAuB;EAC5DC,IAAI,EAAE,YAAY;EAClBC,OAAO,EAAEF;AACX,CAAC,CAAC;;AAEF;AACA;AACA,MAAMG,2BAAwD,GAC3DH,KAAoB,IACpBI,QAAkB,IAAK;EACtB,IAAIJ,KAAK,CAACK,6BAA6B,IAAIL,KAAK,CAACM,wBAAwB,EAAE;IACzE,OAAOF,QAAQ,CAAC;MAAEH,IAAI,EAAE;IAAY,CAAC,CAAC;EACxC;EAEA,IAAID,KAAK,CAACO,cAAc,EAAE;IACxB,OAAOH,QAAQ,CAACN,kBAAkB,CAACE,KAAK,CAAC,CAAC;EAC5C;EAEA,IAAIA,KAAK,CAACQ,SAAS,IAAIR,KAAK,CAACS,gBAAgB,IAAIT,KAAK,CAACU,iBAAiB,EAAE;IACxE,MAAMC,WAAW,GAAGnB,UAAU,CAAC,aAAa,EAAE,UAAU,CAAC;IACzDY,QAAQ,CAACV,IAAI,CAACiB,WAAW,CAAC,CAAC;EAC7B;EAEA,IAAIX,KAAK,CAACY,gBAAgB,EAAE;IAC1B,OAAOR,QAAQ,CAACP,cAAc,CAAC,CAAC,CAAC;EACnC;EAEA,IAAIN,SAAS,EAAE;IACb,OAAOa,QAAQ,CAACL,SAAS,CAACC,KAAK,CAAC,CAAC;EACnC;EAEAa,UAAU,CAAC,MAAM;IACf,MAAMb,KAAK,CAACA,KAAK;EACnB,CAAC,CAAC;EAEF,OAAOI,QAAQ,CAACT,wBAAwB,CAACK,KAAK,CAAC,CAAC;AAClD,CAAC;;AAEH;AACA;AACA;AACA,IAAIc,0BAAsD,GACxDA,CAACC,aAAa,EAAEC,cAAc,KAAMZ,QAAkB,IACpDA,QAAQ,CAACY,cAAc,CAACD,aAAa,CAAC,CAAC;;AAE3C;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,6BAA6B,GACxCC,OAAmC,IAChC;EACHJ,0BAA0B,GAAGI,OAAO;AACtC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GACrBnB,KAA6B,IAC7BI,QAAkB,IAAK;EACtBA,QAAQ,CAACR,aAAa,CAAC,CAAC,CAAC;EAEzB,MAAMmB,aAAa,GAAG,IAAItB,aAAa,CAACO,KAAK,CAAC;EAE9C,OAAOI,QAAQ,CACbU,0BAA0B,CAACC,aAAa,EAAEZ,2BAA2B,CACvE,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"file":"Error.js","names":["IS_SERVER","getSetting","ErrorResponse","push","showXHRErrorNotification","resetProgress","changePassword","handleUnauthorized","noAction","saveError","error","type","payload","defaultErrorResponseHandler","dispatch","isResourceNotFoundAfterReload","isRemoteServiceException","isUnauthorized","isBlocked","isConcurrentUser","isInvalidUsername","LOGOUT_PATH","isChangePassword","setTimeout","customErrorResponseHandler","errorResponse","defaultHandler","setCustomErrorResponseHandler","handler","handleError"],"sources":["../../../src/redux/actions/Error.js"],"sourcesContent":["// @flow\nimport { IS_SERVER } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { showXHRErrorNotification } from \"./Notification\";\nimport { resetProgress } from \"./ProgressIndicator\";\nimport { changePassword } from \"./SignIn\";\nimport { handleUnauthorized } from \"./Authorization\";\nimport { noAction } from \"./Application\";\n\nimport type { FetchException } from \"../../exceptions\";\nimport type { Dispatch, SaveErrorAction, ThunkAction } from \"../types\";\n\ntype DefaultErrorResponseHandler = (error: ErrorResponse) => ThunkAction;\ntype CustomErrorResponseHandler = (\n  errorResponse: ErrorResponse,\n  defaultHandler: DefaultErrorResponseHandler,\n) => ThunkAction;\n\n/**\n */\nconst saveError = (error: ErrorResponse): SaveErrorAction => ({\n  type: \"SAVE_ERROR\",\n  payload: error,\n});\n\n/**\n */\nconst defaultErrorResponseHandler: DefaultErrorResponseHandler =\n  (error: ErrorResponse): ThunkAction =>\n  (dispatch: Dispatch) => {\n    if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {\n      return dispatch(noAction());\n    }\n\n    if (error.isUnauthorized) {\n      return dispatch(handleUnauthorized(error));\n    }\n\n    if (error.isBlocked || error.isConcurrentUser || error.isInvalidUsername) {\n      const LOGOUT_PATH = getSetting(\"LOGOUT_PATH\", \"/signout\");\n      dispatch(push(LOGOUT_PATH));\n    }\n\n    if (error.isChangePassword) {\n      return dispatch(changePassword());\n    }\n\n    if (IS_SERVER) {\n      return dispatch(saveError(error));\n    }\n\n    setTimeout(() => {\n      throw error.error;\n    });\n\n    return dispatch(showXHRErrorNotification(error));\n  };\n\n/**\n * Standard Custom error response, acts as a proxy and can be overwritten by {@link setCustomErrorResponseHandler}\n */\nlet customErrorResponseHandler: CustomErrorResponseHandler =\n  (errorResponse, defaultHandler) => (dispatch: Dispatch) =>\n    dispatch(defaultHandler(errorResponse));\n\n/**\n * Set a custom error response handler,\n * can be used when custom functionality is needed on certain (error) response\n * of the modular ui, for example when custom logic is needed when a user is unauthorized<br>\n * It receives an {@link ErrorResponse} and the {@link defaultErrorResponseHandler}\n */\nexport const setCustomErrorResponseHandler = (\n  handler: CustomErrorResponseHandler,\n) => {\n  customErrorResponseHandler = handler;\n};\n\n/**\n * Handle errors by sending an error notification message\n */\nexport const handleError =\n  (error: Error | FetchException): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(resetProgress());\n\n    const errorResponse = new ErrorResponse(error);\n\n    return dispatch(\n      customErrorResponseHandler(errorResponse, defaultErrorResponseHandler),\n    );\n  };\n"],"mappings":"AACA,SAASA,SAAS,QAAQ,2BAA2B;AACrD,SAASC,UAAU,QAAQ,0BAA0B;AAErD,OAAOC,aAAa,MAAM,kCAAkC;AAE5D,SAASC,IAAI,QAAQ,0BAA0B;AAC/C,SAASC,wBAAwB,QAAQ,gBAAgB;AACzD,SAASC,aAAa,QAAQ,qBAAqB;AACnD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,kBAAkB,QAAQ,iBAAiB;AACpD,SAASC,QAAQ,QAAQ,eAAe;AAWxC;AACA;AACA,MAAMC,SAAS,GAAIC,KAAoB,KAAuB;EAC5DC,IAAI,EAAE,YAAY;EAClBC,OAAO,EAAEF;AACX,CAAC,CAAC;;AAEF;AACA;AACA,MAAMG,2BAAwD,GAC3DH,KAAoB,IACpBI,QAAkB,IAAK;EACtB,IAAIJ,KAAK,CAACK,6BAA6B,IAAIL,KAAK,CAACM,wBAAwB,EAAE;IACzE,OAAOF,QAAQ,CAACN,QAAQ,CAAC,CAAC,CAAC;EAC7B;EAEA,IAAIE,KAAK,CAACO,cAAc,EAAE;IACxB,OAAOH,QAAQ,CAACP,kBAAkB,CAACG,KAAK,CAAC,CAAC;EAC5C;EAEA,IAAIA,KAAK,CAACQ,SAAS,IAAIR,KAAK,CAACS,gBAAgB,IAAIT,KAAK,CAACU,iBAAiB,EAAE;IACxE,MAAMC,WAAW,GAAGpB,UAAU,CAAC,aAAa,EAAE,UAAU,CAAC;IACzDa,QAAQ,CAACX,IAAI,CAACkB,WAAW,CAAC,CAAC;EAC7B;EAEA,IAAIX,KAAK,CAACY,gBAAgB,EAAE;IAC1B,OAAOR,QAAQ,CAACR,cAAc,CAAC,CAAC,CAAC;EACnC;EAEA,IAAIN,SAAS,EAAE;IACb,OAAOc,QAAQ,CAACL,SAAS,CAACC,KAAK,CAAC,CAAC;EACnC;EAEAa,UAAU,CAAC,MAAM;IACf,MAAMb,KAAK,CAACA,KAAK;EACnB,CAAC,CAAC;EAEF,OAAOI,QAAQ,CAACV,wBAAwB,CAACM,KAAK,CAAC,CAAC;AAClD,CAAC;;AAEH;AACA;AACA;AACA,IAAIc,0BAAsD,GACxDA,CAACC,aAAa,EAAEC,cAAc,KAAMZ,QAAkB,IACpDA,QAAQ,CAACY,cAAc,CAACD,aAAa,CAAC,CAAC;;AAE3C;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,6BAA6B,GACxCC,OAAmC,IAChC;EACHJ,0BAA0B,GAAGI,OAAO;AACtC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GACrBnB,KAA6B,IAC7BI,QAAkB,IAAK;EACtBA,QAAQ,CAACT,aAAa,CAAC,CAAC,CAAC;EAEzB,MAAMoB,aAAa,GAAG,IAAIvB,aAAa,CAACQ,KAAK,CAAC;EAE9C,OAAOI,QAAQ,CACbU,0BAA0B,CAACC,aAAa,EAAEZ,2BAA2B,CACvE,CAAC;AACH,CAAC","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"createHref.js","names":["Href","parseUrl","href","path","querystring","hash","_includesInstanceProperty","call","hashSplit","split","qsSplit","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_URLSearchParams","params","_Array$from","_keysInstanceProperty","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","entryDate","location","_startsWithInstanceProperty","replace","search","_context","substring","finalHref","setParameter","removeParameter"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  entryDate?: ISO_DATE,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  const finalHref =\n    dynamicPart instanceof Href\n      ? filterParameters(\n          new Href(href, dynamicPart.resourcetype, {\n            origin: dynamicPart.origin,\n            contextPath: dynamicPart.contextPath,\n          }),\n          allowedParameters,\n        )\n      : filterParameters(href, allowedParameters);\n\n  if (entryDate) {\n    finalHref.setParameter(\"entryDate\", entryDate);\n  } else {\n    finalHref.removeParameter(\"entryDate\");\n  }\n\n  return finalHref;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createHref.js","names":["Href","parseUrl","href","path","querystring","hash","_includesInstanceProperty","call","hashSplit","split","qsSplit","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_URLSearchParams","params","_Array$from","_keysInstanceProperty","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","entryDate","location","_startsWithInstanceProperty","replace","search","_context","substring","finalHref","setParameter","removeParameter"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  entryDate?: ?ISO_DATE,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  const finalHref =\n    dynamicPart instanceof Href\n      ? filterParameters(\n          new Href(href, dynamicPart.resourcetype, {\n            origin: dynamicPart.origin,\n            contextPath: dynamicPart.contextPath,\n          }),\n          allowedParameters,\n        )\n      : filterParameters(href, allowedParameters);\n\n  if (entryDate) {\n    finalHref.setParameter(\"entryDate\", entryDate);\n  } else {\n    finalHref.removeParameter(\"entryDate\");\n  }\n\n  return finalHref;\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -156,7 +156,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useContentType("/contenttypes/contenttype"),
       "contenttypes",
-      "/contenttypes/contenttype?entryDate=" + DateUtil.now(),
+      "/contenttypes/contenttype",
       ContentTypeModel,
     );
   });

package/lib/hooks/useModelCatalog.js

@@ -118,10 +118,7 @@ exports.useContent = useContent;
 const useContentType = function (contentType) {
   let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "contenttypes";
   let options = arguments.length > 2 ? arguments[2] : undefined;
-  const {
-    entryDate
-  } = useEntryDate();
-  const href = (0, _createHref.createHref)("contenttypes", contentType, entryDate, null, []);
+  const href = (0, _createHref.createHref)("contenttypes", contentType, null, null, []);
   return (0, _useModularUIBasic.useModularUIBasic)(key, href, {
     expectedModels: ["ContentType"],
     targetModel: _models.ContentTypeModel,

package/lib/hooks/useModelCatalog.js.flow

@@ -142,10 +142,7 @@ export const useContentType = (
   key?: string = "contenttypes",
   options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {
-  const { entryDate } = useEntryDate();
-
-  const href = createHref("contenttypes", contentType, entryDate, null, []);
-
+  const href = createHref("contenttypes", contentType, null, null, []);
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentType"],
     targetModel: ContentTypeModel,

package/lib/hooks/useModelCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModelCatalog.js","names":["_reactRedux","require","_useRouter","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","_modelcatalog","_ModelCatalog","useModelCatalog","options","useModularUIBasic","expectedModels","targetModel","ModelCatalogModel","exports","useConceptIndex","href","key","arguments","length","undefined","entryDate","useEntryDate","url","filterParameters","setParameter","ConceptIndexModel","useConceptDetail","concept","location","useLocation","createHref","useContentIndex","ContentIndexModel","useContentTOC","content","ContentTOCModel","useContent","contentSection","ContentModel","useContentType","contentType","ContentTypeModel","getSearchHref","uri","filters","filterString","_keys","default","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch","dispatch","useDispatch","useSelector","getEntryDate","setEntryDate","updateEntryDate"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nimport { getEntryDate } from \"../redux/selectors/modelcatalog\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport type Href from \"../models/href/Href\";\nimport type { UseModularUIBasicOptions } from \"./useModularUIBasic\";\nimport type { UpdateEntryDateAction } from \"../redux\";\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  modelCategory?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (\n  options?: UseModularUIBasicOptions<ModelCatalogModel>,\n): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n    ...options,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string | Href,\n  key?: string = \"conceptindex\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const { entryDate } = useEntryDate();\n  const url = filterParameters(href, [\n    \"index\",\n    \"label\",\n    \"modelcategory\",\n    \"type\",\n  ]);\n  url.setParameter(\"entryDate\", entryDate);\n\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string | Href,\n  key?: string = \"conceptdetail\",\n  options?: UseModularUIBasicOptions<\n    ConceptDetailModel | BusinessScenarioModel,\n  >,\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string | Href,\n  key?: string = \"contentindex\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string | Href,\n  key?: string = \"contenttoc\",\n  options?: UseModularUIBasicOptions<ContentTOCModel>,\n): ?ContentTOCModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"content\", content, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string | Href,\n  key?: string = \"content\",\n  options?: UseModularUIBasicOptions<ContentModel>,\n): ?ContentModel => {\n  const { entryDate } = useEntryDate();\n\n  const href = createHref(\"content\", contentSection, entryDate, null, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string | Href,\n  key?: string = \"contenttypes\",\n  options?: UseModularUIBasicOptions<ContentTypeModel>,\n): ?ContentTypeModel => {\n  const { entryDate } = useEntryDate();\n\n  const href = createHref(\"contenttypes\", contentType, entryDate, null, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n    ...options,\n  });\n};\n\n/**\n */\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n  const filterString = [];\n\n  for (const key of Object.keys(filters)) {\n    const filterValue = filters[key];\n    if (filterValue) {\n      let value: string = Array.isArray(filterValue)\n        ? filterValue.join(\",\")\n        : filterValue;\n      if (key === \"type\") {\n        value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n      }\n      filterString.push(`${key}=${value}`);\n    }\n  }\n\n  return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/**\n */\nexport const useConceptSearch = (\n  filters: SearchFilter,\n  key?: string = \"conceptSearch\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key, options);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key, options);\n};\n\n/**\n * Retrieve and update the entrydate for the modelcatalog\n */\nexport const useEntryDate = (): ({\n  entryDate: ISO_DATE,\n  setEntryDate: (entryDate: ISO_DATE) => UpdateEntryDateAction,\n}) => {\n  const dispatch = useDispatch();\n  const entryDate = useSelector(getEntryDate);\n\n  return {\n    entryDate,\n    setEntryDate: (entryDate: ISO_DATE) => dispatch(updateEntryDate(entryDate)),\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModelCatalog.js","names":["_reactRedux","require","_useRouter","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","_modelcatalog","_ModelCatalog","useModelCatalog","options","useModularUIBasic","expectedModels","targetModel","ModelCatalogModel","exports","useConceptIndex","href","key","arguments","length","undefined","entryDate","useEntryDate","url","filterParameters","setParameter","ConceptIndexModel","useConceptDetail","concept","location","useLocation","createHref","useContentIndex","ContentIndexModel","useContentTOC","content","ContentTOCModel","useContent","contentSection","ContentModel","useContentType","contentType","ContentTypeModel","getSearchHref","uri","filters","filterString","_keys","default","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch","dispatch","useDispatch","useSelector","getEntryDate","setEntryDate","updateEntryDate"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nimport { getEntryDate } from \"../redux/selectors/modelcatalog\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport type Href from \"../models/href/Href\";\nimport type { UseModularUIBasicOptions } from \"./useModularUIBasic\";\nimport type { UpdateEntryDateAction } from \"../redux\";\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  modelCategory?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (\n  options?: UseModularUIBasicOptions<ModelCatalogModel>,\n): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n    ...options,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string | Href,\n  key?: string = \"conceptindex\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const { entryDate } = useEntryDate();\n  const url = filterParameters(href, [\n    \"index\",\n    \"label\",\n    \"modelcategory\",\n    \"type\",\n  ]);\n  url.setParameter(\"entryDate\", entryDate);\n\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string | Href,\n  key?: string = \"conceptdetail\",\n  options?: UseModularUIBasicOptions<\n    ConceptDetailModel | BusinessScenarioModel,\n  >,\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string | Href,\n  key?: string = \"contentindex\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string | Href,\n  key?: string = \"contenttoc\",\n  options?: UseModularUIBasicOptions<ContentTOCModel>,\n): ?ContentTOCModel => {\n  const { entryDate } = useEntryDate();\n  const location = useLocation();\n\n  const href = createHref(\"content\", content, entryDate, location, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string | Href,\n  key?: string = \"content\",\n  options?: UseModularUIBasicOptions<ContentModel>,\n): ?ContentModel => {\n  const { entryDate } = useEntryDate();\n\n  const href = createHref(\"content\", contentSection, entryDate, null, []);\n\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n    ...options,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string | Href,\n  key?: string = \"contenttypes\",\n  options?: UseModularUIBasicOptions<ContentTypeModel>,\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, null, []);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n    ...options,\n  });\n};\n\n/**\n */\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n  const filterString = [];\n\n  for (const key of Object.keys(filters)) {\n    const filterValue = filters[key];\n    if (filterValue) {\n      let value: string = Array.isArray(filterValue)\n        ? filterValue.join(\",\")\n        : filterValue;\n      if (key === \"type\") {\n        value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n      }\n      filterString.push(`${key}=${value}`);\n    }\n  }\n\n  return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/**\n */\nexport const useConceptSearch = (\n  filters: SearchFilter,\n  key?: string = \"conceptSearch\",\n  options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key, options);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n  options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key, options);\n};\n\n/**\n * Retrieve and update the entrydate for the modelcatalog\n */\nexport const useEntryDate = (): ({\n  entryDate: ISO_DATE,\n  setEntryDate: (entryDate: ISO_DATE) => UpdateEntryDateAction,\n}) => {\n  const dispatch = useDispatch();\n  const entryDate = useSelector(getEntryDate);\n\n  return {\n    entryDate,\n    setEntryDate: (entryDate: ISO_DATE) => dispatch(updateEntryDate(entryDate)),\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/_modularui/ModularUIActions.js

@@ -116,11 +116,7 @@ const loadModel = (key, href, options) => ({
         origin: options?.origin,
         contextPath: options?.contextPath
       });
-      if (errorResponse.isChangePassword) {
-        return {
-          type: "NO_ACTION"
-        };
-      } else if (errorResponse.isResourceNotFoundAfterReload) {
+      if (errorResponse.isChangePassword || errorResponse.isResourceNotFoundAfterReload) {
         return removeModelByKey(key);
       }
       return updateStatus(key, _Constants.MODULARUI_STATUS.ERROR);

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

@@ -137,14 +137,12 @@ export const loadModel = (
         origin: options?.origin,
         contextPath: options?.contextPath,
       });
-      if (errorResponse.isChangePassword) {
-        return {
-          type: "NO_ACTION",
-        };
-      } else if (errorResponse.isResourceNotFoundAfterReload) {
+      if (
+        errorResponse.isChangePassword ||
+        errorResponse.isResourceNotFoundAfterReload
+      ) {
         return removeModelByKey(key);
       }
-
       return updateStatus(key, MODULARUI_STATUS.ERROR);
     },
   },

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

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

package/lib/redux/actions/Application.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reloadApplication = void 0;
+exports.reloadApplication = exports.noAction = void 0;
 var _ModularUIActions = require("../_modularui/ModularUIActions");
 var _ModularUISelectors = require("../_modularui/ModularUISelectors");
 var _models = require("../../models");
@@ -27,5 +27,12 @@ const reloadApplication = () => (dispatch, getState) => {
     targetModel: _models.ApplicationModel
   }));
 };
+
+/**
+ */
 exports.reloadApplication = reloadApplication;
+const noAction = () => ({
+  type: "NO_ACTION"
+});
+exports.noAction = noAction;
 //# sourceMappingURL=Application.js.map

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

@@ -10,7 +10,7 @@ import {
 import { ApplicationModel, Href } from "../../models";
 import { getLocale } from "../selectors/i18n";
 
-import type { Dispatch, GetState, ThunkAction } from "../types";
+import type { Dispatch, GetState, ThunkAction, NoAction } from "../types";
 
 /**
  */
@@ -37,3 +37,9 @@ export const reloadApplication =
       }),
     );
   };
+
+/**
+ */
+export const noAction = (): NoAction => ({
+  type: "NO_ACTION",
+});

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

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

package/lib/redux/actions/Authorization.js

@@ -12,8 +12,8 @@ var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 var _ModularUIActions = require("../_modularui/ModularUIActions");
 var _ModularUISelectors = require("../_modularui/ModularUISelectors");
 var _Application = require("./Application");
-var _constants = require("../../constants");
 var _SignIn = require("./SignIn");
+var _constants = require("../../constants");
 /**
  */
 const handleUnauthorized = errorResponse => (dispatch, getState) => {
@@ -49,9 +49,7 @@ const handleUnauthorized = errorResponse => (dispatch, getState) => {
       modal: false
     }));
   }
-  return {
-    type: "NO_ACTION"
-  };
+  return dispatch((0, _Application.noAction)());
 };
 exports.handleUnauthorized = handleUnauthorized;
 //# sourceMappingURL=Authorization.js.map

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

@@ -8,12 +8,12 @@ import Cache from "../../utils/browser/Cache";
 
 import { removeModelByKey } from "../_modularui/ModularUIActions";
 import { getApplication } from "../_modularui/ModularUISelectors";
-import { reloadApplication } from "./Application";
+import { noAction, reloadApplication } from "./Application";
+import { sendAuthenticationError } from "./SignIn";
 
 import { getSetting } from "../../constants";
 
 import type { ThunkAction } from "../types";
-import { sendAuthenticationError } from "./SignIn";
 
 /**
  */
@@ -61,5 +61,5 @@ export const handleUnauthorized =
       );
     }
 
-    return { type: "NO_ACTION" };
+    return dispatch(noAction());
   };

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

@@ -1 +1 @@
-{"version":3,"file":"Authorization.js","names":["_ErrorResponse","_interopRequireDefault","require","_RouterActions","_SignOut","_Cache","_ModularUIActions","_ModularUISelectors","_Application","_constants","_SignIn","handleUnauthorized","errorResponse","dispatch","getState","connectKey","removeModelByKey","getSetting","response","error","window","location","reload","application","getApplication","Cache","getItem","isLoggedIn","reloadApplication","logoutSuccess","removeItem","isInvalidUsername","sendAuthenticationError","message","router","LOGIN_PATH","pathname","locationFrom","state","from","replace","modal","type","exports"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/RouterActions\";\nimport { logoutSuccess } from \"./SignOut\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/ModularUIActions\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\nimport { sendAuthenticationError } from \"./SignIn\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged out\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      dispatch(sendAuthenticationError(errorResponse.message));\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        }),\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":";;;;;;;AACA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAEA,IAAAI,iBAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AAEA,IAAAO,UAAA,GAAAP,OAAA;AAGA,IAAAQ,OAAA,GAAAR,OAAA;AAEA;AACA;AACO,MAAMS,kBAAkB,GAC5BC,aAA4B,IAC7B,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EACtB,IAAIF,aAAa,CAACG,UAAU,EAAE;IAC5BF,QAAQ,CAAC,IAAAG,kCAAgB,EAACJ,aAAa,CAACG,UAAU,CAAC,CAAC;EACtD;EAEA,IACE,IAAAE,qBAAU,EAAC,mCAAmC,EAAE,KAAK,CAAC,IACtDL,aAAa,CAACM,QAAQ,EAAEC,KAAK,EAC7B;IACAC,MAAM,CAACC,QAAQ,CAACC,MAAM,CAAC,CAAC;IACxB;EACF;;EAEA;EACA,MAAMC,WAAW,GAAG,IAAAC,kCAAc,EAACV,QAAQ,CAAC,CAAC,CAAC;EAC9C,IAAIW,cAAK,CAACC,OAAO,CAAC,MAAM,CAAC,IAAIH,WAAW,EAAEI,UAAU,EAAE;IACpDd,QAAQ,CAAC,IAAAe,8BAAiB,EAAC,CAAC,CAAC;EAC/B;;EAEA;EACAf,QAAQ,CAAC,IAAAgB,sBAAa,EAAC,CAAC,CAAC;EAEzBJ,cAAK,CAACK,UAAU,CAAC,MAAM,CAAC;EAExB,IAAIlB,aAAa,CAACmB,iBAAiB,EAAE;IACnClB,QAAQ,CAAC,IAAAmB,+BAAuB,EAACpB,aAAa,CAACqB,OAAO,CAAC,CAAC;EAC1D;;EAEA;EACA,MAAMZ,QAAQ,GAAGP,QAAQ,CAAC,CAAC,CAACoB,MAAM,CAACb,QAAQ;EAC3C,MAAMc,UAAU,GAAG,IAAAlB,qBAAU,EAAC,YAAY,EAAE,SAAS,CAAC;EACtD,IAAII,QAAQ,EAAEe,QAAQ,KAAKD,UAAU,EAAE;IACrC,MAAME,YAAY,GAAGhB,QAAQ,EAAEiB,KAAK,EAAEC,IAAI;IAC1C,OAAO1B,QAAQ,CACb,IAAA2B,sBAAO,EAACL,UAAU,EAAE;MAClBI,IAAI,EAAEF,YAAY,GAAGA,YAAY,GAAGvB,QAAQ,CAAC,CAAC,CAACoB,MAAM,CAACb,QAAQ;MAC9D;MACAoB,KAAK,EAAE;IACT,CAAC,CACH,CAAC;EACH;EAEA,OAAO;IAAEC,IAAI,EAAE;EAAY,CAAC;AAC9B,CAAC;AAACC,OAAA,CAAAhC,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"file":"Authorization.js","names":["_ErrorResponse","_interopRequireDefault","require","_RouterActions","_SignOut","_Cache","_ModularUIActions","_ModularUISelectors","_Application","_SignIn","_constants","handleUnauthorized","errorResponse","dispatch","getState","connectKey","removeModelByKey","getSetting","response","error","window","location","reload","application","getApplication","Cache","getItem","isLoggedIn","reloadApplication","logoutSuccess","removeItem","isInvalidUsername","sendAuthenticationError","message","router","LOGIN_PATH","pathname","locationFrom","state","from","replace","modal","noAction","exports"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/RouterActions\";\nimport { logoutSuccess } from \"./SignOut\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/ModularUIActions\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\nimport { noAction, reloadApplication } from \"./Application\";\nimport { sendAuthenticationError } from \"./SignIn\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged out\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      dispatch(sendAuthenticationError(errorResponse.message));\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        }),\n      );\n    }\n\n    return dispatch(noAction());\n  };\n"],"mappings":";;;;;;;AACA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAEA,IAAAI,iBAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,OAAA,GAAAP,OAAA;AAEA,IAAAQ,UAAA,GAAAR,OAAA;AAIA;AACA;AACO,MAAMS,kBAAkB,GAC5BC,aAA4B,IAC7B,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EACtB,IAAIF,aAAa,CAACG,UAAU,EAAE;IAC5BF,QAAQ,CAAC,IAAAG,kCAAgB,EAACJ,aAAa,CAACG,UAAU,CAAC,CAAC;EACtD;EAEA,IACE,IAAAE,qBAAU,EAAC,mCAAmC,EAAE,KAAK,CAAC,IACtDL,aAAa,CAACM,QAAQ,EAAEC,KAAK,EAC7B;IACAC,MAAM,CAACC,QAAQ,CAACC,MAAM,CAAC,CAAC;IACxB;EACF;;EAEA;EACA,MAAMC,WAAW,GAAG,IAAAC,kCAAc,EAACV,QAAQ,CAAC,CAAC,CAAC;EAC9C,IAAIW,cAAK,CAACC,OAAO,CAAC,MAAM,CAAC,IAAIH,WAAW,EAAEI,UAAU,EAAE;IACpDd,QAAQ,CAAC,IAAAe,8BAAiB,EAAC,CAAC,CAAC;EAC/B;;EAEA;EACAf,QAAQ,CAAC,IAAAgB,sBAAa,EAAC,CAAC,CAAC;EAEzBJ,cAAK,CAACK,UAAU,CAAC,MAAM,CAAC;EAExB,IAAIlB,aAAa,CAACmB,iBAAiB,EAAE;IACnClB,QAAQ,CAAC,IAAAmB,+BAAuB,EAACpB,aAAa,CAACqB,OAAO,CAAC,CAAC;EAC1D;;EAEA;EACA,MAAMZ,QAAQ,GAAGP,QAAQ,CAAC,CAAC,CAACoB,MAAM,CAACb,QAAQ;EAC3C,MAAMc,UAAU,GAAG,IAAAlB,qBAAU,EAAC,YAAY,EAAE,SAAS,CAAC;EACtD,IAAII,QAAQ,EAAEe,QAAQ,KAAKD,UAAU,EAAE;IACrC,MAAME,YAAY,GAAGhB,QAAQ,EAAEiB,KAAK,EAAEC,IAAI;IAC1C,OAAO1B,QAAQ,CACb,IAAA2B,sBAAO,EAACL,UAAU,EAAE;MAClBI,IAAI,EAAEF,YAAY,GAAGA,YAAY,GAAGvB,QAAQ,CAAC,CAAC,CAACoB,MAAM,CAACb,QAAQ;MAC9D;MACAoB,KAAK,EAAE;IACT,CAAC,CACH,CAAC;EACH;EAEA,OAAO5B,QAAQ,CAAC,IAAA6B,qBAAQ,EAAC,CAAC,CAAC;AAC7B,CAAC;AAACC,OAAA,CAAAhC,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/lib/redux/actions/Error.js

@@ -13,6 +13,7 @@ var _Notification = require("./Notification");
 var _ProgressIndicator = require("./ProgressIndicator");
 var _SignIn = require("./SignIn");
 var _Authorization = require("./Authorization");
+var _Application = require("./Application");
 /**
  */
 const saveError = error => ({
@@ -24,9 +25,7 @@ const saveError = error => ({
  */
 const defaultErrorResponseHandler = error => dispatch => {
   if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {
-    return dispatch({
-      type: "NO_ACTION"
-    });
+    return dispatch((0, _Application.noAction)());
   }
   if (error.isUnauthorized) {
     return dispatch((0, _Authorization.handleUnauthorized)(error));

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

@@ -9,6 +9,7 @@ import { showXHRErrorNotification } from "./Notification";
 import { resetProgress } from "./ProgressIndicator";
 import { changePassword } from "./SignIn";
 import { handleUnauthorized } from "./Authorization";
+import { noAction } from "./Application";
 
 import type { FetchException } from "../../exceptions";
 import type { Dispatch, SaveErrorAction, ThunkAction } from "../types";
@@ -32,7 +33,7 @@ const defaultErrorResponseHandler: DefaultErrorResponseHandler =
   (error: ErrorResponse): ThunkAction =>
   (dispatch: Dispatch) => {
     if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {
-      return dispatch({ type: "NO_ACTION" });
+      return dispatch(noAction());
     }
 
     if (error.isUnauthorized) {

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

@@ -1 +1 @@
-{"version":3,"file":"Error.js","names":["_Constants","require","_Settings","_ErrorResponse","_interopRequireDefault","_RouterActions","_Notification","_ProgressIndicator","_SignIn","_Authorization","saveError","error","type","payload","defaultErrorResponseHandler","dispatch","isResourceNotFoundAfterReload","isRemoteServiceException","isUnauthorized","handleUnauthorized","isBlocked","isConcurrentUser","isInvalidUsername","LOGOUT_PATH","getSetting","push","isChangePassword","changePassword","IS_SERVER","setTimeout","showXHRErrorNotification","customErrorResponseHandler","errorResponse","defaultHandler","setCustomErrorResponseHandler","handler","exports","handleError","resetProgress","ErrorResponse"],"sources":["../../../src/redux/actions/Error.js"],"sourcesContent":["// @flow\nimport { IS_SERVER } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { showXHRErrorNotification } from \"./Notification\";\nimport { resetProgress } from \"./ProgressIndicator\";\nimport { changePassword } from \"./SignIn\";\nimport { handleUnauthorized } from \"./Authorization\";\n\nimport type { FetchException } from \"../../exceptions\";\nimport type { Dispatch, SaveErrorAction, ThunkAction } from \"../types\";\n\ntype DefaultErrorResponseHandler = (error: ErrorResponse) => ThunkAction;\ntype CustomErrorResponseHandler = (\n  errorResponse: ErrorResponse,\n  defaultHandler: DefaultErrorResponseHandler,\n) => ThunkAction;\n\n/**\n */\nconst saveError = (error: ErrorResponse): SaveErrorAction => ({\n  type: \"SAVE_ERROR\",\n  payload: error,\n});\n\n/**\n */\nconst defaultErrorResponseHandler: DefaultErrorResponseHandler =\n  (error: ErrorResponse): ThunkAction =>\n  (dispatch: Dispatch) => {\n    if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {\n      return dispatch({ type: \"NO_ACTION\" });\n    }\n\n    if (error.isUnauthorized) {\n      return dispatch(handleUnauthorized(error));\n    }\n\n    if (error.isBlocked || error.isConcurrentUser || error.isInvalidUsername) {\n      const LOGOUT_PATH = getSetting(\"LOGOUT_PATH\", \"/signout\");\n      dispatch(push(LOGOUT_PATH));\n    }\n\n    if (error.isChangePassword) {\n      return dispatch(changePassword());\n    }\n\n    if (IS_SERVER) {\n      return dispatch(saveError(error));\n    }\n\n    setTimeout(() => {\n      throw error.error;\n    });\n\n    return dispatch(showXHRErrorNotification(error));\n  };\n\n/**\n * Standard Custom error response, acts as a proxy and can be overwritten by {@link setCustomErrorResponseHandler}\n */\nlet customErrorResponseHandler: CustomErrorResponseHandler =\n  (errorResponse, defaultHandler) => (dispatch: Dispatch) =>\n    dispatch(defaultHandler(errorResponse));\n\n/**\n * Set a custom error response handler,\n * can be used when custom functionality is needed on certain (error) response\n * of the modular ui, for example when custom logic is needed when a user is unauthorized<br>\n * It receives an {@link ErrorResponse} and the {@link defaultErrorResponseHandler}\n */\nexport const setCustomErrorResponseHandler = (\n  handler: CustomErrorResponseHandler,\n) => {\n  customErrorResponseHandler = handler;\n};\n\n/**\n * Handle errors by sending an error notification message\n */\nexport const handleError =\n  (error: Error | FetchException): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(resetProgress());\n\n    const errorResponse = new ErrorResponse(error);\n\n    return dispatch(\n      customErrorResponseHandler(errorResponse, defaultErrorResponseHandler),\n    );\n  };\n"],"mappings":";;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,cAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,cAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,kBAAA,GAAAN,OAAA;AACA,IAAAO,OAAA,GAAAP,OAAA;AACA,IAAAQ,cAAA,GAAAR,OAAA;AAWA;AACA;AACA,MAAMS,SAAS,GAAIC,KAAoB,KAAuB;EAC5DC,IAAI,EAAE,YAAY;EAClBC,OAAO,EAAEF;AACX,CAAC,CAAC;;AAEF;AACA;AACA,MAAMG,2BAAwD,GAC3DH,KAAoB,IACpBI,QAAkB,IAAK;EACtB,IAAIJ,KAAK,CAACK,6BAA6B,IAAIL,KAAK,CAACM,wBAAwB,EAAE;IACzE,OAAOF,QAAQ,CAAC;MAAEH,IAAI,EAAE;IAAY,CAAC,CAAC;EACxC;EAEA,IAAID,KAAK,CAACO,cAAc,EAAE;IACxB,OAAOH,QAAQ,CAAC,IAAAI,iCAAkB,EAACR,KAAK,CAAC,CAAC;EAC5C;EAEA,IAAIA,KAAK,CAACS,SAAS,IAAIT,KAAK,CAACU,gBAAgB,IAAIV,KAAK,CAACW,iBAAiB,EAAE;IACxE,MAAMC,WAAW,GAAG,IAAAC,oBAAU,EAAC,aAAa,EAAE,UAAU,CAAC;IACzDT,QAAQ,CAAC,IAAAU,mBAAI,EAACF,WAAW,CAAC,CAAC;EAC7B;EAEA,IAAIZ,KAAK,CAACe,gBAAgB,EAAE;IAC1B,OAAOX,QAAQ,CAAC,IAAAY,sBAAc,EAAC,CAAC,CAAC;EACnC;EAEA,IAAIC,oBAAS,EAAE;IACb,OAAOb,QAAQ,CAACL,SAAS,CAACC,KAAK,CAAC,CAAC;EACnC;EAEAkB,UAAU,CAAC,MAAM;IACf,MAAMlB,KAAK,CAACA,KAAK;EACnB,CAAC,CAAC;EAEF,OAAOI,QAAQ,CAAC,IAAAe,sCAAwB,EAACnB,KAAK,CAAC,CAAC;AAClD,CAAC;;AAEH;AACA;AACA;AACA,IAAIoB,0BAAsD,GACxDA,CAACC,aAAa,EAAEC,cAAc,KAAMlB,QAAkB,IACpDA,QAAQ,CAACkB,cAAc,CAACD,aAAa,CAAC,CAAC;;AAE3C;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,6BAA6B,GACxCC,OAAmC,IAChC;EACHJ,0BAA0B,GAAGI,OAAO;AACtC,CAAC;;AAED;AACA;AACA;AAFAC,OAAA,CAAAF,6BAAA,GAAAA,6BAAA;AAGO,MAAMG,WAAW,GACrB1B,KAA6B,IAC7BI,QAAkB,IAAK;EACtBA,QAAQ,CAAC,IAAAuB,gCAAa,EAAC,CAAC,CAAC;EAEzB,MAAMN,aAAa,GAAG,IAAIO,sBAAa,CAAC5B,KAAK,CAAC;EAE9C,OAAOI,QAAQ,CACbgB,0BAA0B,CAACC,aAAa,EAAElB,2BAA2B,CACvE,CAAC;AACH,CAAC;AAACsB,OAAA,CAAAC,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"file":"Error.js","names":["_Constants","require","_Settings","_ErrorResponse","_interopRequireDefault","_RouterActions","_Notification","_ProgressIndicator","_SignIn","_Authorization","_Application","saveError","error","type","payload","defaultErrorResponseHandler","dispatch","isResourceNotFoundAfterReload","isRemoteServiceException","noAction","isUnauthorized","handleUnauthorized","isBlocked","isConcurrentUser","isInvalidUsername","LOGOUT_PATH","getSetting","push","isChangePassword","changePassword","IS_SERVER","setTimeout","showXHRErrorNotification","customErrorResponseHandler","errorResponse","defaultHandler","setCustomErrorResponseHandler","handler","exports","handleError","resetProgress","ErrorResponse"],"sources":["../../../src/redux/actions/Error.js"],"sourcesContent":["// @flow\nimport { IS_SERVER } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { showXHRErrorNotification } from \"./Notification\";\nimport { resetProgress } from \"./ProgressIndicator\";\nimport { changePassword } from \"./SignIn\";\nimport { handleUnauthorized } from \"./Authorization\";\nimport { noAction } from \"./Application\";\n\nimport type { FetchException } from \"../../exceptions\";\nimport type { Dispatch, SaveErrorAction, ThunkAction } from \"../types\";\n\ntype DefaultErrorResponseHandler = (error: ErrorResponse) => ThunkAction;\ntype CustomErrorResponseHandler = (\n  errorResponse: ErrorResponse,\n  defaultHandler: DefaultErrorResponseHandler,\n) => ThunkAction;\n\n/**\n */\nconst saveError = (error: ErrorResponse): SaveErrorAction => ({\n  type: \"SAVE_ERROR\",\n  payload: error,\n});\n\n/**\n */\nconst defaultErrorResponseHandler: DefaultErrorResponseHandler =\n  (error: ErrorResponse): ThunkAction =>\n  (dispatch: Dispatch) => {\n    if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {\n      return dispatch(noAction());\n    }\n\n    if (error.isUnauthorized) {\n      return dispatch(handleUnauthorized(error));\n    }\n\n    if (error.isBlocked || error.isConcurrentUser || error.isInvalidUsername) {\n      const LOGOUT_PATH = getSetting(\"LOGOUT_PATH\", \"/signout\");\n      dispatch(push(LOGOUT_PATH));\n    }\n\n    if (error.isChangePassword) {\n      return dispatch(changePassword());\n    }\n\n    if (IS_SERVER) {\n      return dispatch(saveError(error));\n    }\n\n    setTimeout(() => {\n      throw error.error;\n    });\n\n    return dispatch(showXHRErrorNotification(error));\n  };\n\n/**\n * Standard Custom error response, acts as a proxy and can be overwritten by {@link setCustomErrorResponseHandler}\n */\nlet customErrorResponseHandler: CustomErrorResponseHandler =\n  (errorResponse, defaultHandler) => (dispatch: Dispatch) =>\n    dispatch(defaultHandler(errorResponse));\n\n/**\n * Set a custom error response handler,\n * can be used when custom functionality is needed on certain (error) response\n * of the modular ui, for example when custom logic is needed when a user is unauthorized<br>\n * It receives an {@link ErrorResponse} and the {@link defaultErrorResponseHandler}\n */\nexport const setCustomErrorResponseHandler = (\n  handler: CustomErrorResponseHandler,\n) => {\n  customErrorResponseHandler = handler;\n};\n\n/**\n * Handle errors by sending an error notification message\n */\nexport const handleError =\n  (error: Error | FetchException): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(resetProgress());\n\n    const errorResponse = new ErrorResponse(error);\n\n    return dispatch(\n      customErrorResponseHandler(errorResponse, defaultErrorResponseHandler),\n    );\n  };\n"],"mappings":";;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,cAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,cAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,kBAAA,GAAAN,OAAA;AACA,IAAAO,OAAA,GAAAP,OAAA;AACA,IAAAQ,cAAA,GAAAR,OAAA;AACA,IAAAS,YAAA,GAAAT,OAAA;AAWA;AACA;AACA,MAAMU,SAAS,GAAIC,KAAoB,KAAuB;EAC5DC,IAAI,EAAE,YAAY;EAClBC,OAAO,EAAEF;AACX,CAAC,CAAC;;AAEF;AACA;AACA,MAAMG,2BAAwD,GAC3DH,KAAoB,IACpBI,QAAkB,IAAK;EACtB,IAAIJ,KAAK,CAACK,6BAA6B,IAAIL,KAAK,CAACM,wBAAwB,EAAE;IACzE,OAAOF,QAAQ,CAAC,IAAAG,qBAAQ,EAAC,CAAC,CAAC;EAC7B;EAEA,IAAIP,KAAK,CAACQ,cAAc,EAAE;IACxB,OAAOJ,QAAQ,CAAC,IAAAK,iCAAkB,EAACT,KAAK,CAAC,CAAC;EAC5C;EAEA,IAAIA,KAAK,CAACU,SAAS,IAAIV,KAAK,CAACW,gBAAgB,IAAIX,KAAK,CAACY,iBAAiB,EAAE;IACxE,MAAMC,WAAW,GAAG,IAAAC,oBAAU,EAAC,aAAa,EAAE,UAAU,CAAC;IACzDV,QAAQ,CAAC,IAAAW,mBAAI,EAACF,WAAW,CAAC,CAAC;EAC7B;EAEA,IAAIb,KAAK,CAACgB,gBAAgB,EAAE;IAC1B,OAAOZ,QAAQ,CAAC,IAAAa,sBAAc,EAAC,CAAC,CAAC;EACnC;EAEA,IAAIC,oBAAS,EAAE;IACb,OAAOd,QAAQ,CAACL,SAAS,CAACC,KAAK,CAAC,CAAC;EACnC;EAEAmB,UAAU,CAAC,MAAM;IACf,MAAMnB,KAAK,CAACA,KAAK;EACnB,CAAC,CAAC;EAEF,OAAOI,QAAQ,CAAC,IAAAgB,sCAAwB,EAACpB,KAAK,CAAC,CAAC;AAClD,CAAC;;AAEH;AACA;AACA;AACA,IAAIqB,0BAAsD,GACxDA,CAACC,aAAa,EAAEC,cAAc,KAAMnB,QAAkB,IACpDA,QAAQ,CAACmB,cAAc,CAACD,aAAa,CAAC,CAAC;;AAE3C;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,6BAA6B,GACxCC,OAAmC,IAChC;EACHJ,0BAA0B,GAAGI,OAAO;AACtC,CAAC;;AAED;AACA;AACA;AAFAC,OAAA,CAAAF,6BAAA,GAAAA,6BAAA;AAGO,MAAMG,WAAW,GACrB3B,KAA6B,IAC7BI,QAAkB,IAAK;EACtBA,QAAQ,CAAC,IAAAwB,gCAAa,EAAC,CAAC,CAAC;EAEzB,MAAMN,aAAa,GAAG,IAAIO,sBAAa,CAAC7B,KAAK,CAAC;EAE9C,OAAOI,QAAQ,CACbiB,0BAA0B,CAACC,aAAa,EAAEnB,2BAA2B,CACvE,CAAC;AACH,CAAC;AAACuB,OAAA,CAAAC,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/utils/helpers/createHref.js.flow

@@ -77,7 +77,7 @@ export const filterParameters = (
 export const createHref = (
   context: string,
   dynamicPart: string | Href,
-  entryDate?: ISO_DATE,
+  entryDate?: ?ISO_DATE,
   location?: ?Location,
   allowedParameters?: Array<string>,
 ): Href => {

package/lib/utils/helpers/createHref.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHref.js","names":["_Href","_interopRequireDefault","require","parseUrl","href","Href","path","querystring","hash","_includes","default","call","hashSplit","split","qsSplit","exports","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_urlSearchParams","params","_from","_keys","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","entryDate","location","_startsWith","replace","search","_context","substring","finalHref","setParameter","removeParameter"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  entryDate?: ISO_DATE,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  const finalHref =\n    dynamicPart instanceof Href\n      ? filterParameters(\n          new Href(href, dynamicPart.resourcetype, {\n            origin: dynamicPart.origin,\n            contextPath: dynamicPart.contextPath,\n          }),\n          allowedParameters,\n        )\n      : filterParameters(href, allowedParameters);\n\n  if (entryDate) {\n    finalHref.setParameter(\"entryDate\", entryDate);\n  } else {\n    finalHref.removeParameter(\"entryDate\");\n  }\n\n  return finalHref;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createHref.js","names":["_Href","_interopRequireDefault","require","parseUrl","href","Href","path","querystring","hash","_includes","default","call","hashSplit","split","qsSplit","exports","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_urlSearchParams","params","_from","_keys","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","entryDate","location","_startsWith","replace","search","_context","substring","finalHref","setParameter","removeParameter"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  entryDate?: ?ISO_DATE,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  const finalHref =\n    dynamicPart instanceof Href\n      ? filterParameters(\n          new Href(href, dynamicPart.resourcetype, {\n            origin: dynamicPart.origin,\n            contextPath: dynamicPart.contextPath,\n          }),\n          allowedParameters,\n        )\n      : filterParameters(href, allowedParameters);\n\n  if (entryDate) {\n    finalHref.setParameter(\"entryDate\", entryDate);\n  } else {\n    finalHref.removeParameter(\"entryDate\");\n  }\n\n  return finalHref;\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.59.9",
+  "version": "1.59.11",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -110,7 +110,7 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-flow": "^7.25.9",
     "@babel/preset-react": "^7.26.3",
-    "@commitlint/cli": "^19.6.0",
+    "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
     "@testing-library/react": "^16.1.0",
     "auditjs": "^4.0.46",
@@ -126,7 +126,7 @@
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.9.0",
-    "eslint-plugin-jsdoc": "^50.6.0",
+    "eslint-plugin-jsdoc": "^50.6.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
@@ -141,7 +141,7 @@
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^17.1.1",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.2.11",
     "polished": "^4.0.0",
     "prettier": "^3.4.2",
     "react": "^18.3.1",

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

@@ -156,7 +156,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useContentType("/contenttypes/contenttype"),
       "contenttypes",
-      "/contenttypes/contenttype?entryDate=" + DateUtil.now(),
+      "/contenttypes/contenttype",
       ContentTypeModel,
     );
   });

package/src/hooks/useModelCatalog.js

@@ -142,10 +142,7 @@ export const useContentType = (
   key?: string = "contenttypes",
   options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {
-  const { entryDate } = useEntryDate();
-
-  const href = createHref("contenttypes", contentType, entryDate, null, []);
-
+  const href = createHref("contenttypes", contentType, null, null, []);
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentType"],
     targetModel: ContentTypeModel,

package/src/redux/_modularui/ModularUIActions.js

@@ -137,14 +137,12 @@ export const loadModel = (
         origin: options?.origin,
         contextPath: options?.contextPath,
       });
-      if (errorResponse.isChangePassword) {
-        return {
-          type: "NO_ACTION",
-        };
-      } else if (errorResponse.isResourceNotFoundAfterReload) {
+      if (
+        errorResponse.isChangePassword ||
+        errorResponse.isResourceNotFoundAfterReload
+      ) {
         return removeModelByKey(key);
       }
-
       return updateStatus(key, MODULARUI_STATUS.ERROR);
     },
   },

package/src/redux/actions/Application.js

@@ -10,7 +10,7 @@ import {
 import { ApplicationModel, Href } from "../../models";
 import { getLocale } from "../selectors/i18n";
 
-import type { Dispatch, GetState, ThunkAction } from "../types";
+import type { Dispatch, GetState, ThunkAction, NoAction } from "../types";
 
 /**
  */
@@ -37,3 +37,9 @@ export const reloadApplication =
       }),
     );
   };
+
+/**
+ */
+export const noAction = (): NoAction => ({
+  type: "NO_ACTION",
+});

package/src/redux/actions/Authorization.js

@@ -8,12 +8,12 @@ import Cache from "../../utils/browser/Cache";
 
 import { removeModelByKey } from "../_modularui/ModularUIActions";
 import { getApplication } from "../_modularui/ModularUISelectors";
-import { reloadApplication } from "./Application";
+import { noAction, reloadApplication } from "./Application";
+import { sendAuthenticationError } from "./SignIn";
 
 import { getSetting } from "../../constants";
 
 import type { ThunkAction } from "../types";
-import { sendAuthenticationError } from "./SignIn";
 
 /**
  */
@@ -61,5 +61,5 @@ export const handleUnauthorized =
       );
     }
 
-    return { type: "NO_ACTION" };
+    return dispatch(noAction());
   };

package/src/redux/actions/Error.js

@@ -9,6 +9,7 @@ import { showXHRErrorNotification } from "./Notification";
 import { resetProgress } from "./ProgressIndicator";
 import { changePassword } from "./SignIn";
 import { handleUnauthorized } from "./Authorization";
+import { noAction } from "./Application";
 
 import type { FetchException } from "../../exceptions";
 import type { Dispatch, SaveErrorAction, ThunkAction } from "../types";
@@ -32,7 +33,7 @@ const defaultErrorResponseHandler: DefaultErrorResponseHandler =
   (error: ErrorResponse): ThunkAction =>
   (dispatch: Dispatch) => {
     if (error.isResourceNotFoundAfterReload || error.isRemoteServiceException) {
-      return dispatch({ type: "NO_ACTION" });
+      return dispatch(noAction());
     }
 
     if (error.isUnauthorized) {

package/src/utils/helpers/createHref.js

@@ -77,7 +77,7 @@ export const filterParameters = (
 export const createHref = (
   context: string,
   dynamicPart: string | Href,
-  entryDate?: ISO_DATE,
+  entryDate?: ?ISO_DATE,
   location?: ?Location,
   allowedParameters?: Array<string>,
 ): Href => {