@beinformed/ui 1.27.5 → 1.28.0

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

@@ -1,20 +1,20 @@
 // @flow
-import { updateModel } from "../_modularui/ModularUIActions";
+import { updateForm } from "../_modularui/ModularUIActions";
 
 import type FormModel from "../../models/form/FormModel";
 import type FormObjectModel from "../../models/form/FormObjectModel";
-import type { UpdateModelAction } from "../_modularui/types";
+import type { UpdateFormAction } from "../_modularui/types";
 
 /**
  */
 export const addRepeatableAttributeSet = (
   form: FormModel
-): UpdateModelAction => {
+): UpdateFormAction => {
   const newForm = form.clone();
 
   newForm.addEmptyFormObject();
 
-  return updateModel(newForm);
+  return updateForm(newForm);
 };
 
 /**
@@ -22,13 +22,13 @@ export const addRepeatableAttributeSet = (
 export const cancelRepeatableAttributeSet = (
   form: FormModel,
   formObject: FormObjectModel
-): UpdateModelAction => {
+): UpdateFormAction => {
   const newForm = form.clone();
 
   newForm.addEmptyFormObject();
   newForm.removeFormObject(formObject);
 
-  return updateModel(newForm);
+  return updateForm(newForm);
 };
 
 /**
@@ -36,10 +36,10 @@ export const cancelRepeatableAttributeSet = (
 export const removeRepeatableAttributeSet = (
   form: FormModel,
   formObject: FormObjectModel
-): UpdateModelAction => {
+): UpdateFormAction => {
   const newForm = form.clone();
 
   newForm.removeFormObject(formObject);
 
-  return updateModel(newForm);
+  return updateForm(newForm);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"FormAttributeSetRepeatable.js","names":["addRepeatableAttributeSet","form","newForm","clone","addEmptyFormObject","updateModel","cancelRepeatableAttributeSet","formObject","removeFormObject","removeRepeatableAttributeSet"],"sources":["../../../src/redux/actions/FormAttributeSetRepeatable.js"],"sourcesContent":["// @flow\nimport { updateModel } from \"../_modularui/ModularUIActions\";\n\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\nimport type { UpdateModelAction } from \"../_modularui/types\";\n\n/**\n */\nexport const addRepeatableAttributeSet = (\n  form: FormModel\n): UpdateModelAction => {\n  const newForm = form.clone();\n\n  newForm.addEmptyFormObject();\n\n  return updateModel(newForm);\n};\n\n/**\n */\nexport const cancelRepeatableAttributeSet = (\n  form: FormModel,\n  formObject: FormObjectModel\n): UpdateModelAction => {\n  const newForm = form.clone();\n\n  newForm.addEmptyFormObject();\n  newForm.removeFormObject(formObject);\n\n  return updateModel(newForm);\n};\n\n/**\n */\nexport const removeRepeatableAttributeSet = (\n  form: FormModel,\n  formObject: FormObjectModel\n): UpdateModelAction => {\n  const newForm = form.clone();\n\n  newForm.removeFormObject(formObject);\n\n  return updateModel(newForm);\n};\n"],"mappings":";;;;;;AACA;AAMA;AACA;AACO,MAAMA,yBAAyB,GACpCC,IAAe,IACO;EACtB,MAAMC,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACE,kBAAkB,EAAE;EAE5B,OAAO,IAAAC,6BAAW,EAACH,OAAO,CAAC;AAC7B,CAAC;;AAED;AACA;AADA;AAEO,MAAMI,4BAA4B,GAAG,CAC1CL,IAAe,EACfM,UAA2B,KACL;EACtB,MAAML,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACE,kBAAkB,EAAE;EAC5BF,OAAO,CAACM,gBAAgB,CAACD,UAAU,CAAC;EAEpC,OAAO,IAAAF,6BAAW,EAACH,OAAO,CAAC;AAC7B,CAAC;;AAED;AACA;AADA;AAEO,MAAMO,4BAA4B,GAAG,CAC1CR,IAAe,EACfM,UAA2B,KACL;EACtB,MAAML,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACM,gBAAgB,CAACD,UAAU,CAAC;EAEpC,OAAO,IAAAF,6BAAW,EAACH,OAAO,CAAC;AAC7B,CAAC;AAAC"}
+{"version":3,"file":"FormAttributeSetRepeatable.js","names":["addRepeatableAttributeSet","form","newForm","clone","addEmptyFormObject","updateForm","cancelRepeatableAttributeSet","formObject","removeFormObject","removeRepeatableAttributeSet"],"sources":["../../../src/redux/actions/FormAttributeSetRepeatable.js"],"sourcesContent":["// @flow\nimport { updateForm } from \"../_modularui/ModularUIActions\";\n\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\nimport type { UpdateFormAction } from \"../_modularui/types\";\n\n/**\n */\nexport const addRepeatableAttributeSet = (\n  form: FormModel\n): UpdateFormAction => {\n  const newForm = form.clone();\n\n  newForm.addEmptyFormObject();\n\n  return updateForm(newForm);\n};\n\n/**\n */\nexport const cancelRepeatableAttributeSet = (\n  form: FormModel,\n  formObject: FormObjectModel\n): UpdateFormAction => {\n  const newForm = form.clone();\n\n  newForm.addEmptyFormObject();\n  newForm.removeFormObject(formObject);\n\n  return updateForm(newForm);\n};\n\n/**\n */\nexport const removeRepeatableAttributeSet = (\n  form: FormModel,\n  formObject: FormObjectModel\n): UpdateFormAction => {\n  const newForm = form.clone();\n\n  newForm.removeFormObject(formObject);\n\n  return updateForm(newForm);\n};\n"],"mappings":";;;;;;AACA;AAMA;AACA;AACO,MAAMA,yBAAyB,GACpCC,IAAe,IACM;EACrB,MAAMC,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACE,kBAAkB,EAAE;EAE5B,OAAO,IAAAC,4BAAU,EAACH,OAAO,CAAC;AAC5B,CAAC;;AAED;AACA;AADA;AAEO,MAAMI,4BAA4B,GAAG,CAC1CL,IAAe,EACfM,UAA2B,KACN;EACrB,MAAML,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACE,kBAAkB,EAAE;EAC5BF,OAAO,CAACM,gBAAgB,CAACD,UAAU,CAAC;EAEpC,OAAO,IAAAF,4BAAU,EAACH,OAAO,CAAC;AAC5B,CAAC;;AAED;AACA;AADA;AAEO,MAAMO,4BAA4B,GAAG,CAC1CR,IAAe,EACfM,UAA2B,KACN;EACrB,MAAML,OAAO,GAAGD,IAAI,CAACE,KAAK,EAAE;EAE5BD,OAAO,CAACM,gBAAgB,CAACD,UAAU,CAAC;EAEpC,OAAO,IAAAF,4BAAU,EAACH,OAAO,CAAC;AAC5B,CAAC;AAAC"}

package/lib/redux/actions/FormAutosave.js

@@ -37,7 +37,7 @@ const autosave = (dispatch, form) => {
       // update last server update to indicate an update has happened
       // send the existing form to prevent updates in the ui based on autosave results
       form.lastServerUpdate = savedForm.lastServerUpdate;
-      dispatch((0, _ModularUIActions.updateModel)(form));
+      dispatch((0, _ModularUIActions.updateForm)(form));
       dispatch(updateAutosave(_Constants.AUTOSAVE_STATUS.FINISHED, savedForm));
     }
   });

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

@@ -10,7 +10,7 @@ import {
   AUTOSAVE_STATUS,
 } from "../../constants/Constants";
 
-import { updateModel } from "../_modularui/ModularUIActions";
+import { updateForm } from "../_modularui/ModularUIActions";
 
 import type { UpdateAutosaveAction, ThunkAction, Dispatch } from "../types";
 
@@ -49,7 +49,7 @@ const autosave = (dispatch: Dispatch, form: FormModel) => {
         // send the existing form to prevent updates in the ui based on autosave results
         form.lastServerUpdate = savedForm.lastServerUpdate;
 
-        dispatch(updateModel(form));
+        dispatch(updateForm(form));
         dispatch(updateAutosave(AUTOSAVE_STATUS.FINISHED, savedForm));
       }
     });

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

@@ -1 +1 @@
-{"version":3,"file":"FormAutosave.js","names":["updateAutosave","status","model","type","payload","autosave","dispatch","form","AUTOSAVE_STATUS","START","formdata","getFormData","ModularUIRequest","selfhref","setParameter","method","HTTP_METHODS","POST","data","childmodels","locale","fetch","then","savedForm","FormModel","lastServerUpdate","updateModel","FINISHED","debouncedAutosave","debounce","VALIDATE_DEBOUNCE_TIMEOUT","autosaveFormObject"],"sources":["../../../src/redux/actions/FormAutosave.js"],"sourcesContent":["// @flow\nimport debounce from \"lodash/debounce\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport {\n  HTTP_METHODS,\n  VALIDATE_DEBOUNCE_TIMEOUT,\n  AUTOSAVE_STATUS,\n} from \"../../constants/Constants\";\n\nimport { updateModel } from \"../_modularui/ModularUIActions\";\n\nimport type { UpdateAutosaveAction, ThunkAction, Dispatch } from \"../types\";\n\n/**\n * Update validations of the form currently in the reducer\n * because of the debounce timeout there might have been an update on the form during validation\n */\nconst updateAutosave = (\n  status: $Keys<typeof AUTOSAVE_STATUS>,\n  model: FormModel\n): UpdateAutosaveAction => ({\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status,\n    model,\n  },\n});\n\n/**\n */\nconst autosave = (dispatch: Dispatch, form: FormModel) => {\n  dispatch(updateAutosave(AUTOSAVE_STATUS.START, form));\n\n  const formdata = form.getFormData(true, false);\n\n  new ModularUIRequest(form.selfhref.setParameter(\"commit\", \"true\"), {\n    method: HTTP_METHODS.POST,\n    data: formdata,\n    childmodels: false,\n    locale: form.locale,\n  })\n    .fetch()\n    .then((savedForm) => {\n      if (savedForm instanceof FormModel) {\n        // update last server update to indicate an update has happened\n        // send the existing form to prevent updates in the ui based on autosave results\n        form.lastServerUpdate = savedForm.lastServerUpdate;\n\n        dispatch(updateModel(form));\n        dispatch(updateAutosave(AUTOSAVE_STATUS.FINISHED, savedForm));\n      }\n    });\n};\n\n/**\n * Validates form objects debounced to prevent overloading the (form) service\n * When a form with new errors (or complete) arrives, we send the validations\n * to the current form model where the errors are processed\n * A new form with the new constraints is send to the store\n */\nconst debouncedAutosave = debounce((dispatch, form) => {\n  autosave(dispatch, form);\n}, VALIDATE_DEBOUNCE_TIMEOUT);\n\n/**\n */\nexport const autosaveFormObject =\n  (form: FormModel): ThunkAction =>\n  (dispatch) =>\n    debouncedAutosave(dispatch, form);\n"],"mappings":";;;;;;;AACA;AAEA;AACA;AAEA;AAMA;AAIA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAG,CACrBC,MAAqC,EACrCC,KAAgB,MACU;EAC1BC,IAAI,EAAE,wBAAwB;EAC9BC,OAAO,EAAE;IACPH,MAAM;IACNC;EACF;AACF,CAAC,CAAC;;AAEF;AACA;AACA,MAAMG,QAAQ,GAAG,CAACC,QAAkB,EAAEC,IAAe,KAAK;EACxDD,QAAQ,CAACN,cAAc,CAACQ,0BAAe,CAACC,KAAK,EAAEF,IAAI,CAAC,CAAC;EAErD,MAAMG,QAAQ,GAAGH,IAAI,CAACI,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC;EAE9C,IAAIC,yBAAgB,CAACL,IAAI,CAACM,QAAQ,CAACC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;IACjEC,MAAM,EAAEC,uBAAY,CAACC,IAAI;IACzBC,IAAI,EAAER,QAAQ;IACdS,WAAW,EAAE,KAAK;IAClBC,MAAM,EAAEb,IAAI,CAACa;EACf,CAAC,CAAC,CACCC,KAAK,EAAE,CACPC,IAAI,CAAEC,SAAS,IAAK;IACnB,IAAIA,SAAS,YAAYC,kBAAS,EAAE;MAClC;MACA;MACAjB,IAAI,CAACkB,gBAAgB,GAAGF,SAAS,CAACE,gBAAgB;MAElDnB,QAAQ,CAAC,IAAAoB,6BAAW,EAACnB,IAAI,CAAC,CAAC;MAC3BD,QAAQ,CAACN,cAAc,CAACQ,0BAAe,CAACmB,QAAQ,EAAEJ,SAAS,CAAC,CAAC;IAC/D;EACF,CAAC,CAAC;AACN,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,MAAMK,iBAAiB,GAAG,IAAAC,iBAAQ,EAAC,CAACvB,QAAQ,EAAEC,IAAI,KAAK;EACrDF,QAAQ,CAACC,QAAQ,EAAEC,IAAI,CAAC;AAC1B,CAAC,EAAEuB,oCAAyB,CAAC;;AAE7B;AACA;AACO,MAAMC,kBAAkB,GAC5BxB,IAAe,IACfD,QAAQ,IACPsB,iBAAiB,CAACtB,QAAQ,EAAEC,IAAI,CAAC;AAAC"}
+{"version":3,"file":"FormAutosave.js","names":["updateAutosave","status","model","type","payload","autosave","dispatch","form","AUTOSAVE_STATUS","START","formdata","getFormData","ModularUIRequest","selfhref","setParameter","method","HTTP_METHODS","POST","data","childmodels","locale","fetch","then","savedForm","FormModel","lastServerUpdate","updateForm","FINISHED","debouncedAutosave","debounce","VALIDATE_DEBOUNCE_TIMEOUT","autosaveFormObject"],"sources":["../../../src/redux/actions/FormAutosave.js"],"sourcesContent":["// @flow\nimport debounce from \"lodash/debounce\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport FormModel from \"../../models/form/FormModel\";\n\nimport {\n  HTTP_METHODS,\n  VALIDATE_DEBOUNCE_TIMEOUT,\n  AUTOSAVE_STATUS,\n} from \"../../constants/Constants\";\n\nimport { updateForm } from \"../_modularui/ModularUIActions\";\n\nimport type { UpdateAutosaveAction, ThunkAction, Dispatch } from \"../types\";\n\n/**\n * Update validations of the form currently in the reducer\n * because of the debounce timeout there might have been an update on the form during validation\n */\nconst updateAutosave = (\n  status: $Keys<typeof AUTOSAVE_STATUS>,\n  model: FormModel\n): UpdateAutosaveAction => ({\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status,\n    model,\n  },\n});\n\n/**\n */\nconst autosave = (dispatch: Dispatch, form: FormModel) => {\n  dispatch(updateAutosave(AUTOSAVE_STATUS.START, form));\n\n  const formdata = form.getFormData(true, false);\n\n  new ModularUIRequest(form.selfhref.setParameter(\"commit\", \"true\"), {\n    method: HTTP_METHODS.POST,\n    data: formdata,\n    childmodels: false,\n    locale: form.locale,\n  })\n    .fetch()\n    .then((savedForm) => {\n      if (savedForm instanceof FormModel) {\n        // update last server update to indicate an update has happened\n        // send the existing form to prevent updates in the ui based on autosave results\n        form.lastServerUpdate = savedForm.lastServerUpdate;\n\n        dispatch(updateForm(form));\n        dispatch(updateAutosave(AUTOSAVE_STATUS.FINISHED, savedForm));\n      }\n    });\n};\n\n/**\n * Validates form objects debounced to prevent overloading the (form) service\n * When a form with new errors (or complete) arrives, we send the validations\n * to the current form model where the errors are processed\n * A new form with the new constraints is send to the store\n */\nconst debouncedAutosave = debounce((dispatch, form) => {\n  autosave(dispatch, form);\n}, VALIDATE_DEBOUNCE_TIMEOUT);\n\n/**\n */\nexport const autosaveFormObject =\n  (form: FormModel): ThunkAction =>\n  (dispatch) =>\n    debouncedAutosave(dispatch, form);\n"],"mappings":";;;;;;;AACA;AAEA;AACA;AAEA;AAMA;AAIA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAG,CACrBC,MAAqC,EACrCC,KAAgB,MACU;EAC1BC,IAAI,EAAE,wBAAwB;EAC9BC,OAAO,EAAE;IACPH,MAAM;IACNC;EACF;AACF,CAAC,CAAC;;AAEF;AACA;AACA,MAAMG,QAAQ,GAAG,CAACC,QAAkB,EAAEC,IAAe,KAAK;EACxDD,QAAQ,CAACN,cAAc,CAACQ,0BAAe,CAACC,KAAK,EAAEF,IAAI,CAAC,CAAC;EAErD,MAAMG,QAAQ,GAAGH,IAAI,CAACI,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC;EAE9C,IAAIC,yBAAgB,CAACL,IAAI,CAACM,QAAQ,CAACC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;IACjEC,MAAM,EAAEC,uBAAY,CAACC,IAAI;IACzBC,IAAI,EAAER,QAAQ;IACdS,WAAW,EAAE,KAAK;IAClBC,MAAM,EAAEb,IAAI,CAACa;EACf,CAAC,CAAC,CACCC,KAAK,EAAE,CACPC,IAAI,CAAEC,SAAS,IAAK;IACnB,IAAIA,SAAS,YAAYC,kBAAS,EAAE;MAClC;MACA;MACAjB,IAAI,CAACkB,gBAAgB,GAAGF,SAAS,CAACE,gBAAgB;MAElDnB,QAAQ,CAAC,IAAAoB,4BAAU,EAACnB,IAAI,CAAC,CAAC;MAC1BD,QAAQ,CAACN,cAAc,CAACQ,0BAAe,CAACmB,QAAQ,EAAEJ,SAAS,CAAC,CAAC;IAC/D;EACF,CAAC,CAAC;AACN,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,MAAMK,iBAAiB,GAAG,IAAAC,iBAAQ,EAAC,CAACvB,QAAQ,EAAEC,IAAI,KAAK;EACrDF,QAAQ,CAACC,QAAQ,EAAEC,IAAI,CAAC;AAC1B,CAAC,EAAEuB,oCAAyB,CAAC;;AAE7B;AACA;AACO,MAAMC,kBAAkB,GAC5BxB,IAAe,IACfD,QAAQ,IACPsB,iBAAiB,CAACtB,QAAQ,EAAEC,IAAI,CAAC;AAAC"}

package/lib/redux/actions/FormValidations.js

@@ -21,7 +21,7 @@ const updateValidations = (form, formWithValidations) => (dispatch, getState) =>
     if (validatedForm instanceof _FormModel.default) {
       validatedForm.updateValidations(formWithValidations.data);
     }
-    dispatch((0, _ModularUIActions.updateModel)(validatedForm));
+    dispatch((0, _ModularUIActions.updateForm)(validatedForm));
   }
 };
 

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

@@ -1,7 +1,7 @@
 // @flow
 import debounce from "lodash/debounce";
 
-import { updateModel } from "../_modularui/ModularUIActions";
+import { updateForm } from "../_modularui/ModularUIActions";
 
 import ModularUIRequest from "../../modularui/ModularUIRequest";
 
@@ -30,7 +30,7 @@ const updateValidations =
         validatedForm.updateValidations(formWithValidations.data);
       }
 
-      dispatch(updateModel(validatedForm));
+      dispatch(updateForm(validatedForm));
     }
   };
 

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

