@beinformed/ui 1.27.5 → 1.28.0

package/lib/react-client/client.js.flow

@@ -1,12 +1,5 @@
 // @flow
-/* polyfills needed for ie11 */
-import elementClosest from "element-closest";
-elementClosest(window);
-
-/* polyfill for focus-visible */
-import "focus-visible";
-
-import { hydrate, render as reactRender } from "react-dom";
+import { hydrate, render } from "react-dom";
 
 import { has } from "../utils/helpers/objects";
 import setImmediate from "setimmediate";
@@ -36,12 +29,17 @@ import Init from "./Init";
 
 import { handleBeforeRenderHooks } from "../redux/store/beforeRenderHooks";
 
-import type { ComponentType } from "react";
+import type {
+  ComponentType,
+  Element as ReactElement,
+  ElementType,
+} from "react";
 import type { Theme } from "../react-theme/types";
 import type { CustomReducers, ReduxStore } from "../redux/types";
 import type { RouterHistory } from "react-router";
 import type { BeforeRenderHook } from "../redux/store/beforeRenderHooks";
 import type { Props as FallbackProps } from "../react/ErrorBoundaryFallback";
+
 export type Props = {
   customReducers?: CustomReducers,
   theme?: Theme | Array<Theme>,
@@ -53,8 +51,6 @@ export type Props = {
 /*
  * deserialize serialized data from the server to provide a smooth dehydration.
  */
-/**
- */
 const parseDataToJSON = (data: string) => {
   try {
     return JSON.parse(data);
@@ -63,24 +59,48 @@ const parseDataToJSON = (data: string) => {
   }
 };
 
-/**
- * Mount the webapplication to the DOM, used client side when JavaScript is enabled.
- */
-const client = (props: Props) => {
-  if (typeof window.contextPath === "undefined") {
-    throw new Error("Missing contextPath on window object");
-  }
-
+const getDataFromServer = () => {
   const dataElement = document.querySelector(
     'script[type="application/json"][data-app-state="app-json"]'
   );
+
   if (!dataElement) {
     throw new Error("Error loading state, json not found");
   } else if (dataElement.textContent.trim() === "") {
-    return;
+    return {};
   }
 
-  const data = parseDataToJSON(dataElement.textContent);
+  return parseDataToJSON(dataElement.textContent);
+};
+
+/**
+ */
+export const setUnhandledRejectionEvent = (store: ReduxStore) => {
+  window.onunhandledrejection = (event) => {
+    if (event.detail) {
+      return setImmediate(() => {
+        const errorMessage = event.detail.reason.message.toString();
+
+        store.dispatch(showXHRErrorNotification(errorMessage));
+        throw event.detail.reason;
+      });
+    }
+
+    return event;
+  };
+};
+
+/**
+ */
+export const setupClient = (
+  customReducers: CustomReducers = {},
+  beforeRenderHooks: ?Array<BeforeRenderHook>
+): { store: ReduxStore, routerHistory: RouterHistory } => {
+  if (typeof window.contextPath === "undefined") {
+    throw new Error("Missing contextPath on window object");
+  }
+
+  const data = getDataFromServer();
 
   // remove all resources from cache
   Cache.clear("^res:");
@@ -89,9 +109,9 @@ const client = (props: Props) => {
   const browserHistory: RouterHistory = createBrowserHistory({
     basename: getBasePath(),
   });
-  const { history, store } = configureStore(
+  const { routerHistory, store } = configureStore(
     browserHistory,
-    props.customReducers ?? {},
+    customReducers,
     rehydrate(data)
   );
 
@@ -106,7 +126,7 @@ const client = (props: Props) => {
   });
 
   if (has(data, "error.name")) {
-    const error = new FetchException(data.error.response);
+    const error = new FetchException(data?.error?.response);
     store.dispatch(handleError(error));
   }
 
@@ -115,74 +135,93 @@ const client = (props: Props) => {
   }
 
   // listen to history change and update the redux router store
-  history.listen((location, action) => {
+  routerHistory.listen((location, action) => {
     store.dispatch(locationChange(location, action));
   });
 
-  /**
-   */
-  window.onunhandledrejection = (event) => {
-    if (event.detail) {
-      return setImmediate(() => {
-        const errorMessage = event.detail.reason.message.toString();
-
-        store.dispatch(showXHRErrorNotification(errorMessage));
-        throw event.detail.reason;
-      });
-    }
-
-    return event;
-  };
+  setUnhandledRejectionEvent(store);
 
   if (document.body) {
     document.body.className = "js";
   }
 
-  if (props.beforeRenderHooks) {
-    handleBeforeRenderHooks(props.beforeRenderHooks, { store });
+  if (beforeRenderHooks) {
+    handleBeforeRenderHooks(beforeRenderHooks, { store });
   }
 
-  addContentLoadedEvent(
-    store,
-    history,
-    props.theme,
-    props.render,
-    props.ErrorFallbackComponent
-  );
+  return { store, routerHistory };
 };
 
 /**
  */
-const addContentLoadedEvent = (
+export const addContentLoadedEvent = (
   store: ReduxStore,
-  history: RouterHistory,
+  routerHistory: RouterHistory,
   theme?: Theme | Array<Theme>,
   render: Function,
-  ErrorFallbackComponent?: ComponentType<FallbackProps>
+  ErrorFallbackComponent?: ComponentType<FallbackProps>,
+  mount: Function
 ) => {
   window.addEventListener("DOMContentLoaded", () => {
     const applicationNode = document.querySelector("#application");
-    if (applicationNode) {
-      const isSSR = applicationNode.querySelector(".application");
-      const mount = isSSR ? hydrate : reactRender;
-      mount(
-        <Init
-          store={store}
-          history={history}
-          contextPath={window.contextPath}
-          theme={theme}
-          ErrorFallbackComponent={ErrorFallbackComponent}
-        >
-          {render()}
-        </Init>,
-        applicationNode
-      );
-    } else {
+    if (!applicationNode) {
       throw new Error(
         "No DOM element with id application found to attach client to"
       );
     }
+
+    mount(
+      applicationNode,
+      <Init
+        store={store}
+        routerHistory={routerHistory}
+        contextPath={window.contextPath}
+        theme={theme}
+        ErrorFallbackComponent={ErrorFallbackComponent}
+      >
+        {render()}
+      </Init>
+    );
   });
 };
 
+/**
+ */
+const mountClient = (
+  applicationNode: Element,
+  initComponent: ReactElement<ElementType>
+) => {
+  const isSSR = applicationNode.querySelector(".application");
+  if (isSSR) {
+    hydrate(initComponent, applicationNode);
+  } else {
+    render(initComponent, applicationNode);
+  }
+};
+
+/**
+ * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.
+ */
+const client = ({
+  customReducers,
+  theme,
+  render,
+  beforeRenderHooks,
+  ErrorFallbackComponent,
+}: Props) => {
+  const { store, routerHistory } = setupClient(
+    customReducers,
+    beforeRenderHooks
+  );
+
+  addContentLoadedEvent(
+    store,
+    routerHistory,
+    theme,
+    render,
+    ErrorFallbackComponent,
+    mountClient
+  );
+};
+
 export default client;

package/lib/react-client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":["elementClosest","window","parseDataToJSON","data","JSON","parse","error","JsonParseException","client","props","contextPath","Error","dataElement","document","querySelector","textContent","Cache","clear","browserHistory","createBrowserHistory","basename","getBasePath","history","store","configureStore","customReducers","rehydrate","setAllContentInDataSetting","getState","setLoginPreferences","loadOtherBrowserTabs","getItem","dispatch","loginSuccess","has","FetchException","response","handleError","listen","location","action","locationChange","onunhandledrejection","event","detail","setImmediate","errorMessage","reason","message","toString","showXHRErrorNotification","body","className","beforeRenderHooks","handleBeforeRenderHooks","addContentLoadedEvent","theme","render","ErrorFallbackComponent","addEventListener","applicationNode","isSSR","mount","hydrate","reactRender"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n/* polyfills needed for ie11 */\nimport elementClosest from \"element-closest\";\nelementClosest(window);\n\n/* polyfill for focus-visible */\nimport \"focus-visible\";\n\nimport { hydrate, render as reactRender } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport { getBasePath } from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\n\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\n\nimport { locationChange } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport Init from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type { ComponentType } from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\nexport type Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: Function,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\n/**\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, used client side when JavaScript is enabled.\n */\nconst client = (props: Props) => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]'\n  );\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return;\n  }\n\n  const data = parseDataToJSON(dataElement.textContent);\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePath(),\n  });\n  const { history, store } = configureStore(\n    browserHistory,\n    props.customReducers ?? {},\n    rehydrate(data)\n  );\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data.error.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  history.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  /**\n   */\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (props.beforeRenderHooks) {\n    handleBeforeRenderHooks(props.beforeRenderHooks, { store });\n  }\n\n  addContentLoadedEvent(\n    store,\n    history,\n    props.theme,\n    props.render,\n    props.ErrorFallbackComponent\n  );\n};\n\n/**\n */\nconst addContentLoadedEvent = (\n  store: ReduxStore,\n  history: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: Function,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (applicationNode) {\n      const isSSR = applicationNode.querySelector(\".application\");\n      const mount = isSSR ? hydrate : reactRender;\n      mount(\n        <Init\n          store={store}\n          history={history}\n          contextPath={window.contextPath}\n          theme={theme}\n          ErrorFallbackComponent={ErrorFallbackComponent}\n        >\n          {render()}\n        </Init>,\n        applicationNode\n      );\n    } else {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\"\n      );\n    }\n  });\n};\n\nexport default client;\n"],"mappings":"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"}
+{"version":3,"file":"client.js","names":["parseDataToJSON","data","JSON","parse","error","JsonParseException","getDataFromServer","dataElement","document","querySelector","Error","textContent","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","setImmediate","errorMessage","reason","message","toString","dispatch","showXHRErrorNotification","setupClient","customReducers","beforeRenderHooks","contextPath","Cache","clear","browserHistory","createBrowserHistory","basename","getBasePath","routerHistory","configureStore","rehydrate","setAllContentInDataSetting","getState","setLoginPreferences","loadOtherBrowserTabs","getItem","loginSuccess","has","FetchException","response","handleError","listen","location","action","locationChange","body","className","handleBeforeRenderHooks","addContentLoadedEvent","theme","render","ErrorFallbackComponent","mount","addEventListener","applicationNode","mountClient","initComponent","isSSR","hydrate","client"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport { getBasePath } from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\n\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\n\nimport { locationChange } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport Init from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\nexport type Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: Function,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]'\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePath(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data)\n  );\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: Function,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: Function\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\"\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  initComponent: ReactElement<ElementType>\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(initComponent, applicationNode);\n  } else {\n    render(initComponent, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nconst client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mountClient\n  );\n};\n\nexport default client;\n"],"mappings":"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"}

package/lib/redux/_modularui/ModularUIActions.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateStatus = exports.updateModel = exports.setModel = exports.resetModularUI = exports.removeModelByKey = exports.reloadModel = exports.loadModularUI = exports.loadModel = exports.initModels = void 0;
+exports.updateStatus = exports.updateModel = exports.updateForm = exports.setModel = exports.resetModularUI = exports.removeModelByKey = exports.reloadModel = exports.loadModularUI = exports.loadModel = exports.initModels = void 0;
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 var _Constants = require("../../constants/Constants");
 var _Href = _interopRequireDefault(require("../../models/href/Href"));
@@ -44,6 +44,14 @@ const updateModel = model => ({
 /**
  */
 exports.updateModel = updateModel;
+const updateForm = model => ({
+  type: "MODULARUI/UPDATE_FORM",
+  payload: model
+});
+
+/**
+ */
+exports.updateForm = updateForm;
 const removeModelByKey = key => ({
   type: "MODULARUI/REMOVE_KEY",
   payload: key

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

@@ -12,6 +12,7 @@ import type {
   SetModelAction,
   InitModelAction,
   UpdateModelAction,
+  UpdateFormAction,
   RemoveModelByKeyAction,
   ResetModularUIAction,
   UpdateStatusAction,
@@ -51,6 +52,13 @@ export const updateModel = (model: ModularUIModel): UpdateModelAction => ({
   payload: model,
 });
 
+/**
+ */
+export const updateForm = (model: ModularUIModel): UpdateFormAction => ({
+  type: "MODULARUI/UPDATE_FORM",
+  payload: model,
+});
+
 /**
  */
 export const removeModelByKey = (key: string): RemoveModelByKeyAction => ({

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

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

package/lib/redux/_modularui/ModularUIReducer.js

@@ -139,6 +139,7 @@ const ModularUIReducer = function () {
     case "MODULARUI/SET":
       return setModel(state, action.payload);
     case "MODULARUI/UPDATE":
+    case "MODULARUI/UPDATE_FORM":
       return updateModel(state, action.payload);
     case "MODULARUI/REMOVE_KEY":
       return removeKey(action.payload, state);

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

@@ -144,6 +144,7 @@ export const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (
       return setModel(state, action.payload);
 
     case "MODULARUI/UPDATE":
+    case "MODULARUI/UPDATE_FORM":
       return updateModel(state, action.payload);
 
     case "MODULARUI/REMOVE_KEY":

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

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

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

@@ -49,6 +49,11 @@ export type UpdateModelAction = {
   payload: ModularUIModel,
 };
 
+export type UpdateFormAction = {
+  type: "MODULARUI/UPDATE_FORM",
+  payload: ModularUIModel,
+};
+
 export type SuccessAction = (
   model: ModularUIModel
 ) => UpdateModelAction | SetModelAction;

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    successAction: (\n      model: ModularUIModel\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>\n) => ComponentType<any>;\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    successAction: (\n      model: ModularUIModel\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>\n) => ComponentType<any>;\n"],"mappings":""}

package/lib/redux/actions/Form.js

@@ -17,7 +17,7 @@ var _Authenticate = _interopRequireDefault(require("../../modularui/Authenticate
 const previousObject = form => {
   const newForm = form.clone();
   newForm.setPreviousObject();
-  return (0, _ModularUIActions.updateModel)(newForm);
+  return (0, _ModularUIActions.updateForm)(newForm);
 };
 
 /**

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

@@ -1,6 +1,6 @@
 // @flow
 import { goBack } from "../_router/RouterActions";
-import { updateModel } from "../_modularui/ModularUIActions";
+import { updateForm } from "../_modularui/ModularUIActions";
 import { logoutSuccess } from "./SignOut";
 import { reloadApplication } from "./Application";
 import { startProgress, finishProgress } from "./ProgressIndicator";
@@ -9,17 +9,17 @@ import Authenticate from "../../modularui/Authenticate";
 
 import type { Dispatch, GetState, ThunkAction } from "../types";
 import type FormModel from "../../models/form/FormModel";
-import type { UpdateModelAction } from "../_modularui/types";
+import type { UpdateFormAction } from "../_modularui/types";
 
 /**
  * Go back to previous object (back button on form)
  */
-export const previousObject = (form: FormModel): UpdateModelAction => {
+export const previousObject = (form: FormModel): UpdateFormAction => {
   const newForm = form.clone();
 
   newForm.setPreviousObject();
 
-  return updateModel(newForm);
+  return updateForm(newForm);
 };
 
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"Form.js","names":["previousObject","form","newForm","clone","setPreviousObject","updateModel","cancelForm","dispatch","getState","key","auth","mustChangePassword","startProgress","Authenticate","logout","then","logoutSuccess","reloadApplication","finishProgress","goBack"],"sources":["../../../src/redux/actions/Form.js"],"sourcesContent":["// @flow\nimport { goBack } from \"../_router/RouterActions\";\nimport { updateModel } from \"../_modularui/ModularUIActions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type { UpdateModelAction } from \"../_modularui/types\";\n\n/**\n * Go back to previous object (back button on form)\n */\nexport const previousObject = (form: FormModel): UpdateModelAction => {\n  const newForm = form.clone();\n\n  newForm.setPreviousObject();\n\n  return updateModel(newForm);\n};\n\n/**\n */\nexport const cancelForm =\n  (form: FormModel): ThunkAction =>\n  (dispatch: Dispatch, getState: GetState) => {\n    if (form.key === \"ChangePassword\" && getState().auth.mustChangePassword) {\n      dispatch(startProgress());\n      return new Authenticate().logout().then(() => {\n        dispatch(logoutSuccess());\n        dispatch(reloadApplication());\n        dispatch(finishProgress());\n\n        return dispatch(goBack());\n      });\n    }\n\n    return dispatch(goBack());\n  };\n"],"mappings":";;;;;;;AACA;AACA;AACA;AACA;AACA;AAEA;AAMA;AACA;AACA;AACO,MAAMA,cAAc,GAAIC,IAAe,IAAwB;EACpE,MAAMC,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACE,iBAAiB,EAAE;EAE3B,OAAO,IAAAC,6BAAW,EAACH,OAAO,CAAC;AAC7B,CAAC;;AAED;AACA;AADA;AAEO,MAAMI,UAAU,GACpBL,IAAe,IAChB,CAACM,QAAkB,EAAEC,QAAkB,KAAK;EAC1C,IAAIP,IAAI,CAACQ,GAAG,KAAK,gBAAgB,IAAID,QAAQ,EAAE,CAACE,IAAI,CAACC,kBAAkB,EAAE;IACvEJ,QAAQ,CAAC,IAAAK,gCAAa,GAAE,CAAC;IACzB,OAAO,IAAIC,qBAAY,EAAE,CAACC,MAAM,EAAE,CAACC,IAAI,CAAC,MAAM;MAC5CR,QAAQ,CAAC,IAAAS,sBAAa,GAAE,CAAC;MACzBT,QAAQ,CAAC,IAAAU,8BAAiB,GAAE,CAAC;MAC7BV,QAAQ,CAAC,IAAAW,iCAAc,GAAE,CAAC;MAE1B,OAAOX,QAAQ,CAAC,IAAAY,qBAAM,GAAE,CAAC;IAC3B,CAAC,CAAC;EACJ;EAEA,OAAOZ,QAAQ,CAAC,IAAAY,qBAAM,GAAE,CAAC;AAC3B,CAAC;AAAC"}
+{"version":3,"file":"Form.js","names":["previousObject","form","newForm","clone","setPreviousObject","updateForm","cancelForm","dispatch","getState","key","auth","mustChangePassword","startProgress","Authenticate","logout","then","logoutSuccess","reloadApplication","finishProgress","goBack"],"sources":["../../../src/redux/actions/Form.js"],"sourcesContent":["// @flow\nimport { goBack } from \"../_router/RouterActions\";\nimport { updateForm } from \"../_modularui/ModularUIActions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type { UpdateFormAction } from \"../_modularui/types\";\n\n/**\n * Go back to previous object (back button on form)\n */\nexport const previousObject = (form: FormModel): UpdateFormAction => {\n  const newForm = form.clone();\n\n  newForm.setPreviousObject();\n\n  return updateForm(newForm);\n};\n\n/**\n */\nexport const cancelForm =\n  (form: FormModel): ThunkAction =>\n  (dispatch: Dispatch, getState: GetState) => {\n    if (form.key === \"ChangePassword\" && getState().auth.mustChangePassword) {\n      dispatch(startProgress());\n      return new Authenticate().logout().then(() => {\n        dispatch(logoutSuccess());\n        dispatch(reloadApplication());\n        dispatch(finishProgress());\n\n        return dispatch(goBack());\n      });\n    }\n\n    return dispatch(goBack());\n  };\n"],"mappings":";;;;;;;AACA;AACA;AACA;AACA;AACA;AAEA;AAMA;AACA;AACA;AACO,MAAMA,cAAc,GAAIC,IAAe,IAAuB;EACnE,MAAMC,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACE,iBAAiB,EAAE;EAE3B,OAAO,IAAAC,4BAAU,EAACH,OAAO,CAAC;AAC5B,CAAC;;AAED;AACA;AADA;AAEO,MAAMI,UAAU,GACpBL,IAAe,IAChB,CAACM,QAAkB,EAAEC,QAAkB,KAAK;EAC1C,IAAIP,IAAI,CAACQ,GAAG,KAAK,gBAAgB,IAAID,QAAQ,EAAE,CAACE,IAAI,CAACC,kBAAkB,EAAE;IACvEJ,QAAQ,CAAC,IAAAK,gCAAa,GAAE,CAAC;IACzB,OAAO,IAAIC,qBAAY,EAAE,CAACC,MAAM,EAAE,CAACC,IAAI,CAAC,MAAM;MAC5CR,QAAQ,CAAC,IAAAS,sBAAa,GAAE,CAAC;MACzBT,QAAQ,CAAC,IAAAU,8BAAiB,GAAE,CAAC;MAC7BV,QAAQ,CAAC,IAAAW,iCAAc,GAAE,CAAC;MAE1B,OAAOX,QAAQ,CAAC,IAAAY,qBAAM,GAAE,CAAC;IAC3B,CAAC,CAAC;EACJ;EAEA,OAAOZ,QAAQ,CAAC,IAAAY,qBAAM,GAAE,CAAC;AAC3B,CAAC;AAAC"}

package/lib/redux/actions/FormAttributeSet.js

@@ -46,7 +46,7 @@ const updateFormAttribute = function (form, formObject, attribute, inputvalue) {
       // server form validations happens async, don't wait for the form to return
       dispatch((0, _FormValidations.validateFormObject)(newForm));
     }
-    return dispatch((0, _ModularUIActions.updateModel)(newForm));
+    return dispatch((0, _ModularUIActions.updateForm)(newForm));
   };
 };
 exports.updateFormAttribute = updateFormAttribute;

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

@@ -1,5 +1,5 @@
 // @flow
-import { updateModel } from "../_modularui/ModularUIActions";
+import { updateForm } from "../_modularui/ModularUIActions";
 
 import { getSetting } from "../../constants/Settings";
 
@@ -68,5 +68,6 @@ export const updateFormAttribute =
       // server form validations happens async, don't wait for the form to return
       dispatch(validateFormObject(newForm));
     }
-    return dispatch(updateModel(newForm));
+
+    return dispatch(updateForm(newForm));
   };

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

@@ -1 +1 @@
-{"version":3,"file":"FormAttributeSet.js","names":["updateFormAttribute","form","formObject","attribute","inputvalue","options","autosubmit","autosave","forceUpdate","validate","dispatch","newForm","clone","undefined","currentFormObject","equals","updateAttribute","completedFormObjects","forEach","completeObject","isValid","autosubmitAction","autosubmitFormObject","isChanged","autosaveFormObject","hasDynamicValidations","getSetting","validateFormObject","updateModel"],"sources":["../../../src/redux/actions/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { updateModel } from \"../_modularui/ModularUIActions\";\n\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { validateFormObject } from \"./FormValidations\";\nimport { autosaveFormObject } from \"./FormAutosave\";\nimport { autosubmitFormObject } from \"./FormAutosubmit\";\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,\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.autosave && newForm.isValid && newForm.isChanged()) {\n      dispatch(autosaveFormObject(newForm));\n    }\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    return dispatch(updateModel(newForm));\n  };\n"],"mappings":";;;;;;AACA;AAEA;AAEA;AACA;AACA;AAOA;AACA;AACA;AACO,MAAMA,mBAAmB,GAC9B,UACEC,IAAe,EACfC,UAA2B,EAC3BC,SAAwB,EACxBC,UAAkB;EAAA,IAClBC,OAA0B,uEAAG;IAC3BC,UAAU,EAAE,KAAK;IACjBC,QAAQ,EAAE,KAAK;IACfC,WAAW,EAAE,KAAK;IAClBC,QAAQ,EAAE;EACZ,CAAC;EAAA,OAEFC,QAAkB,IAAK;IACtB,MAAMC,OAAO,GAAGV,IAAI,CAACW,KAAK,EAAE;IAE5B,IAAIP,OAAO,CAACI,QAAQ,KAAKI,SAAS,EAAE;MAClCR,OAAO,CAACI,QAAQ,GAAG,IAAI;IACzB;IAEA,IAAIE,OAAO,CAACG,iBAAiB,EAAEC,MAAM,CAACb,UAAU,CAAC,EAAE;MACjDS,OAAO,CAACG,iBAAiB,CAACE,eAAe,CAACb,SAAS,EAAEC,UAAU,CAAC;IAClE,CAAC,MAAM;MACLO,OAAO,CAACM,oBAAoB,CAACC,OAAO,CAAEC,cAAc,IAAK;QACvD,IAAIA,cAAc,CAACJ,MAAM,CAACb,UAAU,CAAC,EAAE;UACrCiB,cAAc,CAACH,eAAe,CAACb,SAAS,EAAEC,UAAU,CAAC;QACvD;MACF,CAAC,CAAC;IACJ;IAEA,IAAIC,OAAO,CAACC,UAAU,IAAIK,OAAO,CAACS,OAAO,EAAE;MACzC,MAAMC,gBAAgB,GAAG,IAAAC,oCAAoB,EAC3CX,OAAO,EACPR,SAAS,EACTE,OAAO,CAACG,WAAW,CACpB;MACD,IAAIa,gBAAgB,EAAE;QACpB,OAAOX,QAAQ,CAACW,gBAAgB,CAAC;MACnC;IACF;IAEA,IAAIhB,OAAO,CAACE,QAAQ,IAAII,OAAO,CAACS,OAAO,IAAIT,OAAO,CAACY,SAAS,EAAE,EAAE;MAC9Db,QAAQ,CAAC,IAAAc,gCAAkB,EAACb,OAAO,CAAC,CAAC;IACvC;IAEA,IACEN,OAAO,CAACI,QAAQ,IAChBE,OAAO,CAACG,iBAAiB,EAAEW,qBAAqB,IAChD,IAAAC,oBAAU,EAAC,+BAA+B,CAAC,EAC3C;MACA;MACAhB,QAAQ,CAAC,IAAAiB,mCAAkB,EAAChB,OAAO,CAAC,CAAC;IACvC;IACA,OAAOD,QAAQ,CAAC,IAAAkB,6BAAW,EAACjB,OAAO,CAAC,CAAC;EACvC,CAAC;AAAA;AAAC"}
+{"version":3,"file":"FormAttributeSet.js","names":["updateFormAttribute","form","formObject","attribute","inputvalue","options","autosubmit","autosave","forceUpdate","validate","dispatch","newForm","clone","undefined","currentFormObject","equals","updateAttribute","completedFormObjects","forEach","completeObject","isValid","autosubmitAction","autosubmitFormObject","isChanged","autosaveFormObject","hasDynamicValidations","getSetting","validateFormObject","updateForm"],"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\";\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,\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.autosave && newForm.isValid && newForm.isChanged()) {\n      dispatch(autosaveFormObject(newForm));\n    }\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    return dispatch(updateForm(newForm));\n  };\n"],"mappings":";;;;;;AACA;AAEA;AAEA;AACA;AACA;AAOA;AACA;AACA;AACO,MAAMA,mBAAmB,GAC9B,UACEC,IAAe,EACfC,UAA2B,EAC3BC,SAAwB,EACxBC,UAAkB;EAAA,IAClBC,OAA0B,uEAAG;IAC3BC,UAAU,EAAE,KAAK;IACjBC,QAAQ,EAAE,KAAK;IACfC,WAAW,EAAE,KAAK;IAClBC,QAAQ,EAAE;EACZ,CAAC;EAAA,OAEFC,QAAkB,IAAK;IACtB,MAAMC,OAAO,GAAGV,IAAI,CAACW,KAAK,EAAE;IAE5B,IAAIP,OAAO,CAACI,QAAQ,KAAKI,SAAS,EAAE;MAClCR,OAAO,CAACI,QAAQ,GAAG,IAAI;IACzB;IAEA,IAAIE,OAAO,CAACG,iBAAiB,EAAEC,MAAM,CAACb,UAAU,CAAC,EAAE;MACjDS,OAAO,CAACG,iBAAiB,CAACE,eAAe,CAACb,SAAS,EAAEC,UAAU,CAAC;IAClE,CAAC,MAAM;MACLO,OAAO,CAACM,oBAAoB,CAACC,OAAO,CAAEC,cAAc,IAAK;QACvD,IAAIA,cAAc,CAACJ,MAAM,CAACb,UAAU,CAAC,EAAE;UACrCiB,cAAc,CAACH,eAAe,CAACb,SAAS,EAAEC,UAAU,CAAC;QACvD;MACF,CAAC,CAAC;IACJ;IAEA,IAAIC,OAAO,CAACC,UAAU,IAAIK,OAAO,CAACS,OAAO,EAAE;MACzC,MAAMC,gBAAgB,GAAG,IAAAC,oCAAoB,EAC3CX,OAAO,EACPR,SAAS,EACTE,OAAO,CAACG,WAAW,CACpB;MACD,IAAIa,gBAAgB,EAAE;QACpB,OAAOX,QAAQ,CAACW,gBAAgB,CAAC;MACnC;IACF;IAEA,IAAIhB,OAAO,CAACE,QAAQ,IAAII,OAAO,CAACS,OAAO,IAAIT,OAAO,CAACY,SAAS,EAAE,EAAE;MAC9Db,QAAQ,CAAC,IAAAc,gCAAkB,EAACb,OAAO,CAAC,CAAC;IACvC;IAEA,IACEN,OAAO,CAACI,QAAQ,IAChBE,OAAO,CAACG,iBAAiB,EAAEW,qBAAqB,IAChD,IAAAC,oBAAU,EAAC,+BAA+B,CAAC,EAC3C;MACA;MACAhB,QAAQ,CAAC,IAAAiB,mCAAkB,EAAChB,OAAO,CAAC,CAAC;IACvC;IAEA,OAAOD,QAAQ,CAAC,IAAAkB,4BAAU,EAACjB,OAAO,CAAC,CAAC;EACtC,CAAC;AAAA;AAAC"}

package/lib/redux/actions/FormAttributeSetRepeatable.js

@@ -10,7 +10,7 @@ var _ModularUIActions = require("../_modularui/ModularUIActions");
 const addRepeatableAttributeSet = form => {
   const newForm = form.clone();
   newForm.addEmptyFormObject();
-  return (0, _ModularUIActions.updateModel)(newForm);
+  return (0, _ModularUIActions.updateForm)(newForm);
 };
 
 /**
@@ -20,7 +20,7 @@ const cancelRepeatableAttributeSet = (form, formObject) => {
   const newForm = form.clone();
   newForm.addEmptyFormObject();
   newForm.removeFormObject(formObject);
-  return (0, _ModularUIActions.updateModel)(newForm);
+  return (0, _ModularUIActions.updateForm)(newForm);
 };
 
 /**
@@ -29,7 +29,7 @@ exports.cancelRepeatableAttributeSet = cancelRepeatableAttributeSet;
 const removeRepeatableAttributeSet = (form, formObject) => {
   const newForm = form.clone();
   newForm.removeFormObject(formObject);
-  return (0, _ModularUIActions.updateModel)(newForm);
+  return (0, _ModularUIActions.updateForm)(newForm);
 };
 exports.removeRepeatableAttributeSet = removeRepeatableAttributeSet;
 //# sourceMappingURL=FormAttributeSetRepeatable.js.map