@beinformed/ui 1.20.2 → 1.20.5

package/src/models/form/FormModel.js

@@ -1,7 +1,6 @@
 // @flow
 import flattenDeep from "lodash/flattenDeep";
 import deepmerge from "deepmerge";
-import { get } from "lodash";
 
 import { has } from "../../utils/helpers/objects";
 
@@ -156,11 +155,11 @@ class FormModel extends ResourceModel {
   ): string | null {
     // cancel button labels are defined on the form
     if (buttonType === "cancel") {
-      return get(this.buttonLabels, "cancel", null);
+      return this.buttonLabels?.cancel ?? null;
     }
 
     // all other form related button labels are defined on the object
-    return get(this.currentFormObject?.buttonLabels, buttonType, null);
+    return this.currentFormObject?.buttonLabels?.[buttonType] ?? null;
   }
 
   /**

package/src/redux/_modularui/actions.js

@@ -116,10 +116,7 @@ export const loadModel = (
         return {
           type: "NO_ACTION",
         };
-      } else if (
-        errorResponse.isResourceNotFoundAfterReload ||
-        errorResponse.isInvalidUsername
-      ) {
+      } else if (errorResponse.isResourceNotFoundAfterReload) {
         return removeModelByKey(key);
       }
 

package/src/redux/actions/Authorization.js

@@ -1,11 +1,8 @@
 // @flow
-import { LOGIN_PATH, NOTIFICATION_TYPES } from "../../constants/Constants";
-
 import ErrorResponse from "../../models/error/ErrorResponse";
 
 import { replace } from "../_router/actions";
 import { logoutSuccess } from "./SignOut";
-import { showNotification } from "./Notification";
 
 import Cache from "../../utils/browser/Cache";
 
@@ -16,6 +13,7 @@ import { reloadApplication } from "./Application";
 import { getSetting } from "../../constants";
 
 import type { ThunkAction } from "../types";
+import { sendAuthenticationError } from "./SignIn";
 
 /**
  */
@@ -40,28 +38,18 @@ export const handleUnauthorized =
       dispatch(reloadApplication());
     }
 
-    // set logged auth
+    // set logged out
     dispatch(logoutSuccess());
 
     Cache.removeItem("auth");
 
     if (errorResponse.isInvalidUsername) {
-      const WARNING_TIMEOUT = 4000;
-      dispatch(
-        showNotification(
-          NOTIFICATION_TYPES.WARNING,
-          {
-            id: errorResponse.id,
-            defaultMessage: errorResponse.message,
-          },
-          null,
-          WARNING_TIMEOUT
-        )
-      );
+      dispatch(sendAuthenticationError(errorResponse.message));
     }
 
     // add current location as from location before redirect
     const location = getState().router.location;
+    const LOGIN_PATH = getSetting("LOGIN_PATH", "/signin");
     if (location?.pathname !== LOGIN_PATH) {
       const locationFrom = location?.state?.from;
       return dispatch(

package/src/redux/actions/Error.js

@@ -1,5 +1,6 @@
 // @flow
-import { LOGOUT_PATH, IS_SERVER } from "../../constants/Constants";
+import { IS_SERVER } from "../../constants/Constants";
+import { getSetting } from "../../constants/Settings";
 
 import ErrorResponse from "../../models/error/ErrorResponse";
 
@@ -39,6 +40,7 @@ const defaultErrorResponseHandler: DefaultErrorResponseHandler =
     }
 
     if (error.isBlocked || error.isConcurrentUser) {
+      const LOGOUT_PATH = getSetting("LOGOUT_PATH", "/signout");
       dispatch(push(LOGOUT_PATH));
     }
 

package/src/redux/actions/SignIn.js

@@ -9,7 +9,7 @@ import { push } from "../_router/actions";
 import { CHANGEPASSWORD_PATH } from "../../constants/Constants";
 
 import type {
-  LoginFailedAction,
+  SendAuthenticationErrorAction,
   ResetAuthErrorsAction,
   LoginSuccessAction,
   ThunkAction,
@@ -18,7 +18,16 @@ import type {
 /**
  * Send login failed action
  */
-export const loginFailed = (errorMessage: string): LoginFailedAction => ({
+export const loginFailed = (
+  errorMessage: string
+): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);
+
+/**
+ * Send authentication error action
+ */
+export const sendAuthenticationError = (
+  errorMessage: string
+): SendAuthenticationErrorAction => ({
   type: "AUTHENTICATION_ERROR",
   payload: errorMessage,
 });

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

@@ -60,15 +60,8 @@ describe("authorization actions", () => {
         type: "AUTHENTICATION_LOGOUT",
       },
       {
-        type: "SHOW_NOTIFICATION",
-        payload: {
-          error: null,
-          message: {
-            defaultMessage: "Error.Authentication.InvalidUsername",
-            id: "Error.Authentication.InvalidUsername",
-          },
-          type: "WARNING",
-        },
+        type: "AUTHENTICATION_ERROR",
+        payload: "Error.Authentication.InvalidUsername",
       },
       {
         type: "ROUTER/REPLACE",
@@ -114,15 +107,8 @@ describe("authorization actions", () => {
         type: "AUTHENTICATION_LOGOUT",
       },
       {
-        type: "SHOW_NOTIFICATION",
-        payload: {
-          error: null,
-          message: {
-            defaultMessage: "Error.Authentication.InvalidUsername",
-            id: "Error.Authentication.InvalidUsername",
-          },
-          type: "WARNING",
-        },
+        type: "AUTHENTICATION_ERROR",
+        payload: "Error.Authentication.InvalidUsername",
       },
       {
         type: "ROUTER/REPLACE",

package/src/redux/index.js

@@ -21,4 +21,7 @@ export * from "./connectors/index";
 // REDUCERS
 export * from "./reducers/index";
 
+// SELECTORS
+export * from "./selectors/index";
+
 export type * from "./types";

package/src/redux/selectors/index.js

@@ -0,0 +1,2 @@
+// @flow
+export * from "./i18n";

package/src/redux/types.js

@@ -103,7 +103,7 @@ export type UpdateProgressAction = {
   payload: { percentComplete: number },
 };
 
-export type LoginFailedAction = {
+export type SendAuthenticationErrorAction = {
   type: "AUTHENTICATION_ERROR",
   payload: string,
 };
@@ -151,8 +151,8 @@ export type ReduxAction =
   | FinishProgressAction
   | ResetProgressAction
   | UpdateProgressAction
-  | LoginFailedAction
   | ResetAuthErrorsAction
+  | SendAuthenticationErrorAction
   | LoginSuccessAction
   | ChangePasswordAction
   | LogoutSuccessAction