@beinformed/ui 1.57.2 → 1.57.3

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","loadModelPromise","_Promise","resolve","then","catch","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key,\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", options?.origin, options?.contextPath),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(\n        error,\n        key,\n        options?.origin,\n        options?.contextPath,\n      );\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\n\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestModularUIOptions,\n  ): ThunkAction =>\n  (dispatch: Dispatch, getState) => {\n    const modularuiStore = getState()?.modularui;\n    if (\n      modularuiStore &&\n      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING\n    ) {\n      // don't create duplicate requests during loading\n      return dispatch({\n        type: \"NO_ACTION\",\n      });\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":";AACA,SAASA,YAAY,EAAEC,gBAAgB,QAAQ,2BAA2B;AAC1E,OAAOC,IAAI,MAAM,wBAAwB;AACzC,OAAOC,aAAa,MAAM,kCAAkC;AAC5D,SAASC,cAAc,EAAEC,aAAa,QAAQ,8BAA8B;AAC5E,SAASC,WAAW,QAAQ,kBAAkB;AAmB9C;AACA;AACA,OAAO,MAAMC,QAAQ,GAAGA,CACtBC,GAAW,EACXC,KAAqB,KACF;EACnB;EACAA,KAAK,CAACC,UAAU,GAAGF,GAAG;EACtB,OAAO;IACLG,IAAI,EAAE,eAAe;IACrBC,OAAO,EAAE;MACPJ,GAAG;MACHC;IACF;EACF,CAAC;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMI,UAAU,GACrBC,MAAqD,KAChC;EACrBH,IAAI,EAAE,gBAAgB;EACtBC,OAAO,EAAEE;AACX,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMC,WAAW,GAAIN,KAAqB,KAAyB;EACxEE,IAAI,EAAE,kBAAkB;EACxBC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMO,UAAU,GAAIP,KAAqB,KAAwB;EACtEE,IAAI,EAAE,uBAAuB;EAC7BC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMQ,gBAAgB,GAAIT,GAAW,KAA8B;EACxEG,IAAI,EAAE,sBAAsB;EAC5BC,OAAO,EAAEJ;AACX,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMU,cAAc,GAAGA,CAAA,MAA6B;EACzDP,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMQ,YAAY,GAAGA,CAC1BX,GAAW,EACXY,MAAsC,MACd;EACxBT,IAAI,EAAE,kBAAkB;EACxBC,OAAO,EAAE;IAAEJ,GAAG;IAAEY;EAAO;AACzB,CAAC,CAAC;;AAEF;AACA;AACA,MAAMC,sBAAsB,GAAGA,CAC7Bb,GAAW,EACXC,KAAqB,EACrBa,aAAmC,KACI;EACvC,IAAIA,aAAa,EAAE;IACjB,OAAOP,WAAW,CAACO,aAAa,CAACb,KAAK,CAAC,CAAC;EAC1C;EACA,OAAOF,QAAQ,CAACC,GAAG,EAAEC,KAAK,CAAC;AAC7B,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMc,SAAS,GAAGA,CACvBf,GAAW,EACXgB,IAAmB,EACnBC,OAAiC,MACZ;EACrBd,IAAI,EAAE,iBAAiB;EACvBC,OAAO,EAAE;IACPJ,GAAG;IACHkB,MAAM,EAAED,OAAO,EAAEC,MAAM;IACvBC,WAAW,EAAEF,OAAO,EAAEE,WAAW;IACjCH,IAAI,EACFA,IAAI,YAAYtB,IAAI,GAChBsB,IAAI,GACJ,IAAItB,IAAI,CAACsB,IAAI,EAAE,EAAE,EAAEC,OAAO,EAAEC,MAAM,EAAED,OAAO,EAAEE,WAAW,CAAC;IAC/DC,MAAM,EAAEH,OAAO,EAAEG,MAAM,IAAI5B,YAAY,CAAC6B,GAAG;IAC3CC,IAAI,EAAEL,OAAO,EAAEK,IAAI;IACnBC,MAAM,EAAEN,OAAO,EAAEM,MAAM,IAAI,IAAI;IAC/BC,WAAW,EAAEP,OAAO,EAAEO,WAAW;IACjCC,WAAW,EAAER,OAAO,EAAEQ,WAAW;IACjCC,gBAAgB,EAAET,OAAO,EAAES,gBAAgB;IAC3CC,KAAK,EAAEV,OAAO,EAAEU,KAAK;IACrB;AACJ;IACIC,aAAa,EAAG3B,KAAK,IACnBY,sBAAsB,CAACb,GAAG,EAAEC,KAAK,EAAEgB,OAAO,EAAEH,aAAa,CAAC;IAC5D;AACJ;IACIe,WAAW,EAAGC,KAAK,IAAK;MACtB,MAAMC,aAAa,GAAG,IAAIpC,aAAa,CACrCmC,KAAK,EACL9B,GAAG,EACHiB,OAAO,EAAEC,MAAM,EACfD,OAAO,EAAEE,WACX,CAAC;MACD,IAAIY,aAAa,CAACC,gBAAgB,EAAE;QAClC,OAAO;UACL7B,IAAI,EAAE;QACR,CAAC;MACH,CAAC,MAAM,IAAI4B,aAAa,CAACE,6BAA6B,EAAE;QACtD,OAAOxB,gBAAgB,CAACT,GAAG,CAAC;MAC9B;MAEA,OAAOW,YAAY,CAACX,GAAG,EAAEP,gBAAgB,CAACyC,KAAK,CAAC;IAClD;EACF;AACF,CAAC,CAAC;;AAEF;AACA;AACA,OAAO,MAAMC,aAAa,GACxBA,CACEnC,GAAW,EACXgB,IAAmB,EACnBC,OAAiC,KAEnC,CAACmB,QAAkB,EAAEC,QAAQ,KAAK;EAChC,MAAMC,cAAc,GAAGD,QAAQ,CAAC,CAAC,EAAEE,SAAS;EAC5C,IACED,cAAc,IACdA,cAAc,CAACtC,GAAG,CAAC,EAAEY,MAAM,KAAKnB,gBAAgB,CAAC+C,OAAO,EACxD;IACA;IACA,OAAOJ,QAAQ,CAAC;MACdjC,IAAI,EAAE;IACR,CAAC,CAAC;EACJ;EAEAiC,QAAQ,CAACvC,aAAa,CAAC,CAAC,CAAC;EAEzB,MAAM4C,gBAAgB,GAAGL,QAAQ,CAACrB,SAAS,CAACf,GAAG,EAAEgB,IAAI,EAAEC,OAAO,CAAC,CAAC;EAEhE,OAAOyB,QAAA,CAAQC,OAAO,CAACF,gBAAgB,CAAC,CACrCG,IAAI,CAAC,MAAMR,QAAQ,CAACxC,cAAc,CAAC,CAAC,CAAC,CAAC,CACtCiD,KAAK,CAAEf,KAAK,IAAKM,QAAQ,CAACtC,WAAW,CAACgC,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC;;AAEH;AACA;AACA,OAAO,MAAMgB,WAAW,GAAGA,CACzB7C,KAAqB,EACrBgB,OAAiC,KAEjCkB,aAAa,CAAClC,KAAK,CAACC,UAAU,EAAED,KAAK,CAAC8C,QAAQ,EAAE;EAC9C,GAAG9B,OAAO;EACV+B,QAAQ,EAAE;AACZ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"ModularUIActions.js","names":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","origin","contextPath","method","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","dispatch","getState","modularuiStore","modularui","LOADING","loadModelPromise","_Promise","resolve","then","catch","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    key,\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", {\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      // don't create duplicate requests during loading\n      return dispatch({\n        type: \"NO_ACTION\",\n      });\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIUtils.js

@@ -1,4 +1,3 @@
-import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import { useState } from "react";
 import { getDisplayName } from "../../react/utils";
 import { MODULARUI_STATUS } from "../../constants/Constants";
@@ -9,15 +8,15 @@ import Href from "../../models/href/Href";
 const getUrl = (resource, props) => {
   const url = typeof resource === "function" ? resource(props) : resource;
   if (url instanceof Href) {
-    return url.toString();
+    return url;
   }
-  return url || "";
+  return new Href(url);
 };
 
 /**
  */
 export const useUrl = (resource, props) => {
-  const [previousUrl, setPreviousUrl] = useState("");
+  const [previousUrl, setPreviousUrl] = useState(null);
   const [previousExact, setPreviousExact] = useState(false);
   const url = getUrl(resource, props);
   const {
@@ -29,21 +28,19 @@ export const useUrl = (resource, props) => {
   if (!match) {
     return url;
   }
-  const isDifferentUrl = url !== previousUrl;
-  if (!isDifferentUrl) {
-    return previousUrl;
+  if (url.equals(previousUrl)) {
+    return url;
   }
-  const hasDifferentStartUriPart = previousUrl !== "" && !_startsWithInstanceProperty(previousUrl).call(previousUrl, match.url);
 
   // Always create an url when the match is exact
   // Or when the match is not exact AND the original match also was not exact
-  // Or when the new start uri is different from the previous url
-  if (match.isExact === true || previousExact === match.isExact || hasDifferentStartUriPart) {
+  // Or when the new start uri is different from the previous url --> different resource for same panel
+  if (match.isExact === true || previousExact === match.isExact || !previousUrl?.startsWith(match.url)) {
     setPreviousUrl(url);
     setPreviousExact(match.isExact);
     return url;
   }
-  return previousUrl;
+  return previousUrl || new Href("");
 };
 
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIUtils.js","names":["useState","getDisplayName","MODULARUI_STATUS","Href","getUrl","resource","props","url","toString","useUrl","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","isDifferentUrl","hasDifferentStartUriPart","_startsWithInstanceProperty","call","isExact","getKey","WrappedComponent","name","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function, props: Object) => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url.toString();\n  }\n\n  return url || \"\";\n};\n\n/**\n */\nexport const useUrl = (resource: string | Function, props: Object): string => {\n  const [previousUrl, setPreviousUrl] = useState(\"\");\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  const isDifferentUrl = url !== previousUrl;\n  if (!isDifferentUrl) {\n    return previousUrl;\n  }\n\n  const hasDifferentStartUriPart =\n    previousUrl !== \"\" && !previousUrl.startsWith(match.url);\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    hasDifferentStartUriPart\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl;\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":";AACA,SAASA,QAAQ,QAAQ,OAAO;AAEhC,SAASC,cAAc,QAAQ,mBAAmB;AAClD,SAASC,gBAAgB,QAAQ,2BAA2B;AAC5D,OAAOC,IAAI,MAAM,wBAAwB;AAIzC;AACA;AACA;AACA,MAAMC,MAAM,GAAGA,CAACC,QAA2B,EAAEC,KAAa,KAAK;EAC7D,MAAMC,GAAG,GAAG,OAAOF,QAAQ,KAAK,UAAU,GAAGA,QAAQ,CAACC,KAAK,CAAC,GAAGD,QAAQ;EAEvE,IAAIE,GAAG,YAAYJ,IAAI,EAAE;IACvB,OAAOI,GAAG,CAACC,QAAQ,CAAC,CAAC;EACvB;EAEA,OAAOD,GAAG,IAAI,EAAE;AAClB,CAAC;;AAED;AACA;AACA,OAAO,MAAME,MAAM,GAAGA,CAACJ,QAA2B,EAAEC,KAAa,KAAa;EAC5E,MAAM,CAACI,WAAW,EAAEC,cAAc,CAAC,GAAGX,QAAQ,CAAC,EAAE,CAAC;EAClD,MAAM,CAACY,aAAa,EAAEC,gBAAgB,CAAC,GAAGb,QAAQ,CAAC,KAAK,CAAC;EAEzD,MAAMO,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,MAAM;IAAEQ;EAAM,CAAC,GAAGR,KAAK;;EAEvB;EACA;EACA,IAAI,CAACQ,KAAK,EAAE;IACV,OAAOP,GAAG;EACZ;EAEA,MAAMQ,cAAc,GAAGR,GAAG,KAAKG,WAAW;EAC1C,IAAI,CAACK,cAAc,EAAE;IACnB,OAAOL,WAAW;EACpB;EAEA,MAAMM,wBAAwB,GAC5BN,WAAW,KAAK,EAAE,IAAI,CAACO,2BAAA,CAAAP,WAAW,EAAAQ,IAAA,CAAXR,WAAW,EAAYI,KAAK,CAACP,GAAG,CAAC;;EAE1D;EACA;EACA;EACA,IACEO,KAAK,CAACK,OAAO,KAAK,IAAI,IACtBP,aAAa,KAAKE,KAAK,CAACK,OAAO,IAC/BH,wBAAwB,EACxB;IACAL,cAAc,CAACJ,GAAG,CAAC;IACnBM,gBAAgB,CAACC,KAAK,CAACK,OAAO,CAAC;IAE/B,OAAOZ,GAAG;EACZ;EAEA,OAAOG,WAAW;AACpB,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMU,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZf,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAGN,cAAc,CAACoB,gBAAgB,EAAEC,IAAI,CAAC,IAAIf,GAAG,CAACgB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAOtB,cAAc,CAACoB,gBAAgB,EAAEC,IAAI,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAME,SAAS,GAAG,SAAAA,CAACC,UAAkB,EAAkC;EAAA,IAAhCC,MAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAC9D,IAAID,MAAM,GAAG,CAAC,EAAE;IACd,MAAMI,aAAa,GAAGL,UAAU,EAAEM,MAAM,KAAK7B,gBAAgB,CAAC8B,QAAQ;IACtE,MAAMC,gBAAgB,GAAGR,UAAU,EAAEQ,gBAAgB,IAAI,CAAC;IAE1D,IAAIH,aAAa,IAAIG,gBAAgB,GAAGP,MAAM,EAAE;MAC9C,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC","ignoreList":[]}
+{"version":3,"file":"ModularUIUtils.js","names":["useState","getDisplayName","MODULARUI_STATUS","Href","getUrl","resource","props","url","useUrl","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","equals","isExact","startsWith","getKey","WrappedComponent","name","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function | Href, props: Object): Href => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url;\n  }\n\n  return new Href(url);\n};\n\n/**\n */\nexport const useUrl = (\n  resource: string | Function | Href,\n  props: Object,\n): Href => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  if (url.equals(previousUrl)) {\n    return url;\n  }\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url --> different resource for same panel\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    !previousUrl?.startsWith(match.url)\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl || new Href(\"\");\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":"AACA,SAASA,QAAQ,QAAQ,OAAO;AAEhC,SAASC,cAAc,QAAQ,mBAAmB;AAClD,SAASC,gBAAgB,QAAQ,2BAA2B;AAC5D,OAAOC,IAAI,MAAM,wBAAwB;AAIzC;AACA;AACA;AACA,MAAMC,MAAM,GAAGA,CAACC,QAAkC,EAAEC,KAAa,KAAW;EAC1E,MAAMC,GAAG,GAAG,OAAOF,QAAQ,KAAK,UAAU,GAAGA,QAAQ,CAACC,KAAK,CAAC,GAAGD,QAAQ;EAEvE,IAAIE,GAAG,YAAYJ,IAAI,EAAE;IACvB,OAAOI,GAAG;EACZ;EAEA,OAAO,IAAIJ,IAAI,CAACI,GAAG,CAAC;AACtB,CAAC;;AAED;AACA;AACA,OAAO,MAAMC,MAAM,GAAGA,CACpBH,QAAkC,EAClCC,KAAa,KACJ;EACT,MAAM,CAACG,WAAW,EAAEC,cAAc,CAAC,GAAGV,QAAQ,CAAC,IAAI,CAAC;EACpD,MAAM,CAACW,aAAa,EAAEC,gBAAgB,CAAC,GAAGZ,QAAQ,CAAC,KAAK,CAAC;EAEzD,MAAMO,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,MAAM;IAAEO;EAAM,CAAC,GAAGP,KAAK;;EAEvB;EACA;EACA,IAAI,CAACO,KAAK,EAAE;IACV,OAAON,GAAG;EACZ;EAEA,IAAIA,GAAG,CAACO,MAAM,CAACL,WAAW,CAAC,EAAE;IAC3B,OAAOF,GAAG;EACZ;;EAEA;EACA;EACA;EACA,IACEM,KAAK,CAACE,OAAO,KAAK,IAAI,IACtBJ,aAAa,KAAKE,KAAK,CAACE,OAAO,IAC/B,CAACN,WAAW,EAAEO,UAAU,CAACH,KAAK,CAACN,GAAG,CAAC,EACnC;IACAG,cAAc,CAACH,GAAG,CAAC;IACnBK,gBAAgB,CAACC,KAAK,CAACE,OAAO,CAAC;IAE/B,OAAOR,GAAG;EACZ;EAEA,OAAOE,WAAW,IAAI,IAAIN,IAAI,CAAC,EAAE,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMc,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZZ,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAGN,cAAc,CAACiB,gBAAgB,EAAEC,IAAI,CAAC,IAAIZ,GAAG,CAACa,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAOnB,cAAc,CAACiB,gBAAgB,EAAEC,IAAI,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAME,SAAS,GAAG,SAAAA,CAACC,UAAkB,EAAkC;EAAA,IAAhCC,MAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAC9D,IAAID,MAAM,GAAG,CAAC,EAAE;IACd,MAAMI,aAAa,GAAGL,UAAU,EAAEM,MAAM,KAAK1B,gBAAgB,CAAC2B,QAAQ;IACtE,MAAMC,gBAAgB,GAAGR,UAAU,EAAEQ,gBAAgB,IAAI,CAAC;IAE1D,IAAIH,aAAa,IAAIG,gBAAgB,GAAGP,MAAM,EAAE;MAC9C,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC","ignoreList":[]}

package/esm/utils/browser/Cookies.js

@@ -1,5 +1,5 @@
 import Cookies from "js-cookie";
-import { getBasePath } from "../../constants/Settings";
+import { getBasePathServer } from "../../constants/Settings";
 /**
  */
 export const getCookie = name => {
@@ -10,7 +10,7 @@ export const getCookie = name => {
  */
 export const setCookie = (name, value, options) => {
   const attributes = {
-    path: getBasePath()
+    path: getBasePathServer()
   };
   attributes.expires = options?.days;
   attributes.sameSite = options?.sameSite ?? "Strict";
@@ -22,7 +22,7 @@ export const setCookie = (name, value, options) => {
  */
 export const clearCookie = name => {
   Cookies.remove(name, {
-    path: getBasePath()
+    path: getBasePathServer()
   });
 };
 //# sourceMappingURL=Cookies.js.map

package/esm/utils/browser/Cookies.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cookies.js","names":["Cookies","getBasePath","getCookie","name","get","setCookie","value","options","attributes","path","expires","days","sameSite","secure","set","clearCookie","remove"],"sources":["../../../src/utils/browser/Cookies.js"],"sourcesContent":["// @flow\nimport Cookies from \"js-cookie\";\n\nimport { getBasePath } from \"../../constants/Settings\";\n\ntype CookieOptions = {\n  days?: number,\n  sameSite?: \"None\" | \"Lax\" | \"Strict\",\n  secure?: boolean,\n};\n\ntype CookieAttributes = {\n  path: string,\n  expires?: number,\n  sameSite?: string,\n  secure?: boolean,\n};\n\n/**\n */\nexport const getCookie = (name: string): null | string => {\n  return Cookies.get(name);\n};\n\n/**\n */\nexport const setCookie = (\n  name: string,\n  value: any,\n  options?: CookieOptions,\n) => {\n  const attributes: CookieAttributes = { path: getBasePath() };\n  attributes.expires = options?.days;\n  attributes.sameSite = options?.sameSite ?? \"Strict\";\n  attributes.secure = options?.secure;\n\n  Cookies.set(name, value, attributes);\n};\n\n/**\n */\nexport const clearCookie = (name: string) => {\n  Cookies.remove(name, { path: getBasePath() });\n};\n"],"mappings":"AACA,OAAOA,OAAO,MAAM,WAAW;AAE/B,SAASC,WAAW,QAAQ,0BAA0B;AAetD;AACA;AACA,OAAO,MAAMC,SAAS,GAAIC,IAAY,IAAoB;EACxD,OAAOH,OAAO,CAACI,GAAG,CAACD,IAAI,CAAC;AAC1B,CAAC;;AAED;AACA;AACA,OAAO,MAAME,SAAS,GAAGA,CACvBF,IAAY,EACZG,KAAU,EACVC,OAAuB,KACpB;EACH,MAAMC,UAA4B,GAAG;IAAEC,IAAI,EAAER,WAAW,CAAC;EAAE,CAAC;EAC5DO,UAAU,CAACE,OAAO,GAAGH,OAAO,EAAEI,IAAI;EAClCH,UAAU,CAACI,QAAQ,GAAGL,OAAO,EAAEK,QAAQ,IAAI,QAAQ;EACnDJ,UAAU,CAACK,MAAM,GAAGN,OAAO,EAAEM,MAAM;EAEnCb,OAAO,CAACc,GAAG,CAACX,IAAI,EAAEG,KAAK,EAAEE,UAAU,CAAC;AACtC,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,WAAW,GAAIZ,IAAY,IAAK;EAC3CH,OAAO,CAACgB,MAAM,CAACb,IAAI,EAAE;IAAEM,IAAI,EAAER,WAAW,CAAC;EAAE,CAAC,CAAC;AAC/C,CAAC","ignoreList":[]}
+{"version":3,"file":"Cookies.js","names":["Cookies","getBasePathServer","getCookie","name","get","setCookie","value","options","attributes","path","expires","days","sameSite","secure","set","clearCookie","remove"],"sources":["../../../src/utils/browser/Cookies.js"],"sourcesContent":["// @flow\nimport Cookies from \"js-cookie\";\n\nimport { getBasePathServer } from \"../../constants/Settings\";\n\ntype CookieOptions = {\n  days?: number,\n  sameSite?: \"None\" | \"Lax\" | \"Strict\",\n  secure?: boolean,\n};\n\ntype CookieAttributes = {\n  path: string,\n  expires?: number,\n  sameSite?: string,\n  secure?: boolean,\n};\n\n/**\n */\nexport const getCookie = (name: string): null | string => {\n  return Cookies.get(name);\n};\n\n/**\n */\nexport const setCookie = (\n  name: string,\n  value: any,\n  options?: CookieOptions,\n) => {\n  const attributes: CookieAttributes = { path: getBasePathServer() };\n  attributes.expires = options?.days;\n  attributes.sameSite = options?.sameSite ?? \"Strict\";\n  attributes.secure = options?.secure;\n\n  Cookies.set(name, value, attributes);\n};\n\n/**\n */\nexport const clearCookie = (name: string) => {\n  Cookies.remove(name, { path: getBasePathServer() });\n};\n"],"mappings":"AACA,OAAOA,OAAO,MAAM,WAAW;AAE/B,SAASC,iBAAiB,QAAQ,0BAA0B;AAe5D;AACA;AACA,OAAO,MAAMC,SAAS,GAAIC,IAAY,IAAoB;EACxD,OAAOH,OAAO,CAACI,GAAG,CAACD,IAAI,CAAC;AAC1B,CAAC;;AAED;AACA;AACA,OAAO,MAAME,SAAS,GAAGA,CACvBF,IAAY,EACZG,KAAU,EACVC,OAAuB,KACpB;EACH,MAAMC,UAA4B,GAAG;IAAEC,IAAI,EAAER,iBAAiB,CAAC;EAAE,CAAC;EAClEO,UAAU,CAACE,OAAO,GAAGH,OAAO,EAAEI,IAAI;EAClCH,UAAU,CAACI,QAAQ,GAAGL,OAAO,EAAEK,QAAQ,IAAI,QAAQ;EACnDJ,UAAU,CAACK,MAAM,GAAGN,OAAO,EAAEM,MAAM;EAEnCb,OAAO,CAACc,GAAG,CAACX,IAAI,EAAEG,KAAK,EAAEE,UAAU,CAAC;AACtC,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,WAAW,GAAIZ,IAAY,IAAK;EAC3CH,OAAO,CAACgB,MAAM,CAACb,IAAI,EAAE;IAAEM,IAAI,EAAER,iBAAiB,CAAC;EAAE,CAAC,CAAC;AACrD,CAAC","ignoreList":[]}

package/esm/utils/helpers/createHref.js

@@ -3,9 +3,17 @@ import _URLSearchParams from "@babel/runtime-corejs3/core-js-stable/url-search-p
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _keysInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/keys";
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
+import Href from "../../models/href/Href";
 /**
  */
 export const parseUrl = href => {
+  if (href instanceof Href) {
+    return {
+      path: href.path,
+      querystring: href.querystring,
+      hash: href.hash
+    };
+  }
   let path = href;
   let hash = null;
   let querystring = null;
@@ -30,7 +38,7 @@ export const parseUrl = href => {
  */
 export const filterParameters = (href, allowedParameters) => {
   if (!Array.isArray(allowedParameters)) {
-    return href;
+    return new Href(href);
   }
   const url = parseUrl(href);
   let filteredUrl = url.path;
@@ -47,13 +55,19 @@ export const filterParameters = (href, allowedParameters) => {
   if (url.hash) {
     filteredUrl = filteredUrl + "#" + url.hash;
   }
-  return filteredUrl;
+  if (href instanceof Href) {
+    return new Href(filteredUrl, href.resourcetype, {
+      origin: href.origin,
+      contextPath: href.contextPath
+    });
+  }
+  return new Href(filteredUrl);
 };
 
 /**
  */
 export const createHref = (context, dynamicPart, location, allowedParameters) => {
-  let href = dynamicPart;
+  let href = dynamicPart.toString();
   if (!_startsWithInstanceProperty(href).call(href, `/${context}/`)) {
     href = `/${context}/${href}`;
   }
@@ -63,6 +77,12 @@ export const createHref = (context, dynamicPart, location, allowedParameters) =>
     const search = _startsWithInstanceProperty(_context = location.search).call(_context, "?") ? location.search.substring(1) : location.search;
     href = `${href}?${search}`;
   }
+  if (dynamicPart instanceof Href) {
+    return filterParameters(new Href(href, dynamicPart.resourcetype, {
+      origin: dynamicPart.origin,
+      contextPath: dynamicPart.contextPath
+    }), allowedParameters);
+  }
   return filterParameters(href, allowedParameters);
 };
 //# sourceMappingURL=createHref.js.map

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

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

package/esm/utils/helpers/repositoryResource.js

@@ -1,12 +1,12 @@
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
-import { getBasePath, RESOURCE_PATH } from "../../constants";
+import { getBasePathServer, RESOURCE_PATH } from "../../constants";
 
 /**
  * Creates an url to a resource in the Be Informed repository
  * Only possible when serving using the UI Servlet of Be Informed
  */
 export const getRepositoryResourceUrl = function (resourceUrl) {
-  let contextPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : getBasePath();
+  let contextPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : getBasePathServer();
   let origin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
   if (_startsWithInstanceProperty(resourceUrl).call(resourceUrl, origin + contextPath)) {
     return resourceUrl;

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

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

package/lib/constants/Settings.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setSettings = exports.setSetting = exports.setContextPath = exports.logoutPath = exports.loginUsernameField = exports.loginType = exports.loginPath = exports.loginPasswordField = exports.hasAllContentInData = exports.getUploadPath = exports.getSwimLaneDiagramConfiguration = exports.getSetting = exports.getCaptchaPath = exports.getBasePath = exports.cacheContributions = exports.allSettings = exports.LOGOUT_PATH = exports.LOGIN_PATH = exports.BASE = void 0;
+exports.setSettings = exports.setSetting = exports.setContextPath = exports.logoutPath = exports.loginUsernameField = exports.loginType = exports.loginPath = exports.loginPasswordField = exports.hasAllContentInData = exports.getUploadPath = exports.getSwimLaneDiagramConfiguration = exports.getSetting = exports.getCaptchaPath = exports.getBasePathServer = exports.getBasePathModularUI = exports.getBasePath = exports.cacheContributions = exports.allSettings = exports.LOGOUT_PATH = exports.LOGIN_PATH = exports.BASE = void 0;
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _objects = require("../utils/helpers/objects");
@@ -112,20 +112,30 @@ exports.allSettings = allSettings;
 const cacheContributions = () => getSetting("CACHE_CONTRIBUTIONS", true);
 
 /**
- * Base path
- * This uses contextPath set from property from server
- * When requesting a remote server with CORS enabled, add the origin, for example:
- * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';
+ * The context path is retrieved on the server using the context path property as set in the runtime properties
+ * This can be manually override by setting the UI setting 'CONTEXT_PATH'
  */
 exports.cacheContributions = cacheContributions;
 const getBasePath = () => getSetting("CONTEXT_PATH", "/BeInformed");
 
 /**
- * Path to upload service
+ * The context path to modular ui rest services
  */
 exports.getBasePath = getBasePath;
+const getBasePathModularUI = () => getSetting("CONTEXT_PATH_SERVER", getBasePath());
+
+/**
+ * Used to link the css and js files in the server templates
+ */
+exports.getBasePathModularUI = getBasePathModularUI;
+const getBasePathServer = () => getSetting("CONTEXT_PATH_SERVER", getBasePath());
+
+/**
+ * Path to upload service
+ */
+exports.getBasePathServer = getBasePathServer;
 const getUploadPath = function () {
-  let contextPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getBasePath();
+  let contextPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getBasePathModularUI();
   let origin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
   return `${origin}${contextPath}${_Constants.UPLOAD_PATH}`;
 };
@@ -135,7 +145,7 @@ const getUploadPath = function () {
  */
 exports.getUploadPath = getUploadPath;
 const getCaptchaPath = function () {
-  let contextPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getBasePath();
+  let contextPath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getBasePathModularUI();
   let origin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
   return `${origin}${contextPath}${_Constants.CAPTCHA_PATH}`;
 };

package/lib/constants/Settings.js.flow

@@ -161,19 +161,29 @@ export const cacheContributions = (): boolean =>
   getSetting("CACHE_CONTRIBUTIONS", true);
 
 /**
- * Base path
- * This uses contextPath set from property from server
- * When requesting a remote server with CORS enabled, add the origin, for example:
- * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';
+ * The context path is retrieved on the server using the context path property as set in the runtime properties
+ * This can be manually override by setting the UI setting 'CONTEXT_PATH'
  */
 export const getBasePath = (): string =>
   getSetting("CONTEXT_PATH", "/BeInformed");
 
+/**
+ * The context path to modular ui rest services
+ */
+export const getBasePathModularUI = (): string =>
+  getSetting("CONTEXT_PATH_SERVER", getBasePath());
+
+/**
+ * Used to link the css and js files in the server templates
+ */
+export const getBasePathServer = (): string =>
+  getSetting("CONTEXT_PATH_SERVER", getBasePath());
+
 /**
  * Path to upload service
  */
 export const getUploadPath = (
-  contextPath: string = getBasePath(),
+  contextPath: string = getBasePathModularUI(),
   origin: string = "",
 ): string => `${origin}${contextPath}${UPLOAD_PATH}`;
 
@@ -181,7 +191,7 @@ export const getUploadPath = (
  * Path to captcha service
  */
 export const getCaptchaPath = (
-  contextPath: string = getBasePath(),
+  contextPath: string = getBasePathModularUI(),
   origin: string = "",
 ): string => `${origin}${contextPath}${CAPTCHA_PATH}`;
 

package/lib/constants/Settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.js","names":["_objects","require","_repositoryResource","_Constants","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","settings","setSettings","config","isPlainObject","_assign","default","exports","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getUploadPath","arguments","length","origin","UPLOAD_PATH","getCaptchaPath","CAPTCHA_PATH","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","loginType","LOGIN_TYPE","INTERNAL_LOGIN_TYPE","JAAS","loginPath","clientName","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING","getSwimLaneDiagramConfiguration","configLocation","_startsWith","call","getRepositoryResourceUrl","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * Base path\n * This uses contextPath set from property from server\n * When requesting a remote server with CORS enabled, add the origin, for example:\n * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n * Login type, only available when pac4j is configured\n *\n * Preview does not support pac4j, thus is probably not configured when started, which results in login type JAAS\n */\nexport const loginType = (): string =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Settings.js","names":["_objects","require","_repositoryResource","_Constants","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","settings","setSettings","config","isPlainObject","_assign","default","exports","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getBasePathModularUI","getBasePathServer","getUploadPath","arguments","length","origin","UPLOAD_PATH","getCaptchaPath","CAPTCHA_PATH","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","loginType","LOGIN_TYPE","INTERNAL_LOGIN_TYPE","JAAS","loginPath","clientName","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING","getSwimLaneDiagramConfiguration","configLocation","_startsWith","call","getRepositoryResourceUrl","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * The context path is retrieved on the server using the context path property as set in the runtime properties\n * This can be manually override by setting the UI setting 'CONTEXT_PATH'\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * The context path to modular ui rest services\n */\nexport const getBasePathModularUI = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Used to link the css and js files in the server templates\n */\nexport const getBasePathServer = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n * Login type, only available when pac4j is configured\n *\n * Preview does not support pac4j, thus is probably not configured when started, which results in login type JAAS\n */\nexport const loginType = (): string =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useAuthentication.js

@@ -32,7 +32,7 @@ const useLogin = () => {
       }
       if (!isAuthenticated) {
         _Cache.default.setItem("isRedirectLogin", true);
-        window.location.assign(`${(0, _constants.getBasePath)()}${authenticationType.redirectUri ?? ""}`);
+        window.location.assign(`${(0, _constants.getBasePathServer)()}${authenticationType.redirectUri ?? ""}`);
       }
     }
   };
@@ -45,7 +45,7 @@ const useLogout = () => {
   const dispatch = (0, _reactRedux.useDispatch)();
   const application = (0, _reactRedux.useSelector)(_ModularUISelectors.getApplication);
   const LOGOUT_PATH = (0, _constants.logoutPath)();
-  const BASE_PATH = (0, _constants.getBasePath)();
+  const BASE_PATH = (0, _constants.getBasePathServer)();
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,

package/lib/hooks/useAuthentication.js.flow

@@ -7,7 +7,7 @@ import { login, logout, resetAuthErrors } from "../redux/actions";
 import Cache from "../utils/browser/Cache";
 import {
   DEFAULT_AUTHENTICATION_TYPE,
-  getBasePath,
+  getBasePathServer,
   logoutPath,
 } from "../constants";
 
@@ -62,7 +62,7 @@ export const useLogin = (): LoginHook => {
       if (!isAuthenticated) {
         Cache.setItem("isRedirectLogin", true);
         window.location.assign(
-          `${getBasePath()}${authenticationType.redirectUri ?? ""}`,
+          `${getBasePathServer()}${authenticationType.redirectUri ?? ""}`,
         );
       }
     },
@@ -76,7 +76,7 @@ export const useLogout = (): LogoutHook => {
   const application = useSelector(getApplication);
 
   const LOGOUT_PATH = logoutPath();
-  const BASE_PATH = getBasePath();
+  const BASE_PATH = getBasePathServer();
 
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {

package/lib/hooks/useAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_ModularUISelectors","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","useLogin","Cache","setItem","dispatch","useDispatch","application","useSelector","getApplication","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","DEFAULT_AUTHENTICATION_TYPE","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","getItem","IllegalStateException","authentication","redirectUri","window","location","assign","getBasePath","exports","useLogout","LOGOUT_PATH","logoutPath","BASE_PATH","logout","origin","url"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePath,\n  logoutPath,\n} from \"../constants\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\nimport { IllegalStateException } from \"../exceptions\";\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePath()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePath();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_ModularUISelectors","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","useLogin","Cache","setItem","dispatch","useDispatch","application","useSelector","getApplication","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","DEFAULT_AUTHENTICATION_TYPE","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","getItem","IllegalStateException","authentication","redirectUri","window","location","assign","getBasePathServer","exports","useLogout","LOGOUT_PATH","logoutPath","BASE_PATH","logout","origin","url"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePathServer,\n  logoutPath,\n} from \"../constants\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\nimport { IllegalStateException } from \"../exceptions\";\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModelCatalog.js.flow

@@ -14,6 +14,7 @@ import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
 
+import type Href from "../models/href/Href";
 import type { UseModularUIBasicOptions } from "./useModularUIBasic";
 export type SearchFilter = {
   index?: string,
@@ -37,7 +38,7 @@ export const useModelCatalog = (
 /**
  */
 export const useConceptIndex = (
-  href: string,
+  href: string | Href,
   key?: string = "conceptindex",
   options?: UseModularUIBasicOptions<ConceptIndexModel>,
 ): ?ConceptIndexModel => {
@@ -58,7 +59,7 @@ export const useConceptIndex = (
 /**
  */
 export const useConceptDetail = (
-  concept: string,
+  concept: string | Href,
   key?: string = "conceptdetail",
   options?: UseModularUIBasicOptions<
     ConceptDetailModel | BusinessScenarioModel,
@@ -76,7 +77,7 @@ export const useConceptDetail = (
 /**
  */
 export const useContentIndex = (
-  href: string,
+  href: string | Href,
   key?: string = "contentindex",
   options?: UseModularUIBasicOptions<ContentIndexModel>,
 ): ?ContentIndexModel => {
@@ -91,7 +92,7 @@ export const useContentIndex = (
 /**
  */
 export const useContentTOC = (
-  content: string,
+  content: string | Href,
   key?: string = "contenttoc",
   options?: UseModularUIBasicOptions<ContentTOCModel>,
 ): ?ContentTOCModel => {
@@ -107,7 +108,7 @@ export const useContentTOC = (
 /**
  */
 export const useContent = (
-  contentSection: string,
+  contentSection: string | Href,
   key?: string = "content",
   options?: UseModularUIBasicOptions<ContentModel>,
 ): ?ContentModel => {
@@ -122,7 +123,7 @@ export const useContent = (
 /**
  */
 export const useContentType = (
-  contentType: string,
+  contentType: string | Href,
   key?: string = "contenttypes",
   options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {