@beinformed/ui 1.27.5 → 1.27.6

package/src/redux/actions/Form.js

@@ -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/src/redux/actions/FormAttributeSet.js

@@ -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/src/redux/actions/FormAttributeSetRepeatable.js

@@ -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/src/redux/actions/FormAutosave.js

@@ -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/src/redux/actions/FormValidations.js

@@ -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/src/redux/actions/__tests__/Form.spec.js

@@ -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/src/redux/connectors/Form.js

@@ -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/src/redux/connectors/FormAttributeSet.js

@@ -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/src/redux/types.js

@@ -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