@beinformed/ui 1.63.2 → 1.63.4

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

package/lib/redux/_modularui/ModularUIConnector.js

@@ -36,11 +36,10 @@ const patchUpdateModelOption = oldOptions => {
 
 /**
  */
-const modularUIConnector = function (name, resource) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-    propName: "data",
-    removeOnUnmount: false
-  };
+const modularUIConnector = (name, resource, options = {
+  propName: "data",
+  removeOnUnmount: false
+}) => {
   const {
     propName = "data",
     removeOnUnmount = false,

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      // explicit property for removeOnMount overwrite the setting\n      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (finalRemoveOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey, finalRemoveOnUnmount]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry?.model ?? null,\n        location,\n        status: modelEntry?.status ?? null,\n        lastModification: modelEntry?.lastModification ?? null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      // explicit property for removeOnMount overwrite the setting\n      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (finalRemoveOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey, finalRemoveOnUnmount]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry?.model ?? null,\n        location,\n        status: modelEntry?.status ?? null,\n        lastModification: modelEntry?.lastModification ?? null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/_modularui/ModularUIReducer.js

@@ -12,12 +12,11 @@ var _Constants = require("../../constants/Constants");
 var _models = require("../../models");
 /**
  */
-const updateStatus = (state, _ref) => {
-  let {
-    key,
-    status,
-    requestOptions
-  } = _ref;
+const updateStatus = (state, {
+  key,
+  status,
+  requestOptions
+}) => {
   // model should always be available when status is not loading
   if (status !== _Constants.MODULARUI_STATUS.LOADING && !state[key]) {
     return state;
@@ -35,11 +34,10 @@ const updateStatus = (state, _ref) => {
 
 /**
  */
-const setModel = (state, _ref2) => {
-  let {
-    key,
-    model
-  } = _ref2;
+const setModel = (state, {
+  key,
+  model
+}) => {
   if (!state[key]) {
     return state;
   }
@@ -64,11 +62,10 @@ const setModel = (state, _ref2) => {
  */
 const initModularUI = (state, models) => {
   const newState = (0, _assign.default)({}, state);
-  models.forEach(_ref3 => {
-    let {
-      key,
-      model
-    } = _ref3;
+  models.forEach(({
+    key,
+    model
+  }) => {
     newState[key] = {
       status: _Constants.MODULARUI_STATUS.FINISHED,
       lastModification: Date.now(),
@@ -131,9 +128,7 @@ const initialState = {};
 /**
  * Modular UI Reducer
  */
-const ModularUIReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const ModularUIReducer = (state = initialState, action) => {
   if (!action) {
     return state;
   }

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

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

package/lib/redux/_modularui/ModularUIUtils.js

@@ -70,8 +70,7 @@ const getKey = (WrappedComponent, name, url) => {
  * Check if the model corresponding to a modular ui service should be reloaded
  */
 exports.getKey = getKey;
-const useReload = function (modelEntry) {
-  let reload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+const useReload = (modelEntry, reload = 0) => {
   if (reload > 0) {
     const isFullyLoaded = modelEntry?.status === _Constants.MODULARUI_STATUS.FINISHED;
     const lastModification = modelEntry?.lastModification ?? 0;

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIUtils.js","names":["_react","require","_utils","_Constants","_Href","_interopRequireDefault","getUrl","resource","props","url","Href","useUrl","_context","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","equalsWithParameters","isExact","Function","call","bind","_startsWith","default","exports","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function | Href, props: Object): Href => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url;\n  }\n\n  return new Href(url);\n};\n\n/**\n */\nexport const useUrl = (\n  resource: string | Function | Href,\n  props: Object,\n): Href => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  if (url == null && previousUrl == null) {\n    return new Href(\"\");\n  }\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  if (url.equalsWithParameters(previousUrl)) {\n    return previousUrl || url;\n  }\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url --> different resource for same panel\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    !previousUrl?.startsWith(match.url)\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl || new Href(\"\");\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIUtils.js","names":["_react","require","_utils","_Constants","_Href","_interopRequireDefault","getUrl","resource","props","url","Href","useUrl","_context","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","equalsWithParameters","isExact","Function","call","bind","_startsWith","default","exports","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function | Href, props: Object): Href => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url;\n  }\n\n  return new Href(url);\n};\n\n/**\n */\nexport const useUrl = (\n  resource: string | Function | Href,\n  props: Object,\n): Href => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  if (url == null && previousUrl == null) {\n    return new Href(\"\");\n  }\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  if (url.equalsWithParameters(previousUrl)) {\n    return previousUrl || url;\n  }\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url --> different resource for same panel\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    !previousUrl?.startsWith(match.url)\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl || new Href(\"\");\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/_modularui/withModularUI.js

@@ -12,8 +12,7 @@ var _ProgressIndicator = require("../actions/ProgressIndicator");
 var _Error = require("../actions/Error");
 var _i18n = require("../selectors/i18n");
 var _ModularUIActions = require("./ModularUIActions");
-const modularui = (0, _reselect.createSelector)([_i18n.getLocale], localeCode => function (href) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const modularui = (0, _reselect.createSelector)([_i18n.getLocale], localeCode => (href, options = {}) => {
   const modularuiRequest = new _ModularUIRequest.default(href, options);
   modularuiRequest.locale = localeCode;
   return modularuiRequest;

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

@@ -1 +1 @@
-{"version":3,"file":"withModularUI.js","names":["_reactRedux","require","_reselect","_ModularUIRequest","_interopRequireDefault","_ProgressIndicator","_Error","_i18n","_ModularUIActions","modularui","createSelector","getLocale","localeCode","href","options","arguments","length","undefined","modularuiRequest","ModularUIRequest","locale","mapStateToProps","state","i18n","mapDispatchToProps","startProgress","finishProgress","reloadModel","handleError","withModularui","connect","_default","exports","default"],"sources":["../../../src/redux/_modularui/withModularUI.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { createSelector } from \"reselect\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport { getLocale } from \"../selectors/i18n\";\n\nimport { reloadModel } from \"./ModularUIActions\";\n\nimport type {\n  ReduxState,\n  StartProgressAction,\n  FinishProgressAction,\n  ThunkAction,\n} from \"../types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type FetchException from \"../../exceptions/FetchException\";\nimport type { ComponentType } from \"react\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\ntype StateProps = {\n  modularui: (href: Href, options: any) => ModularUIRequest,\n  locale: string,\n};\n\ntype DispatchProps = {\n  startProgress: () => StartProgressAction,\n  finishProgress: () => FinishProgressAction,\n  reloadModel: (\n    model: ModularUIModel,\n    options?: RequestModularUIOptions,\n  ) => ThunkAction,\n  handleError: (error: Error | FetchException) => ThunkAction,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst modularui = createSelector(\n  [getLocale],\n  (localeCode) =>\n    (href, options = {}) => {\n      const modularuiRequest = new ModularUIRequest(href, options);\n      modularuiRequest.locale = localeCode;\n      return modularuiRequest;\n    },\n);\n\n/**\n */\nconst mapStateToProps = (state: ReduxState): StateProps => ({\n  modularui: modularui(state),\n  locale: state.i18n.locale,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  startProgress,\n  finishProgress,\n  reloadModel,\n  handleError,\n};\n\n/**\n * Injects the modular ui service and the progress start and finish actions\n * This can be used to request modular ui services inside react view components\n */\nconst withModularui: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _,\n>(mapStateToProps, mapDispatchToProps);\n\nexport default withModularui;\n"],"mappings":";;;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,iBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,kBAAA,GAAAJ,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AAEA,IAAAM,KAAA,GAAAN,OAAA;AAEA,IAAAO,iBAAA,GAAAP,OAAA;AAkCA,MAAMQ,SAAS,GAAG,IAAAC,wBAAc,EAC9B,CAACC,eAAS,CAAC,EACVC,UAAU,IACT,UAACC,IAAI,EAAmB;EAAA,IAAjBC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EACjB,MAAMG,gBAAgB,GAAG,IAAIC,yBAAgB,CAACN,IAAI,EAAEC,OAAO,CAAC;EAC5DI,gBAAgB,CAACE,MAAM,GAAGR,UAAU;EACpC,OAAOM,gBAAgB;AACzB,CACJ,CAAC;;AAED;AACA;AACA,MAAMG,eAAe,GAAIC,KAAiB,KAAkB;EAC1Db,SAAS,EAAEA,SAAS,CAACa,KAAK,CAAC;EAC3BF,MAAM,EAAEE,KAAK,CAACC,IAAI,CAACH;AACrB,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,aAAa,EAAbA,gCAAa;EACbC,cAAc,EAAdA,iCAAc;EACdC,WAAW,EAAXA,6BAAW;EACXC,WAAW,EAAXA;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAiC,GAAG,IAAAC,mBAAO,EAO/CT,eAAe,EAAEG,kBAAkB,CAAC;AAAC,IAAAO,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAExBJ,aAAa","ignoreList":[]}
+{"version":3,"file":"withModularUI.js","names":["_reactRedux","require","_reselect","_ModularUIRequest","_interopRequireDefault","_ProgressIndicator","_Error","_i18n","_ModularUIActions","modularui","createSelector","getLocale","localeCode","href","options","modularuiRequest","ModularUIRequest","locale","mapStateToProps","state","i18n","mapDispatchToProps","startProgress","finishProgress","reloadModel","handleError","withModularui","connect","_default","exports","default"],"sources":["../../../src/redux/_modularui/withModularUI.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { createSelector } from \"reselect\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport { getLocale } from \"../selectors/i18n\";\n\nimport { reloadModel } from \"./ModularUIActions\";\n\nimport type {\n  ReduxState,\n  StartProgressAction,\n  FinishProgressAction,\n  ThunkAction,\n} from \"../types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type FetchException from \"../../exceptions/FetchException\";\nimport type { ComponentType } from \"react\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\ntype StateProps = {\n  modularui: (href: Href, options: any) => ModularUIRequest,\n  locale: string,\n};\n\ntype DispatchProps = {\n  startProgress: () => StartProgressAction,\n  finishProgress: () => FinishProgressAction,\n  reloadModel: (\n    model: ModularUIModel,\n    options?: RequestModularUIOptions,\n  ) => ThunkAction,\n  handleError: (error: Error | FetchException) => ThunkAction,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst modularui = createSelector(\n  [getLocale],\n  (localeCode) =>\n    (href, options = {}) => {\n      const modularuiRequest = new ModularUIRequest(href, options);\n      modularuiRequest.locale = localeCode;\n      return modularuiRequest;\n    },\n);\n\n/**\n */\nconst mapStateToProps = (state: ReduxState): StateProps => ({\n  modularui: modularui(state),\n  locale: state.i18n.locale,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  startProgress,\n  finishProgress,\n  reloadModel,\n  handleError,\n};\n\n/**\n * Injects the modular ui service and the progress start and finish actions\n * This can be used to request modular ui services inside react view components\n */\nconst withModularui: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _,\n>(mapStateToProps, mapDispatchToProps);\n\nexport default withModularui;\n"],"mappings":";;;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,iBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,kBAAA,GAAAJ,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AAEA,IAAAM,KAAA,GAAAN,OAAA;AAEA,IAAAO,iBAAA,GAAAP,OAAA;AAkCA,MAAMQ,SAAS,GAAG,IAAAC,wBAAc,EAC9B,CAACC,eAAS,CAAC,EACVC,UAAU,IACT,CAACC,IAAI,EAAEC,OAAO,GAAG,CAAC,CAAC,KAAK;EACtB,MAAMC,gBAAgB,GAAG,IAAIC,yBAAgB,CAACH,IAAI,EAAEC,OAAO,CAAC;EAC5DC,gBAAgB,CAACE,MAAM,GAAGL,UAAU;EACpC,OAAOG,gBAAgB;AACzB,CACJ,CAAC;;AAED;AACA;AACA,MAAMG,eAAe,GAAIC,KAAiB,KAAkB;EAC1DV,SAAS,EAAEA,SAAS,CAACU,KAAK,CAAC;EAC3BF,MAAM,EAAEE,KAAK,CAACC,IAAI,CAACH;AACrB,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,aAAa,EAAbA,gCAAa;EACbC,cAAc,EAAdA,iCAAc;EACdC,WAAW,EAAXA,6BAAW;EACXC,WAAW,EAAXA;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAiC,GAAG,IAAAC,mBAAO,EAO/CT,eAAe,EAAEG,kBAAkB,CAAC;AAAC,IAAAO,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAExBJ,aAAa","ignoreList":[]}

package/lib/redux/_router/RouterReducer.js

@@ -10,9 +10,7 @@ const initialState = {};
 /**
  * Router reducer
  */
-const RouterReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+const RouterReducer = (state = initialState, action = null) => {
   if (action && action.type === "ROUTER/LOCATION_CHANGE") {
     return action.payload;
   }

package/lib/redux/_router/RouterReducer.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterReducer.js","names":["initialState","RouterReducer","state","arguments","length","undefined","action","type","payload","exports"],"sources":["../../../src/redux/_router/RouterReducer.js"],"sourcesContent":["// @flow\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { RouterState } from \"./types\";\n\n// REDUCER\nconst initialState: $Shape<RouterState> = {};\n\n/**\n * Router reducer\n */\nexport const RouterReducer: Reducer<RouterState, ReduxAction> = (\n  state = initialState,\n  action = null,\n) => {\n  if (action && action.type === \"ROUTER/LOCATION_CHANGE\") {\n    return action.payload;\n  }\n\n  return state;\n};\n"],"mappings":";;;;;;AAKA;AACA,MAAMA,YAAiC,GAAG,CAAC,CAAC;;AAE5C;AACA;AACA;AACO,MAAMC,aAAgD,GAAG,SAAAA,CAAA,EAG3D;EAAA,IAFHC,KAAK,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGH,YAAY;EAAA,IACpBM,MAAM,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAEb,IAAIG,MAAM,IAAIA,MAAM,CAACC,IAAI,KAAK,wBAAwB,EAAE;IACtD,OAAOD,MAAM,CAACE,OAAO;EACvB;EAEA,OAAON,KAAK;AACd,CAAC;AAACO,OAAA,CAAAR,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"file":"RouterReducer.js","names":["initialState","RouterReducer","state","action","type","payload","exports"],"sources":["../../../src/redux/_router/RouterReducer.js"],"sourcesContent":["// @flow\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { RouterState } from \"./types\";\n\n// REDUCER\nconst initialState: $Shape<RouterState> = {};\n\n/**\n * Router reducer\n */\nexport const RouterReducer: Reducer<RouterState, ReduxAction> = (\n  state = initialState,\n  action = null,\n) => {\n  if (action && action.type === \"ROUTER/LOCATION_CHANGE\") {\n    return action.payload;\n  }\n\n  return state;\n};\n"],"mappings":";;;;;;AAKA;AACA,MAAMA,YAAiC,GAAG,CAAC,CAAC;;AAE5C;AACA;AACA;AACO,MAAMC,aAAgD,GAAGA,CAC9DC,KAAK,GAAGF,YAAY,EACpBG,MAAM,GAAG,IAAI,KACV;EACH,IAAIA,MAAM,IAAIA,MAAM,CAACC,IAAI,KAAK,wBAAwB,EAAE;IACtD,OAAOD,MAAM,CAACE,OAAO;EACvB;EAEA,OAAOH,KAAK;AACd,CAAC;AAACI,OAAA,CAAAL,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/redux/actions/FormAttributeSet.js

@@ -13,46 +13,43 @@ var _FormAutoupdate = require("./FormAutoupdate");
 /**
  * Update an attribute on a form
  */
-const updateFormAttribute = function (form, formObject, attribute, inputvalue) {
-  let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
-    autosubmit: false,
-    autosave: false,
-    // autosave commits the form in the background
-    autoupdate: false,
-    // autoupdate does not commit and updates the form with for example a new dynamicschema (work-around for form-tree iq)
-    forceUpdate: false,
-    validate: true
-  };
-  return dispatch => {
-    const newForm = form.clone();
-    if (options.validate === undefined) {
-      options.validate = true;
-    }
-    if (newForm.currentFormObject?.equals(formObject)) {
-      newForm.currentFormObject.updateAttribute(attribute, inputvalue);
-    } else {
-      newForm.completedFormObjects.forEach(completeObject => {
-        if (completeObject.equals(formObject)) {
-          completeObject.updateAttribute(attribute, inputvalue);
-        }
-      });
-    }
-    if (options.autosubmit && newForm.isValid) {
-      const autosubmitAction = (0, _FormAutosubmit.autosubmitFormObject)(newForm, attribute, options.forceUpdate);
-      if (autosubmitAction) {
-        return dispatch(autosubmitAction);
+const updateFormAttribute = (form, formObject, attribute, inputvalue, options = {
+  autosubmit: false,
+  autosave: false,
+  // autosave commits the form in the background
+  autoupdate: false,
+  // autoupdate does not commit and updates the form with for example a new dynamicschema (work-around for form-tree iq)
+  forceUpdate: false,
+  validate: true
+}) => dispatch => {
+  const newForm = form.clone();
+  if (options.validate === undefined) {
+    options.validate = true;
+  }
+  if (newForm.currentFormObject?.equals(formObject)) {
+    newForm.currentFormObject.updateAttribute(attribute, inputvalue);
+  } else {
+    newForm.completedFormObjects.forEach(completeObject => {
+      if (completeObject.equals(formObject)) {
+        completeObject.updateAttribute(attribute, inputvalue);
       }
+    });
+  }
+  if (options.autosubmit && newForm.isValid) {
+    const autosubmitAction = (0, _FormAutosubmit.autosubmitFormObject)(newForm, attribute, options.forceUpdate);
+    if (autosubmitAction) {
+      return dispatch(autosubmitAction);
     }
-    if (options.autoupdate && newForm.isValid) {
-      const autoupdateAction = (0, _FormAutoupdate.autoupdateFormObject)(newForm, attribute);
-      if (autoupdateAction) {
-        return dispatch(autoupdateAction);
-      }
+  }
+  if (options.autoupdate && newForm.isValid) {
+    const autoupdateAction = (0, _FormAutoupdate.autoupdateFormObject)(newForm, attribute);
+    if (autoupdateAction) {
+      return dispatch(autoupdateAction);
     }
-    handleAutoSave(dispatch, newForm, options);
-    handleValidate(dispatch, newForm, options);
-    return dispatch((0, _ModularUIActions.updateForm)(newForm));
-  };
+  }
+  handleAutoSave(dispatch, newForm, options);
+  handleValidate(dispatch, newForm, options);
+  return dispatch((0, _ModularUIActions.updateForm)(newForm));
 };
 exports.updateFormAttribute = updateFormAttribute;
 const handleAutoSave = (dispatch, newForm, options) => {

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

@@ -1 +1 @@
-{"version":3,"file":"FormAttributeSet.js","names":["_ModularUIActions","require","_Settings","_FormValidations","_FormAutosave","_FormAutosubmit","_FormAutoupdate","updateFormAttribute","form","formObject","attribute","inputvalue","options","arguments","length","undefined","autosubmit","autosave","autoupdate","forceUpdate","validate","dispatch","newForm","clone","currentFormObject","equals","updateAttribute","completedFormObjects","forEach","completeObject","isValid","autosubmitAction","autosubmitFormObject","autoupdateAction","autoupdateFormObject","handleAutoSave","handleValidate","updateForm","exports","isChanged","autosaveFormObject","hasDynamicValidations","getSetting","validateFormObject"],"sources":["../../../src/redux/actions/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { updateForm } from \"../_modularui/ModularUIActions\";\n\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { validateFormObject } from \"./FormValidations\";\nimport { autosaveFormObject } from \"./FormAutosave\";\nimport { autosubmitFormObject } from \"./FormAutosubmit\";\nimport { autoupdateFormObject } from \"./FormAutoupdate\";\n\nimport type { Dispatch, ThunkAction, UpdateFormOptions } from \"../types\";\nimport type { AttributeType } from \"../../models/types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\n\n/**\n * Update an attribute on a form\n */\nexport const updateFormAttribute =\n  (\n    form: FormModel,\n    formObject: FormObjectModel,\n    attribute: AttributeType,\n    inputvalue: string,\n    options: UpdateFormOptions = {\n      autosubmit: false,\n      autosave: false, // autosave commits the form in the background\n      autoupdate: false, // autoupdate does not commit and updates the form with for example a new dynamicschema (work-around for form-tree iq)\n      forceUpdate: false,\n      validate: true,\n    },\n  ): ThunkAction =>\n  (dispatch: Dispatch) => {\n    const newForm = form.clone();\n\n    if (options.validate === undefined) {\n      options.validate = true;\n    }\n\n    if (newForm.currentFormObject?.equals(formObject)) {\n      newForm.currentFormObject.updateAttribute(attribute, inputvalue);\n    } else {\n      newForm.completedFormObjects.forEach((completeObject) => {\n        if (completeObject.equals(formObject)) {\n          completeObject.updateAttribute(attribute, inputvalue);\n        }\n      });\n    }\n\n    if (options.autosubmit && newForm.isValid) {\n      const autosubmitAction = autosubmitFormObject(\n        newForm,\n        attribute,\n        options.forceUpdate,\n      );\n      if (autosubmitAction) {\n        return dispatch(autosubmitAction);\n      }\n    }\n\n    if (options.autoupdate && newForm.isValid) {\n      const autoupdateAction = autoupdateFormObject(newForm, attribute);\n      if (autoupdateAction) {\n        return dispatch(autoupdateAction);\n      }\n    }\n\n    handleAutoSave(dispatch, newForm, options);\n\n    handleValidate(dispatch, newForm, options);\n\n    return dispatch(updateForm(newForm));\n  };\n\nconst handleAutoSave = (\n  dispatch: Dispatch,\n  newForm: FormModel,\n  options: UpdateFormOptions,\n) => {\n  if (options.autosave && newForm.isValid && newForm.isChanged()) {\n    dispatch(autosaveFormObject(newForm));\n  }\n};\n\nconst handleValidate = (\n  dispatch: Dispatch,\n  newForm: FormModel,\n  options: UpdateFormOptions,\n) => {\n  if (\n    options.validate &&\n    newForm.currentFormObject?.hasDynamicValidations &&\n    getSetting(\"USE_INSTANT_SERVER_VALIDATION\")\n  ) {\n    // server form validations happens async, don't wait for the form to return\n    dispatch(validateFormObject(newForm));\n  }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FormAttributeSet.js","names":["_ModularUIActions","require","_Settings","_FormValidations","_FormAutosave","_FormAutosubmit","_FormAutoupdate","updateFormAttribute","form","formObject","attribute","inputvalue","options","autosubmit","autosave","autoupdate","forceUpdate","validate","dispatch","newForm","clone","undefined","currentFormObject","equals","updateAttribute","completedFormObjects","forEach","completeObject","isValid","autosubmitAction","autosubmitFormObject","autoupdateAction","autoupdateFormObject","handleAutoSave","handleValidate","updateForm","exports","isChanged","autosaveFormObject","hasDynamicValidations","getSetting","validateFormObject"],"sources":["../../../src/redux/actions/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { updateForm } from \"../_modularui/ModularUIActions\";\n\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { validateFormObject } from \"./FormValidations\";\nimport { autosaveFormObject } from \"./FormAutosave\";\nimport { autosubmitFormObject } from \"./FormAutosubmit\";\nimport { autoupdateFormObject } from \"./FormAutoupdate\";\n\nimport type { Dispatch, ThunkAction, UpdateFormOptions } from \"../types\";\nimport type { AttributeType } from \"../../models/types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\n\n/**\n * Update an attribute on a form\n */\nexport const updateFormAttribute =\n  (\n    form: FormModel,\n    formObject: FormObjectModel,\n    attribute: AttributeType,\n    inputvalue: string,\n    options: UpdateFormOptions = {\n      autosubmit: false,\n      autosave: false, // autosave commits the form in the background\n      autoupdate: false, // autoupdate does not commit and updates the form with for example a new dynamicschema (work-around for form-tree iq)\n      forceUpdate: false,\n      validate: true,\n    },\n  ): ThunkAction =>\n  (dispatch: Dispatch) => {\n    const newForm = form.clone();\n\n    if (options.validate === undefined) {\n      options.validate = true;\n    }\n\n    if (newForm.currentFormObject?.equals(formObject)) {\n      newForm.currentFormObject.updateAttribute(attribute, inputvalue);\n    } else {\n      newForm.completedFormObjects.forEach((completeObject) => {\n        if (completeObject.equals(formObject)) {\n          completeObject.updateAttribute(attribute, inputvalue);\n        }\n      });\n    }\n\n    if (options.autosubmit && newForm.isValid) {\n      const autosubmitAction = autosubmitFormObject(\n        newForm,\n        attribute,\n        options.forceUpdate,\n      );\n      if (autosubmitAction) {\n        return dispatch(autosubmitAction);\n      }\n    }\n\n    if (options.autoupdate && newForm.isValid) {\n      const autoupdateAction = autoupdateFormObject(newForm, attribute);\n      if (autoupdateAction) {\n        return dispatch(autoupdateAction);\n      }\n    }\n\n    handleAutoSave(dispatch, newForm, options);\n\n    handleValidate(dispatch, newForm, options);\n\n    return dispatch(updateForm(newForm));\n  };\n\nconst handleAutoSave = (\n  dispatch: Dispatch,\n  newForm: FormModel,\n  options: UpdateFormOptions,\n) => {\n  if (options.autosave && newForm.isValid && newForm.isChanged()) {\n    dispatch(autosaveFormObject(newForm));\n  }\n};\n\nconst handleValidate = (\n  dispatch: Dispatch,\n  newForm: FormModel,\n  options: UpdateFormOptions,\n) => {\n  if (\n    options.validate &&\n    newForm.currentFormObject?.hasDynamicValidations &&\n    getSetting(\"USE_INSTANT_SERVER_VALIDATION\")\n  ) {\n    // server form validations happens async, don't wait for the form to return\n    dispatch(validateFormObject(newForm));\n  }\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AAOA;AACA;AACA;AACO,MAAMM,mBAAmB,GAC9BA,CACEC,IAAe,EACfC,UAA2B,EAC3BC,SAAwB,EACxBC,UAAkB,EAClBC,OAA0B,GAAG;EAC3BC,UAAU,EAAE,KAAK;EACjBC,QAAQ,EAAE,KAAK;EAAE;EACjBC,UAAU,EAAE,KAAK;EAAE;EACnBC,WAAW,EAAE,KAAK;EAClBC,QAAQ,EAAE;AACZ,CAAC,KAEFC,QAAkB,IAAK;EACtB,MAAMC,OAAO,GAAGX,IAAI,CAACY,KAAK,CAAC,CAAC;EAE5B,IAAIR,OAAO,CAACK,QAAQ,KAAKI,SAAS,EAAE;IAClCT,OAAO,CAACK,QAAQ,GAAG,IAAI;EACzB;EAEA,IAAIE,OAAO,CAACG,iBAAiB,EAAEC,MAAM,CAACd,UAAU,CAAC,EAAE;IACjDU,OAAO,CAACG,iBAAiB,CAACE,eAAe,CAACd,SAAS,EAAEC,UAAU,CAAC;EAClE,CAAC,MAAM;IACLQ,OAAO,CAACM,oBAAoB,CAACC,OAAO,CAAEC,cAAc,IAAK;MACvD,IAAIA,cAAc,CAACJ,MAAM,CAACd,UAAU,CAAC,EAAE;QACrCkB,cAAc,CAACH,eAAe,CAACd,SAAS,EAAEC,UAAU,CAAC;MACvD;IACF,CAAC,CAAC;EACJ;EAEA,IAAIC,OAAO,CAACC,UAAU,IAAIM,OAAO,CAACS,OAAO,EAAE;IACzC,MAAMC,gBAAgB,GAAG,IAAAC,oCAAoB,EAC3CX,OAAO,EACPT,SAAS,EACTE,OAAO,CAACI,WACV,CAAC;IACD,IAAIa,gBAAgB,EAAE;MACpB,OAAOX,QAAQ,CAACW,gBAAgB,CAAC;IACnC;EACF;EAEA,IAAIjB,OAAO,CAACG,UAAU,IAAII,OAAO,CAACS,OAAO,EAAE;IACzC,MAAMG,gBAAgB,GAAG,IAAAC,oCAAoB,EAACb,OAAO,EAAET,SAAS,CAAC;IACjE,IAAIqB,gBAAgB,EAAE;MACpB,OAAOb,QAAQ,CAACa,gBAAgB,CAAC;IACnC;EACF;EAEAE,cAAc,CAACf,QAAQ,EAAEC,OAAO,EAAEP,OAAO,CAAC;EAE1CsB,cAAc,CAAChB,QAAQ,EAAEC,OAAO,EAAEP,OAAO,CAAC;EAE1C,OAAOM,QAAQ,CAAC,IAAAiB,4BAAU,EAAChB,OAAO,CAAC,CAAC;AACtC,CAAC;AAACiB,OAAA,CAAA7B,mBAAA,GAAAA,mBAAA;AAEJ,MAAM0B,cAAc,GAAGA,CACrBf,QAAkB,EAClBC,OAAkB,EAClBP,OAA0B,KACvB;EACH,IAAIA,OAAO,CAACE,QAAQ,IAAIK,OAAO,CAACS,OAAO,IAAIT,OAAO,CAACkB,SAAS,CAAC,CAAC,EAAE;IAC9DnB,QAAQ,CAAC,IAAAoB,gCAAkB,EAACnB,OAAO,CAAC,CAAC;EACvC;AACF,CAAC;AAED,MAAMe,cAAc,GAAGA,CACrBhB,QAAkB,EAClBC,OAAkB,EAClBP,OAA0B,KACvB;EACH,IACEA,OAAO,CAACK,QAAQ,IAChBE,OAAO,CAACG,iBAAiB,EAAEiB,qBAAqB,IAChD,IAAAC,oBAAU,EAAC,+BAA+B,CAAC,EAC3C;IACA;IACAtB,QAAQ,CAAC,IAAAuB,mCAAkB,EAACtB,OAAO,CAAC,CAAC;EACvC;AACF,CAAC","ignoreList":[]}

package/lib/redux/actions/FormAutosubmit.js

@@ -10,8 +10,7 @@ var _Constants = require("../../constants/Constants");
 var _FormModel = _interopRequireDefault(require("../../models/form/FormModel"));
 /**
  */
-const autosubmitFormObject = function (form, attribute) {
-  let forceUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+const autosubmitFormObject = (form, attribute, forceUpdate = false) => {
   // As long as we have form objects,
   // and the current attribute is not found in the current form object, go back.
   // When a form has a result, the current form object is null

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

@@ -1 +1 @@
-{"version":3,"file":"FormAutosubmit.js","names":["_ModularUIActions","require","_Constants","_FormModel","_interopRequireDefault","autosubmitFormObject","form","attribute","forceUpdate","arguments","length","undefined","allObjects","currentFormObject","hasAttributeByKey","key","setPreviousObject","isChanged","loadModularUI","connectKey","selfhref","method","HTTP_METHODS","POST","data","formdata","updateHandler","newModel","FormModel","clonedModel","clone","update","exports"],"sources":["../../../src/redux/actions/FormAutosubmit.js"],"sourcesContent":["// @flow\nimport { loadModularUI } from \"../_modularui/ModularUIActions\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ModularUIModel, AttributeType } from \"../../models/types\";\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const autosubmitFormObject = (\n  form: FormModel,\n  attribute: AttributeType,\n  forceUpdate: boolean = false,\n): ?ThunkAction => {\n  // As long as we have form objects,\n  // and the current attribute is not found in the current form object, go back.\n  // When a form has a result, the current form object is null\n  while (\n    form.allObjects.length > 0 &&\n    (!form.currentFormObject ||\n      !form.currentFormObject.hasAttributeByKey(attribute.key))\n  ) {\n    form.setPreviousObject();\n  }\n\n  if (form.isChanged() || forceUpdate) {\n    return loadModularUI(form.connectKey, form.selfhref, {\n      method: HTTP_METHODS.POST,\n      data: form.formdata,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          const clonedModel: FormModel = form.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    });\n  }\n\n  return null;\n};\n"],"mappings":";;;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAC,sBAAA,CAAAH,OAAA;AAKA;AACA;AACO,MAAMI,oBAAoB,GAAG,SAAAA,CAClCC,IAAe,EACfC,SAAwB,EAEP;EAAA,IADjBC,WAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,KAAK;EAE5B;EACA;EACA;EACA,OACEH,IAAI,CAACM,UAAU,CAACF,MAAM,GAAG,CAAC,KACzB,CAACJ,IAAI,CAACO,iBAAiB,IACtB,CAACP,IAAI,CAACO,iBAAiB,CAACC,iBAAiB,CAACP,SAAS,CAACQ,GAAG,CAAC,CAAC,EAC3D;IACAT,IAAI,CAACU,iBAAiB,CAAC,CAAC;EAC1B;EAEA,IAAIV,IAAI,CAACW,SAAS,CAAC,CAAC,IAAIT,WAAW,EAAE;IACnC,OAAO,IAAAU,+BAAa,EAACZ,IAAI,CAACa,UAAU,EAAEb,IAAI,CAACc,QAAQ,EAAE;MACnDC,MAAM,EAAEC,uBAAY,CAACC,IAAI;MACzBC,IAAI,EAAElB,IAAI,CAACmB,QAAQ;MACnBC,aAAa,EAAGC,QAAwB,IAAqB;QAC3D,IAAIA,QAAQ,YAAYC,kBAAS,EAAE;UACjC,MAAMC,WAAsB,GAAGvB,IAAI,CAACwB,KAAK,CAAC,CAAC;UAC3CD,WAAW,CAACE,MAAM,CAACJ,QAAQ,CAAC;UAC5B,OAAOE,WAAW;QACpB;QACA,OAAOF,QAAQ;MACjB;IACF,CAAC,CAAC;EACJ;EAEA,OAAO,IAAI;AACb,CAAC;AAACK,OAAA,CAAA3B,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"file":"FormAutosubmit.js","names":["_ModularUIActions","require","_Constants","_FormModel","_interopRequireDefault","autosubmitFormObject","form","attribute","forceUpdate","allObjects","length","currentFormObject","hasAttributeByKey","key","setPreviousObject","isChanged","loadModularUI","connectKey","selfhref","method","HTTP_METHODS","POST","data","formdata","updateHandler","newModel","FormModel","clonedModel","clone","update","exports"],"sources":["../../../src/redux/actions/FormAutosubmit.js"],"sourcesContent":["// @flow\nimport { loadModularUI } from \"../_modularui/ModularUIActions\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ModularUIModel, AttributeType } from \"../../models/types\";\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const autosubmitFormObject = (\n  form: FormModel,\n  attribute: AttributeType,\n  forceUpdate: boolean = false,\n): ?ThunkAction => {\n  // As long as we have form objects,\n  // and the current attribute is not found in the current form object, go back.\n  // When a form has a result, the current form object is null\n  while (\n    form.allObjects.length > 0 &&\n    (!form.currentFormObject ||\n      !form.currentFormObject.hasAttributeByKey(attribute.key))\n  ) {\n    form.setPreviousObject();\n  }\n\n  if (form.isChanged() || forceUpdate) {\n    return loadModularUI(form.connectKey, form.selfhref, {\n      method: HTTP_METHODS.POST,\n      data: form.formdata,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          const clonedModel: FormModel = form.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    });\n  }\n\n  return null;\n};\n"],"mappings":";;;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAC,sBAAA,CAAAH,OAAA;AAKA;AACA;AACO,MAAMI,oBAAoB,GAAGA,CAClCC,IAAe,EACfC,SAAwB,EACxBC,WAAoB,GAAG,KAAK,KACX;EACjB;EACA;EACA;EACA,OACEF,IAAI,CAACG,UAAU,CAACC,MAAM,GAAG,CAAC,KACzB,CAACJ,IAAI,CAACK,iBAAiB,IACtB,CAACL,IAAI,CAACK,iBAAiB,CAACC,iBAAiB,CAACL,SAAS,CAACM,GAAG,CAAC,CAAC,EAC3D;IACAP,IAAI,CAACQ,iBAAiB,CAAC,CAAC;EAC1B;EAEA,IAAIR,IAAI,CAACS,SAAS,CAAC,CAAC,IAAIP,WAAW,EAAE;IACnC,OAAO,IAAAQ,+BAAa,EAACV,IAAI,CAACW,UAAU,EAAEX,IAAI,CAACY,QAAQ,EAAE;MACnDC,MAAM,EAAEC,uBAAY,CAACC,IAAI;MACzBC,IAAI,EAAEhB,IAAI,CAACiB,QAAQ;MACnBC,aAAa,EAAGC,QAAwB,IAAqB;QAC3D,IAAIA,QAAQ,YAAYC,kBAAS,EAAE;UACjC,MAAMC,WAAsB,GAAGrB,IAAI,CAACsB,KAAK,CAAC,CAAC;UAC3CD,WAAW,CAACE,MAAM,CAACJ,QAAQ,CAAC;UAC5B,OAAOE,WAAW;QACpB;QACA,OAAOF,QAAQ;MACjB;IACF,CAAC,CAAC;EACJ;EAEA,OAAO,IAAI;AACb,CAAC;AAACK,OAAA,CAAAzB,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/redux/actions/Preferences.js

@@ -14,9 +14,7 @@ var _Settings = require("../../constants/Settings");
 var _constants = require("../../constants");
 /**
  */
-const getServerPreferenceValue = function (preferenceName) {
-  let defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  let type = arguments.length > 2 ? arguments[2] : undefined;
+const getServerPreferenceValue = (preferenceName, defaultValue = null, type) => {
   let value = null;
   if (typeof preferencesProvider !== "undefined") {
     value = preferencesProvider.getPreferenceByName(preferenceName);
@@ -33,9 +31,7 @@ const getServerPreferenceValue = function (preferenceName) {
 
 /**
  */
-const setServerPreference = function (propertyName) {
-  let defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  let type = arguments.length > 2 ? arguments[2] : undefined;
+const setServerPreference = (propertyName, defaultValue = null, type) => {
   const value = getServerPreferenceValue(propertyName, defaultValue, type);
   return setPreference(propertyName, value);
 };
@@ -43,15 +39,12 @@ const setServerPreference = function (propertyName) {
 /**
  */
 exports.setServerPreference = setServerPreference;
-const setPreference = function (propertyName) {
-  let propertyValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  return {
-    type: "SET_PREFERENCE",
-    payload: {
-      [propertyName]: propertyValue
-    }
-  };
-};
+const setPreference = (propertyName, propertyValue = null) => ({
+  type: "SET_PREFERENCE",
+  payload: {
+    [propertyName]: propertyValue
+  }
+});
 
 /**
  */

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

@@ -1 +1 @@
-{"version":3,"file":"Preferences.js","names":["_objects","require","_exceptions","_Settings","_constants","getServerPreferenceValue","preferenceName","defaultValue","arguments","length","undefined","type","value","preferencesProvider","getPreferenceByName","_includes","default","call","_context","_map","split","val","_trim","setServerPreference","propertyName","setPreference","exports","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","JsonParseException","isPlainObject","setSettings","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","ALL_CONTENT_IN_DATA_SETTING","setSetting","setDateTimeSettings","isIncludeTimeOffsetInDateTimes","INCLUDE_TIME_OFFSET","setLoginPreferences","loginSettings","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n  PreferenceValue,\n  ReduxState,\n  SetPreferenceAction,\n  SetPreferencesAction,\n} from \"../types\";\n\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INCLUDE_TIME_OFFSET,\n  LOGIN_TYPE,\n  LOGIN_PASSWORD_SETTING,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n  preferenceName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string,\n) => {\n  let value: PreferenceValue = null;\n  if (typeof preferencesProvider !== \"undefined\") {\n    value = preferencesProvider.getPreferenceByName(preferenceName);\n  }\n\n  if (value == null) {\n    value = defaultValue;\n  }\n\n  if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n    value = value.split(\",\").map((val) => val.trim());\n  }\n\n  return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n  propertyName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string,\n): SetPreferenceAction => {\n  const value = getServerPreferenceValue(propertyName, defaultValue, type);\n  return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n  propertyName: string,\n  propertyValue: PreferenceValue = null,\n): SetPreferenceAction => ({\n  type: \"SET_PREFERENCE\",\n  payload: {\n    [propertyName]: propertyValue,\n  },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n  type: \"SET_PREFERENCES\",\n  payload: {\n    ...preferences,\n  },\n});\n\n/**\n */\nexport const setThemePreference = (\n  configTheme: string,\n): SetPreferenceAction => {\n  let themeData;\n\n  try {\n    themeData = configTheme ? JSON.parse(configTheme) : null;\n  } catch (error) {\n    throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n  }\n\n  if (themeData && isPlainObject(themeData)) {\n    setSettings(themeData.settings);\n  }\n\n  return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n  state?: ReduxState,\n): SetPreferenceAction => {\n  let allContentInDataSetting: PreferenceValue = false;\n\n  if (\n    typeof preferencesProvider !== \"undefined\" &&\n    typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n  ) {\n    allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n  } else if (typeof state !== \"undefined\") {\n    allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n  }\n\n  setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n  return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieve settings for date time conversion\n */\nexport const setDateTimeSettings = (\n  state?: ReduxState,\n): SetPreferenceAction => {\n  let isIncludeTimeOffsetInDateTimes: PreferenceValue = false;\n  if (\n    typeof preferencesProvider !== \"undefined\" &&\n    typeof preferencesProvider.isIncludeTimeOffsetInDateTimes !== \"undefined\"\n  ) {\n    isIncludeTimeOffsetInDateTimes =\n      preferencesProvider.isIncludeTimeOffsetInDateTimes();\n  } else if (typeof state !== \"undefined\") {\n    isIncludeTimeOffsetInDateTimes = state.preferences[INCLUDE_TIME_OFFSET];\n  }\n\n  setSetting(INCLUDE_TIME_OFFSET, !!isIncludeTimeOffsetInDateTimes);\n  return setPreference(INCLUDE_TIME_OFFSET, isIncludeTimeOffsetInDateTimes);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n  state?: ReduxState,\n): SetPreferencesAction => {\n  const loginSettings = {\n    [LOGIN_TYPE]: getServerPreferenceValue(\n      LOGIN_TYPE,\n      state?.preferences[LOGIN_TYPE],\n    ),\n    [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n      LOGIN_PATH_SETTING,\n      state?.preferences[LOGIN_PATH_SETTING] ??\n        `/callback?client_name=FormClient`,\n    ),\n    [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(\n      LOGIN_USERNAME_SETTING,\n      state?.preferences[LOGIN_USERNAME_SETTING] ?? \"j_username\",\n    ),\n    [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(\n      LOGIN_PASSWORD_SETTING,\n      state?.preferences[LOGIN_PASSWORD_SETTING] ?? \"j_password\",\n    ),\n    [LOGOUT_PATH_SETTING]: getServerPreferenceValue(\n      LOGOUT_PATH_SETTING,\n      state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`,\n    ),\n  };\n\n  setSettings(loginSettings);\n  return setPreferences(loginSettings);\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Preferences.js","names":["_objects","require","_exceptions","_Settings","_constants","getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","_includes","default","call","_context","_map","split","val","_trim","setServerPreference","propertyName","setPreference","exports","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","JsonParseException","isPlainObject","setSettings","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","ALL_CONTENT_IN_DATA_SETTING","setSetting","setDateTimeSettings","isIncludeTimeOffsetInDateTimes","INCLUDE_TIME_OFFSET","setLoginPreferences","loginSettings","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n  PreferenceValue,\n  ReduxState,\n  SetPreferenceAction,\n  SetPreferencesAction,\n} from \"../types\";\n\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INCLUDE_TIME_OFFSET,\n  LOGIN_TYPE,\n  LOGIN_PASSWORD_SETTING,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n  preferenceName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string,\n) => {\n  let value: PreferenceValue = null;\n  if (typeof preferencesProvider !== \"undefined\") {\n    value = preferencesProvider.getPreferenceByName(preferenceName);\n  }\n\n  if (value == null) {\n    value = defaultValue;\n  }\n\n  if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n    value = value.split(\",\").map((val) => val.trim());\n  }\n\n  return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n  propertyName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string,\n): SetPreferenceAction => {\n  const value = getServerPreferenceValue(propertyName, defaultValue, type);\n  return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n  propertyName: string,\n  propertyValue: PreferenceValue = null,\n): SetPreferenceAction => ({\n  type: \"SET_PREFERENCE\",\n  payload: {\n    [propertyName]: propertyValue,\n  },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n  type: \"SET_PREFERENCES\",\n  payload: {\n    ...preferences,\n  },\n});\n\n/**\n */\nexport const setThemePreference = (\n  configTheme: string,\n): SetPreferenceAction => {\n  let themeData;\n\n  try {\n    themeData = configTheme ? JSON.parse(configTheme) : null;\n  } catch (error) {\n    throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n  }\n\n  if (themeData && isPlainObject(themeData)) {\n    setSettings(themeData.settings);\n  }\n\n  return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n  state?: ReduxState,\n): SetPreferenceAction => {\n  let allContentInDataSetting: PreferenceValue = false;\n\n  if (\n    typeof preferencesProvider !== \"undefined\" &&\n    typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n  ) {\n    allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n  } else if (typeof state !== \"undefined\") {\n    allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n  }\n\n  setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n  return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieve settings for date time conversion\n */\nexport const setDateTimeSettings = (\n  state?: ReduxState,\n): SetPreferenceAction => {\n  let isIncludeTimeOffsetInDateTimes: PreferenceValue = false;\n  if (\n    typeof preferencesProvider !== \"undefined\" &&\n    typeof preferencesProvider.isIncludeTimeOffsetInDateTimes !== \"undefined\"\n  ) {\n    isIncludeTimeOffsetInDateTimes =\n      preferencesProvider.isIncludeTimeOffsetInDateTimes();\n  } else if (typeof state !== \"undefined\") {\n    isIncludeTimeOffsetInDateTimes = state.preferences[INCLUDE_TIME_OFFSET];\n  }\n\n  setSetting(INCLUDE_TIME_OFFSET, !!isIncludeTimeOffsetInDateTimes);\n  return setPreference(INCLUDE_TIME_OFFSET, isIncludeTimeOffsetInDateTimes);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n  state?: ReduxState,\n): SetPreferencesAction => {\n  const loginSettings = {\n    [LOGIN_TYPE]: getServerPreferenceValue(\n      LOGIN_TYPE,\n      state?.preferences[LOGIN_TYPE],\n    ),\n    [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n      LOGIN_PATH_SETTING,\n      state?.preferences[LOGIN_PATH_SETTING] ??\n        `/callback?client_name=FormClient`,\n    ),\n    [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(\n      LOGIN_USERNAME_SETTING,\n      state?.preferences[LOGIN_USERNAME_SETTING] ?? \"j_username\",\n    ),\n    [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(\n      LOGIN_PASSWORD_SETTING,\n      state?.preferences[LOGIN_PASSWORD_SETTING] ?? \"j_password\",\n    ),\n    [LOGOUT_PATH_SETTING]: getServerPreferenceValue(\n      LOGOUT_PATH_SETTING,\n      state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`,\n    ),\n  };\n\n  setSettings(loginSettings);\n  return setPreferences(loginSettings);\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/connectors/CaseView.js

@@ -8,12 +8,9 @@ exports.connectCaseView = void 0;
 var _ModularUIConnector = _interopRequireDefault(require("../_modularui/ModularUIConnector"));
 /**
  */
-const connectCaseView = exports.connectCaseView = (0, _ModularUIConnector.default)("CaseView", _ref => {
-  let {
-    match
-  } = _ref;
-  return match.url;
-}, {
+const connectCaseView = exports.connectCaseView = (0, _ModularUIConnector.default)("CaseView", ({
+  match
+}) => match.url, {
   propName: "caseview"
 });
 //# sourceMappingURL=CaseView.js.map