npm - @beinformed/ui - Versions diffs - 1.63.2 → 1.63.3 - Mend

@beinformed/ui 1.63.2 → 1.63.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (460) hide show

package/esm/redux/_modularui/ModularUIActions.js CHANGED Viewed

@@ -133,30 +133,26 @@ export const loadModel = (key, href, options) => ({
 /**
  */
-export const loadModularUI = function (key, href, options) {
-  let retryCount = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3;
-  let retryDelay = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 200;
-  return (dispatch, getState) => {
-    const modularuiStore = getState()?.modularui;
-    const currentRequest = modularuiStore?.[key];
-    const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;
-    if (isLoading) {
-      const isDifferentRequest = currentRequest.requestOptions?.href?.toString() !== href.toString();
-      if (isDifferentRequest && retryCount > 0) {
-        return new _Promise(resolve => {
-          setTimeout(() => {
-            resolve(dispatch(loadModularUI(key, href, options, retryCount - 1, retryDelay)));
-          }, retryDelay);
-        });
-      }
-      // Same request is already loading — do nothing
-      return _Promise.resolve();
+export const loadModularUI = (key, href, options, retryCount = 3, retryDelay = 200) => (dispatch, getState) => {
+  const modularuiStore = getState()?.modularui;
+  const currentRequest = modularuiStore?.[key];
+  const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;
+  if (isLoading) {
+    const isDifferentRequest = currentRequest.requestOptions?.href?.toString() !== href.toString();
+    if (isDifferentRequest && retryCount > 0) {
+      return new _Promise(resolve => {
+        setTimeout(() => {
+          resolve(dispatch(loadModularUI(key, href, options, retryCount - 1, retryDelay)));
+        }, retryDelay);
+      });
     }
-    dispatch(startProgress());
-    const loadModelPromise = dispatch(loadModel(key, href, options));
-    return _Promise.resolve(loadModelPromise).then(() => dispatch(finishProgress())).catch(error => dispatch(handleError(error)));
-  };
+    // Same request is already loading — do nothing
+    return _Promise.resolve();
+  }
+  dispatch(startProgress());
+  const loadModelPromise = dispatch(loadModel(key, href, options));
+  return _Promise.resolve(loadModelPromise).then(() => dispatch(finishProgress())).catch(error => dispatch(handleError(error)));
 };
 /**

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

	@@ -1 +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","requestOptions","loadModelSuccessAction","updateHandler","getRequestLocale","optionLocale","navigator","language","split","loadModel","href","options","origin","contextPath","method","GET","params","data","timeout","headers","events","onProgress","locale","childmodels","targetModel","forceTargetModel","cache","isReload","withCredentials","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","retryCount","arguments","length","undefined","retryDelay","dispatch","getState","modularuiStore","modularui","currentRequest","isLoading","LOADING","isDifferentRequest","toString","_Promise","resolve","setTimeout","loadModelPromise","then","catch","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":[]}
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","requestOptions","loadModelSuccessAction","updateHandler","getRequestLocale","optionLocale","navigator","language","split","loadModel","href","options","origin","contextPath","method","GET","params","data","timeout","headers","events","onProgress","locale","childmodels","targetModel","forceTargetModel","cache","isReload","withCredentials","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","retryCount","retryDelay","dispatch","getState","modularuiStore","modularui","currentRequest","isLoading","LOADING","isDifferentRequest","toString","_Promise","resolve","setTimeout","loadModelPromise","then","catch","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/esm/redux/_modularui/ModularUIConnector.js CHANGED Viewed

@@ -29,11 +29,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/esm/redux/_modularui/ModularUIConnector.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ModularUIConnector.js","names":["useEffect","useDispatch","useLocation","loadModularUI","reloadModel","removeModelByKey","Href","getDisplayName","useUrl","useReload","useModularUI","useLocale","FormModel","jsx","_jsx","patchUpdateModelOption","oldOptions","updateModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","~~arguments","length","undefined","~~propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","location","url","displayName","contextId","modelEntry","modelKey","model","connectKey","handleManualReload","reloadOptions","handleFetch","href","fetchOptions","reload","state","doReload","isReload","locale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI"],"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":"AACA,SAASA,SAAS,QAAQ,OAAO;AACjC,SAASC,WAAW,QAAQ,aAAa;AACzC,SAASC,WAAW,QAAQ,cAAc;AAE1C,SACEC,aAAa,EACbC,WAAW,EACXC,gBAAgB,QACX,oBAAoB;AAE3B,OAAOC,IAAI,MAAM,wBAAwB;AACzC,SAASC,cAAc,QAAQ,mBAAmB;AAElD,SAASC,MAAM,EAAEC,SAAS,QAAQ,kBAAkB;AACpD,SAASC,YAAY,QAAQ,0BAA0B;AACvD,SAASC,SAAS,QAAQ,qBAAqB;AAM/C,OAAOC,SAAS,MAAM,6BAA6B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAcpD,MAAMC,sBAAsB,GAAIC,UAAkB,IAAK;EACrD,IACE,aAAa,IAAIA,UAAU,IAC3BA,UAAU,CAACC,WAAW,YAAYL,SAAS,EAC3C;IACA,OAAO;MACL,GAAGI,UAAU;MACbE,aAAa,EAAGC,QAAwB,IAAqB;QAC3D,IAAIA,QAAQ,YAAYP,SAAS,EAAE;UACjC;UACA,MAAMQ,WAAsB,GAAGJ,UAAU,CAACC,WAAW,CAACI,KAAK,CAAC,CAAC;UAC7DD,WAAW,CAACE,MAAM,CAACH,QAAQ,CAAC;UAC5B,OAAOC,WAAW;QACpB;QACA,OAAOD,QAAQ;MACjB;IACF,CAAC;EACH;EAEA,OAAOH,UAAU;AACnB,CAAC;;AAED;AACA;AACA,MAAMO,kBAAkB,~~GAAG~~,~~SAAAA,~~CACzBC,IAAY,EACZC,QAA2B,~~EAEmC;EAAA~~,~~IAD9DC,~~OAAyB,~~GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG~~;~~IAAEG~~,QAAQ,EAAE,MAAM;~~IAAEC~~,eAAe,EAAE;~~EAAM~~,CAAC;~~EAExE~~,MAAM;IACJD,QAAQ,GAAG,MAAM;IACjBC,eAAe,GAAG,KAAK;IACvB,GAAGC;EACL,CAAC,~~GAAGN~~,OAAO;EAEX,~~OAAQO~~,SAA6B,IAAK;IACxC,MAAMC,gBAAgB,GAAIC,KAAU,IAAK;MACvC;MACA,MAAMC,oBAAoB,GAAGD,KAAK,CAACJ,eAAe,IAAIA,eAAe;MAErE,MAAMM,QAAQ,~~GAAGpC~~,WAAW,CAAC,CAAC;MAC9B,~~MAAMqC~~,QAAQ,~~GAAGpC~~,WAAW,CAAC,CAAC;MAE9B,~~MAAMqC~~,GAAG,~~GAAG/B~~,MAAM,CAACiB,QAAQ,EAAE;~~QAAEa~~,QAAQ;QAAE,GAAGH;MAAM,CAAC,CAAC;MACpD,MAAMK,WAAW,~~GAAGjC~~,cAAc,~~CAAC0B~~,SAAS,~~EAAET~~,IAAI,~~EAAEW~~,KAAK,CAACM,SAAS,CAAC;;MAEpE;MACA,MAAMC,UAAU,~~GAAGhC~~,YAAY,~~CAAC8B~~,WAAW,EAAED,GAAG,EAAE;QAChD,GAAGP,YAAY;QACfD,eAAe,EAAEK;MACnB,CAAC,CAAC;MACF,MAAMO,QAAQ,GAAGD,UAAU,EAAEE,KAAK,EAAEC,UAAU;;MAE9C;MACA,MAAMC,kBAAkB,GAAGA,CACzBF,KAAqB,EACrBG,aAAsB,KACnB;QACHV,QAAQ,~~CAACjC~~,WAAW,~~CAACwC~~,KAAK,EAAEG,aAAa,CAAC,CAAC;MAC7C,CAAC;;MAED;MACA;MACA,MAAMC,WAAW,GAAGA,CAACC,IAAmB,EAAEC,YAAoB,KAAK;QACjEb,QAAQ,~~CACNlC~~,aAAa,~~CAACwC~~,QAAQ,EAAEM,IAAI,~~EAAElC~~,sBAAsB,~~CAACmC~~,YAAY,CAAC,CACpE,CAAC;MACH,CAAC;;MAED;MACA,MAAMC,MAAM,GAAGb,QAAQ,EAAEc,KAAK,EAAED,MAAM,IAAI,CAAC;MAC3C,MAAME,QAAQ,~~GAAG5C~~,SAAS,~~CAACiC~~,UAAU,EAAES,MAAM,CAAC;~~MAC9CnD~~,SAAS,CAAC,MAAM;QACd,~~IAAIqD~~,QAAQ,EAAE;UACZhB,QAAQ,~~CACNlC~~,aAAa,~~CAACwC~~,QAAQ,EAAEJ,GAAG,EAAE;YAC3B,~~GAAGxB~~,sBAAsB,~~CAACiB~~,YAAY,CAAC;YACvCsB,QAAQ,EAAE;UACZ,CAAC,CACH,CAAC;QACH;MACF,CAAC,EAAE,CAACjB,QAAQ,EAAEgB,QAAQ,EAAEd,GAAG,EAAEI,QAAQ,CAAC,CAAC;;MAEvC;~~MACA3C~~,SAAS,CAAC,MAAM;QACd,OAAO,MAAM;UACX,~~IAAIoC~~,oBAAoB,EAAE;YACxBC,QAAQ,~~CAAChC~~,gBAAgB,~~CAACsC~~,QAAQ,CAAC,CAAC;UACtC;QACF,CAAC;MACH,CAAC,EAAE,CAACN,QAAQ,EAAEM,QAAQ,EAAEP,oBAAoB,CAAC,CAAC;;MAE9C;MACA,MAAMmB,MAAM,~~GAAG5C~~,SAAS,CAAC,CAAC;MAC1B,~~MAAM6C~~,QAAuB,GAAG;QAC9Bb,QAAQ;QACR,CAACb,QAAQ,GAAGY,UAAU,EAAEE,KAAK,IAAI,IAAI;QACrCN,QAAQ;QACRmB,MAAM,EAAEf,UAAU,EAAEe,MAAM,IAAI,IAAI;QAClCC,gBAAgB,EAAEhB,UAAU,EAAEgB,gBAAgB,IAAI,IAAI;QACtDC,QAAQ,EAAEC,OAAO,CAAClB,UAAU,CAAC;QAC7Ba,MAAM;QACNM,cAAc,EAAEb,WAAW;~~QAC3B5C~~,WAAW,~~EAAE0C~~;MACf,CAAC;MAED,~~oBAAOhC~~,IAAA,~~CAACmB~~,SAAS;QAAA,GAAKE,KAAK;QAAA,GAAMqB;MAAQ,CAAG,CAAC;IAC/C,CAAC;IAEDtB,gBAAgB,CAACM,WAAW,GAAG,~~gBAAgBjC~~,cAAc,~~CAC3D2B~~,gBAAgB,~~EAChBV~~,IACF,CAAC,EAAE;IAEH,~~OAAOU~~,gBAAgB;EACzB,CAAC;AACH,CAAC;AAED,~~eAAeX~~,kBAAkB","ignoreList":[]}
1	+ {"version":3,"file":"ModularUIConnector.js","names":["useEffect","useDispatch","useLocation","loadModularUI","reloadModel","removeModelByKey","Href","getDisplayName","useUrl","useReload","useModularUI","useLocale","FormModel","jsx","_jsx","patchUpdateModelOption","oldOptions","updateModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","location","url","displayName","contextId","modelEntry","modelKey","model","connectKey","handleManualReload","reloadOptions","handleFetch","href","fetchOptions","reload","state","doReload","isReload","locale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI"],"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/esm/redux/_modularui/ModularUIReducer.js CHANGED Viewed

@@ -5,12 +5,11 @@ import { MODULARUI_STATUS } from "../../constants/Constants";
 import { ApplicationModel } from "../../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 !== MODULARUI_STATUS.LOADING && !state[key]) {
     return state;
@@ -28,11 +27,10 @@ const updateStatus = (state, _ref) => {
 /**
  */
-const setModel = (state, _ref2) => {
-  let {
-    key,
-    model
-  } = _ref2;
+const setModel = (state, {
+  key,
+  model
+}) => {
   if (!state[key]) {
     return state;
   }
@@ -57,11 +55,10 @@ const setModel = (state, _ref2) => {
  */
 const initModularUI = (state, models) => {
   const newState = _Object$assign({}, state);
-  models.forEach(_ref3 => {
-    let {
-      key,
-      model
-    } = _ref3;
+  models.forEach(({
+    key,
+    model
+  }) => {
     newState[key] = {
       status: MODULARUI_STATUS.FINISHED,
       lastModification: Date.now(),
@@ -124,9 +121,7 @@ const initialState = {};
 /**
  * Modular UI Reducer
  */
-export const ModularUIReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+export const ModularUIReducer = (state = initialState, action) => {
   if (!action) {
     return state;
   }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ModularUIReducer.js","names":["MODULARUI_STATUS","ApplicationModel","updateStatus","state","~~_ref","~~key","status","requestOptions","LOADING","lastModification","Date","now","setModel","~~_ref2","~~model","FINISHED","console","debug","initModularUI","models","newState","_Object$assign","forEach","~~_ref3","~~getModelKey","_context","_findInstanceProperty","_Object$keys","call","connectKey","updateModel","modelKey","removeKey","resetModularUI","initialState","ModularUIReducer","~~arguments","length","undefined","~~action","type","payload"],"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":";;;AACA,SAASA,gBAAgB,QAAQ,2BAA2B;AAC5D,SAASC,gBAAgB,QAAQ,cAAc;AAO/C;AACA;AACA,MAAMC,YAAY,GAAGA,CACnBC,KAAqB,~~EAAAC,IAAA,KAUlB~~;~~EAAA~~,~~IATH;IACEC,~~GAAG;~~IACHC~~,MAAM;~~IACNC~~;~~EAKF~~,CAAC,~~GAAAH,IAAA~~;~~EAED~~;EACA,~~IAAIE~~,MAAM,~~KAAKN~~,gBAAgB,~~CAACQ~~,OAAO,IAAI,~~CAACL~~,KAAK,~~CAACE~~,GAAG,CAAC,EAAE;IACtD,~~OAAOF~~,KAAK;EACd;EAEA,OAAO;IACL,GAAGA,KAAK;IACR,~~CAACE~~,GAAG,GAAG;MACL,~~GAAGF~~,KAAK,~~CAACE~~,GAAG,CAAC;MACbC,MAAM;MACNG,gBAAgB,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;MAC5BJ,cAAc,EAAEA,cAAc,~~IAAIJ~~,KAAK,~~CAACE~~,GAAG,CAAC,EAAEE;IAChD;EACF,CAAC;AACH,CAAC;;AAED;AACA;AACA,MAAMK,QAAQ,GAAGA,~~CACfT~~,KAAqB,~~EAAAU,KAAA,KAElB~~;~~EAAA~~,~~IADH;IAAER,~~GAAG;~~IAAES~~;~~EAA~~+C,CAAC,~~GAAAD,KAAA~~;~~EAEvD~~,IAAI,~~CAACV~~,KAAK,~~CAACE~~,GAAG,CAAC,EAAE;IACf,~~OAAOF~~,KAAK;EACd;EAEA,~~IAAIW~~,KAAK,EAAE;IACT,OAAO;MACL,~~GAAGX~~,KAAK;MACR,~~CAACE~~,GAAG,GAAG;QACL,~~GAAGF~~,KAAK,~~CAACE~~,GAAG,CAAC;~~QACbS~~,KAAK;~~QACLL~~,gBAAgB,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;QAC5BL,MAAM,~~EAAEN~~,gBAAgB,~~CAACe~~;MAC3B;IACF,CAAC;EACH;;EAEA;EACAC,OAAO,CAACC,KAAK,CAAC,uBAAuB,CAAC;EACtC,~~OAAOd~~,KAAK;AACd,CAAC;;AAED;AACA;AACA,~~MAAMe~~,aAAa,GAAGA,~~CACpBf~~,KAAqB,~~EACrBgB~~,MAAqD,KAClD;EACH,MAAMC,QAAQ,GAAGC,cAAA,CAAc,CAAC,CAAC,~~EAAElB~~,KAAK,CAAC;~~EAEzCgB~~,MAAM,CAACG,OAAO,~~CAACC~~,~~KAAA,IAAoB~~;~~IAAA~~,~~IAAnB;MAAElB,~~GAAG;~~MAAES~~;~~IAAM~~,CAAC,~~GAAAS,KAAA~~;~~IAC5BH~~,QAAQ,~~CAACf~~,GAAG,CAAC,GAAG;MACdC,MAAM,~~EAAEN~~,gBAAgB,~~CAACe~~,QAAQ;~~MACjCN~~,gBAAgB,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;~~MAC5BG~~;IACF,CAAC;EACH,CAAC,CAAC;EAEF,OAAOM,QAAQ;AACjB,CAAC;;AAED;AACA;AACA,~~MAAMI~~,WAAW,GAAGA,~~CAACrB~~,KAAqB,~~EAAEW~~,KAAqB;EAAA,~~IAAAW~~,QAAA;EAAA,OAC/DC,qBAAA,CAAAD,QAAA,GAAAE,YAAA,~~CAAYxB~~,KAAK,CAAC,~~EAAAyB~~,IAAA,CAAAH,QAAA,~~EAAOpB~~,GAAG,IAAK;IAC/B,~~MAAMwB~~,UAAU,~~GAAG1B~~,KAAK,~~CAACE~~,GAAG,CAAC,~~EAAES~~,KAAK,~~EAAEe~~,UAAU,IAAI,EAAE;IACtD,OAAOA,UAAU,~~KAAKf~~,KAAK,~~CAACe~~,UAAU;EACxC,CAAC,CAAC;AAAA;;AAEJ;AACA;AACA,MAAMC,WAAW,GAAGA,~~CAAC3B~~,KAAqB,~~EAAEW~~,KAAqB,KAAK;EACpE,~~MAAMiB~~,QAAQ,GAAGP,WAAW,~~CAACrB~~,KAAK,~~EAAEW~~,KAAK,CAAC;EAE1C,~~IAAIiB~~,QAAQ,EAAE;IACZ,~~OAAOnB~~,QAAQ,~~CAACT~~,KAAK,EAAE;~~MAAEE~~,GAAG,~~EAAE0B~~,QAAQ;~~MAAEjB~~;IAAM,CAAC,CAAC;EAClD;;EAEA;EACAE,OAAO,CAACC,KAAK,CACX,kDAAkDH,KAAK,~~CAACe~~,UAAU,EACpE,CAAC;EACD,~~OAAO1B~~,KAAK;AACd,CAAC;;AAED;AACA;AACA,~~MAAM6B~~,SAAS,GAAGA,CAACD,QAAgB,~~EAAE5B~~,KAAqB,KAAqB;EAC7E,~~MAAMiB~~,QAAQ,GAAGC,cAAA,CAAc,CAAC,CAAC,~~EAAElB~~,KAAK,CAAC;EACzC,~~OAAOiB~~,QAAQ,~~CAACW~~,QAAQ,CAAC;EACzB,~~OAAOX~~,QAAQ;AACjB,CAAC;;AAED;AACA;AACA;AACA,~~MAAMa~~,cAAc,~~GAAI9B~~,KAAqB,IAAK;EAChD,~~MAAMiB~~,QAAwB,GAAG,CAAC,CAAC;EAEnC,KAAK,~~MAAMf~~,GAAG,~~IAAIF~~,KAAK,EAAE;IACvB,IAAIA,KAAK,~~CAACE~~,GAAG,CAAC,~~CAACS~~,KAAK,~~YAAYb~~,gBAAgB,EAAE;~~MAChDmB~~,QAAQ,~~CAACf~~,GAAG,CAAC,GAAG;QAAE,~~GAAGF~~,KAAK,~~CAACE~~,GAAG;MAAE,CAAC;IACnC;EACF;EAEA,~~OAAOe~~,QAAQ;AACjB,CAAC;AAED,~~MAAMc~~,YAA4B,GAAG,CAAC,CAAC;;AAEvC;AACA;AACA;AACA,OAAO,MAAMC,gBAAsD,~~GAAG~~,~~SAAAA~~,~~CAAA,EAGjE;EAAA,IAFHhC,~~KAAK,~~GAAAiC~~,~~SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGF,~~YAAY~~;EAAA~~,~~IACpBK~~,MAAM,~~GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA~~;~~EAEN~~,IAAI,~~CAACC~~,MAAM,EAAE;IACX,~~OAAOpC~~,KAAK;EACd;EAEA,~~QAAQoC~~,MAAM,CAACC,IAAI;IACjB,KAAK,gBAAgB;MACnB,~~OAAOtB~~,aAAa,~~CAACf~~,KAAK,~~EAAEoC~~,MAAM,CAACE,OAAO,CAAC;IAE7C,KAAK,iBAAiB;MACpB,~~OAAOR~~,cAAc,~~CAAC9B~~,KAAK,CAAC;IAE9B,KAAK,kBAAkB;MACrB,OAAOD,YAAY,CAACC,KAAK,~~EAAEoC~~,MAAM,CAACE,OAAO,CAAC;IAE5C,KAAK,eAAe;MAClB,~~OAAO7B~~,QAAQ,~~CAACT~~,KAAK,~~EAAEoC~~,MAAM,CAACE,OAAO,CAAC;IAExC,KAAK,kBAAkB;IACvB,KAAK,uBAAuB;MAC1B,~~OAAOX~~,WAAW,~~CAAC3B~~,KAAK,~~EAAEoC~~,MAAM,CAACE,OAAO,CAAC;IAE3C,KAAK,sBAAsB;MACzB,~~OAAOT~~,SAAS,~~CAACO~~,MAAM,CAACE,OAAO,~~EAAEtC~~,KAAK,CAAC;IAEzC;MACE,OAAOA,KAAK;EAChB;AACF,CAAC","ignoreList":[]}
1	+ {"version":3,"file":"ModularUIReducer.js","names":["MODULARUI_STATUS","ApplicationModel","updateStatus","state","key","status","requestOptions","LOADING","lastModification","Date","now","setModel","model","FINISHED","console","debug","initModularUI","models","newState","_Object$assign","forEach","getModelKey","_context","_findInstanceProperty","_Object$keys","call","connectKey","updateModel","modelKey","removeKey","resetModularUI","initialState","ModularUIReducer","action","type","payload"],"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/esm/redux/_modularui/ModularUIUtils.js CHANGED Viewed

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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ModularUIUtils.js","names":["useState","getDisplayName","MODULARUI_STATUS","Href","getUrl","resource","props","url","useUrl","_context","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","equalsWithParameters","isExact","Function","call","bind","_startsWithInstanceProperty","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 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":";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;EAAA,IAAAG,QAAA;EACT,MAAM,CAACC,WAAW,EAAEC,cAAc,CAAC,GAAGX,QAAQ,CAAC,IAAI,CAAC;EACpD,MAAM,CAACY,aAAa,EAAEC,gBAAgB,CAAC,GAAGb,QAAQ,CAAC,KAAK,CAAC;EAEzD,MAAMO,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,IAAIC,GAAG,IAAI,IAAI,IAAIG,WAAW,IAAI,IAAI,EAAE;IACtC,OAAO,IAAIP,IAAI,CAAC,EAAE,CAAC;EACrB;EAEA,MAAM;IAAEW;EAAM,CAAC,GAAGR,KAAK;;EAEvB;EACA;EACA,IAAI,CAACQ,KAAK,EAAE;IACV,OAAOP,GAAG;EACZ;EAEA,IAAIA,GAAG,CAACQ,oBAAoB,CAACL,WAAW,CAAC,EAAE;IACzC,OAAOA,WAAW,IAAIH,GAAG;EAC3B;;EAEA;EACA;EACA;EACA,IACEO,KAAK,CAACE,OAAO,KAAK,IAAI,IACtBJ,aAAa,KAAKE,KAAK,CAACE,OAAO,IAC/B,CAAC,EAAAP,QAAA,GAAAC,WAAW,qBAAAO,QAAA,CAAAC,IAAA,CAAAC,IAAA,CAAAC,2BAAA,CAAAX,QAAA,GAAAA,QAAA,KAAaK,KAAK,CAACP,GAAG,CAAC,EACnC;IACAI,cAAc,CAACJ,GAAG,CAAC;IACnBM,gBAAgB,CAACC,KAAK,CAACE,OAAO,CAAC;IAE/B,OAAOT,GAAG;EACZ;EAEA,OAAOG,WAAW,IAAI,IAAIP,IAAI,CAAC,EAAE,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMkB,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZhB,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAGN,cAAc,CAACqB,gBAAgB,EAAEC,IAAI,CAAC,IAAIhB,GAAG,CAACiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAOvB,cAAc,CAACqB,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,~~KAAK9B~~,gBAAgB,~~CAAC+B~~,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":[]}
1	+ {"version":3,"file":"ModularUIUtils.js","names":["useState","getDisplayName","MODULARUI_STATUS","Href","getUrl","resource","props","url","useUrl","_context","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","equalsWithParameters","isExact","Function","call","bind","_startsWithInstanceProperty","getKey","WrappedComponent","name","split","useReload","modelEntry","reload","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 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":";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;EAAA,IAAAG,QAAA;EACT,MAAM,CAACC,WAAW,EAAEC,cAAc,CAAC,GAAGX,QAAQ,CAAC,IAAI,CAAC;EACpD,MAAM,CAACY,aAAa,EAAEC,gBAAgB,CAAC,GAAGb,QAAQ,CAAC,KAAK,CAAC;EAEzD,MAAMO,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,IAAIC,GAAG,IAAI,IAAI,IAAIG,WAAW,IAAI,IAAI,EAAE;IACtC,OAAO,IAAIP,IAAI,CAAC,EAAE,CAAC;EACrB;EAEA,MAAM;IAAEW;EAAM,CAAC,GAAGR,KAAK;;EAEvB;EACA;EACA,IAAI,CAACQ,KAAK,EAAE;IACV,OAAOP,GAAG;EACZ;EAEA,IAAIA,GAAG,CAACQ,oBAAoB,CAACL,WAAW,CAAC,EAAE;IACzC,OAAOA,WAAW,IAAIH,GAAG;EAC3B;;EAEA;EACA;EACA;EACA,IACEO,KAAK,CAACE,OAAO,KAAK,IAAI,IACtBJ,aAAa,KAAKE,KAAK,CAACE,OAAO,IAC/B,CAAC,EAAAP,QAAA,GAAAC,WAAW,qBAAAO,QAAA,CAAAC,IAAA,CAAAC,IAAA,CAAAC,2BAAA,CAAAX,QAAA,GAAAA,QAAA,KAAaK,KAAK,CAACP,GAAG,CAAC,EACnC;IACAI,cAAc,CAACJ,GAAG,CAAC;IACnBM,gBAAgB,CAACC,KAAK,CAACE,OAAO,CAAC;IAE/B,OAAOT,GAAG;EACZ;EAEA,OAAOG,WAAW,IAAI,IAAIP,IAAI,CAAC,EAAE,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMkB,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZhB,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAGN,cAAc,CAACqB,gBAAgB,EAAEC,IAAI,CAAC,IAAIhB,GAAG,CAACiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAOvB,cAAc,CAACqB,gBAAgB,EAAEC,IAAI,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAME,SAAS,GAAGA,CAACC,UAAkB,EAAEC,MAAc,GAAG,CAAC,KAAc;EAC5E,IAAIA,MAAM,GAAG,CAAC,EAAE;IACd,MAAMC,aAAa,GAAGF,UAAU,EAAEG,MAAM,KAAK3B,gBAAgB,CAAC4B,QAAQ;IACtE,MAAMC,gBAAgB,GAAGL,UAAU,EAAEK,gBAAgB,IAAI,CAAC;IAE1D,IAAIH,aAAa,IAAIG,gBAAgB,GAAGJ,MAAM,EAAE;MAC9C,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC","ignoreList":[]}

package/esm/redux/_modularui/withModularUI.js CHANGED Viewed

@@ -5,8 +5,7 @@ import { startProgress, finishProgress } from "../actions/ProgressIndicator";
 import { handleError } from "../actions/Error";
 import { getLocale } from "../selectors/i18n";
 import { reloadModel } from "./ModularUIActions";
-const modularui = createSelector([getLocale], localeCode => function (href) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const modularui = createSelector([getLocale], localeCode => (href, options = {}) => {
   const modularuiRequest = new ModularUIRequest(href, options);
   modularuiRequest.locale = localeCode;
   return modularuiRequest;

package/esm/redux/_modularui/withModularUI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"withModularUI.js","names":["connect","createSelector","ModularUIRequest","startProgress","finishProgress","handleError","getLocale","reloadModel","modularui","localeCode","href","options","~~arguments","length","undefined","~~modularuiRequest","locale","mapStateToProps","state","i18n","mapDispatchToProps","withModularui"],"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,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,cAAc,QAAQ,UAAU;AAEzC,OAAOC,gBAAgB,MAAM,kCAAkC;AAE/D,SAASC,aAAa,EAAEC,cAAc,QAAQ,8BAA8B;AAE5E,SAASC,WAAW,QAAQ,kBAAkB;AAE9C,SAASC,SAAS,QAAQ,mBAAmB;AAE7C,SAASC,WAAW,QAAQ,oBAAoB;AAkChD,MAAMC,SAAS,GAAGP,cAAc,CAC9B,CAACK,SAAS,CAAC,EACVG,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,~~IAAIb~~,gBAAgB,CAACQ,IAAI,EAAEC,OAAO,CAAC;~~EAC5DI~~,gBAAgB,CAACC,MAAM,~~GAAGP~~,UAAU;EACpC,~~OAAOM~~,gBAAgB;AACzB,CACJ,CAAC;;AAED;AACA;AACA,MAAME,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;~~EACxCjB~~,aAAa;EACbC,cAAc;EACdG,WAAW;EACXF;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA,~~MAAMgB~~,aAAiC,~~GAAGrB~~,OAAO,CAO/~~CiB~~,eAAe,EAAEG,kBAAkB,CAAC;AAEtC,eAAeC,aAAa","ignoreList":[]}
1	+ {"version":3,"file":"withModularUI.js","names":["connect","createSelector","ModularUIRequest","startProgress","finishProgress","handleError","getLocale","reloadModel","modularui","localeCode","href","options","modularuiRequest","locale","mapStateToProps","state","i18n","mapDispatchToProps","withModularui"],"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,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,cAAc,QAAQ,UAAU;AAEzC,OAAOC,gBAAgB,MAAM,kCAAkC;AAE/D,SAASC,aAAa,EAAEC,cAAc,QAAQ,8BAA8B;AAE5E,SAASC,WAAW,QAAQ,kBAAkB;AAE9C,SAASC,SAAS,QAAQ,mBAAmB;AAE7C,SAASC,WAAW,QAAQ,oBAAoB;AAkChD,MAAMC,SAAS,GAAGP,cAAc,CAC9B,CAACK,SAAS,CAAC,EACVG,UAAU,IACT,CAACC,IAAI,EAAEC,OAAO,GAAG,CAAC,CAAC,KAAK;EACtB,MAAMC,gBAAgB,GAAG,IAAIV,gBAAgB,CAACQ,IAAI,EAAEC,OAAO,CAAC;EAC5DC,gBAAgB,CAACC,MAAM,GAAGJ,UAAU;EACpC,OAAOG,gBAAgB;AACzB,CACJ,CAAC;;AAED;AACA;AACA,MAAME,eAAe,GAAIC,KAAiB,KAAkB;EAC1DP,SAAS,EAAEA,SAAS,CAACO,KAAK,CAAC;EAC3BF,MAAM,EAAEE,KAAK,CAACC,IAAI,CAACH;AACrB,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCd,aAAa;EACbC,cAAc;EACdG,WAAW;EACXF;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMa,aAAiC,GAAGlB,OAAO,CAO/Cc,eAAe,EAAEG,kBAAkB,CAAC;AAEtC,eAAeC,aAAa","ignoreList":[]}

package/esm/redux/_router/RouterReducer.js CHANGED Viewed

@@ -4,9 +4,7 @@ const initialState = {};
 /**
  * Router reducer
  */
-export 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;
+export const RouterReducer = (state = initialState, action = null) => {
   if (action && action.type === "ROUTER/LOCATION_CHANGE") {
     return action.payload;
   }

package/esm/redux/_router/RouterReducer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RouterReducer.js","names":["initialState","RouterReducer","state","~~arguments","length","undefined","~~action","type","payload"],"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;AACA,OAAO,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","ignoreList":[]}
1	+ {"version":3,"file":"RouterReducer.js","names":["initialState","RouterReducer","state","action","type","payload"],"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;AACA,OAAO,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","ignoreList":[]}

package/esm/redux/actions/FormAttributeSet.js CHANGED Viewed

@@ -7,46 +7,43 @@ import { autoupdateFormObject } from "./FormAutoupdate";
 /**
  * Update an attribute on a form
  */
-export 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 = autosubmitFormObject(newForm, attribute, options.forceUpdate);
-      if (autosubmitAction) {
-        return dispatch(autosubmitAction);
+export 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 = autosubmitFormObject(newForm, attribute, options.forceUpdate);
+    if (autosubmitAction) {
+      return dispatch(autosubmitAction);
     }
-    if (options.autoupdate && newForm.isValid) {
-      const autoupdateAction = autoupdateFormObject(newForm, attribute);
-      if (autoupdateAction) {
-        return dispatch(autoupdateAction);
-      }
+  }
+  if (options.autoupdate && newForm.isValid) {
+    const autoupdateAction = autoupdateFormObject(newForm, attribute);
+    if (autoupdateAction) {
+      return dispatch(autoupdateAction);
     }
-    handleAutoSave(dispatch, newForm, options);
-    handleValidate(dispatch, newForm, options);
-    return dispatch(updateForm(newForm));
-  };
+  }
+  handleAutoSave(dispatch, newForm, options);
+  handleValidate(dispatch, newForm, options);
+  return dispatch(updateForm(newForm));
 };
 const handleAutoSave = (dispatch, newForm, options) => {
   if (options.autosave && newForm.isValid && newForm.isChanged()) {

package/esm/redux/actions/FormAttributeSet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FormAttributeSet.js","names":["updateForm","getSetting","validateFormObject","autosaveFormObject","autosubmitFormObject","autoupdateFormObject","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","autoupdateAction","handleAutoSave","handleValidate","isChanged","hasDynamicValidations"],"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,SAASA,UAAU,QAAQ,gCAAgC;AAE3D,SAASC,UAAU,QAAQ,0BAA0B;AAErD,SAASC,kBAAkB,QAAQ,mBAAmB;AACtD,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,oBAAoB,QAAQ,kBAAkB;AACvD,SAASC,oBAAoB,QAAQ,kBAAkB;AAOvD;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,~~GAC9B~~,~~SAAAA,~~CACEC,IAAe,EACfC,UAA2B,EAC3BC,SAAwB,EACxBC,UAAkB~~;EAAA~~,~~IAClBC~~,OAA0B,~~GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG~~;~~IAC3BG~~,UAAU,EAAE,KAAK;~~IACjBC~~,QAAQ,EAAE,KAAK;~~IAAE~~;~~IACjBC~~,UAAU,EAAE,KAAK;~~IAAE~~;~~IACnBC~~,WAAW,EAAE,KAAK;~~IAClBC~~,QAAQ,EAAE;~~EACZ~~,CAAC~~;EAAA~~,~~OAEFC~~,QAAkB,IAAK;~~IACtB~~,MAAMC,OAAO,~~GAAGd~~,IAAI,~~CAACe~~,KAAK,CAAC,CAAC;~~IAE5B~~,~~IAAIX~~,OAAO,~~CAACQ~~,QAAQ,~~KAAKL~~,SAAS,EAAE;~~MAClCH~~,OAAO,~~CAACQ~~,QAAQ,GAAG,IAAI;~~IACzB~~;~~IAEA~~,IAAIE,OAAO,~~CAACE~~,iBAAiB,EAAEC,MAAM,~~CAAChB~~,UAAU,CAAC,EAAE;~~MACjDa~~,OAAO,~~CAACE~~,iBAAiB,CAACE,eAAe,~~CAAChB~~,SAAS,EAAEC,UAAU,CAAC;~~IAClE~~,CAAC,MAAM;~~MACLW~~,OAAO,~~CAACK~~,oBAAoB,CAACC,OAAO,CAAEC,cAAc,IAAK;~~QACvD~~,IAAIA,cAAc,CAACJ,MAAM,~~CAAChB~~,UAAU,CAAC,EAAE;~~UACrCoB~~,cAAc,CAACH,eAAe,~~CAAChB~~,SAAS,EAAEC,UAAU,CAAC;~~QACvD~~;~~MACF~~,CAAC,CAAC;~~IACJ~~;~~IAEA~~,IAAIC,OAAO,~~CAACI~~,UAAU,IAAIM,OAAO,~~CAACQ~~,OAAO,EAAE;~~MACzC~~,MAAMC,gBAAgB,~~GAAG1B~~,oBAAoB,~~CAC3CiB~~,OAAO,~~EACPZ~~,SAAS,EACTE,OAAO,~~CAACO~~,WACV,CAAC;~~MACD~~,~~IAAIY~~,gBAAgB,EAAE;~~QACpB~~,~~OAAOV~~,QAAQ,~~CAACU~~,gBAAgB,CAAC;~~MACnC~~;~~IACF~~;~~IAEA~~,~~IAAInB~~,OAAO,~~CAACM~~,UAAU,IAAII,OAAO,~~CAACQ~~,OAAO,EAAE;~~MACzC~~,MAAME,gBAAgB,~~GAAG1B~~,oBAAoB,~~CAACgB~~,OAAO,~~EAAEZ~~,SAAS,CAAC;~~MACjE~~,~~IAAIsB~~,gBAAgB,EAAE;~~QACpB~~,~~OAAOX~~,QAAQ,~~CAACW~~,gBAAgB,CAAC;~~MACnC~~;~~IACF~~;~~IAEAC~~,cAAc,~~CAACZ~~,QAAQ,EAAEC,OAAO,~~EAAEV~~,OAAO,CAAC;~~IAE1CsB~~,cAAc,~~CAACb~~,QAAQ,EAAEC,OAAO,~~EAAEV~~,OAAO,CAAC;~~IAE1C~~,~~OAAOS~~,QAAQ,~~CAACpB~~,UAAU,~~CAACqB~~,OAAO,CAAC,CAAC;~~EACtC~~,CAAC;~~AAAA;~~AAEH,~~MAAMW~~,cAAc,GAAGA,~~CACrBZ~~,QAAkB,EAClBC,OAAkB,~~EAClBV~~,OAA0B,KACvB;EACH,IAAIA,OAAO,~~CAACK~~,QAAQ,IAAIK,OAAO,~~CAACQ~~,OAAO,~~IAAIR~~,OAAO,~~CAACa~~,SAAS,CAAC,CAAC,EAAE;~~IAC9Dd~~,QAAQ,~~CAACjB~~,kBAAkB,~~CAACkB~~,OAAO,CAAC,CAAC;EACvC;AACF,CAAC;AAED,~~MAAMY~~,cAAc,GAAGA,~~CACrBb~~,QAAkB,EAClBC,OAAkB,~~EAClBV~~,OAA0B,KACvB;EACH,IACEA,OAAO,~~CAACQ~~,QAAQ,IAChBE,OAAO,~~CAACE~~,iBAAiB,EAAEY,qBAAqB,~~IAChDlC~~,UAAU,CAAC,+BAA+B,CAAC,EAC3C;IACA;~~IACAmB~~,QAAQ,~~CAAClB~~,kBAAkB,~~CAACmB~~,OAAO,CAAC,CAAC;EACvC;AACF,CAAC","ignoreList":[]}
1	+ {"version":3,"file":"FormAttributeSet.js","names":["updateForm","getSetting","validateFormObject","autosaveFormObject","autosubmitFormObject","autoupdateFormObject","updateFormAttribute","form","formObject","attribute","inputvalue","options","autosubmit","autosave","autoupdate","forceUpdate","validate","dispatch","newForm","clone","undefined","currentFormObject","equals","updateAttribute","completedFormObjects","forEach","completeObject","isValid","autosubmitAction","autoupdateAction","handleAutoSave","handleValidate","isChanged","hasDynamicValidations"],"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,SAASA,UAAU,QAAQ,gCAAgC;AAE3D,SAASC,UAAU,QAAQ,0BAA0B;AAErD,SAASC,kBAAkB,QAAQ,mBAAmB;AACtD,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,oBAAoB,QAAQ,kBAAkB;AACvD,SAASC,oBAAoB,QAAQ,kBAAkB;AAOvD;AACA;AACA;AACA,OAAO,MAAMC,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,GAAGxB,oBAAoB,CAC3Cc,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,MAAME,gBAAgB,GAAGxB,oBAAoB,CAACa,OAAO,EAAET,SAAS,CAAC;IACjE,IAAIoB,gBAAgB,EAAE;MACpB,OAAOZ,QAAQ,CAACY,gBAAgB,CAAC;IACnC;EACF;EAEAC,cAAc,CAACb,QAAQ,EAAEC,OAAO,EAAEP,OAAO,CAAC;EAE1CoB,cAAc,CAACd,QAAQ,EAAEC,OAAO,EAAEP,OAAO,CAAC;EAE1C,OAAOM,QAAQ,CAACjB,UAAU,CAACkB,OAAO,CAAC,CAAC;AACtC,CAAC;AAEH,MAAMY,cAAc,GAAGA,CACrBb,QAAkB,EAClBC,OAAkB,EAClBP,OAA0B,KACvB;EACH,IAAIA,OAAO,CAACE,QAAQ,IAAIK,OAAO,CAACS,OAAO,IAAIT,OAAO,CAACc,SAAS,CAAC,CAAC,EAAE;IAC9Df,QAAQ,CAACd,kBAAkB,CAACe,OAAO,CAAC,CAAC;EACvC;AACF,CAAC;AAED,MAAMa,cAAc,GAAGA,CACrBd,QAAkB,EAClBC,OAAkB,EAClBP,OAA0B,KACvB;EACH,IACEA,OAAO,CAACK,QAAQ,IAChBE,OAAO,CAACG,iBAAiB,EAAEY,qBAAqB,IAChDhC,UAAU,CAAC,+BAA+B,CAAC,EAC3C;IACA;IACAgB,QAAQ,CAACf,kBAAkB,CAACgB,OAAO,CAAC,CAAC;EACvC;AACF,CAAC","ignoreList":[]}

package/esm/redux/actions/FormAutosubmit.js CHANGED Viewed

@@ -3,8 +3,7 @@ import { HTTP_METHODS } from "../../constants/Constants";
 import FormModel from "../../models/form/FormModel";
 /**
  */
-export const autosubmitFormObject = function (form, attribute) {
-  let forceUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+export 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/esm/redux/actions/FormAutosubmit.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FormAutosubmit.js","names":["loadModularUI","HTTP_METHODS","FormModel","autosubmitFormObject","form","attribute","forceUpdate","~~arguments~~","length","~~undefined","allObjects","~~currentFormObject","hasAttributeByKey","key","setPreviousObject","isChanged","connectKey","selfhref","method","POST","data","formdata","updateHandler","newModel","clonedModel","clone","update"],"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,SAASA,aAAa,QAAQ,gCAAgC;AAC9D,SAASC,YAAY,QAAQ,2BAA2B;AACxD,OAAOC,SAAS,MAAM,6BAA6B;AAKnD;AACA;AACA,OAAO,MAAMC,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,OAAON,aAAa,CAACI,IAAI,~~CAACY~~,UAAU,~~EAAEZ~~,IAAI,~~CAACa~~,QAAQ,EAAE;MACnDC,MAAM,~~EAAEjB~~,YAAY,~~CAACkB~~,IAAI;MACzBC,IAAI,~~EAAEhB~~,IAAI,~~CAACiB~~,QAAQ;MACnBC,aAAa,EAAGC,QAAwB,IAAqB;QAC3D,IAAIA,QAAQ,~~YAAYrB~~,SAAS,EAAE;UACjC,~~MAAMsB~~,WAAsB,~~GAAGpB~~,IAAI,~~CAACqB~~,KAAK,CAAC,CAAC;UAC3CD,WAAW,CAACE,MAAM,CAACH,QAAQ,CAAC;UAC5B,OAAOC,WAAW;QACpB;QACA,OAAOD,QAAQ;MACjB;IACF,CAAC,CAAC;EACJ;EAEA,OAAO,IAAI;AACb,CAAC","ignoreList":[]}
1	+ {"version":3,"file":"FormAutosubmit.js","names":["loadModularUI","HTTP_METHODS","FormModel","autosubmitFormObject","form","attribute","forceUpdate","allObjects","length","currentFormObject","hasAttributeByKey","key","setPreviousObject","isChanged","connectKey","selfhref","method","POST","data","formdata","updateHandler","newModel","clonedModel","clone","update"],"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,SAASA,aAAa,QAAQ,gCAAgC;AAC9D,SAASC,YAAY,QAAQ,2BAA2B;AACxD,OAAOC,SAAS,MAAM,6BAA6B;AAKnD;AACA;AACA,OAAO,MAAMC,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,OAAON,aAAa,CAACI,IAAI,CAACU,UAAU,EAAEV,IAAI,CAACW,QAAQ,EAAE;MACnDC,MAAM,EAAEf,YAAY,CAACgB,IAAI;MACzBC,IAAI,EAAEd,IAAI,CAACe,QAAQ;MACnBC,aAAa,EAAGC,QAAwB,IAAqB;QAC3D,IAAIA,QAAQ,YAAYnB,SAAS,EAAE;UACjC,MAAMoB,WAAsB,GAAGlB,IAAI,CAACmB,KAAK,CAAC,CAAC;UAC3CD,WAAW,CAACE,MAAM,CAACH,QAAQ,CAAC;UAC5B,OAAOC,WAAW;QACpB;QACA,OAAOD,QAAQ;MACjB;IACF,CAAC,CAAC;EACJ;EAEA,OAAO,IAAI;AACb,CAAC","ignoreList":[]}

package/esm/redux/actions/Preferences.js CHANGED Viewed

@@ -8,9 +8,7 @@ import { ALL_CONTENT_IN_DATA_SETTING, INCLUDE_TIME_OFFSET, LOGIN_TYPE, LOGIN_PAS
 /**
  */
-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);
@@ -27,24 +25,19 @@ const getServerPreferenceValue = function (preferenceName) {
 /**
  */
-export const setServerPreference = function (propertyName) {
-  let defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  let type = arguments.length > 2 ? arguments[2] : undefined;
+export const setServerPreference = (propertyName, defaultValue = null, type) => {
   const value = getServerPreferenceValue(propertyName, defaultValue, type);
   return setPreference(propertyName, value);
 };
 /**
  */
-export const setPreference = function (propertyName) {
-  let propertyValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  return {
-    type: "SET_PREFERENCE",
-    payload: {
-      [propertyName]: propertyValue
-    }
-  };
-};
+export const setPreference = (propertyName, propertyValue = null) => ({
+  type: "SET_PREFERENCE",
+  payload: {
+    [propertyName]: propertyValue
+  }
+});
 /**
  */