@beinformed/ui 1.17.2 → 1.18.1

package/src/redux/actions/FormAttributeSet.js

@@ -35,10 +35,7 @@ export const updateFormAttribute =
       options.validate = true;
     }
 
-    if (
-      newForm.currentFormObject &&
-      newForm.currentFormObject.equals(formObject)
-    ) {
+    if (newForm.currentFormObject?.equals(formObject)) {
       newForm.currentFormObject.updateAttribute(attribute, inputvalue);
     } else {
       newForm.completedFormObjects.forEach((completeObject) => {
@@ -64,22 +61,12 @@ export const updateFormAttribute =
     }
 
     if (
-      newForm.currentFormObject &&
       options.validate &&
-      newForm.currentFormObject.hasDynamicValidations &&
+      newForm.currentFormObject?.hasDynamicValidations &&
       getSetting("USE_INSTANT_SERVER_VALIDATION")
     ) {
+      // server form validations happens async, don't wait for the form to return
       dispatch(validateFormObject(newForm));
     }
-
     return dispatch(updateModel(newForm));
   };
-
-/**
- * Validate an attribute on a form
- */
-export const validateFormAttribute =
-  (form: FormModel): ThunkAction =>
-  (dispatch: Dispatch) => {
-    return dispatch(validateFormObject(form));
-  };

package/src/redux/actions/Preferences.js

@@ -2,14 +2,23 @@
 import { isPlainObject } from "../../utils/helpers/objects";
 
 import { JsonParseException } from "../../exceptions";
-import { setSettings, setSetting } from "../../constants/Settings";
+import { setSetting, setSettings } from "../../constants/Settings";
 
 import type {
   PreferenceValue,
   ReduxState,
   SetPreferenceAction,
+  SetPreferencesAction,
 } from "../types";
-import { ALL_CONTENT_IN_DATA_SETTING } from "../../constants";
+
+import {
+  BASE,
+  ALL_CONTENT_IN_DATA_SETTING,
+  LOGIN_PASSWORD_SETTING,
+  LOGIN_PATH_SETTING,
+  LOGIN_USERNAME_SETTING,
+  LOGOUT_PATH_SETTING,
+} from "../../constants";
 
 /**
  */
@@ -57,6 +66,15 @@ export const setPreference = (
   },
 });
 
+/**
+ */
+export const setPreferences = (preferences: Object): SetPreferencesAction => ({
+  type: "SET_PREFERENCES",
+  payload: {
+    ...preferences,
+  },
+});
+
 /**
  */
 export const setThemePreference = (
@@ -97,3 +115,32 @@ export const setAllContentInDataSetting = (
   setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);
   return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);
 };
+
+/**
+ * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer
+ */
+export const setLoginPreferences = (
+  state?: ReduxState
+): SetPreferencesAction => {
+  const loginSettings = {
+    [LOGIN_PATH_SETTING]: getServerPreferenceValue(
+      LOGIN_PATH_SETTING,
+      state?.preferences[LOGIN_PATH_SETTING] ?? `${BASE}/j_security_check`
+    ),
+    [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(
+      LOGIN_USERNAME_SETTING,
+      state?.preferences[LOGIN_USERNAME_SETTING] ?? "j_username"
+    ),
+    [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(
+      LOGIN_PASSWORD_SETTING,
+      state?.preferences[LOGIN_PASSWORD_SETTING] ?? "j_password"
+    ),
+    [LOGOUT_PATH_SETTING]: getServerPreferenceValue(
+      LOGOUT_PATH_SETTING,
+      state?.preferences[LOGOUT_PATH_SETTING] ?? `${BASE}/Logoff`
+    ),
+  };
+
+  setSettings(loginSettings);
+  return setPreferences(loginSettings);
+};

package/src/redux/actions/__tests__/Preferences.spec.js

@@ -4,6 +4,7 @@ import thunk from "redux-thunk";
 import {
   setServerPreference,
   setPreference,
+  setPreferences,
   setThemePreference,
 } from "../Preferences";
 
@@ -31,6 +32,16 @@ describe("preference actions", () => {
     ]);
   });
 
+  it("set preferences", () => {
+    const store = mockStore({ preferences: {} });
+
+    store.dispatch(setPreferences({ name: "value" }));
+
+    expect(store.getActions()).toStrictEqual([
+      { type: "SET_PREFERENCES", payload: { name: "value" } },
+    ]);
+  });
+
   it("theme settings", () => {
     const store = mockStore({ preferences: {} });
 

package/src/redux/reducers/PreferencesReducer.js

@@ -11,7 +11,14 @@ const PreferencesReducer: Reducer<PreferencesState, ReduxAction> = (
   state = initialState,
   action
 ) => {
-  if (action && action.type === "SET_PREFERENCE") {
+  if (action?.type === "SET_PREFERENCE") {
+    return {
+      ...state,
+      ...action.payload,
+    };
+  }
+
+  if (action?.type === "SET_PREFERENCES") {
     return {
       ...state,
       ...action.payload,

package/src/redux/reducers/__tests__/PreferencesReducer.spec.js

@@ -16,4 +16,16 @@ describe("preferences reducer", () => {
       name: "value",
     });
   });
+
+  it("should handle SET_PREFERENCES", () => {
+    expect(
+      PreferencesReducer([], {
+        type: "SET_PREFERENCES",
+        payload: { name: "value", name2: "value2" },
+      })
+    ).toStrictEqual({
+      name: "value",
+      name2: "value2",
+    });
+  });
 });

package/src/redux/types.js

@@ -84,6 +84,10 @@ export type SetPreferenceAction = {
   type: "SET_PREFERENCE",
   payload: { [name: string]: PreferenceValue },
 };
+export type SetPreferencesAction = {
+  type: "SET_PREFERENCES",
+  payload: { [name: string]: PreferenceValue },
+};
 
 export type StartProgressAction = {
   type: "START_PROGRESS",
@@ -142,6 +146,7 @@ export type ReduxAction =
   | DismissNotificationAction
   | ShowNotificationAction
   | SetPreferenceAction
+  | SetPreferencesAction
   | StartProgressAction
   | FinishProgressAction
   | ResetProgressAction