@beinformed/ui 1.65.0 → 1.65.2

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

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["_Cache","_interopRequireDefault","require","_Authenticate","_ModularUISelectors","_Error","_Application","_ProgressIndicator","_RouterActions","_Constants","loginFailed","errorMessage","sendAuthenticationError","exports","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","push","CHANGEPASSWORD_PATH","login","username","password","startProgress","Authenticate","then","reloadApplication","Cache","addItem","application","getApplication","userMustChangePassword","finishProgress","catch","error","id","dispatchedReloadApplication","_promise","default","resolve","handleError"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { handleError } from \"./Error\";\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch, getState) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        const application = getApplication(getState());\n        if (application?.userMustChangePassword) {\n          dispatch(changePassword());\n        } else {\n          dispatch(loginSuccess());\n        }\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            dispatch(changePassword());\n            return dispatch(finishProgress());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(handleError(error));\n      });\n  };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SignIn.js","names":["_Cache","_interopRequireDefault","require","_Authenticate","_ModularUISelectors","_Application","_ProgressIndicator","_RouterActions","_Constants","loginFailed","errorMessage","sendAuthenticationError","exports","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","push","CHANGEPASSWORD_PATH","login","username","password","startProgress","response","Authenticate","reloadApplication","Cache","addItem","application","getApplication","userMustChangePassword","finishProgress","error","id"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  async (dispatch, getState) => {\n    dispatch(startProgress());\n\n    try {\n      const response = await new Authenticate().login(username, password);\n\n      await dispatch(reloadApplication());\n\n      Cache.addItem(\"auth\", true);\n      const application = getApplication(getState());\n\n      if (application?.userMustChangePassword) {\n        dispatch(changePassword());\n      } else {\n        dispatch(loginSuccess());\n      }\n\n      dispatch(finishProgress());\n      return response;\n    } catch (error) {\n      if (error.id === \"Error.ChangePasswordRequired\") {\n        await dispatch(reloadApplication());\n        Cache.addItem(\"auth\", true);\n        dispatch(changePassword());\n      } else {\n        dispatch(loginFailed(error.id));\n      }\n      dispatch(finishProgress());\n      return error;\n    }\n  };\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.65.0",
+  "version": "1.65.2",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",

package/src/hooks/useModularUI.js

@@ -10,24 +10,13 @@ import {
 } from "../redux/_modularui/ModularUIActions";
 
 import useDeepCompareEffect from "./useDeepCompareEffect";
+import { useModularUIKey } from "./useModularUIKey";
 
-import { useLocale } from "./useI18n";
 import Href from "../models/href/Href";
-
 import type { RequestModularUIOptions } from "../utils";
 
 /**
- */
-const useKeyForHook = (modelKey: string, url: string) => {
-  const locale = useLocale();
-  return useMemo(
-    () => `${modelKey}(${url.split("?")[0]})(${locale})`,
-    [modelKey, url, locale],
-  );
-};
-
-/**
- * Use redux action and selector to retrieve the correct modular ui service model
+ * Core hook to retrieve information for a Be Informed modular ui resource
  */
 export const useModularUI = (
   modelKey: string,
@@ -39,7 +28,7 @@ export const useModularUI = (
 ): any => {
   const dispatch = useDispatch();
   const href = useMemo(() => url?.toString() || "", [url]);
-  const key = useKeyForHook(modelKey, href);
+  const key = useModularUIKey(modelKey, href);
 
   const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);
   const model = useSelector(modelSelector);

package/src/hooks/useModularUIBasic.js

@@ -1,12 +1,18 @@
 // @flow
-import type { ModularUIModel, Href } from "../models";
 import { useLocation } from "react-router";
+import { useSelector } from "react-redux";
 import { useMemo } from "react";
 import { useModularUI } from "./useModularUI";
 
+import { MODULARUI_STATUS } from "../constants";
+import { useModularUIKey } from "./useModularUIKey";
+
+import type { ModularUIModel, Href } from "../models";
 export type HookOptions = {
+  key?: string,
   origin?: string,
   contextPath?: string,
+  removeOnUnmount?: boolean,
 };
 
 export type UseModularUIBasicOptions<T: ModularUIModel> = {
@@ -16,13 +22,16 @@ export type UseModularUIBasicOptions<T: ModularUIModel> = {
   origin?: string,
   contextPath?: string,
   cache?: boolean,
+  key?: string,
+  isReload?: boolean,
+  removeOnUnmount?: boolean,
 };
 
 // Helper to create useModularUI options
 const createUseModularUIOptions = <T: ModularUIModel>(
   options: UseModularUIBasicOptions<T>,
   href: string,
-  location: any,
+  mustReload: boolean,
 ): Object => {
   const baseOptions = {
     targetModel: undefined,
@@ -31,6 +40,7 @@ const createUseModularUIOptions = <T: ModularUIModel>(
     origin: undefined,
     contextPath: undefined,
     cache: false,
+    removeOnUnmount: false,
   };
 
   // Handle targetModel and forceTargetModel
@@ -44,11 +54,14 @@ const createUseModularUIOptions = <T: ModularUIModel>(
     baseOptions.cache = options.cache;
   }
 
-  // Check for reload if location matches href
-  if (location.state?.reload && location.pathname.startsWith(href)) {
+  if (mustReload) {
     baseOptions.isReload = true;
   }
 
+  if (options.removeOnUnmount) {
+    baseOptions.removeOnUnmount = true;
+  }
+
   // Handle origin and contextPath options
   baseOptions.origin = options.origin ?? baseOptions.origin;
   baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;
@@ -72,7 +85,7 @@ const validateModel = (model: any, expectedModels: Array<string>) => {
  * useModularUIBasic Hook
  */
 export const useModularUIBasic = <T: ModularUIModel>(
-  key: string,
+  defaultKey: string,
   href: string | Href,
   options: UseModularUIBasicOptions<T> = {
     expectedModels: [],
@@ -80,16 +93,19 @@ export const useModularUIBasic = <T: ModularUIModel>(
     forceTargetModel: false,
     origin: undefined,
     contextPath: undefined,
+    key: undefined,
   },
 ): T | null => {
-  const location = useLocation();
   const memoizedHref = useMemo(() => href.toString(), [href]);
-  const useModularUIOptions = useMemo(
-    () => createUseModularUIOptions(options, memoizedHref, location),
-    [options, memoizedHref, location],
+  const key = options.key ?? defaultKey;
+
+  const mustReload = useReload(key, memoizedHref);
+  const modularUIOptions = useMemo(
+    () => createUseModularUIOptions(options, memoizedHref, mustReload),
+    [options, memoizedHref, mustReload],
   );
 
-  const modularUI = useModularUI(key, href, useModularUIOptions);
+  const modularUI = useModularUI(key, href, modularUIOptions);
   const expectedModels = useMemo(
     () => options.expectedModels ?? [],
     [options.expectedModels],
@@ -103,3 +119,24 @@ export const useModularUIBasic = <T: ModularUIModel>(
     return null;
   }, [expectedModels, modularUI]);
 };
+
+/**
+ * Check if the model corresponding to a modular ui service should be reloaded
+ */
+export const useReload = (modelKey: string, url: string): boolean => {
+  const location = useLocation();
+  const key = useModularUIKey(modelKey, url);
+  const modelEntry = useSelector((state) => state.modularui[key]);
+
+  if (modelEntry) {
+    const reload = location.state?.reload || 0;
+    if (reload > 0) {
+      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;
+      const lastModification = modelEntry?.lastModification ?? 0;
+      if (isFullyLoaded && lastModification < reload) {
+        return true;
+      }
+    }
+  }
+  return false;
+};

package/src/hooks/useModularUIKey.js

@@ -0,0 +1,14 @@
+// @flow
+import { useLocale } from "./useI18n";
+import { useMemo } from "react";
+
+/**
+ * Generates the key that is used in the modular ui reducer of redux
+ */
+export const useModularUIKey = (modelKey: string, url: string): string => {
+  const locale = useLocale();
+  return useMemo(
+    () => `${modelKey}(${url.split("?")[0]})(${locale})`,
+    [modelKey, url, locale],
+  );
+};

package/src/hooks/usePanel.js

@@ -65,11 +65,12 @@ export const usePanel = (
   href?: string | Href,
   options?: HookOptions & { fromRoute?: boolean },
 ): ListModel | GroupingPanelModel | DetailModel | null => {
-  const url = useUrl(href, options?.fromRoute || false);
+  const { fromRoute, ...hookOptions } = options || { fromRoute: false };
+
+  const url = useUrl(href, fromRoute || false);
   const basicOptions = {
     expectedModels: ["List", "GroupingPanel", "Detail"],
-    origin: options?.origin,
-    contextPath: options?.contextPath,
+    ...(hookOptions: HookOptions),
   };
 
   return useModularUIBasic("panel", url, basicOptions);

package/src/models/filters/FilterCollection.js

@@ -194,17 +194,17 @@ export default class FilterCollection extends BaseCollection<FilterType> {
   /**
    */
   get formdata(): { [string]: any } | null {
-    let data = {};
-    this.filter(
-      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),
-    ).forEach((f) => {
-      // $FlowIgnore[cannot-spread-indexer]
-      // $FlowIgnore[exponential-spread]
-      data = {
-        ...data,
-        ...f.formdata,
-      };
-    });
-    return data;
+    const bodyFields = this.filter(
+      (f) =>
+        f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata,
+    );
+
+    if (bodyFields.length === 0) {
+      return null;
+    }
+
+    return bodyFields.reduce((data, f) => {
+      return Object.assign(data, f.formdata);
+    }, {});
   }
 }

package/src/redux/actions/SignIn.js

@@ -3,7 +3,6 @@ import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
 
-import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 
@@ -70,34 +69,34 @@ export const changePassword = (): ThunkAction => (dispatch, getState) => {
  */
 export const login =
   (username: string, password: string): ThunkAction =>
-  (dispatch, getState) => {
+  async (dispatch, getState) => {
     dispatch(startProgress());
 
-    return new Authenticate()
-      .login(username, password)
-      .then(() => dispatch(reloadApplication()))
-      .then(() => {
-        Cache.addItem("auth", true);
-        const application = getApplication(getState());
-        if (application?.userMustChangePassword) {
-          dispatch(changePassword());
-        } else {
-          dispatch(loginSuccess());
-        }
-        return dispatch(finishProgress());
-      })
-      .catch((error) => {
-        if (error.id === "Error.ChangePasswordRequired") {
-          const dispatchedReloadApplication = dispatch(reloadApplication());
+    try {
+      const response = await new Authenticate().login(username, password);
+
+      await dispatch(reloadApplication());
 
-          return Promise.resolve(dispatchedReloadApplication).then(() => {
-            Cache.addItem("auth", true);
-            dispatch(changePassword());
-            return dispatch(finishProgress());
-          });
-        }
+      Cache.addItem("auth", true);
+      const application = getApplication(getState());
 
+      if (application?.userMustChangePassword) {
+        dispatch(changePassword());
+      } else {
+        dispatch(loginSuccess());
+      }
+
+      dispatch(finishProgress());
+      return response;
+    } catch (error) {
+      if (error.id === "Error.ChangePasswordRequired") {
+        await dispatch(reloadApplication());
+        Cache.addItem("auth", true);
+        dispatch(changePassword());
+      } else {
         dispatch(loginFailed(error.id));
-        return dispatch(handleError(error));
-      });
+      }
+      dispatch(finishProgress());
+      return error;
+    }
   };