@@ -1 +1 @@
-{"version":3,"file":"FormValidations.js","names":["updateValidations","form","formWithValidations","dispatch","getState","currentForm","modularui","connectKey","validatedForm","model","clone","FormModel","data","updateModel","debouncedValidateFormObject","debounce","ModularUIRequest","selfhref","setParameter","method","HTTP_METHODS","POST","validationData","childmodels","isValidationRequest","locale","fetch","then","VALIDATE_DEBOUNCE_TIMEOUT","leading","trailing","validateFormObject"],"sources":["../../../src/redux/actions/FormValidations.js"],"sourcesContent":["// @flow\nimport debounce from \"lodash/debounce\";\n\nimport { updateModel } from \"../_modularui/ModularUIActions\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport {\n  HTTP_METHODS,\n  VALIDATE_DEBOUNCE_TIMEOUT,\n} from \"../../constants/Constants\";\n\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n * Update validations of the form currently in the reducer\n * because of the debounce timeout there might have been an update on the form during validation\n */\nconst updateValidations =\n  (form: FormModel, formWithValidations: ModularUIModel) =>\n  (dispatch: Dispatch, getState: GetState) => {\n    const currentForm = getState().modularui[form.connectKey];\n\n    if (currentForm) {\n      const validatedForm = currentForm.model.clone();\n      if (validatedForm instanceof FormModel) {\n        validatedForm.updateValidations(formWithValidations.data);\n      }\n\n      dispatch(updateModel(validatedForm));\n    }\n  };\n\n/**\n * Validates form objects debounced to prevent overloading the (form) service\n * When a form with new errors (or complete) arrives, we send the validations\n * to the current form model where the errors are processed\n * A new form with the new constraints is send to the store\n */\nconst debouncedValidateFormObject = debounce<\n  (dispatch: Dispatch, form: FormModel) => void\n>(\n  (dispatch, form: FormModel) => {\n    new ModularUIRequest(form.selfhref.setParameter(\"commit\", \"false\"), {\n      method: HTTP_METHODS.POST,\n      data: form.validationData,\n      childmodels: false,\n      isValidationRequest: true,\n      locale: form.locale,\n    })\n      .fetch()\n      .then((formWithValidations) =>\n        dispatch(updateValidations(form, formWithValidations))\n      );\n  },\n  VALIDATE_DEBOUNCE_TIMEOUT,\n  {\n    leading: true,\n    trailing: true,\n  }\n);\n\n/**\n */\nexport const validateFormObject =\n  (form: FormModel): ThunkAction =>\n  (dispatch) =>\n    debouncedValidateFormObject(dispatch, form);\n"],"mappings":";;;;;;;AACA;AAEA;AAEA;AAEA;AAKA;AAKA;AACA;AACA;AACA;AACA,MAAMA,iBAAiB,GACrB,CAACC,IAAe,EAAEC,mBAAmC,KACrD,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC1C,MAAMC,WAAW,GAAGD,QAAQ,EAAE,CAACE,SAAS,CAACL,IAAI,CAACM,UAAU,CAAC;EAEzD,IAAIF,WAAW,EAAE;IACf,MAAMG,aAAa,GAAGH,WAAW,CAACI,KAAK,CAACC,KAAK,EAAE;IAC/C,IAAIF,aAAa,YAAYG,kBAAS,EAAE;MACtCH,aAAa,CAACR,iBAAiB,CAACE,mBAAmB,CAACU,IAAI,CAAC;IAC3D;IAEAT,QAAQ,CAAC,IAAAU,6BAAW,EAACL,aAAa,CAAC,CAAC;EACtC;AACF,CAAC;;AAEH;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,2BAA2B,GAAG,IAAAC,iBAAQ,EAG1C,CAACZ,QAAQ,EAAEF,IAAe,KAAK;EAC7B,IAAIe,yBAAgB,CAACf,IAAI,CAACgB,QAAQ,CAACC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;IAClEC,MAAM,EAAEC,uBAAY,CAACC,IAAI;IACzBT,IAAI,EAAEX,IAAI,CAACqB,cAAc;IACzBC,WAAW,EAAE,KAAK;IAClBC,mBAAmB,EAAE,IAAI;IACzBC,MAAM,EAAExB,IAAI,CAACwB;EACf,CAAC,CAAC,CACCC,KAAK,EAAE,CACPC,IAAI,CAAEzB,mBAAmB,IACxBC,QAAQ,CAACH,iBAAiB,CAACC,IAAI,EAAEC,mBAAmB,CAAC,CAAC,CACvD;AACL,CAAC,EACD0B,oCAAyB,EACzB;EACEC,OAAO,EAAE,IAAI;EACbC,QAAQ,EAAE;AACZ,CAAC,CACF;;AAED;AACA;AACO,MAAMC,kBAAkB,GAC5B9B,IAAe,IACfE,QAAQ,IACPW,2BAA2B,CAACX,QAAQ,EAAEF,IAAI,CAAC;AAAC"}
+{"version":3,"file":"FormValidations.js","names":["updateValidations","form","formWithValidations","dispatch","getState","currentForm","modularui","connectKey","validatedForm","model","clone","FormModel","data","updateForm","debouncedValidateFormObject","debounce","ModularUIRequest","selfhref","setParameter","method","HTTP_METHODS","POST","validationData","childmodels","isValidationRequest","locale","fetch","then","VALIDATE_DEBOUNCE_TIMEOUT","leading","trailing","validateFormObject"],"sources":["../../../src/redux/actions/FormValidations.js"],"sourcesContent":["// @flow\nimport debounce from \"lodash/debounce\";\n\nimport { updateForm } from \"../_modularui/ModularUIActions\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport {\n  HTTP_METHODS,\n  VALIDATE_DEBOUNCE_TIMEOUT,\n} from \"../../constants/Constants\";\n\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n * Update validations of the form currently in the reducer\n * because of the debounce timeout there might have been an update on the form during validation\n */\nconst updateValidations =\n  (form: FormModel, formWithValidations: ModularUIModel) =>\n  (dispatch: Dispatch, getState: GetState) => {\n    const currentForm = getState().modularui[form.connectKey];\n\n    if (currentForm) {\n      const validatedForm = currentForm.model.clone();\n      if (validatedForm instanceof FormModel) {\n        validatedForm.updateValidations(formWithValidations.data);\n      }\n\n      dispatch(updateForm(validatedForm));\n    }\n  };\n\n/**\n * Validates form objects debounced to prevent overloading the (form) service\n * When a form with new errors (or complete) arrives, we send the validations\n * to the current form model where the errors are processed\n * A new form with the new constraints is send to the store\n */\nconst debouncedValidateFormObject = debounce<\n  (dispatch: Dispatch, form: FormModel) => void\n>(\n  (dispatch, form: FormModel) => {\n    new ModularUIRequest(form.selfhref.setParameter(\"commit\", \"false\"), {\n      method: HTTP_METHODS.POST,\n      data: form.validationData,\n      childmodels: false,\n      isValidationRequest: true,\n      locale: form.locale,\n    })\n      .fetch()\n      .then((formWithValidations) =>\n        dispatch(updateValidations(form, formWithValidations))\n      );\n  },\n  VALIDATE_DEBOUNCE_TIMEOUT,\n  {\n    leading: true,\n    trailing: true,\n  }\n);\n\n/**\n */\nexport const validateFormObject =\n  (form: FormModel): ThunkAction =>\n  (dispatch) =>\n    debouncedValidateFormObject(dispatch, form);\n"],"mappings":";;;;;;;AACA;AAEA;AAEA;AAEA;AAKA;AAKA;AACA;AACA;AACA;AACA,MAAMA,iBAAiB,GACrB,CAACC,IAAe,EAAEC,mBAAmC,KACrD,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC1C,MAAMC,WAAW,GAAGD,QAAQ,EAAE,CAACE,SAAS,CAACL,IAAI,CAACM,UAAU,CAAC;EAEzD,IAAIF,WAAW,EAAE;IACf,MAAMG,aAAa,GAAGH,WAAW,CAACI,KAAK,CAACC,KAAK,EAAE;IAC/C,IAAIF,aAAa,YAAYG,kBAAS,EAAE;MACtCH,aAAa,CAACR,iBAAiB,CAACE,mBAAmB,CAACU,IAAI,CAAC;IAC3D;IAEAT,QAAQ,CAAC,IAAAU,4BAAU,EAACL,aAAa,CAAC,CAAC;EACrC;AACF,CAAC;;AAEH;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,2BAA2B,GAAG,IAAAC,iBAAQ,EAG1C,CAACZ,QAAQ,EAAEF,IAAe,KAAK;EAC7B,IAAIe,yBAAgB,CAACf,IAAI,CAACgB,QAAQ,CAACC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;IAClEC,MAAM,EAAEC,uBAAY,CAACC,IAAI;IACzBT,IAAI,EAAEX,IAAI,CAACqB,cAAc;IACzBC,WAAW,EAAE,KAAK;IAClBC,mBAAmB,EAAE,IAAI;IACzBC,MAAM,EAAExB,IAAI,CAACwB;EACf,CAAC,CAAC,CACCC,KAAK,EAAE,CACPC,IAAI,CAAEzB,mBAAmB,IACxBC,QAAQ,CAACH,iBAAiB,CAACC,IAAI,EAAEC,mBAAmB,CAAC,CAAC,CACvD;AACL,CAAC,EACD0B,oCAAyB,EACzB;EACEC,OAAO,EAAE,IAAI;EACbC,QAAQ,EAAE;AACZ,CAAC,CACF;;AAED;AACA;AACO,MAAMC,kBAAkB,GAC5B9B,IAAe,IACfE,QAAQ,IACPW,2BAA2B,CAACX,QAAQ,EAAEF,IAAI,CAAC;AAAC"}

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

