@beinformed/ui 1.65.0 → 1.65.2

package/esm/redux/actions/SignIn.js

@@ -1,8 +1,6 @@
-import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 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";
 import { push } from "../_router/RouterActions";
@@ -51,9 +49,11 @@ export const changePassword = () => (dispatch, getState) => {
 
 /**
  */
-export const login = (username, password) => (dispatch, getState) => {
+export const login = (username, password) => async (dispatch, getState) => {
   dispatch(startProgress());
-  return new Authenticate().login(username, password).then(() => dispatch(reloadApplication())).then(() => {
+  try {
+    const response = await new Authenticate().login(username, password);
+    await dispatch(reloadApplication());
     Cache.addItem("auth", true);
     const application = getApplication(getState());
     if (application?.userMustChangePassword) {
@@ -61,18 +61,18 @@ export const login = (username, password) => (dispatch, getState) => {
     } else {
       dispatch(loginSuccess());
     }
-    return dispatch(finishProgress());
-  }).catch(error => {
+    dispatch(finishProgress());
+    return response;
+  } catch (error) {
     if (error.id === "Error.ChangePasswordRequired") {
-      const dispatchedReloadApplication = dispatch(reloadApplication());
-      return _Promise.resolve(dispatchedReloadApplication).then(() => {
-        Cache.addItem("auth", true);
-        dispatch(changePassword());
-        return dispatch(finishProgress());
-      });
+      await dispatch(reloadApplication());
+      Cache.addItem("auth", true);
+      dispatch(changePassword());
+    } else {
+      dispatch(loginFailed(error.id));
     }
-    dispatch(loginFailed(error.id));
-    return dispatch(handleError(error));
-  });
+    dispatch(finishProgress());
+    return error;
+  }
 };
 //# sourceMappingURL=SignIn.js.map

package/esm/redux/actions/SignIn.js.flow

@@ -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;
+    }
   };

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

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","getApplication","handleError","reloadApplication","startProgress","finishProgress","push","CHANGEPASSWORD_PATH","loginFailed","errorMessage","sendAuthenticationError","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","login","username","password","then","addItem","application","userMustChangePassword","catch","error","id","dispatchedReloadApplication","_Promise","resolve"],"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","Authenticate","getApplication","reloadApplication","startProgress","finishProgress","push","CHANGEPASSWORD_PATH","loginFailed","errorMessage","sendAuthenticationError","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","login","username","password","response","addItem","application","userMustChangePassword","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":"AACA,OAAOA,KAAK,MAAM,2BAA2B;AAC7C,OAAOC,YAAY,MAAM,8BAA8B;AACvD,SAASC,cAAc,QAAQ,kCAAkC;AAEjE,SAASC,iBAAiB,QAAQ,eAAe;AACjD,SAASC,aAAa,EAAEC,cAAc,QAAQ,qBAAqB;AAEnE,SAASC,IAAI,QAAQ,0BAA0B;AAC/C,SAASC,mBAAmB,QAAQ,2BAA2B;AAS/D;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GACtBC,YAAoB,IACcC,uBAAuB,CAACD,YAAY,CAAC;;AAEzE;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAClCD,YAAoB,KACe;EACnCE,IAAI,EAAE,sBAAsB;EAC5BC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMI,eAAe,GAAGA,CAAA,MAA8B;EAC3DF,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMG,YAAY,GAAGA,CAAA,MAA2B;EACrDH,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMI,cAAc,GAAGA,CAAA,KAAmB,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EACvED,QAAQ,CAAC;IACPL,IAAI,EAAE;EACR,CAAC,CAAC;EAEF,MAAMO,OAAO,GAAGD,QAAQ,CAAC,CAAC,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEC,KAAK;EACxD,MAAMC,YAAY,GAAGN,QAAQ,CAAC,CAAC,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEG,IAAI;EAC5D,OAAOR,QAAQ,CACbV,IAAI,CAACC,mBAAmB,EAAE;IACxBiB,IAAI,EAAED,YAAY,GAAGA,YAAY,GAAGN,QAAQ,CAAC,CAAC,CAACE,MAAM,CAACC,QAAQ;IAC9DE,KAAK,EAAEJ;EACT,CAAC,CACH,CAAC;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,KAAK,GAChBA,CAACC,QAAgB,EAAEC,QAAgB,KACnC,OAAOX,QAAQ,EAAEC,QAAQ,KAAK;EAC5BD,QAAQ,CAACZ,aAAa,CAAC,CAAC,CAAC;EAEzB,IAAI;IACF,MAAMwB,QAAQ,GAAG,MAAM,IAAI3B,YAAY,CAAC,CAAC,CAACwB,KAAK,CAACC,QAAQ,EAAEC,QAAQ,CAAC;IAEnE,MAAMX,QAAQ,CAACb,iBAAiB,CAAC,CAAC,CAAC;IAEnCH,KAAK,CAAC6B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;IAC3B,MAAMC,WAAW,GAAG5B,cAAc,CAACe,QAAQ,CAAC,CAAC,CAAC;IAE9C,IAAIa,WAAW,EAAEC,sBAAsB,EAAE;MACvCf,QAAQ,CAACD,cAAc,CAAC,CAAC,CAAC;IAC5B,CAAC,MAAM;MACLC,QAAQ,CAACF,YAAY,CAAC,CAAC,CAAC;IAC1B;IAEAE,QAAQ,CAACX,cAAc,CAAC,CAAC,CAAC;IAC1B,OAAOuB,QAAQ;EACjB,CAAC,CAAC,OAAOI,KAAK,EAAE;IACd,IAAIA,KAAK,CAACC,EAAE,KAAK,8BAA8B,EAAE;MAC/C,MAAMjB,QAAQ,CAACb,iBAAiB,CAAC,CAAC,CAAC;MACnCH,KAAK,CAAC6B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;MAC3Bb,QAAQ,CAACD,cAAc,CAAC,CAAC,CAAC;IAC5B,CAAC,MAAM;MACLC,QAAQ,CAACR,WAAW,CAACwB,KAAK,CAACC,EAAE,CAAC,CAAC;IACjC;IACAjB,QAAQ,CAACX,cAAc,CAAC,CAAC,CAAC;IAC1B,OAAO2B,KAAK;EACd;AACF,CAAC","ignoreList":[]}

package/lib/hooks/useModularUI.js

@@ -11,17 +11,10 @@ var _reactRouter = require("react-router");
 var _constants = require("../constants");
 var _ModularUIActions = require("../redux/_modularui/ModularUIActions");
 var _useDeepCompareEffect = _interopRequireDefault(require("./useDeepCompareEffect"));
-var _useI18n = require("./useI18n");
+var _useModularUIKey = require("./useModularUIKey");
 var _Href = _interopRequireDefault(require("../models/href/Href"));
 /**
- */
-const useKeyForHook = (modelKey, url) => {
-  const locale = (0, _useI18n.useLocale)();
-  return (0, _react.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
  */
 const useModularUI = (modelKey, url, options = {
   method: _constants.HTTP_METHODS.GET,
@@ -29,7 +22,7 @@ const useModularUI = (modelKey, url, options = {
 }) => {
   const dispatch = (0, _reactRedux.useDispatch)();
   const href = (0, _react.useMemo)(() => url?.toString() || "", [url]);
-  const key = useKeyForHook(modelKey, href);
+  const key = (0, _useModularUIKey.useModularUIKey)(modelKey, href);
   const modelSelector = (0, _react.useMemo)(() => state => state.modularui[key], [key]);
   const model = (0, _reactRedux.useSelector)(modelSelector);
   if (url instanceof _Href.default) {

package/lib/hooks/useModularUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useI18n","_Href","useKeyForHook","modelKey","url","locale","useLocale","useMemo","split","useModularUI","options","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","modelSelector","state","modularui","model","useSelector","Href","origin","contextPath","location","useLocation","redirectLocation","forceLoad","equals","prevOptions","useRef","prevHref","prevForceLoad","useDeepCompareEffect","isOldReload","current","isReload","doForceLoad","loadModularUI","useEffect","removeModelByKey","exports"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef, useMemo } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\n\nimport { useLocale } from \"./useI18n\";\nimport Href from \"../models/href/Href\";\n\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n */\nconst useKeyForHook = (modelKey: string, url: string) => {\n  const locale = useLocale();\n  return useMemo(\n    () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n    [modelKey, url, locale],\n  );\n};\n\n/**\n * Use redux action and selector to retrieve the correct modular ui service model\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = useMemo(() => url?.toString() || \"\", [url]);\n  const key = useKeyForHook(modelKey, href);\n\n  const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);\n  const model = useSelector(modelSelector);\n\n  if (url instanceof Href) {\n    options.origin = options.origin ?? url.origin;\n    options.contextPath = options.contextPath ?? url.contextPath;\n  }\n\n  const location = useLocation();\n  const redirectLocation = location.state?.redirectLocation;\n  const forceLoad =\n    model == null ||\n    (redirectLocation instanceof Href ? redirectLocation?.equals(href) : false);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceLoad = useRef(forceLoad);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    const doForceLoad = forceLoad && !prevForceLoad.current;\n\n    if (href !== \"\" && (doForceLoad || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceLoad.current = forceLoad;\n  }, [key, href, options, forceLoad]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  return model;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useModularUIKey","_Href","useModularUI","modelKey","url","options","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","useMemo","toString","key","useModularUIKey","modelSelector","state","modularui","model","useSelector","Href","origin","contextPath","location","useLocation","redirectLocation","forceLoad","equals","prevOptions","useRef","prevHref","prevForceLoad","useDeepCompareEffect","isOldReload","current","isReload","doForceLoad","loadModularUI","useEffect","removeModelByKey","exports"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef, useMemo } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n * Core hook to retrieve information for a Be Informed modular ui resource\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = useMemo(() => url?.toString() || \"\", [url]);\n  const key = useModularUIKey(modelKey, href);\n\n  const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);\n  const model = useSelector(modelSelector);\n\n  if (url instanceof Href) {\n    options.origin = options.origin ?? url.origin;\n    options.contextPath = options.contextPath ?? url.contextPath;\n  }\n\n  const location = useLocation();\n  const redirectLocation = location.state?.redirectLocation;\n  const forceLoad =\n    model == null ||\n    (redirectLocation instanceof Href ? redirectLocation?.equals(href) : false);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceLoad = useRef(forceLoad);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    const doForceLoad = forceLoad && !prevForceLoad.current;\n\n    if (href !== \"\" && (doForceLoad || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceLoad.current = forceLoad;\n  }, [key, href, options, forceLoad]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  return model;\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModularUIBasic.js

@@ -1,24 +1,25 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useModularUIBasic = void 0;
-var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
+exports.useReload = exports.useModularUIBasic = void 0;
 var _reactRouter = require("react-router");
+var _reactRedux = require("react-redux");
 var _react = require("react");
 var _useModularUI = require("./useModularUI");
+var _constants = require("../constants");
+var _useModularUIKey = require("./useModularUIKey");
 // Helper to create useModularUI options
-const createUseModularUIOptions = (options, href, location) => {
-  var _context;
+const createUseModularUIOptions = (options, href, mustReload) => {
   const baseOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
     isReload: false,
     origin: undefined,
     contextPath: undefined,
-    cache: false
+    cache: false,
+    removeOnUnmount: false
   };
 
   // Handle targetModel and forceTargetModel
@@ -31,11 +32,12 @@ const createUseModularUIOptions = (options, href, location) => {
   if (options.cache) {
     baseOptions.cache = options.cache;
   }
-
-  // Check for reload if location matches href
-  if (location.state?.reload && (0, _startsWith.default)(_context = location.pathname).call(_context, href)) {
+  if (mustReload) {
     baseOptions.isReload = true;
   }
+  if (options.removeOnUnmount) {
+    baseOptions.removeOnUnmount = true;
+  }
 
   // Handle origin and contextPath options
   baseOptions.origin = options.origin ?? baseOptions.origin;
@@ -56,17 +58,19 @@ const validateModel = (model, expectedModels) => {
 /**
  * useModularUIBasic Hook
  */
-const useModularUIBasic = (key, href, options = {
+const useModularUIBasic = (defaultKey, href, options = {
   expectedModels: [],
   targetModel: undefined,
   forceTargetModel: false,
   origin: undefined,
-  contextPath: undefined
+  contextPath: undefined,
+  key: undefined
 }) => {
-  const location = (0, _reactRouter.useLocation)();
   const memoizedHref = (0, _react.useMemo)(() => href.toString(), [href]);
-  const useModularUIOptions = (0, _react.useMemo)(() => createUseModularUIOptions(options, memoizedHref, location), [options, memoizedHref, location]);
-  const modularUI = (0, _useModularUI.useModularUI)(key, href, useModularUIOptions);
+  const key = options.key ?? defaultKey;
+  const mustReload = useReload(key, memoizedHref);
+  const modularUIOptions = (0, _react.useMemo)(() => createUseModularUIOptions(options, memoizedHref, mustReload), [options, memoizedHref, mustReload]);
+  const modularUI = (0, _useModularUI.useModularUI)(key, href, modularUIOptions);
   const expectedModels = (0, _react.useMemo)(() => options.expectedModels ?? [], [options.expectedModels]);
   return (0, _react.useMemo)(() => {
     if (modularUI?.model) {
@@ -76,5 +80,26 @@ const useModularUIBasic = (key, href, options = {
     return null;
   }, [expectedModels, modularUI]);
 };
+
+/**
+ * Check if the model corresponding to a modular ui service should be reloaded
+ */
 exports.useModularUIBasic = useModularUIBasic;
+const useReload = (modelKey, url) => {
+  const location = (0, _reactRouter.useLocation)();
+  const key = (0, _useModularUIKey.useModularUIKey)(modelKey, url);
+  const modelEntry = (0, _reactRedux.useSelector)(state => state.modularui[key]);
+  if (modelEntry) {
+    const reload = location.state?.reload || 0;
+    if (reload > 0) {
+      const isFullyLoaded = modelEntry?.status === _constants.MODULARUI_STATUS.FINISHED;
+      const lastModification = modelEntry?.lastModification ?? 0;
+      if (isFullyLoaded && lastModification < reload) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+exports.useReload = useReload;
 //# sourceMappingURL=useModularUIBasic.js.map

package/lib/hooks/useModularUIBasic.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUIBasic.js","names":["_reactRouter","require","_react","_useModularUI","createUseModularUIOptions","options","href","location","_context","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","state","reload","_startsWith","default","pathname","call","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","warn","useModularUIBasic","key","useLocation","memoizedHref","useMemo","toString","useModularUIOptions","modularUI","useModularUI","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel, Href } from \"../models\";\nimport { useLocation } from \"react-router\";\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\n\nexport type HookOptions = {\n  origin?: string,\n  contextPath?: string,\n};\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  origin?: string,\n  contextPath?: string,\n  cache?: boolean,\n};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n  options: UseModularUIBasicOptions<T>,\n  href: string,\n  location: any,\n): Object => {\n  const baseOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    origin: undefined,\n    contextPath: undefined,\n    cache: false,\n  };\n\n  // Handle targetModel and forceTargetModel\n  if (options.targetModel) {\n    baseOptions.targetModel = options.targetModel;\n    baseOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  // Handle cache option\n  if (options.cache) {\n    baseOptions.cache = options.cache;\n  }\n\n  // Check for reload if location matches href\n  if (location.state?.reload && location.pathname.startsWith(href)) {\n    baseOptions.isReload = true;\n  }\n\n  // Handle origin and contextPath options\n  baseOptions.origin = options.origin ?? baseOptions.origin;\n  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;\n\n  return baseOptions;\n};\n\n// Helper to validate the model against expectedModels\nconst validateModel = (model: any, expectedModels: Array<string>) => {\n  if (expectedModels.length > 0) {\n    const isCorrectModel = expectedModels.some(\n      (expectedModel) => model.type === expectedModel,\n    );\n    if (!isCorrectModel) {\n      console.warn(model, \"is not of instance\", expectedModels);\n    }\n  }\n};\n\n/**\n * useModularUIBasic Hook\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  key: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n    origin: undefined,\n    contextPath: undefined,\n  },\n): T | null => {\n  const location = useLocation();\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n  const useModularUIOptions = useMemo(\n    () => createUseModularUIOptions(options, memoizedHref, location),\n    [options, memoizedHref, location],\n  );\n\n  const modularUI = useModularUI(key, href, useModularUIOptions);\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      validateModel(modularUI.model, expectedModels);\n      return modularUI.model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["_reactRouter","require","_reactRedux","_react","_useModularUI","_constants","_useModularUIKey","createUseModularUIOptions","options","href","mustReload","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","removeOnUnmount","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","warn","useModularUIBasic","defaultKey","key","memoizedHref","useMemo","toString","useReload","modularUIOptions","modularUI","useModularUI","exports","modelKey","url","location","useLocation","useModularUIKey","modelEntry","useSelector","state","modularui","reload","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"react-router\";\nimport { useSelector } from \"react-redux\";\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\n\nimport { MODULARUI_STATUS } from \"../constants\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport type { ModularUIModel, Href } from \"../models\";\nexport type HookOptions = {\n  key?: string,\n  origin?: string,\n  contextPath?: string,\n  removeOnUnmount?: boolean,\n};\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  origin?: string,\n  contextPath?: string,\n  cache?: boolean,\n  key?: string,\n  isReload?: boolean,\n  removeOnUnmount?: boolean,\n};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n  options: UseModularUIBasicOptions<T>,\n  href: string,\n  mustReload: boolean,\n): Object => {\n  const baseOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    origin: undefined,\n    contextPath: undefined,\n    cache: false,\n    removeOnUnmount: false,\n  };\n\n  // Handle targetModel and forceTargetModel\n  if (options.targetModel) {\n    baseOptions.targetModel = options.targetModel;\n    baseOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  // Handle cache option\n  if (options.cache) {\n    baseOptions.cache = options.cache;\n  }\n\n  if (mustReload) {\n    baseOptions.isReload = true;\n  }\n\n  if (options.removeOnUnmount) {\n    baseOptions.removeOnUnmount = true;\n  }\n\n  // Handle origin and contextPath options\n  baseOptions.origin = options.origin ?? baseOptions.origin;\n  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;\n\n  return baseOptions;\n};\n\n// Helper to validate the model against expectedModels\nconst validateModel = (model: any, expectedModels: Array<string>) => {\n  if (expectedModels.length > 0) {\n    const isCorrectModel = expectedModels.some(\n      (expectedModel) => model.type === expectedModel,\n    );\n    if (!isCorrectModel) {\n      console.warn(model, \"is not of instance\", expectedModels);\n    }\n  }\n};\n\n/**\n * useModularUIBasic Hook\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  defaultKey: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n    origin: undefined,\n    contextPath: undefined,\n    key: undefined,\n  },\n): T | null => {\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n  const key = options.key ?? defaultKey;\n\n  const mustReload = useReload(key, memoizedHref);\n  const modularUIOptions = useMemo(\n    () => createUseModularUIOptions(options, memoizedHref, mustReload),\n    [options, memoizedHref, mustReload],\n  );\n\n  const modularUI = useModularUI(key, href, modularUIOptions);\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      validateModel(modularUI.model, expectedModels);\n      return modularUI.model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelKey: string, url: string): boolean => {\n  const location = useLocation();\n  const key = useModularUIKey(modelKey, url);\n  const modelEntry = useSelector((state) => state.modularui[key]);\n\n  if (modelEntry) {\n    const reload = location.state?.reload || 0;\n    if (reload > 0) {\n      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n      const lastModification = modelEntry?.lastModification ?? 0;\n      if (isFullyLoaded && lastModification < reload) {\n        return true;\n      }\n    }\n  }\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModularUIKey.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useModularUIKey = void 0;
+var _useI18n = require("./useI18n");
+var _react = require("react");
+/**
+ * Generates the key that is used in the modular ui reducer of redux
+ */
+const useModularUIKey = (modelKey, url) => {
+  const locale = (0, _useI18n.useLocale)();
+  return (0, _react.useMemo)(() => `${modelKey}(${url.split("?")[0]})(${locale})`, [modelKey, url, locale]);
+};
+exports.useModularUIKey = useModularUIKey;
+//# sourceMappingURL=useModularUIKey.js.map

package/lib/hooks/useModularUIKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useModularUIKey.js","names":["_useI18n","require","_react","useModularUIKey","modelKey","url","locale","useLocale","useMemo","split","exports"],"sources":["../../src/hooks/useModularUIKey.js"],"sourcesContent":["// @flow\nimport { useLocale } from \"./useI18n\";\nimport { useMemo } from \"react\";\n\n/**\n * Generates the key that is used in the modular ui reducer of redux\n */\nexport const useModularUIKey = (modelKey: string, url: string): string => {\n  const locale = useLocale();\n  return useMemo(\n    () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n    [modelKey, url, locale],\n  );\n};\n"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACO,MAAME,eAAe,GAAGA,CAACC,QAAgB,EAAEC,GAAW,KAAa;EACxE,MAAMC,MAAM,GAAG,IAAAC,kBAAS,EAAC,CAAC;EAC1B,OAAO,IAAAC,cAAO,EACZ,MAAM,GAAGJ,QAAQ,IAAIC,GAAG,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKH,MAAM,GAAG,EACpD,CAACF,QAAQ,EAAEC,GAAG,EAAEC,MAAM,CACxB,CAAC;AACH,CAAC;AAACI,OAAA,CAAAP,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/hooks/usePanel.js

@@ -45,11 +45,16 @@ const useUrl = (href, fromRoute = false) => {
 /**
  */
 const usePanel = (href, options) => {
-  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
   };
   return (0, _useModularUIBasic.useModularUIBasic)("panel", url, basicOptions);
 };

package/lib/hooks/usePanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePanel.js","names":["_react","require","_reactRouter","_Href","_interopRequireDefault","_useModularUIBasic","useUrl","href","fromRoute","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","useRouteMatch","location","useLocation","useMemo","_context","Href","url","isExact","addParametersFromString","search","equalsWithParameters","shouldUpdate","Function","call","bind","_startsWith","default","usePanel","options","basicOptions","expectedModels","origin","contextPath","useModularUIBasic","exports"],"sources":["../../src/hooks/usePanel.js"],"sourcesContent":["// @flow\nimport { useState, useMemo } from \"react\";\nimport { useLocation, useRouteMatch } from \"react-router\";\nimport Href from \"../models/href/Href\";\nimport { useModularUIBasic } from \"./useModularUIBasic\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type GroupingPanelModel from \"../models/panels/GroupingPanelModel\";\nimport type ListModel from \"../models/list/ListModel\";\nimport type DetailModel from \"../models/detail/DetailModel\";\n\nconst useUrl = (href?: string | Href, fromRoute: boolean = false) => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const match = useRouteMatch();\n  const location = useLocation();\n\n  return useMemo(() => {\n    if (href == null && previousUrl == null) {\n      return new Href(\"\");\n    }\n\n    const url = href instanceof Href ? href : new Href(href);\n\n    if (!fromRoute) {\n      return url;\n    }\n\n    if (match.isExact) {\n      url.addParametersFromString(location.search);\n    }\n\n    // Check equality to prevent unnecessary state updates\n    if (url.equalsWithParameters(previousUrl)) {\n      return previousUrl || url;\n    }\n\n    const shouldUpdate =\n      match.isExact === true ||\n      previousExact === match.isExact ||\n      !previousUrl?.startsWith(match.url);\n\n    if (shouldUpdate) {\n      setPreviousUrl(url);\n      setPreviousExact(match.isExact);\n      return url;\n    }\n\n    return previousUrl || new Href(\"\");\n  }, [\n    href,\n    previousUrl,\n    fromRoute,\n    match.isExact,\n    match.url,\n    previousExact,\n    location.search,\n  ]);\n};\n\n/**\n */\nexport const usePanel = (\n  href?: string | Href,\n  options?: HookOptions & { fromRoute?: boolean },\n): ListModel | GroupingPanelModel | DetailModel | null => {\n  const url = useUrl(href, options?.fromRoute || false);\n  const basicOptions = {\n    expectedModels: [\"List\", \"GroupingPanel\", \"Detail\"],\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n  };\n\n  return useModularUIBasic(\"panel\", url, basicOptions);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AAOA,MAAMK,MAAM,GAAGA,CAACC,IAAoB,EAAEC,SAAkB,GAAG,KAAK,KAAK;EACnE,MAAM,CAACC,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAC,eAAQ,EAAC,IAAI,CAAC;EACpD,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAF,eAAQ,EAAC,KAAK,CAAC;EAEzD,MAAMG,KAAK,GAAG,IAAAC,0BAAa,EAAC,CAAC;EAC7B,MAAMC,QAAQ,GAAG,IAAAC,wBAAW,EAAC,CAAC;EAE9B,OAAO,IAAAC,cAAO,EAAC,MAAM;IAAA,IAAAC,QAAA;IACnB,IAAIZ,IAAI,IAAI,IAAI,IAAIE,WAAW,IAAI,IAAI,EAAE;MACvC,OAAO,IAAIW,aAAI,CAAC,EAAE,CAAC;IACrB;IAEA,MAAMC,GAAG,GAAGd,IAAI,YAAYa,aAAI,GAAGb,IAAI,GAAG,IAAIa,aAAI,CAACb,IAAI,CAAC;IAExD,IAAI,CAACC,SAAS,EAAE;MACd,OAAOa,GAAG;IACZ;IAEA,IAAIP,KAAK,CAACQ,OAAO,EAAE;MACjBD,GAAG,CAACE,uBAAuB,CAACP,QAAQ,CAACQ,MAAM,CAAC;IAC9C;;IAEA;IACA,IAAIH,GAAG,CAACI,oBAAoB,CAAChB,WAAW,CAAC,EAAE;MACzC,OAAOA,WAAW,IAAIY,GAAG;IAC3B;IAEA,MAAMK,YAAY,GAChBZ,KAAK,CAACQ,OAAO,KAAK,IAAI,IACtBV,aAAa,KAAKE,KAAK,CAACQ,OAAO,IAC/B,CAAC,EAAAH,QAAA,GAAAV,WAAW,qBAAAkB,QAAA,CAAAC,IAAA,CAAAC,IAAA,KAAAC,WAAA,CAAAC,OAAA,EAAAZ,QAAA,GAAAA,QAAA,KAAaL,KAAK,CAACO,GAAG,CAAC;IAErC,IAAIK,YAAY,EAAE;MAChBhB,cAAc,CAACW,GAAG,CAAC;MACnBR,gBAAgB,CAACC,KAAK,CAACQ,OAAO,CAAC;MAC/B,OAAOD,GAAG;IACZ;IAEA,OAAOZ,WAAW,IAAI,IAAIW,aAAI,CAAC,EAAE,CAAC;EACpC,CAAC,EAAE,CACDb,IAAI,EACJE,WAAW,EACXD,SAAS,EACTM,KAAK,CAACQ,OAAO,EACbR,KAAK,CAACO,GAAG,EACTT,aAAa,EACbI,QAAQ,CAACQ,MAAM,CAChB,CAAC;AACJ,CAAC;;AAED;AACA;AACO,MAAMQ,QAAQ,GAAGA,CACtBzB,IAAoB,EACpB0B,OAA+C,KACS;EACxD,MAAMZ,GAAG,GAAGf,MAAM,CAACC,IAAI,EAAE0B,OAAO,EAAEzB,SAAS,IAAI,KAAK,CAAC;EACrD,MAAM0B,YAAY,GAAG;IACnBC,cAAc,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC;IACnDC,MAAM,EAAEH,OAAO,EAAEG,MAAM;IACvBC,WAAW,EAAEJ,OAAO,EAAEI;EACxB,CAAC;EAED,OAAO,IAAAC,oCAAiB,EAAC,OAAO,EAAEjB,GAAG,EAAEa,YAAY,CAAC;AACtD,CAAC;AAACK,OAAA,CAAAP,QAAA,GAAAA,QAAA","ignoreList":[]}
+{"version":3,"file":"usePanel.js","names":["_react","require","_reactRouter","_Href","_interopRequireDefault","_useModularUIBasic","useUrl","href","fromRoute","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","useRouteMatch","location","useLocation","useMemo","_context","Href","url","isExact","addParametersFromString","search","equalsWithParameters","shouldUpdate","Function","call","bind","_startsWith","default","usePanel","options","hookOptions","basicOptions","expectedModels","useModularUIBasic","exports"],"sources":["../../src/hooks/usePanel.js"],"sourcesContent":["// @flow\nimport { useState, useMemo } from \"react\";\nimport { useLocation, useRouteMatch } from \"react-router\";\nimport Href from \"../models/href/Href\";\nimport { useModularUIBasic } from \"./useModularUIBasic\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type GroupingPanelModel from \"../models/panels/GroupingPanelModel\";\nimport type ListModel from \"../models/list/ListModel\";\nimport type DetailModel from \"../models/detail/DetailModel\";\n\nconst useUrl = (href?: string | Href, fromRoute: boolean = false) => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const match = useRouteMatch();\n  const location = useLocation();\n\n  return useMemo(() => {\n    if (href == null && previousUrl == null) {\n      return new Href(\"\");\n    }\n\n    const url = href instanceof Href ? href : new Href(href);\n\n    if (!fromRoute) {\n      return url;\n    }\n\n    if (match.isExact) {\n      url.addParametersFromString(location.search);\n    }\n\n    // Check equality to prevent unnecessary state updates\n    if (url.equalsWithParameters(previousUrl)) {\n      return previousUrl || url;\n    }\n\n    const shouldUpdate =\n      match.isExact === true ||\n      previousExact === match.isExact ||\n      !previousUrl?.startsWith(match.url);\n\n    if (shouldUpdate) {\n      setPreviousUrl(url);\n      setPreviousExact(match.isExact);\n      return url;\n    }\n\n    return previousUrl || new Href(\"\");\n  }, [\n    href,\n    previousUrl,\n    fromRoute,\n    match.isExact,\n    match.url,\n    previousExact,\n    location.search,\n  ]);\n};\n\n/**\n */\nexport const usePanel = (\n  href?: string | Href,\n  options?: HookOptions & { fromRoute?: boolean },\n): ListModel | GroupingPanelModel | DetailModel | null => {\n  const { fromRoute, ...hookOptions } = options || { fromRoute: false };\n\n  const url = useUrl(href, fromRoute || false);\n  const basicOptions = {\n    expectedModels: [\"List\", \"GroupingPanel\", \"Detail\"],\n    ...(hookOptions: HookOptions),\n  };\n\n  return useModularUIBasic(\"panel\", url, basicOptions);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AAOA,MAAMK,MAAM,GAAGA,CAACC,IAAoB,EAAEC,SAAkB,GAAG,KAAK,KAAK;EACnE,MAAM,CAACC,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAC,eAAQ,EAAC,IAAI,CAAC;EACpD,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAF,eAAQ,EAAC,KAAK,CAAC;EAEzD,MAAMG,KAAK,GAAG,IAAAC,0BAAa,EAAC,CAAC;EAC7B,MAAMC,QAAQ,GAAG,IAAAC,wBAAW,EAAC,CAAC;EAE9B,OAAO,IAAAC,cAAO,EAAC,MAAM;IAAA,IAAAC,QAAA;IACnB,IAAIZ,IAAI,IAAI,IAAI,IAAIE,WAAW,IAAI,IAAI,EAAE;MACvC,OAAO,IAAIW,aAAI,CAAC,EAAE,CAAC;IACrB;IAEA,MAAMC,GAAG,GAAGd,IAAI,YAAYa,aAAI,GAAGb,IAAI,GAAG,IAAIa,aAAI,CAACb,IAAI,CAAC;IAExD,IAAI,CAACC,SAAS,EAAE;MACd,OAAOa,GAAG;IACZ;IAEA,IAAIP,KAAK,CAACQ,OAAO,EAAE;MACjBD,GAAG,CAACE,uBAAuB,CAACP,QAAQ,CAACQ,MAAM,CAAC;IAC9C;;IAEA;IACA,IAAIH,GAAG,CAACI,oBAAoB,CAAChB,WAAW,CAAC,EAAE;MACzC,OAAOA,WAAW,IAAIY,GAAG;IAC3B;IAEA,MAAMK,YAAY,GAChBZ,KAAK,CAACQ,OAAO,KAAK,IAAI,IACtBV,aAAa,KAAKE,KAAK,CAACQ,OAAO,IAC/B,CAAC,EAAAH,QAAA,GAAAV,WAAW,qBAAAkB,QAAA,CAAAC,IAAA,CAAAC,IAAA,KAAAC,WAAA,CAAAC,OAAA,EAAAZ,QAAA,GAAAA,QAAA,KAAaL,KAAK,CAACO,GAAG,CAAC;IAErC,IAAIK,YAAY,EAAE;MAChBhB,cAAc,CAACW,GAAG,CAAC;MACnBR,gBAAgB,CAACC,KAAK,CAACQ,OAAO,CAAC;MAC/B,OAAOD,GAAG;IACZ;IAEA,OAAOZ,WAAW,IAAI,IAAIW,aAAI,CAAC,EAAE,CAAC;EACpC,CAAC,EAAE,CACDb,IAAI,EACJE,WAAW,EACXD,SAAS,EACTM,KAAK,CAACQ,OAAO,EACbR,KAAK,CAACO,GAAG,EACTT,aAAa,EACbI,QAAQ,CAACQ,MAAM,CAChB,CAAC;AACJ,CAAC;;AAED;AACA;AACO,MAAMQ,QAAQ,GAAGA,CACtBzB,IAAoB,EACpB0B,OAA+C,KACS;EACxD,MAAM;IAAEzB,SAAS;IAAE,GAAG0B;EAAY,CAAC,GAAGD,OAAO,IAAI;IAAEzB,SAAS,EAAE;EAAM,CAAC;EAErE,MAAMa,GAAG,GAAGf,MAAM,CAACC,IAAI,EAAEC,SAAS,IAAI,KAAK,CAAC;EAC5C,MAAM2B,YAAY,GAAG;IACnBC,cAAc,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC;IACnD,GAAIF;EACN,CAAC;EAED,OAAO,IAAAG,oCAAiB,EAAC,OAAO,EAAEhB,GAAG,EAAEc,YAAY,CAAC;AACtD,CAAC;AAACG,OAAA,CAAAN,QAAA,GAAAA,QAAA","ignoreList":[]}

package/lib/models/filters/FilterCollection.js

@@ -10,6 +10,7 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _BaseCollection = _interopRequireDefault(require("../base/BaseCollection"));
 var _StringFilterModel = _interopRequireDefault(require("../filters/StringFilterModel"));
 var _RangeFilterModel = _interopRequireDefault(require("../filters/RangeFilterModel"));
@@ -153,16 +154,13 @@ class FilterCollection extends _BaseCollection.default {
    */
   get formdata() {
     var _context7;
-    let data = {};
-    (0, _filter.default)(_context7 = this).call(_context7, f => f.parameterType === _constants.PARAMETER_TYPES.BODY && f.hasValue()).forEach(f => {
-      // $FlowIgnore[cannot-spread-indexer]
-      // $FlowIgnore[exponential-spread]
-      data = {
-        ...data,
-        ...f.formdata
-      };
-    });
-    return data;
+    const bodyFields = (0, _filter.default)(_context7 = this).call(_context7, f => f.parameterType === _constants.PARAMETER_TYPES.BODY && f.hasValue() && f.formdata);
+    if (bodyFields.length === 0) {
+      return null;
+    }
+    return bodyFields.reduce((data, f) => {
+      return (0, _assign.default)(data, f.formdata);
+    }, {});
   }
 }
 exports.default = FilterCollection;

package/lib/models/filters/FilterCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilterCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_StringFilterModel","_RangeFilterModel","_AssignmentFilterModel","_ConceptIndexFilterModel","_CompositeAttributeModel","_FilterModel","_constants","FilterCollection","BaseCollection","constructor","data","contributions","modelOptions","Array","isArray","_filter","default","_context","_context2","collection","_map","call","filterContribution","_keys","filterKey","filterData","filterContributionByKey","filter","createFilter","dynamicschema","listkey","contexts","contextid","_context3","filterContext","_find","context","id","type","ConceptIndexFilterModel","_includes","RangeFilterModel","AssignmentFilterModel","StringFilterModel","FilterModel","reset","_context4","checkRangeFilterByAttributeKey","key","rangeAttribute","attribute","CompositeAttributeModel","start","end","checkAssignmentFilterByAttributeKey","user","assignmenttype","getFilterByAttributeKey","_context5","update","value","_context6","filterToUpdate","parentKey","Error","newFilter","clone","name","isValid","every","hasActiveFilters","some","isActive","formdata","_context7","f","parameterType","PARAMETER_TYPES","BODY","hasValue","forEach","exports"],"sources":["../../../src/models/filters/FilterCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\n\nimport StringFilterModel from \"../filters/StringFilterModel\";\nimport RangeFilterModel from \"../filters/RangeFilterModel\";\nimport AssignmentFilterModel from \"../filters/AssignmentFilterModel\";\nimport ConceptIndexFilterModel from \"../filters/ConceptIndexFilterModel\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport FilterModel from \"../filters/FilterModel\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\nimport { PARAMETER_TYPES } from \"../../constants\";\n\n/**\n * Contains a collection of filters\n */\nexport default class FilterCollection extends BaseCollection<FilterType> {\n  /**\n   * Construct a collection of filters\n   */\n  constructor(\n    data: Object = {},\n    contributions: Object = {},\n    modelOptions?: ModelOptions,\n  ) {\n    super();\n\n    if (data && contributions && Array.isArray(contributions.filter)) {\n      this.collection = contributions.filter\n        .filter((filterContribution) => Object.keys(filterContribution)[0])\n        .map((filterContribution) => {\n          const [filterKey] = Object.keys(filterContribution);\n          const filterData = data[filterKey];\n          const filterContributionByKey = filterContribution[filterKey];\n\n          const filter = this.createFilter(\n            filterKey,\n            {\n              ...filterData,\n              dynamicschema: contributions.dynamicschema,\n            },\n            filterContributionByKey,\n            modelOptions,\n          );\n\n          if (contributions.listkey) {\n            filter.listkey = contributions.listkey;\n          }\n\n          if (contributions.contexts && filterContributionByKey.contextid) {\n            const filterContext = contributions.contexts.find(\n              (context) => context.id === filterContributionByKey.contextid,\n            );\n            if (filterContext) {\n              filter.context = filterContext;\n            }\n          }\n\n          return filter;\n        });\n    }\n  }\n\n  /**\n   */\n  createFilter(\n    filterKey: string,\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ): FilterType {\n    const type = contributions.type || \"stringfilter\";\n    if (type === \"choicefilter\" && filterKey === \"index\") {\n      return new ConceptIndexFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type.includes(\"rangefilter\")) {\n      return new RangeFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"assignmentfilter\") {\n      return new AssignmentFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"stringfilter\") {\n      return new StringFilterModel(data, contributions, modelOptions);\n    }\n\n    return new FilterModel(data, contributions, modelOptions);\n  }\n\n  /**\n   * Call the reset function on all filters\n   *\n   * @see {FilterType#reset()}\n   */\n  reset(): FilterCollection {\n    this.collection = this.collection.map((filter) => filter.reset());\n\n    return this;\n  }\n\n  /**\n   * Checks if range attribute key equals key\n   */\n  checkRangeFilterByAttributeKey(\n    filter: RangeFilterModel,\n    key: string,\n  ): boolean {\n    const rangeAttribute = filter.attribute;\n\n    if (rangeAttribute instanceof CompositeAttributeModel) {\n      return (\n        rangeAttribute.key === key ||\n        (rangeAttribute.start && rangeAttribute.start.key === key) ||\n        (rangeAttribute.end && rangeAttribute.end.key === key)\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   * Check if assignment filter attribute matches key\n   */\n  checkAssignmentFilterByAttributeKey(\n    filter: AssignmentFilterModel,\n    key: string,\n  ): boolean {\n    return (\n      filter.key === key ||\n      filter.user?.key === key ||\n      filter.assignmenttype?.key === key\n    );\n  }\n\n  /**\n   * Getting the filter by name\n   */\n  getFilterByAttributeKey(key: string): FilterType | null {\n    return (\n      this.find((filter) => {\n        if (filter instanceof RangeFilterModel) {\n          return this.checkRangeFilterByAttributeKey(filter, key);\n        }\n\n        if (filter instanceof AssignmentFilterModel) {\n          return this.checkAssignmentFilterByAttributeKey(filter, key);\n        }\n\n        return filter.attribute?.key === key;\n      }) || null\n    );\n  }\n\n  /**\n   * Update Filter by input name and value\n   */\n  update(attribute: AttributeType, value: string): void {\n    const filterToUpdate = attribute.parentKey\n      ? this.getFilterByAttributeKey(attribute.parentKey)\n      : this.getFilterByAttributeKey(attribute.key);\n\n    if (!filterToUpdate) {\n      throw new Error(`Can not find filter by attribute key: ${attribute.key}`);\n    }\n\n    const newFilter = filterToUpdate.clone();\n    newFilter.update(attribute, value);\n\n    this.collection = this.collection.map((filter) => {\n      if (filter.name === newFilter.name) {\n        return newFilter;\n      }\n\n      return filter;\n    });\n  }\n\n  /**\n   * Retrieve if all filters are valid\n   */\n  get isValid(): boolean {\n    return this.collection.every((filter) => filter.isValid);\n  }\n\n  /**\n   * Indicates if an active filter is present in the collection\n   */\n  hasActiveFilters(): boolean {\n    return this.collection.some((filter) => filter.isActive());\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    let data = {};\n    this.filter(\n      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),\n    ).forEach((f) => {\n      // $FlowIgnore[cannot-spread-indexer]\n      // $FlowIgnore[exponential-spread]\n      data = {\n        ...data,\n        ...f.formdata,\n      };\n    });\n    return data;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FilterCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_StringFilterModel","_RangeFilterModel","_AssignmentFilterModel","_ConceptIndexFilterModel","_CompositeAttributeModel","_FilterModel","_constants","FilterCollection","BaseCollection","constructor","data","contributions","modelOptions","Array","isArray","_filter","default","_context","_context2","collection","_map","call","filterContribution","_keys","filterKey","filterData","filterContributionByKey","filter","createFilter","dynamicschema","listkey","contexts","contextid","_context3","filterContext","_find","context","id","type","ConceptIndexFilterModel","_includes","RangeFilterModel","AssignmentFilterModel","StringFilterModel","FilterModel","reset","_context4","checkRangeFilterByAttributeKey","key","rangeAttribute","attribute","CompositeAttributeModel","start","end","checkAssignmentFilterByAttributeKey","user","assignmenttype","getFilterByAttributeKey","_context5","update","value","_context6","filterToUpdate","parentKey","Error","newFilter","clone","name","isValid","every","hasActiveFilters","some","isActive","formdata","_context7","bodyFields","f","parameterType","PARAMETER_TYPES","BODY","hasValue","length","reduce","_assign","exports"],"sources":["../../../src/models/filters/FilterCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\n\nimport StringFilterModel from \"../filters/StringFilterModel\";\nimport RangeFilterModel from \"../filters/RangeFilterModel\";\nimport AssignmentFilterModel from \"../filters/AssignmentFilterModel\";\nimport ConceptIndexFilterModel from \"../filters/ConceptIndexFilterModel\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport FilterModel from \"../filters/FilterModel\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\nimport { PARAMETER_TYPES } from \"../../constants\";\n\n/**\n * Contains a collection of filters\n */\nexport default class FilterCollection extends BaseCollection<FilterType> {\n  /**\n   * Construct a collection of filters\n   */\n  constructor(\n    data: Object = {},\n    contributions: Object = {},\n    modelOptions?: ModelOptions,\n  ) {\n    super();\n\n    if (data && contributions && Array.isArray(contributions.filter)) {\n      this.collection = contributions.filter\n        .filter((filterContribution) => Object.keys(filterContribution)[0])\n        .map((filterContribution) => {\n          const [filterKey] = Object.keys(filterContribution);\n          const filterData = data[filterKey];\n          const filterContributionByKey = filterContribution[filterKey];\n\n          const filter = this.createFilter(\n            filterKey,\n            {\n              ...filterData,\n              dynamicschema: contributions.dynamicschema,\n            },\n            filterContributionByKey,\n            modelOptions,\n          );\n\n          if (contributions.listkey) {\n            filter.listkey = contributions.listkey;\n          }\n\n          if (contributions.contexts && filterContributionByKey.contextid) {\n            const filterContext = contributions.contexts.find(\n              (context) => context.id === filterContributionByKey.contextid,\n            );\n            if (filterContext) {\n              filter.context = filterContext;\n            }\n          }\n\n          return filter;\n        });\n    }\n  }\n\n  /**\n   */\n  createFilter(\n    filterKey: string,\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ): FilterType {\n    const type = contributions.type || \"stringfilter\";\n    if (type === \"choicefilter\" && filterKey === \"index\") {\n      return new ConceptIndexFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type.includes(\"rangefilter\")) {\n      return new RangeFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"assignmentfilter\") {\n      return new AssignmentFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"stringfilter\") {\n      return new StringFilterModel(data, contributions, modelOptions);\n    }\n\n    return new FilterModel(data, contributions, modelOptions);\n  }\n\n  /**\n   * Call the reset function on all filters\n   *\n   * @see {FilterType#reset()}\n   */\n  reset(): FilterCollection {\n    this.collection = this.collection.map((filter) => filter.reset());\n\n    return this;\n  }\n\n  /**\n   * Checks if range attribute key equals key\n   */\n  checkRangeFilterByAttributeKey(\n    filter: RangeFilterModel,\n    key: string,\n  ): boolean {\n    const rangeAttribute = filter.attribute;\n\n    if (rangeAttribute instanceof CompositeAttributeModel) {\n      return (\n        rangeAttribute.key === key ||\n        (rangeAttribute.start && rangeAttribute.start.key === key) ||\n        (rangeAttribute.end && rangeAttribute.end.key === key)\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   * Check if assignment filter attribute matches key\n   */\n  checkAssignmentFilterByAttributeKey(\n    filter: AssignmentFilterModel,\n    key: string,\n  ): boolean {\n    return (\n      filter.key === key ||\n      filter.user?.key === key ||\n      filter.assignmenttype?.key === key\n    );\n  }\n\n  /**\n   * Getting the filter by name\n   */\n  getFilterByAttributeKey(key: string): FilterType | null {\n    return (\n      this.find((filter) => {\n        if (filter instanceof RangeFilterModel) {\n          return this.checkRangeFilterByAttributeKey(filter, key);\n        }\n\n        if (filter instanceof AssignmentFilterModel) {\n          return this.checkAssignmentFilterByAttributeKey(filter, key);\n        }\n\n        return filter.attribute?.key === key;\n      }) || null\n    );\n  }\n\n  /**\n   * Update Filter by input name and value\n   */\n  update(attribute: AttributeType, value: string): void {\n    const filterToUpdate = attribute.parentKey\n      ? this.getFilterByAttributeKey(attribute.parentKey)\n      : this.getFilterByAttributeKey(attribute.key);\n\n    if (!filterToUpdate) {\n      throw new Error(`Can not find filter by attribute key: ${attribute.key}`);\n    }\n\n    const newFilter = filterToUpdate.clone();\n    newFilter.update(attribute, value);\n\n    this.collection = this.collection.map((filter) => {\n      if (filter.name === newFilter.name) {\n        return newFilter;\n      }\n\n      return filter;\n    });\n  }\n\n  /**\n   * Retrieve if all filters are valid\n   */\n  get isValid(): boolean {\n    return this.collection.every((filter) => filter.isValid);\n  }\n\n  /**\n   * Indicates if an active filter is present in the collection\n   */\n  hasActiveFilters(): boolean {\n    return this.collection.some((filter) => filter.isActive());\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    const bodyFields = this.filter(\n      (f) =>\n        f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata,\n    );\n\n    if (bodyFields.length === 0) {\n      return null;\n    }\n\n    return bodyFields.reduce((data, f) => {\n      return Object.assign(data, f.formdata);\n    }, {});\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/actions/SignIn.js

@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sendAuthenticationError = exports.resetAuthErrors = exports.loginSuccess = exports.loginFailed = exports.login = exports.changePassword = void 0;
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 var _Authenticate = _interopRequireDefault(require("../../modularui/Authenticate"));
 var _ModularUISelectors = require("../_modularui/ModularUISelectors");
-var _Error = require("./Error");
 var _Application = require("./Application");
 var _ProgressIndicator = require("./ProgressIndicator");
 var _RouterActions = require("../_router/RouterActions");
@@ -63,9 +61,11 @@ const changePassword = () => (dispatch, getState) => {
 /**
  */
 exports.changePassword = changePassword;
-const login = (username, password) => (dispatch, getState) => {
+const login = (username, password) => async (dispatch, getState) => {
   dispatch((0, _ProgressIndicator.startProgress)());
-  return new _Authenticate.default().login(username, password).then(() => dispatch((0, _Application.reloadApplication)())).then(() => {
+  try {
+    const response = await new _Authenticate.default().login(username, password);
+    await dispatch((0, _Application.reloadApplication)());
     _Cache.default.addItem("auth", true);
     const application = (0, _ModularUISelectors.getApplication)(getState());
     if (application?.userMustChangePassword) {
@@ -73,19 +73,19 @@ const login = (username, password) => (dispatch, getState) => {
     } else {
       dispatch(loginSuccess());
     }
-    return dispatch((0, _ProgressIndicator.finishProgress)());
-  }).catch(error => {
+    dispatch((0, _ProgressIndicator.finishProgress)());
+    return response;
+  } catch (error) {
     if (error.id === "Error.ChangePasswordRequired") {
-      const dispatchedReloadApplication = dispatch((0, _Application.reloadApplication)());
-      return _promise.default.resolve(dispatchedReloadApplication).then(() => {
-        _Cache.default.addItem("auth", true);
-        dispatch(changePassword());
-        return dispatch((0, _ProgressIndicator.finishProgress)());
-      });
+      await dispatch((0, _Application.reloadApplication)());
+      _Cache.default.addItem("auth", true);
+      dispatch(changePassword());
+    } else {
+      dispatch(loginFailed(error.id));
     }
-    dispatch(loginFailed(error.id));
-    return dispatch((0, _Error.handleError)(error));
-  });
+    dispatch((0, _ProgressIndicator.finishProgress)());
+    return error;
+  }
 };
 exports.login = login;
 //# sourceMappingURL=SignIn.js.map