@@ -15,7 +15,7 @@ describe("form actions", () => {
 
     expect(store.getActions()).toStrictEqual([
       {
-        type: "MODULARUI/UPDATE",
+        type: "MODULARUI/UPDATE_FORM",
         payload: expect.objectContaining({
           _contributions: expect.objectContaining({
             label: "Create person",

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

@@ -16,10 +16,7 @@ import type { AbstractComponent } from "react";
 import type FormModel from "../../models/form/FormModel";
 import type { ContextRouter } from "react-router";
 import type { ReduxState, ThunkAction } from "../types";
-import type {
-  ModularUIConnector,
-  UpdateModelAction,
-} from "../_modularui/types";
+import type { ModularUIConnector, UpdateFormAction } from "../_modularui/types";
 
 type OwnProps = {
   ...?ContextRouter,
@@ -33,7 +30,7 @@ type StateProps = {
 };
 
 type DispatchProps = {
-  onPrevious: (form: FormModel) => UpdateModelAction,
+  onPrevious: (form: FormModel) => UpdateFormAction,
   onCancel: (form: FormModel) => ThunkAction,
   showFormNotification: (form: FormModel) => ThunkAction,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"Form.js","names":["mapStateToProps","state","ownProps","isModal","router","location","modal","mapDispatchToProps","onPrevious","previousObject","onCancel","cancelForm","showFormNotification","reduxConnectedForm","connect","moduiConnectedForm","modularui","href","formHref","Href","pathname","search","getSetting","addParameter","propName","method","HTTP_METHODS","POST","connectForm","compose"],"sources":["../../../src/redux/connectors/Form.js"],"sourcesContent":["// @flow\nimport { compose } from \"redux\";\nimport { connect } from \"react-redux\";\n\nimport modularui from \"../_modularui/ModularUIConnector\";\n\nimport { HTTP_METHODS } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { cancelForm, previousObject } from \"../actions/Form\";\nimport { showFormNotification } from \"../actions/Notification\";\n\nimport Href from \"../../models/href/Href\";\n\nimport type { AbstractComponent } from \"react\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type { ContextRouter } from \"react-router\";\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type {\n  ModularUIConnector,\n  UpdateModelAction,\n} from \"../_modularui/types\";\n\ntype OwnProps = {\n  ...?ContextRouter,\n  href?: Href,\n  isModal?: boolean,\n  redirectTo?: string,\n};\n\ntype StateProps = {\n  isModal: boolean,\n};\n\ntype DispatchProps = {\n  onPrevious: (form: FormModel) => UpdateModelAction,\n  onCancel: (form: FormModel) => ThunkAction,\n  showFormNotification: (form: FormModel) => ThunkAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (\n  state: ReduxState,\n  ownProps: OwnProps\n): StateProps => ({\n  isModal: state.router.location?.state?.modal || ownProps.isModal || false,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  onPrevious: previousObject,\n  onCancel: cancelForm,\n  showFormNotification,\n};\n\nconst reduxConnectedForm = connect<Props, OwnProps, StateProps, _, _, _>(\n  mapStateToProps,\n  mapDispatchToProps\n);\n\nconst moduiConnectedForm: ModularUIConnector = modularui(\n  \"Form\",\n  ({ href, location }) => {\n    const formHref = href || new Href(`${location.pathname}${location.search}`);\n\n    if (getSetting(\"ALWAYS_COMMIT_FORM\")) {\n      return formHref;\n    }\n\n    return formHref.addParameter(\"commit\", \"false\");\n  },\n  { propName: \"form\", method: HTTP_METHODS.POST }\n);\n\n/**\n */\nexport const connectForm: (\n  Component: AbstractComponent<Props>\n) => AbstractComponent<OwnProps> = compose(\n  moduiConnectedForm,\n  reduxConnectedForm\n);\n"],"mappings":";;;;;;;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AAEA;AAkCA,MAAMA,eAAe,GAAG,CACtBC,KAAiB,EACjBC,QAAkB,MACF;EAChBC,OAAO,EAAEF,KAAK,CAACG,MAAM,CAACC,QAAQ,EAAEJ,KAAK,EAAEK,KAAK,IAAIJ,QAAQ,CAACC,OAAO,IAAI;AACtE,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,UAAU,EAAEC,oBAAc;EAC1BC,QAAQ,EAAEC,gBAAU;EACpBC,oBAAoB,EAApBA;AACF,CAAC;AAED,MAAMC,kBAAkB,GAAG,IAAAC,mBAAO,EAChCd,eAAe,EACfO,kBAAkB,CACnB;AAED,MAAMQ,kBAAsC,GAAG,IAAAC,2BAAS,EACtD,MAAM,EACN,QAAwB;EAAA,IAAvB;IAAEC,IAAI;IAAEZ;EAAS,CAAC;EACjB,MAAMa,QAAQ,GAAGD,IAAI,IAAI,IAAIE,aAAI,CAAE,GAAEd,QAAQ,CAACe,QAAS,GAAEf,QAAQ,CAACgB,MAAO,EAAC,CAAC;EAE3E,IAAI,IAAAC,oBAAU,EAAC,oBAAoB,CAAC,EAAE;IACpC,OAAOJ,QAAQ;EACjB;EAEA,OAAOA,QAAQ,CAACK,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;AACjD,CAAC,EACD;EAAEC,QAAQ,EAAE,MAAM;EAAEC,MAAM,EAAEC,uBAAY,CAACC;AAAK,CAAC,CAChD;;AAED;AACA;AACO,MAAMC,WAEmB,GAAG,IAAAC,cAAO,EACxCd,kBAAkB,EAClBF,kBAAkB,CACnB;AAAC"}
+{"version":3,"file":"Form.js","names":["mapStateToProps","state","ownProps","isModal","router","location","modal","mapDispatchToProps","onPrevious","previousObject","onCancel","cancelForm","showFormNotification","reduxConnectedForm","connect","moduiConnectedForm","modularui","href","formHref","Href","pathname","search","getSetting","addParameter","propName","method","HTTP_METHODS","POST","connectForm","compose"],"sources":["../../../src/redux/connectors/Form.js"],"sourcesContent":["// @flow\nimport { compose } from \"redux\";\nimport { connect } from \"react-redux\";\n\nimport modularui from \"../_modularui/ModularUIConnector\";\n\nimport { HTTP_METHODS } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { cancelForm, previousObject } from \"../actions/Form\";\nimport { showFormNotification } from \"../actions/Notification\";\n\nimport Href from \"../../models/href/Href\";\n\nimport type { AbstractComponent } from \"react\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type { ContextRouter } from \"react-router\";\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ModularUIConnector, UpdateFormAction } from \"../_modularui/types\";\n\ntype OwnProps = {\n  ...?ContextRouter,\n  href?: Href,\n  isModal?: boolean,\n  redirectTo?: string,\n};\n\ntype StateProps = {\n  isModal: boolean,\n};\n\ntype DispatchProps = {\n  onPrevious: (form: FormModel) => UpdateFormAction,\n  onCancel: (form: FormModel) => ThunkAction,\n  showFormNotification: (form: FormModel) => ThunkAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (\n  state: ReduxState,\n  ownProps: OwnProps\n): StateProps => ({\n  isModal: state.router.location?.state?.modal || ownProps.isModal || false,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  onPrevious: previousObject,\n  onCancel: cancelForm,\n  showFormNotification,\n};\n\nconst reduxConnectedForm = connect<Props, OwnProps, StateProps, _, _, _>(\n  mapStateToProps,\n  mapDispatchToProps\n);\n\nconst moduiConnectedForm: ModularUIConnector = modularui(\n  \"Form\",\n  ({ href, location }) => {\n    const formHref = href || new Href(`${location.pathname}${location.search}`);\n\n    if (getSetting(\"ALWAYS_COMMIT_FORM\")) {\n      return formHref;\n    }\n\n    return formHref.addParameter(\"commit\", \"false\");\n  },\n  { propName: \"form\", method: HTTP_METHODS.POST }\n);\n\n/**\n */\nexport const connectForm: (\n  Component: AbstractComponent<Props>\n) => AbstractComponent<OwnProps> = compose(\n  moduiConnectedForm,\n  reduxConnectedForm\n);\n"],"mappings":";;;;;;;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AAEA;AA+BA,MAAMA,eAAe,GAAG,CACtBC,KAAiB,EACjBC,QAAkB,MACF;EAChBC,OAAO,EAAEF,KAAK,CAACG,MAAM,CAACC,QAAQ,EAAEJ,KAAK,EAAEK,KAAK,IAAIJ,QAAQ,CAACC,OAAO,IAAI;AACtE,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,UAAU,EAAEC,oBAAc;EAC1BC,QAAQ,EAAEC,gBAAU;EACpBC,oBAAoB,EAApBA;AACF,CAAC;AAED,MAAMC,kBAAkB,GAAG,IAAAC,mBAAO,EAChCd,eAAe,EACfO,kBAAkB,CACnB;AAED,MAAMQ,kBAAsC,GAAG,IAAAC,2BAAS,EACtD,MAAM,EACN,QAAwB;EAAA,IAAvB;IAAEC,IAAI;IAAEZ;EAAS,CAAC;EACjB,MAAMa,QAAQ,GAAGD,IAAI,IAAI,IAAIE,aAAI,CAAE,GAAEd,QAAQ,CAACe,QAAS,GAAEf,QAAQ,CAACgB,MAAO,EAAC,CAAC;EAE3E,IAAI,IAAAC,oBAAU,EAAC,oBAAoB,CAAC,EAAE;IACpC,OAAOJ,QAAQ;EACjB;EAEA,OAAOA,QAAQ,CAACK,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;AACjD,CAAC,EACD;EAAEC,QAAQ,EAAE,MAAM;EAAEC,MAAM,EAAEC,uBAAY,CAACC;AAAK,CAAC,CAChD;;AAED;AACA;AACO,MAAMC,WAEmB,GAAG,IAAAC,cAAO,EACxCd,kBAAkB,EAClBF,kBAAkB,CACnB;AAAC"}

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

@@ -9,14 +9,14 @@ import {
 } from "../actions/FormAttributeSetRepeatable";
 
 import type { ThunkAction, UpdateFormOptions } from "../types";
-import type { UpdateModelAction } from "../_modularui/types";
+import type { UpdateFormAction } from "../_modularui/types";
 import type { AttributeType } from "../../models/types";
 import type FormModel from "../../models/form/FormModel";
 import type FormObjectModel from "../../models/form/FormObjectModel";
 import type { DispatchAPI } from "redux";
 import type { ComponentType } from "react";
 
-type Dispatch = DispatchAPI<UpdateModelAction> & DispatchAPI<ThunkAction>;
+type Dispatch = DispatchAPI<UpdateFormAction> & DispatchAPI<ThunkAction>;
 
 type OwnProps = {
   form: FormModel,
@@ -32,9 +32,9 @@ type DispatchProps = {
     value: string,
     options: UpdateFormOptions
   ) => ThunkAction,
-  onAddAttributeSetClick: () => UpdateModelAction,
-  onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateModelAction,
-  onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateModelAction,
+  onAddAttributeSetClick: () => UpdateFormAction,
+  onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,
+  onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,
 };
 
 type Props = {

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

@@ -1 +1 @@
-{"version":3,"file":"FormAttributeSet.js","names":["mapDispatchToProps","dispatch","ownProps","onAttributeChange","attribute","value","options","autosubmit","autosave","updateFormAttribute","form","object","onAddAttributeSetClick","addRepeatableAttributeSet","onCancelAttributeSetClick","formObject","cancelRepeatableAttributeSet","onRemoveAttributeSetClick","removeRepeatableAttributeSet","connectFormAttributeSet","connect"],"sources":["../../../src/redux/connectors/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { updateFormAttribute } from \"../actions/FormAttributeSet\";\nimport {\n  addRepeatableAttributeSet,\n  cancelRepeatableAttributeSet,\n  removeRepeatableAttributeSet,\n} from \"../actions/FormAttributeSetRepeatable\";\n\nimport type { ThunkAction, UpdateFormOptions } from \"../types\";\nimport type { UpdateModelAction } from \"../_modularui/types\";\nimport type { AttributeType } from \"../../models/types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\nimport type { DispatchAPI } from \"redux\";\nimport type { ComponentType } from \"react\";\n\ntype Dispatch = DispatchAPI<UpdateModelAction> & DispatchAPI<ThunkAction>;\n\ntype OwnProps = {\n  form: FormModel,\n  object: FormObjectModel,\n  formLayout?: \"vertical\" | \"horizontal\" | \"compact\",\n  autosubmit?: boolean,\n  autosave?: boolean,\n};\n\ntype DispatchProps = {\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions\n  ) => ThunkAction,\n  onAddAttributeSetClick: () => UpdateModelAction,\n  onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateModelAction,\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateModelAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...DispatchProps,\n};\n\nconst mapDispatchToProps = (\n  dispatch: Dispatch,\n  ownProps: OwnProps\n): DispatchProps => ({\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions = {\n      autosubmit: ownProps.autosubmit || false,\n      autosave: ownProps.autosave || false,\n    }\n  ) =>\n    dispatch(\n      updateFormAttribute(\n        ownProps.form,\n        ownProps.object,\n        attribute,\n        value,\n        options\n      )\n    ),\n  onAddAttributeSetClick: () =>\n    dispatch(addRepeatableAttributeSet(ownProps.form)),\n  onCancelAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(cancelRepeatableAttributeSet(ownProps.form, formObject)),\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(removeRepeatableAttributeSet(ownProps.form, formObject)),\n});\n\n/**\n */\nexport const connectFormAttributeSet: ComponentType<any> = connect<\n  Props,\n  OwnProps,\n  _,\n  DispatchProps,\n  _,\n  _\n>(null, mapDispatchToProps);\n"],"mappings":";;;;;;AACA;AAEA;AACA;AAwCA,MAAMA,kBAAkB,GAAG,CACzBC,QAAkB,EAClBC,QAAkB,MACC;EACnBC,iBAAiB,EAAE,UACjBC,SAAwB,EACxBC,KAAa;IAAA,IACbC,OAA0B,uEAAG;MAC3BC,UAAU,EAAEL,QAAQ,CAACK,UAAU,IAAI,KAAK;MACxCC,QAAQ,EAAEN,QAAQ,CAACM,QAAQ,IAAI;IACjC,CAAC;IAAA,OAEDP,QAAQ,CACN,IAAAQ,qCAAmB,EACjBP,QAAQ,CAACQ,IAAI,EACbR,QAAQ,CAACS,MAAM,EACfP,SAAS,EACTC,KAAK,EACLC,OAAO,CACR,CACF;EAAA;EACHM,sBAAsB,EAAE,MACtBX,QAAQ,CAAC,IAAAY,qDAAyB,EAACX,QAAQ,CAACQ,IAAI,CAAC,CAAC;EACpDI,yBAAyB,EAAGC,UAA2B,IACrDd,QAAQ,CAAC,IAAAe,wDAA4B,EAACd,QAAQ,CAACQ,IAAI,EAAEK,UAAU,CAAC,CAAC;EACnEE,yBAAyB,EAAGF,UAA2B,IACrDd,QAAQ,CAAC,IAAAiB,wDAA4B,EAAChB,QAAQ,CAACQ,IAAI,EAAEK,UAAU,CAAC;AACpE,CAAC,CAAC;;AAEF;AACA;AACO,MAAMI,uBAA2C,GAAG,IAAAC,mBAAO,EAOhE,IAAI,EAAEpB,kBAAkB,CAAC;AAAC"}
+{"version":3,"file":"FormAttributeSet.js","names":["mapDispatchToProps","dispatch","ownProps","onAttributeChange","attribute","value","options","autosubmit","autosave","updateFormAttribute","form","object","onAddAttributeSetClick","addRepeatableAttributeSet","onCancelAttributeSetClick","formObject","cancelRepeatableAttributeSet","onRemoveAttributeSetClick","removeRepeatableAttributeSet","connectFormAttributeSet","connect"],"sources":["../../../src/redux/connectors/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { updateFormAttribute } from \"../actions/FormAttributeSet\";\nimport {\n  addRepeatableAttributeSet,\n  cancelRepeatableAttributeSet,\n  removeRepeatableAttributeSet,\n} from \"../actions/FormAttributeSetRepeatable\";\n\nimport type { ThunkAction, UpdateFormOptions } from \"../types\";\nimport type { UpdateFormAction } from \"../_modularui/types\";\nimport type { AttributeType } from \"../../models/types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\nimport type { DispatchAPI } from \"redux\";\nimport type { ComponentType } from \"react\";\n\ntype Dispatch = DispatchAPI<UpdateFormAction> & DispatchAPI<ThunkAction>;\n\ntype OwnProps = {\n  form: FormModel,\n  object: FormObjectModel,\n  formLayout?: \"vertical\" | \"horizontal\" | \"compact\",\n  autosubmit?: boolean,\n  autosave?: boolean,\n};\n\ntype DispatchProps = {\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions\n  ) => ThunkAction,\n  onAddAttributeSetClick: () => UpdateFormAction,\n  onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...DispatchProps,\n};\n\nconst mapDispatchToProps = (\n  dispatch: Dispatch,\n  ownProps: OwnProps\n): DispatchProps => ({\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions = {\n      autosubmit: ownProps.autosubmit || false,\n      autosave: ownProps.autosave || false,\n    }\n  ) =>\n    dispatch(\n      updateFormAttribute(\n        ownProps.form,\n        ownProps.object,\n        attribute,\n        value,\n        options\n      )\n    ),\n  onAddAttributeSetClick: () =>\n    dispatch(addRepeatableAttributeSet(ownProps.form)),\n  onCancelAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(cancelRepeatableAttributeSet(ownProps.form, formObject)),\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(removeRepeatableAttributeSet(ownProps.form, formObject)),\n});\n\n/**\n */\nexport const connectFormAttributeSet: ComponentType<any> = connect<\n  Props,\n  OwnProps,\n  _,\n  DispatchProps,\n  _,\n  _\n>(null, mapDispatchToProps);\n"],"mappings":";;;;;;AACA;AAEA;AACA;AAwCA,MAAMA,kBAAkB,GAAG,CACzBC,QAAkB,EAClBC,QAAkB,MACC;EACnBC,iBAAiB,EAAE,UACjBC,SAAwB,EACxBC,KAAa;IAAA,IACbC,OAA0B,uEAAG;MAC3BC,UAAU,EAAEL,QAAQ,CAACK,UAAU,IAAI,KAAK;MACxCC,QAAQ,EAAEN,QAAQ,CAACM,QAAQ,IAAI;IACjC,CAAC;IAAA,OAEDP,QAAQ,CACN,IAAAQ,qCAAmB,EACjBP,QAAQ,CAACQ,IAAI,EACbR,QAAQ,CAACS,MAAM,EACfP,SAAS,EACTC,KAAK,EACLC,OAAO,CACR,CACF;EAAA;EACHM,sBAAsB,EAAE,MACtBX,QAAQ,CAAC,IAAAY,qDAAyB,EAACX,QAAQ,CAACQ,IAAI,CAAC,CAAC;EACpDI,yBAAyB,EAAGC,UAA2B,IACrDd,QAAQ,CAAC,IAAAe,wDAA4B,EAACd,QAAQ,CAACQ,IAAI,EAAEK,UAAU,CAAC,CAAC;EACnEE,yBAAyB,EAAGF,UAA2B,IACrDd,QAAQ,CAAC,IAAAiB,wDAA4B,EAAChB,QAAQ,CAACQ,IAAI,EAAEK,UAAU,CAAC;AACpE,CAAC,CAAC;;AAEF;AACA;AACO,MAAMI,uBAA2C,GAAG,IAAAC,mBAAO,EAOhE,IAAI,EAAEpB,kBAAkB,CAAC;AAAC"}

package/lib/redux/store/configureStore.js

@@ -13,7 +13,7 @@ var _createReducer = require("../reducers/createReducer");
 var _RouterActions = require("../_router/RouterActions");
 /**
  */
-const configureStore = (history, customReducers, initialState) => {
+const configureStore = (routerHistory, customReducers, initialState) => {
   let composeEnhancers = _redux.compose;
   if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
     composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || _redux.compose;
@@ -22,14 +22,14 @@ const configureStore = (history, customReducers, initialState) => {
     ...customReducers,
     ...(0, _createReducer.createReducer)()
   });
-  const middleware = (0, _redux.applyMiddleware)(_ModularUIMiddleware.modularUIMiddleware, (0, _RouterMiddleware.routerMiddleware)(history), _reduxThunk.default);
+  const middleware = (0, _redux.applyMiddleware)(_ModularUIMiddleware.modularUIMiddleware, (0, _RouterMiddleware.routerMiddleware)(routerHistory), _reduxThunk.default);
   const enhancers = composeEnhancers(middleware);
   const store = (0, _redux.createStore)(combinedReducers, initialState, enhancers);
   if (!initialState?.router) {
-    store.dispatch((0, _RouterActions.locationChange)(history.location, "PUSH"));
+    store.dispatch((0, _RouterActions.locationChange)(routerHistory.location, "PUSH"));
   }
   return {
-    history,
+    routerHistory,
     store
   };
 };

package/lib/redux/store/configureStore.js.flow

@@ -20,10 +20,10 @@ import type { Reducer } from "redux";
 /**
  */
 const configureStore = (
-  history: RouterHistory,
+  routerHistory: RouterHistory,
   customReducers?: Object,
   initialState?: $Shape<ReduxState>
-): { history: RouterHistory, store: ReduxStore } => {
+): { routerHistory: RouterHistory, store: ReduxStore } => {
   let composeEnhancers = compose;
 
   if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
@@ -37,7 +37,7 @@ const configureStore = (
 
   const middleware = applyMiddleware(
     modularUIMiddleware,
-    routerMiddleware(history),
+    routerMiddleware(routerHistory),
     thunk
   );
 
@@ -50,9 +50,9 @@ const configureStore = (
   );
 
   if (!initialState?.router) {
-    store.dispatch(locationChange(history.location, "PUSH"));
+    store.dispatch(locationChange(routerHistory.location, "PUSH"));
   }
-  return { history, store };
+  return { routerHistory, store };
 };
 
 export default configureStore;

package/lib/redux/store/configureStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureStore.js","names":["configureStore","history","customReducers","initialState","composeEnhancers","compose","process","env","NODE_ENV","window","__REDUX_DEVTOOLS_EXTENSION_COMPOSE__","combinedReducers","combineReducers","createReducer","middleware","applyMiddleware","modularUIMiddleware","routerMiddleware","thunk","enhancers","store","createReduxStore","router","dispatch","locationChange","location"],"sources":["../../../src/redux/store/configureStore.js"],"sourcesContent":["// @flow\nimport {\n  applyMiddleware,\n  compose,\n  combineReducers,\n  createStore as createReduxStore,\n} from \"redux\";\nimport thunk from \"redux-thunk\";\n\nimport { routerMiddleware } from \"../_router/RouterMiddleware\";\nimport { modularUIMiddleware } from \"../_modularui/ModularUIMiddleware\";\n\nimport { createReducer } from \"../reducers/createReducer\";\nimport { locationChange } from \"../_router/RouterActions\";\n\nimport type { RouterHistory } from \"react-router\";\nimport type { ReduxAction, ReduxState, ReduxStore } from \"../types\";\nimport type { Reducer } from \"redux\";\n\n/**\n */\nconst configureStore = (\n  history: RouterHistory,\n  customReducers?: Object,\n  initialState?: $Shape<ReduxState>\n): { history: RouterHistory, store: ReduxStore } => {\n  let composeEnhancers = compose;\n\n  if (process.env.NODE_ENV !== \"production\" && typeof window !== \"undefined\") {\n    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;\n  }\n\n  const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({\n    ...customReducers,\n    ...createReducer(),\n  });\n\n  const middleware = applyMiddleware(\n    modularUIMiddleware,\n    routerMiddleware(history),\n    thunk\n  );\n\n  const enhancers = composeEnhancers(middleware);\n\n  const store: ReduxStore = createReduxStore(\n    combinedReducers,\n    initialState,\n    enhancers\n  );\n\n  if (!initialState?.router) {\n    store.dispatch(locationChange(history.location, \"PUSH\"));\n  }\n  return { history, store };\n};\n\nexport default configureStore;\n"],"mappings":";;;;;;;AACA;AAMA;AAEA;AACA;AAEA;AACA;AAMA;AACA;AACA,MAAMA,cAAc,GAAG,CACrBC,OAAsB,EACtBC,cAAuB,EACvBC,YAAiC,KACiB;EAClD,IAAIC,gBAAgB,GAAGC,cAAO;EAE9B,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IAC1EL,gBAAgB,GAAGK,MAAM,CAACC,oCAAoC,IAAIL,cAAO;EAC3E;EAEA,MAAMM,gBAAkD,GAAG,IAAAC,sBAAe,EAAC;IACzE,GAAGV,cAAc;IACjB,GAAG,IAAAW,4BAAa;EAClB,CAAC,CAAC;EAEF,MAAMC,UAAU,GAAG,IAAAC,sBAAe,EAChCC,wCAAmB,EACnB,IAAAC,kCAAgB,EAAChB,OAAO,CAAC,EACzBiB,mBAAK,CACN;EAED,MAAMC,SAAS,GAAGf,gBAAgB,CAACU,UAAU,CAAC;EAE9C,MAAMM,KAAiB,GAAG,IAAAC,kBAAgB,EACxCV,gBAAgB,EAChBR,YAAY,EACZgB,SAAS,CACV;EAED,IAAI,CAAChB,YAAY,EAAEmB,MAAM,EAAE;IACzBF,KAAK,CAACG,QAAQ,CAAC,IAAAC,6BAAc,EAACvB,OAAO,CAACwB,QAAQ,EAAE,MAAM,CAAC,CAAC;EAC1D;EACA,OAAO;IAAExB,OAAO;IAAEmB;EAAM,CAAC;AAC3B,CAAC;AAAC,eAEapB,cAAc;AAAA"}
+{"version":3,"file":"configureStore.js","names":["configureStore","routerHistory","customReducers","initialState","composeEnhancers","compose","process","env","NODE_ENV","window","__REDUX_DEVTOOLS_EXTENSION_COMPOSE__","combinedReducers","combineReducers","createReducer","middleware","applyMiddleware","modularUIMiddleware","routerMiddleware","thunk","enhancers","store","createReduxStore","router","dispatch","locationChange","location"],"sources":["../../../src/redux/store/configureStore.js"],"sourcesContent":["// @flow\nimport {\n  applyMiddleware,\n  compose,\n  combineReducers,\n  createStore as createReduxStore,\n} from \"redux\";\nimport thunk from \"redux-thunk\";\n\nimport { routerMiddleware } from \"../_router/RouterMiddleware\";\nimport { modularUIMiddleware } from \"../_modularui/ModularUIMiddleware\";\n\nimport { createReducer } from \"../reducers/createReducer\";\nimport { locationChange } from \"../_router/RouterActions\";\n\nimport type { RouterHistory } from \"react-router\";\nimport type { ReduxAction, ReduxState, ReduxStore } from \"../types\";\nimport type { Reducer } from \"redux\";\n\n/**\n */\nconst configureStore = (\n  routerHistory: RouterHistory,\n  customReducers?: Object,\n  initialState?: $Shape<ReduxState>\n): { routerHistory: RouterHistory, store: ReduxStore } => {\n  let composeEnhancers = compose;\n\n  if (process.env.NODE_ENV !== \"production\" && typeof window !== \"undefined\") {\n    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;\n  }\n\n  const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({\n    ...customReducers,\n    ...createReducer(),\n  });\n\n  const middleware = applyMiddleware(\n    modularUIMiddleware,\n    routerMiddleware(routerHistory),\n    thunk\n  );\n\n  const enhancers = composeEnhancers(middleware);\n\n  const store: ReduxStore = createReduxStore(\n    combinedReducers,\n    initialState,\n    enhancers\n  );\n\n  if (!initialState?.router) {\n    store.dispatch(locationChange(routerHistory.location, \"PUSH\"));\n  }\n  return { routerHistory, store };\n};\n\nexport default configureStore;\n"],"mappings":";;;;;;;AACA;AAMA;AAEA;AACA;AAEA;AACA;AAMA;AACA;AACA,MAAMA,cAAc,GAAG,CACrBC,aAA4B,EAC5BC,cAAuB,EACvBC,YAAiC,KACuB;EACxD,IAAIC,gBAAgB,GAAGC,cAAO;EAE9B,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IAC1EL,gBAAgB,GAAGK,MAAM,CAACC,oCAAoC,IAAIL,cAAO;EAC3E;EAEA,MAAMM,gBAAkD,GAAG,IAAAC,sBAAe,EAAC;IACzE,GAAGV,cAAc;IACjB,GAAG,IAAAW,4BAAa;EAClB,CAAC,CAAC;EAEF,MAAMC,UAAU,GAAG,IAAAC,sBAAe,EAChCC,wCAAmB,EACnB,IAAAC,kCAAgB,EAAChB,aAAa,CAAC,EAC/BiB,mBAAK,CACN;EAED,MAAMC,SAAS,GAAGf,gBAAgB,CAACU,UAAU,CAAC;EAE9C,MAAMM,KAAiB,GAAG,IAAAC,kBAAgB,EACxCV,gBAAgB,EAChBR,YAAY,EACZgB,SAAS,CACV;EAED,IAAI,CAAChB,YAAY,EAAEmB,MAAM,EAAE;IACzBF,KAAK,CAACG,QAAQ,CAAC,IAAAC,6BAAc,EAACvB,aAAa,CAACwB,QAAQ,EAAE,MAAM,CAAC,CAAC;EAChE;EACA,OAAO;IAAExB,aAAa;IAAEmB;EAAM,CAAC;AACjC,CAAC;AAAC,eAEapB,cAAc;AAAA"}

package/lib/redux/types.js.flow

@@ -21,6 +21,7 @@ import type {
   UpdateStatusAction,
   SetModelAction,
   UpdateModelAction,
+  UpdateFormAction,
   RemoveModelByKeyAction,
   ResetModularUIAction,
   InitModelAction,
@@ -138,6 +139,7 @@ export type ReduxAction =
   | SetModelAction
   | InitModelAction
   | UpdateModelAction
+  | UpdateFormAction
   | RemoveModelByKeyAction
   | ResetModularUIAction
   | SaveErrorAction

package/lib/redux/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/redux/types.js"],"sourcesContent":["// @flow\nimport type { Store, DispatchAPI } from \"redux\";\n\nimport type ErrorResponse from \"../models/error/ErrorResponse\";\n\nimport type FormModel from \"../models/form/FormModel\";\nimport typeof {\n  NOTIFICATION_TYPES,\n  AUTOSAVE_STATUS,\n} from \"../constants/Constants\";\n\nimport type { MessageObject } from \"../i18n/types\";\nimport type {\n  I18nState,\n  UpdateLocaleAction,\n  SetLocalesAction,\n} from \"./_i18n/types\";\nimport type {\n  ModularUIState,\n  ModularUIAction,\n  UpdateStatusAction,\n  SetModelAction,\n  UpdateModelAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  InitModelAction,\n} from \"./_modularui/types\";\nimport type {\n  RouterState,\n  LocationChangeAction,\n  PushAction,\n  ReplaceAction,\n  GoAction,\n  GoBackAction,\n  GoForwardAction,\n} from \"./_router/types\";\n\nexport type PreferenceValue =\n  | null\n  | string\n  | boolean\n  | { [key: string]: any }\n  | Array<PreferenceValue>;\n\nexport type UpdateFormOptions = {\n  autosubmit: boolean,\n  autosave: boolean,\n  forceUpdate?: boolean,\n  /** Default true: Activate/deactivate the form object validate by an update */\n  validate?: boolean,\n};\n\nexport type NoAction = {\n  type: \"NO_ACTION\",\n};\n\nexport type SaveErrorAction = {\n  type: \"SAVE_ERROR\",\n  payload: ErrorResponse,\n};\n\nexport type ShowModalAction = {\n  type: \"SHOW_MODAL\",\n  payload: string,\n};\n\nexport type CloseModalAction = {\n  type: \"CLOSE_MODAL\",\n  payload: string,\n};\n\nexport type DismissNotificationAction = {\n  type: \"DISMISS_NOTIFICATION\",\n};\nexport type ShowNotificationAction = {\n  type: \"SHOW_NOTIFICATION\",\n  payload: {\n    type: $Keys<NOTIFICATION_TYPES>,\n    message: MessageObject,\n    error: ?ErrorResponse,\n  },\n};\n\nexport type SetPreferenceAction = {\n  type: \"SET_PREFERENCE\",\n  payload: { [name: string]: PreferenceValue },\n};\nexport type SetPreferencesAction = {\n  type: \"SET_PREFERENCES\",\n  payload: { [name: string]: PreferenceValue },\n};\n\nexport type StartProgressAction = {\n  type: \"START_PROGRESS\",\n};\nexport type FinishProgressAction = {\n  type: \"FINISH_PROGRESS\",\n};\nexport type ResetProgressAction = {\n  type: \"RESET_PROGRESS\",\n};\nexport type UpdateProgressAction = {\n  type: \"UPDATE_PROGRESS\",\n  payload: { percentComplete: number },\n};\n\nexport type SendAuthenticationErrorAction = {\n  type: \"AUTHENTICATION_ERROR\",\n  payload: string,\n};\n\nexport type ResetAuthErrorsAction = {\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n};\n\nexport type LoginSuccessAction = {\n  type: \"AUTHENTICATION_SUCCESS\",\n};\n\nexport type ChangePasswordAction = {\n  type: \"CHANGE_PASSWORD\",\n};\n\nexport type LogoutSuccessAction = {\n  type: \"AUTHENTICATION_LOGOUT\",\n};\n\nexport type UpdateAutosaveAction = {\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status: $Keys<AUTOSAVE_STATUS>,\n    model: FormModel,\n  },\n};\n\nexport type ReduxAction =\n  | UpdateStatusAction\n  | SetModelAction\n  | InitModelAction\n  | UpdateModelAction\n  | RemoveModelByKeyAction\n  | ResetModularUIAction\n  | SaveErrorAction\n  | UpdateLocaleAction\n  | SetLocalesAction\n  | ShowModalAction\n  | CloseModalAction\n  | DismissNotificationAction\n  | ShowNotificationAction\n  | SetPreferenceAction\n  | SetPreferencesAction\n  | StartProgressAction\n  | FinishProgressAction\n  | ResetProgressAction\n  | UpdateProgressAction\n  | ResetAuthErrorsAction\n  | SendAuthenticationErrorAction\n  | LoginSuccessAction\n  | ChangePasswordAction\n  | LogoutSuccessAction\n  | UpdateAutosaveAction\n  | LocationChangeAction\n  | PushAction\n  | ReplaceAction\n  | GoAction\n  | GoBackAction\n  | GoForwardAction\n  | ModularUIAction\n  | NoAction;\n\n// Redux state\nexport type AuthState = {\n  +mustChangePassword: boolean,\n  +error: ?string,\n};\n\nexport type ErrorState = null | ErrorResponse;\n\nexport type ModalState = {\n  +key: string,\n  +visible: boolean,\n  +size?: string,\n};\n\nexport type ModalsState = {\n  +modals: Array<ModalState>,\n};\n\nexport type NotificationState = {\n  +render: boolean,\n  +messageType: string | null,\n  +message: MessageObject | null,\n  +error: ?ErrorResponse | null,\n};\n\nexport type PreferencesState = {\n  +[name: string]: PreferenceValue,\n};\n\nexport type ProgressIndicatorState = {\n  +count: number,\n  +timestamp: number,\n  +percentComplete: number,\n};\n\nexport type ReduxState = {\n  +router: RouterState,\n  +modularui: ModularUIState,\n  +i18n: I18nState,\n  +auth: AuthState,\n  +error: ErrorState,\n  +modals: ModalsState,\n  +notification: NotificationState,\n  +progressindicator: ProgressIndicatorState,\n  +preferences: PreferencesState,\n  ...\n};\n\nexport type GetState = () => ReduxState;\nexport type ThunkAction = (dispatch: Dispatch, getState: GetState) => any;\nexport type PromiseAction = Promise<PossibleAction>;\nexport type Dispatch = DispatchAPI<PossibleAction>;\nexport type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;\n\nexport type PossibleAction = ReduxAction | ThunkAction | PromiseAction;\n\nexport type CustomReducers = { [reducerKey: string]: any };\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/redux/types.js"],"sourcesContent":["// @flow\nimport type { Store, DispatchAPI } from \"redux\";\n\nimport type ErrorResponse from \"../models/error/ErrorResponse\";\n\nimport type FormModel from \"../models/form/FormModel\";\nimport typeof {\n  NOTIFICATION_TYPES,\n  AUTOSAVE_STATUS,\n} from \"../constants/Constants\";\n\nimport type { MessageObject } from \"../i18n/types\";\nimport type {\n  I18nState,\n  UpdateLocaleAction,\n  SetLocalesAction,\n} from \"./_i18n/types\";\nimport type {\n  ModularUIState,\n  ModularUIAction,\n  UpdateStatusAction,\n  SetModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  InitModelAction,\n} from \"./_modularui/types\";\nimport type {\n  RouterState,\n  LocationChangeAction,\n  PushAction,\n  ReplaceAction,\n  GoAction,\n  GoBackAction,\n  GoForwardAction,\n} from \"./_router/types\";\n\nexport type PreferenceValue =\n  | null\n  | string\n  | boolean\n  | { [key: string]: any }\n  | Array<PreferenceValue>;\n\nexport type UpdateFormOptions = {\n  autosubmit: boolean,\n  autosave: boolean,\n  forceUpdate?: boolean,\n  /** Default true: Activate/deactivate the form object validate by an update */\n  validate?: boolean,\n};\n\nexport type NoAction = {\n  type: \"NO_ACTION\",\n};\n\nexport type SaveErrorAction = {\n  type: \"SAVE_ERROR\",\n  payload: ErrorResponse,\n};\n\nexport type ShowModalAction = {\n  type: \"SHOW_MODAL\",\n  payload: string,\n};\n\nexport type CloseModalAction = {\n  type: \"CLOSE_MODAL\",\n  payload: string,\n};\n\nexport type DismissNotificationAction = {\n  type: \"DISMISS_NOTIFICATION\",\n};\nexport type ShowNotificationAction = {\n  type: \"SHOW_NOTIFICATION\",\n  payload: {\n    type: $Keys<NOTIFICATION_TYPES>,\n    message: MessageObject,\n    error: ?ErrorResponse,\n  },\n};\n\nexport type SetPreferenceAction = {\n  type: \"SET_PREFERENCE\",\n  payload: { [name: string]: PreferenceValue },\n};\nexport type SetPreferencesAction = {\n  type: \"SET_PREFERENCES\",\n  payload: { [name: string]: PreferenceValue },\n};\n\nexport type StartProgressAction = {\n  type: \"START_PROGRESS\",\n};\nexport type FinishProgressAction = {\n  type: \"FINISH_PROGRESS\",\n};\nexport type ResetProgressAction = {\n  type: \"RESET_PROGRESS\",\n};\nexport type UpdateProgressAction = {\n  type: \"UPDATE_PROGRESS\",\n  payload: { percentComplete: number },\n};\n\nexport type SendAuthenticationErrorAction = {\n  type: \"AUTHENTICATION_ERROR\",\n  payload: string,\n};\n\nexport type ResetAuthErrorsAction = {\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n};\n\nexport type LoginSuccessAction = {\n  type: \"AUTHENTICATION_SUCCESS\",\n};\n\nexport type ChangePasswordAction = {\n  type: \"CHANGE_PASSWORD\",\n};\n\nexport type LogoutSuccessAction = {\n  type: \"AUTHENTICATION_LOGOUT\",\n};\n\nexport type UpdateAutosaveAction = {\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status: $Keys<AUTOSAVE_STATUS>,\n    model: FormModel,\n  },\n};\n\nexport type ReduxAction =\n  | UpdateStatusAction\n  | SetModelAction\n  | InitModelAction\n  | UpdateModelAction\n  | UpdateFormAction\n  | RemoveModelByKeyAction\n  | ResetModularUIAction\n  | SaveErrorAction\n  | UpdateLocaleAction\n  | SetLocalesAction\n  | ShowModalAction\n  | CloseModalAction\n  | DismissNotificationAction\n  | ShowNotificationAction\n  | SetPreferenceAction\n  | SetPreferencesAction\n  | StartProgressAction\n  | FinishProgressAction\n  | ResetProgressAction\n  | UpdateProgressAction\n  | ResetAuthErrorsAction\n  | SendAuthenticationErrorAction\n  | LoginSuccessAction\n  | ChangePasswordAction\n  | LogoutSuccessAction\n  | UpdateAutosaveAction\n  | LocationChangeAction\n  | PushAction\n  | ReplaceAction\n  | GoAction\n  | GoBackAction\n  | GoForwardAction\n  | ModularUIAction\n  | NoAction;\n\n// Redux state\nexport type AuthState = {\n  +mustChangePassword: boolean,\n  +error: ?string,\n};\n\nexport type ErrorState = null | ErrorResponse;\n\nexport type ModalState = {\n  +key: string,\n  +visible: boolean,\n  +size?: string,\n};\n\nexport type ModalsState = {\n  +modals: Array<ModalState>,\n};\n\nexport type NotificationState = {\n  +render: boolean,\n  +messageType: string | null,\n  +message: MessageObject | null,\n  +error: ?ErrorResponse | null,\n};\n\nexport type PreferencesState = {\n  +[name: string]: PreferenceValue,\n};\n\nexport type ProgressIndicatorState = {\n  +count: number,\n  +timestamp: number,\n  +percentComplete: number,\n};\n\nexport type ReduxState = {\n  +router: RouterState,\n  +modularui: ModularUIState,\n  +i18n: I18nState,\n  +auth: AuthState,\n  +error: ErrorState,\n  +modals: ModalsState,\n  +notification: NotificationState,\n  +progressindicator: ProgressIndicatorState,\n  +preferences: PreferencesState,\n  ...\n};\n\nexport type GetState = () => ReduxState;\nexport type ThunkAction = (dispatch: Dispatch, getState: GetState) => any;\nexport type PromiseAction = Promise<PossibleAction>;\nexport type Dispatch = DispatchAPI<PossibleAction>;\nexport type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;\n\nexport type PossibleAction = ReduxAction | ThunkAction | PromiseAction;\n\nexport type CustomReducers = { [reducerKey: string]: any };\n"],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.27.5",
+  "version": "1.28.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -33,8 +33,8 @@
     "test:ci": "jest --ci",
     "test:changed": "jest --onlyChanged",
     "upgrade-interactive": "npm-check -u",
-    "release": "standard-version",
-    "beta-release": "standard-version --prerelease beta",
+    "release": "commit-and-tag-version",
+    "beta-release": "commit-and-tag-version --prerelease beta",
     "prepublishOnly": "npm run build",
     "docs": "node ./.build/docs.mjs",
     "prepare": "husky install",
@@ -72,8 +72,8 @@
   "peerDependencies": {
     "history": "^4.0.0",
     "polished": "^4.0.0",
-    "react": "^16.14.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
     "react-helmet-async": "^1.0.0",
     "react-redux": "^7.0.0 || ^8.0.0",
     "react-router": "^5.0.0",
@@ -87,9 +87,7 @@
     "date-fns": "^2.29.3",
     "deepmerge": "^4.3.0",
     "dequal": "^2.0.3",
-    "element-closest": "^3.0.2",
     "file-size": "^1.0.0",
-    "focus-visible": "^5.2.0",
     "format-message": "^6.2.4",
     "he": "^1.2.0",
     "iban": "^0.0.14",
@@ -110,39 +108,40 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-flow": "^7.18.6",
     "@babel/preset-react": "^7.18.6",
-    "@commitlint/cli": "^17.4.2",
-    "@commitlint/config-conventional": "^17.4.2",
-    "@testing-library/react": "^13.4.0",
+    "@commitlint/cli": "^17.4.4",
+    "@commitlint/config-conventional": "^17.4.4",
+    "@testing-library/react": "^14.0.0",
     "auditjs": "^4.0.39",
-    "babel-jest": "^29.4.1",
+    "babel-jest": "^29.4.3",
     "babel-plugin-styled-components": "^2.0.7",
     "cherry-pick": "^0.5.0",
+    "commit-and-tag-version": "^11.1.0",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.1",
-    "eslint": "^8.33.0",
+    "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^2.0.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsdoc": "^39.8.0",
+    "eslint-plugin-jsdoc": "^40.0.0",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
-    "flow-bin": "^0.199.1",
+    "flow-bin": "^0.200.0",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.8.0",
     "glob": "^8.1.0",
     "history": "^4.0.0",
     "husky": "^8.0.3",
-    "jest": "^29.4.1",
-    "jest-environment-jsdom": "^29.4.1",
+    "jest": "^29.4.3",
+    "jest-environment-jsdom": "^29.4.3",
     "jest-junit": "^15.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.14.0",
-    "lint-staged": "^13.1.0",
+    "lint-staged": "^13.1.2",
     "polished": "^4.0.0",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.4",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-helmet-async": "^1.0.0",
@@ -153,7 +152,6 @@
     "redux-mock-store": "^1.5.4",
     "redux-thunk": "^2.4.2",
     "rimraf": "^4.1.2",
-    "standard-version": "^9.5.0",
     "styled-components": "^5.3.6",
     "xhr-mock": "^2.5.1"
   },

package/src/constants/LayoutHintConfig.js

@@ -109,15 +109,6 @@ export const LayoutHintConfiguration = {
     link: "",
     component: ["attribute/number"],
   },
-  IGNORE_FORMAT_SETTING: {
-    hint: "ignore-format-setting",
-    description: {
-      NL: "Maakt het mogelijk om de global date format setting te negeren voor een specifiek attribuut",
-      EN: "Makes it possible to ignore the global date format for a specific attribute",
-    },
-    link: "",
-    component: ["attribute/date", "attribute/datetime"],
-  },
   CREATE_ACTION: {
     hint: "create",
     description: {

package/src/constants/LayoutHints.js

@@ -53,10 +53,6 @@ export const SORT_OPTIONS: string = getHint("SORT_OPTIONS");
  * Layout-hint: Marks an attribute as a title attribute
  */
 export const TITLE: string = getHint("TITLE");
-/**
- * Layout-hint: Ignore the global input format for specific attribute
- */
-export const IGNORE_FORMAT_SETTING: string = getHint("IGNORE_FORMAT_SETTING");
 
 /*
  * --------------------------------

package/src/constants/Settings.js

@@ -97,12 +97,6 @@ const defaultSettings: { [name: string]: Setting } = {
     "/Library/KMTs/Business scenarios.bixml/Persona",
   ],
 
-  // Input format for dates. Without this setting having a value, the contributions format is used
-  DATE_INPUT_FORMAT: "",
-
-  // Readonly format for dates.  Without this setting having a value, the contributions format is used
-  DATE_READONLY_FORMAT: "",
-
   // indicates on what day the week starts (0 = Sunday)
   CALENDAR_WEEK_STARTS_ON: 1,
 

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

@@ -140,7 +140,7 @@ describe("form hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       {
-        type: "MODULARUI/UPDATE",
+        type: "MODULARUI/UPDATE_FORM",
         payload: expect.objectContaining({ _key: "form" }),
       },
     ]);
@@ -252,7 +252,7 @@ describe("form hooks", () => {
     result.current(zipCode, "1234AB");
     expect(store.getActions()).toStrictEqual([
       expect.objectContaining({
-        type: "MODULARUI/UPDATE",
+        type: "MODULARUI/UPDATE_FORM",
       }),
     ]);
   });
@@ -278,7 +278,7 @@ describe("form hooks", () => {
     result.current.save();
 
     expect(store.getActions()).toStrictEqual([
-      expect.objectContaining({ type: "MODULARUI/UPDATE" }),
+      expect.objectContaining({ type: "MODULARUI/UPDATE_FORM" }),
     ]);
 
     store.clearActions();
@@ -286,7 +286,7 @@ describe("form hooks", () => {
     result.current.cancel(form.currentFormObject);
 
     expect(store.getActions()).toStrictEqual([
-      expect.objectContaining({ type: "MODULARUI/UPDATE" }),
+      expect.objectContaining({ type: "MODULARUI/UPDATE_FORM" }),
     ]);
 
     store.clearActions();

package/src/hooks/useForm.js

@@ -24,11 +24,11 @@ import type { FormObjectModel, AttributeType } from "../models";
 import type { UpdateFormOptions } from "../redux/types";
 import type {
   RemoveModelByKeyAction,
-  UpdateModelAction,
+  UpdateFormAction,
 } from "../redux/_modularui";
 
 type FormNavigationHook = {
-  previous: (form: FormModel) => UpdateModelAction,
+  previous: (form: FormModel) => UpdateFormAction,
   cancel: (form: FormModel) => void,
   submit: (form: FormModel) => void,
   showFormNotification: (form: FormModel) => void,
@@ -36,9 +36,9 @@ type FormNavigationHook = {
 };
 
 type AttributeSetHook = {
-  save: () => UpdateModelAction,
-  cancel: (object: FormObjectModel) => UpdateModelAction,
-  remove: (object: FormObjectModel) => UpdateModelAction,
+  save: () => UpdateFormAction,
+  cancel: (object: FormObjectModel) => UpdateFormAction,
+  remove: (object: FormObjectModel) => UpdateFormAction,
 };
 
 type AttributeUpdateHook = (

package/src/models/attributes/ChoiceAttributeModel.js

@@ -324,6 +324,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
     }
     values.forEach((val) => {
       if (val instanceof ChoiceAttributeOptionModel) {
+        // option does not exist in existing options, add it. This can happen when lookup list has other options then lookup options
         if (!this.options.some((option) => option.equals(val))) {
           this.options.add(val);
         }