@beinformed/ui 1.28.4 → 1.28.6

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.28.6](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.28.5...v1.28.6) (2023-03-01)
+
+### Bug Fixes
+
+- **precache:** swallow confusing info message on not able to load webapplication ([aa53c69](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/aa53c69f06195695dce8e519259d780ac37c6c83))
+
+## [1.28.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.28.4...v1.28.5) (2023-02-23)
+
+### Bug Fixes
+
+- **progressindicator:** set progess to finished when change password occurs ([739d112](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/739d112a0de4360f0b62dac2d8b4d64fafe26292))
+
 ## [1.28.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.28.2...v1.28.4) (2023-02-22)
 
 ### Bug Fixes

package/esm/react-server/serverUtil.js

@@ -133,8 +133,8 @@ const setApplication = store => {
       model: application
     }]));
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.info("Could not load webapplication on server");
+    // swallow error, in this case we just don't pre-cache the webapplication,
+    // which has not much difference for the end user
   }
 };
 

package/esm/react-server/serverUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverUtil.js","names":["createMemoryHistory","has","deepmerge","configureStore","availableLocales","Locales","getPreferredLocale","setLocales","setServerPreference","setThemePreference","setPreference","setAllContentInDataSetting","setLoginPreferences","getSetting","IllegalArgumentException","initModels","getLocale","ModularUIRequest","createReduxStore","requestHref","customReducers","initialState","history","initialEntries","toString","store","setI18n","locales","arguments","length","undefined","request","Array","isArray","mergedLocales","_mapInstanceProperty","call","locale","code","customLocale","_findInstanceProperty","custLocale","forEach","some","push","enabledLocales","_filterInstanceProperty","_context","_includesInstanceProperty","localesInstance","preferredLocale","dispatch","setServerPreferencesFromArray","serverPreferences","serverPreference","name","defaultValue","type","setServerPreferences","preferencesProvider","isStudioContext","setConfigurationTheme","configTheme","configFileLocation","getLayoutConfigFileLocation","configFilePath","_startsWithInstanceProperty","dataFetcher","fetch","Error","setApplication","getState","application","fetchSync","connectKey","key","model","e","console","info","handleErrors","state","error","shouldThrowOnServer","dehydrate","modularui","status","lastModification","filteredState","_JSON$stringify","replace","createHead","sheet","UUID","helmetContext","style","getStyleTags","meta","helmet"],"sources":["../../src/react-server/serverUtil.js"],"sourcesContent":["// @flow\nimport { createMemoryHistory } from \"history\";\nimport { has } from \"../utils/helpers/objects\";\nimport deepmerge from \"deepmerge\";\n\nimport configureStore from \"../redux/store/configureStore\";\n\nimport { availableLocales } from \"../i18n/Locales\";\nimport Locales from \"../i18n/Locales\";\n\nimport { getPreferredLocale } from \"./requestInformation\";\nimport { setLocales } from \"../redux/_i18n/I18nActions\";\n\nimport {\n  setServerPreference,\n  setThemePreference,\n  setPreference,\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\n\nimport { getSetting } from \"../constants/Settings\";\n\nimport { IllegalArgumentException } from \"../exceptions\";\n\nimport { initModels } from \"../redux\";\nimport { getLocale } from \"../redux/selectors/i18n\";\n\nimport ModularUIRequest from \"../modularui/ModularUIRequest\";\n\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { ReduxState, ReduxStore } from \"../redux/types\";\nimport type Href from \"../models/href/Href\";\nimport type { RouterHistory } from \"react-router\";\n\nexport type PreferenceValue = {\n  name: string,\n  defaultValue?: string | null,\n  type?: string,\n};\n\n/**\n */\nconst createReduxStore = (\n  requestHref: Href,\n  customReducers: Object,\n  initialState?: $Shape<ReduxState>\n): ReduxStore => {\n  // $FlowExpectedError\n  const history: RouterHistory = createMemoryHistory({\n    initialEntries: [requestHref.toString()],\n  });\n\n  const { store } = configureStore(history, customReducers, initialState);\n\n  return store;\n};\n\n/**\n */\nconst setI18n = (\n  store: ReduxStore,\n  locales: Array<LocaleConfiguration> = [],\n  request: HttpServletRequestJava\n) => {\n  if (!Array.isArray(locales)) {\n    throw new IllegalArgumentException(\"locales must be an array of objects\");\n  }\n  if (!request) {\n    throw new IllegalArgumentException(\"missing request argument\");\n  }\n\n  const mergedLocales = availableLocales.map((locale) => {\n    const code = locale.code;\n    const customLocale = locales.find((custLocale) => custLocale.code === code);\n\n    if (customLocale) {\n      return deepmerge(locale, customLocale);\n    }\n\n    return locale;\n  });\n\n  locales.forEach((customLocale) => {\n    if (!mergedLocales.some((locale) => locale.code === customLocale.code)) {\n      mergedLocales.push(customLocale);\n    }\n  });\n\n  const enabledLocales = mergedLocales.filter((locale: LocaleConfiguration) =>\n    getSetting(\"ENABLED_LOCALES\").includes(locale.code)\n  );\n\n  const localesInstance = new Locales(enabledLocales);\n  const preferredLocale = getPreferredLocale(request, localesInstance);\n  store.dispatch(setLocales(localesInstance, preferredLocale ?? \"en\"));\n};\n\nconst setServerPreferencesFromArray = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  serverPreferences.forEach((serverPreference) => {\n    if (typeof serverPreference === \"object\") {\n      const { name, defaultValue, type } = serverPreference;\n      store.dispatch(setServerPreference(name, defaultValue, type));\n    } else {\n      store.dispatch(setServerPreference(serverPreference, null));\n    }\n  });\n};\n\n/**\n * Server preferences can be suplied by an array of preference names,\n * or an array of objects which has the name, an optional default value and an optional type.<br>\n * When the type is set to string, a comma separated value is not converted to an array:\n *\n * @example\n * // value becomes an array [default1, default2]\n * { name: \"prefName\", defaultValue: \"default1, default2\" }\n * // value remains a string \"default1, default2\"\n * { name: \"prefName\", defaultValue: \"default1, default2\", type: \"string\" }\n *\n * @param store\n * @param serverPreferences\n */\nconst setServerPreferences = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  if (Array.isArray(serverPreferences)) {\n    setServerPreferencesFromArray(store, serverPreferences);\n  }\n\n  store.dispatch(setAllContentInDataSetting());\n  store.dispatch(setLoginPreferences());\n\n  if (\n    preferencesProvider &&\n    preferencesProvider.isStudioContext &&\n    preferencesProvider.isStudioContext()\n  ) {\n    store.dispatch(setPreference(\"isStudioContext\", true));\n  }\n};\n\n/**\n */\nconst setConfigurationTheme = (store: ReduxStore) => {\n  let configTheme = null;\n\n  const configFileLocation = preferencesProvider.getLayoutConfigFileLocation();\n  if (typeof configFileLocation === \"string\") {\n    const configFilePath = configFileLocation.startsWith(\"/\")\n      ? `/resource${configFileLocation}`\n      : `/resource/${configFileLocation}`;\n\n    configTheme = dataFetcher.fetch(configFilePath);\n\n    if (configTheme) {\n      store.dispatch(setThemePreference(configTheme));\n    } else {\n      throw new Error(\n        `Could not read theme configuration file from: ${configFilePath}`\n      );\n    }\n  }\n};\n\n/**\n */\nconst setApplication = (store: ReduxStore) => {\n  try {\n    const locale = getLocale(store.getState());\n    const application = new ModularUIRequest(\"/\", {\n      locale: locale,\n    }).fetchSync();\n\n    application.connectKey = `application(/)(${locale})`;\n\n    store.dispatch(\n      initModels([\n        {\n          key: `application(/)(${locale})`,\n          model: application,\n        },\n      ])\n    );\n  } catch (e) {\n    // eslint-disable-next-line no-console\n    console.info(\"Could not load webapplication on server\");\n  }\n};\n\n/**\n */\nconst handleErrors = (store: ReduxStore) => {\n  const state = store.getState();\n\n  if (\n    state.error &&\n    (state.error.shouldThrowOnServer ||\n      !has(state.error, \"shouldThrowOnServer\"))\n  ) {\n    throw state.error;\n  }\n};\n\n/**\n */\nconst dehydrate = (store: ReduxStore): string => {\n  const state = store.getState();\n\n  const modularui: {\n    [key: string]: { status: string, lastModification: number, model: ?Object },\n  } = {};\n\n  for (const key in state.modularui) {\n    const { status, model, lastModification } = state.modularui[key];\n\n    if (model) {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: model.dehydrate(),\n      };\n    } else {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: undefined,\n      };\n    }\n  }\n\n  const filteredState = {\n    ...state,\n    modularui,\n  };\n\n  return JSON.stringify(filteredState).replace(/</g, \"\\\\u003c\");\n};\n\n/**\n */\nconst createHead = (\n  sheet: any,\n  UUID: string,\n  helmetContext?: Object\n): Object => {\n  const style = sheet.getStyleTags();\n  const meta = helmetContext ? [...helmetContext.helmet.meta] : [];\n\n  if (helmetContext) {\n    return {\n      ...helmetContext.helmet,\n      style,\n      meta,\n    };\n  }\n\n  return {\n    style,\n    meta,\n  };\n};\n\nexport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  createHead,\n  handleErrors,\n  dehydrate,\n};\n"],"mappings":"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"}
+{"version":3,"file":"serverUtil.js","names":["createMemoryHistory","has","deepmerge","configureStore","availableLocales","Locales","getPreferredLocale","setLocales","setServerPreference","setThemePreference","setPreference","setAllContentInDataSetting","setLoginPreferences","getSetting","IllegalArgumentException","initModels","getLocale","ModularUIRequest","createReduxStore","requestHref","customReducers","initialState","history","initialEntries","toString","store","setI18n","locales","arguments","length","undefined","request","Array","isArray","mergedLocales","_mapInstanceProperty","call","locale","code","customLocale","_findInstanceProperty","custLocale","forEach","some","push","enabledLocales","_filterInstanceProperty","_context","_includesInstanceProperty","localesInstance","preferredLocale","dispatch","setServerPreferencesFromArray","serverPreferences","serverPreference","name","defaultValue","type","setServerPreferences","preferencesProvider","isStudioContext","setConfigurationTheme","configTheme","configFileLocation","getLayoutConfigFileLocation","configFilePath","_startsWithInstanceProperty","dataFetcher","fetch","Error","setApplication","getState","application","fetchSync","connectKey","key","model","e","handleErrors","state","error","shouldThrowOnServer","dehydrate","modularui","status","lastModification","filteredState","_JSON$stringify","replace","createHead","sheet","UUID","helmetContext","style","getStyleTags","meta","helmet"],"sources":["../../src/react-server/serverUtil.js"],"sourcesContent":["// @flow\nimport { createMemoryHistory } from \"history\";\nimport { has } from \"../utils/helpers/objects\";\nimport deepmerge from \"deepmerge\";\n\nimport configureStore from \"../redux/store/configureStore\";\n\nimport { availableLocales } from \"../i18n/Locales\";\nimport Locales from \"../i18n/Locales\";\n\nimport { getPreferredLocale } from \"./requestInformation\";\nimport { setLocales } from \"../redux/_i18n/I18nActions\";\n\nimport {\n  setServerPreference,\n  setThemePreference,\n  setPreference,\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\n\nimport { getSetting } from \"../constants/Settings\";\n\nimport { IllegalArgumentException } from \"../exceptions\";\n\nimport { initModels } from \"../redux\";\nimport { getLocale } from \"../redux/selectors/i18n\";\n\nimport ModularUIRequest from \"../modularui/ModularUIRequest\";\n\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { ReduxState, ReduxStore } from \"../redux/types\";\nimport type Href from \"../models/href/Href\";\nimport type { RouterHistory } from \"react-router\";\n\nexport type PreferenceValue = {\n  name: string,\n  defaultValue?: string | null,\n  type?: string,\n};\n\n/**\n */\nconst createReduxStore = (\n  requestHref: Href,\n  customReducers: Object,\n  initialState?: $Shape<ReduxState>\n): ReduxStore => {\n  // $FlowExpectedError\n  const history: RouterHistory = createMemoryHistory({\n    initialEntries: [requestHref.toString()],\n  });\n\n  const { store } = configureStore(history, customReducers, initialState);\n\n  return store;\n};\n\n/**\n */\nconst setI18n = (\n  store: ReduxStore,\n  locales: Array<LocaleConfiguration> = [],\n  request: HttpServletRequestJava\n) => {\n  if (!Array.isArray(locales)) {\n    throw new IllegalArgumentException(\"locales must be an array of objects\");\n  }\n  if (!request) {\n    throw new IllegalArgumentException(\"missing request argument\");\n  }\n\n  const mergedLocales = availableLocales.map((locale) => {\n    const code = locale.code;\n    const customLocale = locales.find((custLocale) => custLocale.code === code);\n\n    if (customLocale) {\n      return deepmerge(locale, customLocale);\n    }\n\n    return locale;\n  });\n\n  locales.forEach((customLocale) => {\n    if (!mergedLocales.some((locale) => locale.code === customLocale.code)) {\n      mergedLocales.push(customLocale);\n    }\n  });\n\n  const enabledLocales = mergedLocales.filter((locale: LocaleConfiguration) =>\n    getSetting(\"ENABLED_LOCALES\").includes(locale.code)\n  );\n\n  const localesInstance = new Locales(enabledLocales);\n  const preferredLocale = getPreferredLocale(request, localesInstance);\n  store.dispatch(setLocales(localesInstance, preferredLocale ?? \"en\"));\n};\n\nconst setServerPreferencesFromArray = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  serverPreferences.forEach((serverPreference) => {\n    if (typeof serverPreference === \"object\") {\n      const { name, defaultValue, type } = serverPreference;\n      store.dispatch(setServerPreference(name, defaultValue, type));\n    } else {\n      store.dispatch(setServerPreference(serverPreference, null));\n    }\n  });\n};\n\n/**\n * Server preferences can be suplied by an array of preference names,\n * or an array of objects which has the name, an optional default value and an optional type.<br>\n * When the type is set to string, a comma separated value is not converted to an array:\n *\n * @example\n * // value becomes an array [default1, default2]\n * { name: \"prefName\", defaultValue: \"default1, default2\" }\n * // value remains a string \"default1, default2\"\n * { name: \"prefName\", defaultValue: \"default1, default2\", type: \"string\" }\n *\n * @param store\n * @param serverPreferences\n */\nconst setServerPreferences = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  if (Array.isArray(serverPreferences)) {\n    setServerPreferencesFromArray(store, serverPreferences);\n  }\n\n  store.dispatch(setAllContentInDataSetting());\n  store.dispatch(setLoginPreferences());\n\n  if (\n    preferencesProvider &&\n    preferencesProvider.isStudioContext &&\n    preferencesProvider.isStudioContext()\n  ) {\n    store.dispatch(setPreference(\"isStudioContext\", true));\n  }\n};\n\n/**\n */\nconst setConfigurationTheme = (store: ReduxStore) => {\n  let configTheme = null;\n\n  const configFileLocation = preferencesProvider.getLayoutConfigFileLocation();\n  if (typeof configFileLocation === \"string\") {\n    const configFilePath = configFileLocation.startsWith(\"/\")\n      ? `/resource${configFileLocation}`\n      : `/resource/${configFileLocation}`;\n\n    configTheme = dataFetcher.fetch(configFilePath);\n\n    if (configTheme) {\n      store.dispatch(setThemePreference(configTheme));\n    } else {\n      throw new Error(\n        `Could not read theme configuration file from: ${configFilePath}`\n      );\n    }\n  }\n};\n\n/**\n */\nconst setApplication = (store: ReduxStore) => {\n  try {\n    const locale = getLocale(store.getState());\n    const application = new ModularUIRequest(\"/\", {\n      locale: locale,\n    }).fetchSync();\n\n    application.connectKey = `application(/)(${locale})`;\n\n    store.dispatch(\n      initModels([\n        {\n          key: `application(/)(${locale})`,\n          model: application,\n        },\n      ])\n    );\n  } catch (e) {\n    // swallow error, in this case we just don't pre-cache the webapplication,\n    // which has not much difference for the end user\n  }\n};\n\n/**\n */\nconst handleErrors = (store: ReduxStore) => {\n  const state = store.getState();\n\n  if (\n    state.error &&\n    (state.error.shouldThrowOnServer ||\n      !has(state.error, \"shouldThrowOnServer\"))\n  ) {\n    throw state.error;\n  }\n};\n\n/**\n */\nconst dehydrate = (store: ReduxStore): string => {\n  const state = store.getState();\n\n  const modularui: {\n    [key: string]: { status: string, lastModification: number, model: ?Object },\n  } = {};\n\n  for (const key in state.modularui) {\n    const { status, model, lastModification } = state.modularui[key];\n\n    if (model) {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: model.dehydrate(),\n      };\n    } else {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: undefined,\n      };\n    }\n  }\n\n  const filteredState = {\n    ...state,\n    modularui,\n  };\n\n  return JSON.stringify(filteredState).replace(/</g, \"\\\\u003c\");\n};\n\n/**\n */\nconst createHead = (\n  sheet: any,\n  UUID: string,\n  helmetContext?: Object\n): Object => {\n  const style = sheet.getStyleTags();\n  const meta = helmetContext ? [...helmetContext.helmet.meta] : [];\n\n  if (helmetContext) {\n    return {\n      ...helmetContext.helmet,\n      style,\n      meta,\n    };\n  }\n\n  return {\n    style,\n    meta,\n  };\n};\n\nexport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  createHead,\n  handleErrors,\n  dehydrate,\n};\n"],"mappings":"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"}

package/esm/redux/actions/SignIn.js

@@ -60,7 +60,8 @@ export const login = (username, password) => dispatch => {
       const dispatchedReloadApplication = dispatch(reloadApplication());
       return _Promise.resolve(dispatchedReloadApplication).then(() => {
         Cache.addItem("auth", true);
-        return dispatch(changePassword());
+        dispatch(changePassword());
+        return dispatch(finishProgress());
       });
     }
     dispatch(loginFailed(error.id));

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

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","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","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\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\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) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\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            return dispatch(changePassword());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(finishProgress());\n      });\n  };\n"],"mappings":";AACA,OAAOA,KAAK,MAAM,2BAA2B;AAC7C,OAAOC,YAAY,MAAM,8BAA8B;AAEvD,SAASC,iBAAiB,QAAQ,eAAe;AAEjD,SAASC,aAAa,EAAEC,cAAc,QAAQ,qBAAqB;AACnE,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,EAAE,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEC,KAAK;EACxD,MAAMC,YAAY,GAAGN,QAAQ,EAAE,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEG,IAAI;EAC5D,OAAOR,QAAQ,CACbV,IAAI,CAACC,mBAAmB,EAAE;IACxBiB,IAAI,EAAED,YAAY,GAAGA,YAAY,GAAGN,QAAQ,EAAE,CAACE,MAAM,CAACC,QAAQ;IAC9DE,KAAK,EAAEJ;EACT,CAAC,CAAC,CACH;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,KAAK,GAChBA,CAACC,QAAgB,EAAEC,QAAgB,KAClCX,QAAQ,IAAK;EACZA,QAAQ,CAACZ,aAAa,EAAE,CAAC;EAEzB,OAAO,IAAIF,YAAY,EAAE,CACtBuB,KAAK,CAACC,QAAQ,EAAEC,QAAQ,CAAC,CACzBC,IAAI,CAAC,MAAMZ,QAAQ,CAACb,iBAAiB,EAAE,CAAC,CAAC,CACzCyB,IAAI,CAAC,MAAM;IACV3B,KAAK,CAAC4B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;IAC3Bb,QAAQ,CAACF,YAAY,EAAE,CAAC;IAExB,OAAOE,QAAQ,CAACX,cAAc,EAAE,CAAC;EACnC,CAAC,CAAC,CACDyB,KAAK,CAAEC,KAAK,IAAK;IAChB,IAAIA,KAAK,CAACC,EAAE,KAAK,8BAA8B,EAAE;MAC/C,MAAMC,2BAA2B,GAAGjB,QAAQ,CAACb,iBAAiB,EAAE,CAAC;MAEjE,OAAO+B,QAAA,CAAQC,OAAO,CAACF,2BAA2B,CAAC,CAACL,IAAI,CAAC,MAAM;QAC7D3B,KAAK,CAAC4B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;QAC3B,OAAOb,QAAQ,CAACD,cAAc,EAAE,CAAC;MACnC,CAAC,CAAC;IACJ;IAEAC,QAAQ,CAACR,WAAW,CAACuB,KAAK,CAACC,EAAE,CAAC,CAAC;IAC/B,OAAOhB,QAAQ,CAACX,cAAc,EAAE,CAAC;EACnC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","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","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\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\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) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\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(finishProgress());\n      });\n  };\n"],"mappings":";AACA,OAAOA,KAAK,MAAM,2BAA2B;AAC7C,OAAOC,YAAY,MAAM,8BAA8B;AAEvD,SAASC,iBAAiB,QAAQ,eAAe;AAEjD,SAASC,aAAa,EAAEC,cAAc,QAAQ,qBAAqB;AACnE,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,EAAE,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEC,KAAK;EACxD,MAAMC,YAAY,GAAGN,QAAQ,EAAE,CAACE,MAAM,CAACC,QAAQ,EAAEC,KAAK,EAAEG,IAAI;EAC5D,OAAOR,QAAQ,CACbV,IAAI,CAACC,mBAAmB,EAAE;IACxBiB,IAAI,EAAED,YAAY,GAAGA,YAAY,GAAGN,QAAQ,EAAE,CAACE,MAAM,CAACC,QAAQ;IAC9DE,KAAK,EAAEJ;EACT,CAAC,CAAC,CACH;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMO,KAAK,GAChBA,CAACC,QAAgB,EAAEC,QAAgB,KAClCX,QAAQ,IAAK;EACZA,QAAQ,CAACZ,aAAa,EAAE,CAAC;EAEzB,OAAO,IAAIF,YAAY,EAAE,CACtBuB,KAAK,CAACC,QAAQ,EAAEC,QAAQ,CAAC,CACzBC,IAAI,CAAC,MAAMZ,QAAQ,CAACb,iBAAiB,EAAE,CAAC,CAAC,CACzCyB,IAAI,CAAC,MAAM;IACV3B,KAAK,CAAC4B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;IAC3Bb,QAAQ,CAACF,YAAY,EAAE,CAAC;IAExB,OAAOE,QAAQ,CAACX,cAAc,EAAE,CAAC;EACnC,CAAC,CAAC,CACDyB,KAAK,CAAEC,KAAK,IAAK;IAChB,IAAIA,KAAK,CAACC,EAAE,KAAK,8BAA8B,EAAE;MAC/C,MAAMC,2BAA2B,GAAGjB,QAAQ,CAACb,iBAAiB,EAAE,CAAC;MAEjE,OAAO+B,QAAA,CAAQC,OAAO,CAACF,2BAA2B,CAAC,CAACL,IAAI,CAAC,MAAM;QAC7D3B,KAAK,CAAC4B,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;QAC3Bb,QAAQ,CAACD,cAAc,EAAE,CAAC;QAC1B,OAAOC,QAAQ,CAACX,cAAc,EAAE,CAAC;MACnC,CAAC,CAAC;IACJ;IAEAW,QAAQ,CAACR,WAAW,CAACuB,KAAK,CAACC,EAAE,CAAC,CAAC;IAC/B,OAAOhB,QAAQ,CAACX,cAAc,EAAE,CAAC;EACnC,CAAC,CAAC;AACN,CAAC"}

package/lib/react-server/serverUtil.js

@@ -147,8 +147,8 @@ const setApplication = store => {
       model: application
     }]));
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.info("Could not load webapplication on server");
+    // swallow error, in this case we just don't pre-cache the webapplication,
+    // which has not much difference for the end user
   }
 };
 

package/lib/react-server/serverUtil.js.flow

@@ -187,8 +187,8 @@ const setApplication = (store: ReduxStore) => {
       ])
     );
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.info("Could not load webapplication on server");
+    // swallow error, in this case we just don't pre-cache the webapplication,
+    // which has not much difference for the end user
   }
 };
 

package/lib/react-server/serverUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverUtil.js","names":["_history","require","_objects","_deepmerge","_interopRequireDefault","_configureStore","_Locales","_interopRequireWildcard","_requestInformation","_I18nActions","_Preferences","_Settings","_exceptions","_redux","_i18n","_ModularUIRequest","_getRequireWildcardCache","nodeInterop","_WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","_Object$getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","createReduxStore","requestHref","customReducers","initialState","history","createMemoryHistory","initialEntries","toString","store","configureStore","exports","setI18n","locales","arguments","length","undefined","request","Array","isArray","IllegalArgumentException","mergedLocales","_map","availableLocales","locale","code","customLocale","_find","custLocale","deepmerge","forEach","some","push","enabledLocales","_filter","_context","_includes","getSetting","localesInstance","Locales","preferredLocale","getPreferredLocale","dispatch","setLocales","setServerPreferencesFromArray","serverPreferences","serverPreference","name","defaultValue","type","setServerPreference","setServerPreferences","setAllContentInDataSetting","setLoginPreferences","preferencesProvider","isStudioContext","setPreference","setConfigurationTheme","configTheme","configFileLocation","getLayoutConfigFileLocation","configFilePath","_startsWith","dataFetcher","fetch","setThemePreference","Error","setApplication","getLocale","getState","application","ModularUIRequest","fetchSync","connectKey","initModels","model","e","console","info","handleErrors","state","error","shouldThrowOnServer","dehydrate","modularui","status","lastModification","filteredState","_stringify","replace","createHead","sheet","UUID","helmetContext","style","getStyleTags","meta","helmet"],"sources":["../../src/react-server/serverUtil.js"],"sourcesContent":["// @flow\nimport { createMemoryHistory } from \"history\";\nimport { has } from \"../utils/helpers/objects\";\nimport deepmerge from \"deepmerge\";\n\nimport configureStore from \"../redux/store/configureStore\";\n\nimport { availableLocales } from \"../i18n/Locales\";\nimport Locales from \"../i18n/Locales\";\n\nimport { getPreferredLocale } from \"./requestInformation\";\nimport { setLocales } from \"../redux/_i18n/I18nActions\";\n\nimport {\n  setServerPreference,\n  setThemePreference,\n  setPreference,\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\n\nimport { getSetting } from \"../constants/Settings\";\n\nimport { IllegalArgumentException } from \"../exceptions\";\n\nimport { initModels } from \"../redux\";\nimport { getLocale } from \"../redux/selectors/i18n\";\n\nimport ModularUIRequest from \"../modularui/ModularUIRequest\";\n\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { ReduxState, ReduxStore } from \"../redux/types\";\nimport type Href from \"../models/href/Href\";\nimport type { RouterHistory } from \"react-router\";\n\nexport type PreferenceValue = {\n  name: string,\n  defaultValue?: string | null,\n  type?: string,\n};\n\n/**\n */\nconst createReduxStore = (\n  requestHref: Href,\n  customReducers: Object,\n  initialState?: $Shape<ReduxState>\n): ReduxStore => {\n  // $FlowExpectedError\n  const history: RouterHistory = createMemoryHistory({\n    initialEntries: [requestHref.toString()],\n  });\n\n  const { store } = configureStore(history, customReducers, initialState);\n\n  return store;\n};\n\n/**\n */\nconst setI18n = (\n  store: ReduxStore,\n  locales: Array<LocaleConfiguration> = [],\n  request: HttpServletRequestJava\n) => {\n  if (!Array.isArray(locales)) {\n    throw new IllegalArgumentException(\"locales must be an array of objects\");\n  }\n  if (!request) {\n    throw new IllegalArgumentException(\"missing request argument\");\n  }\n\n  const mergedLocales = availableLocales.map((locale) => {\n    const code = locale.code;\n    const customLocale = locales.find((custLocale) => custLocale.code === code);\n\n    if (customLocale) {\n      return deepmerge(locale, customLocale);\n    }\n\n    return locale;\n  });\n\n  locales.forEach((customLocale) => {\n    if (!mergedLocales.some((locale) => locale.code === customLocale.code)) {\n      mergedLocales.push(customLocale);\n    }\n  });\n\n  const enabledLocales = mergedLocales.filter((locale: LocaleConfiguration) =>\n    getSetting(\"ENABLED_LOCALES\").includes(locale.code)\n  );\n\n  const localesInstance = new Locales(enabledLocales);\n  const preferredLocale = getPreferredLocale(request, localesInstance);\n  store.dispatch(setLocales(localesInstance, preferredLocale ?? \"en\"));\n};\n\nconst setServerPreferencesFromArray = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  serverPreferences.forEach((serverPreference) => {\n    if (typeof serverPreference === \"object\") {\n      const { name, defaultValue, type } = serverPreference;\n      store.dispatch(setServerPreference(name, defaultValue, type));\n    } else {\n      store.dispatch(setServerPreference(serverPreference, null));\n    }\n  });\n};\n\n/**\n * Server preferences can be suplied by an array of preference names,\n * or an array of objects which has the name, an optional default value and an optional type.<br>\n * When the type is set to string, a comma separated value is not converted to an array:\n *\n * @example\n * // value becomes an array [default1, default2]\n * { name: \"prefName\", defaultValue: \"default1, default2\" }\n * // value remains a string \"default1, default2\"\n * { name: \"prefName\", defaultValue: \"default1, default2\", type: \"string\" }\n *\n * @param store\n * @param serverPreferences\n */\nconst setServerPreferences = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  if (Array.isArray(serverPreferences)) {\n    setServerPreferencesFromArray(store, serverPreferences);\n  }\n\n  store.dispatch(setAllContentInDataSetting());\n  store.dispatch(setLoginPreferences());\n\n  if (\n    preferencesProvider &&\n    preferencesProvider.isStudioContext &&\n    preferencesProvider.isStudioContext()\n  ) {\n    store.dispatch(setPreference(\"isStudioContext\", true));\n  }\n};\n\n/**\n */\nconst setConfigurationTheme = (store: ReduxStore) => {\n  let configTheme = null;\n\n  const configFileLocation = preferencesProvider.getLayoutConfigFileLocation();\n  if (typeof configFileLocation === \"string\") {\n    const configFilePath = configFileLocation.startsWith(\"/\")\n      ? `/resource${configFileLocation}`\n      : `/resource/${configFileLocation}`;\n\n    configTheme = dataFetcher.fetch(configFilePath);\n\n    if (configTheme) {\n      store.dispatch(setThemePreference(configTheme));\n    } else {\n      throw new Error(\n        `Could not read theme configuration file from: ${configFilePath}`\n      );\n    }\n  }\n};\n\n/**\n */\nconst setApplication = (store: ReduxStore) => {\n  try {\n    const locale = getLocale(store.getState());\n    const application = new ModularUIRequest(\"/\", {\n      locale: locale,\n    }).fetchSync();\n\n    application.connectKey = `application(/)(${locale})`;\n\n    store.dispatch(\n      initModels([\n        {\n          key: `application(/)(${locale})`,\n          model: application,\n        },\n      ])\n    );\n  } catch (e) {\n    // eslint-disable-next-line no-console\n    console.info(\"Could not load webapplication on server\");\n  }\n};\n\n/**\n */\nconst handleErrors = (store: ReduxStore) => {\n  const state = store.getState();\n\n  if (\n    state.error &&\n    (state.error.shouldThrowOnServer ||\n      !has(state.error, \"shouldThrowOnServer\"))\n  ) {\n    throw state.error;\n  }\n};\n\n/**\n */\nconst dehydrate = (store: ReduxStore): string => {\n  const state = store.getState();\n\n  const modularui: {\n    [key: string]: { status: string, lastModification: number, model: ?Object },\n  } = {};\n\n  for (const key in state.modularui) {\n    const { status, model, lastModification } = state.modularui[key];\n\n    if (model) {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: model.dehydrate(),\n      };\n    } else {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: undefined,\n      };\n    }\n  }\n\n  const filteredState = {\n    ...state,\n    modularui,\n  };\n\n  return JSON.stringify(filteredState).replace(/</g, \"\\\\u003c\");\n};\n\n/**\n */\nconst createHead = (\n  sheet: any,\n  UUID: string,\n  helmetContext?: Object\n): Object => {\n  const style = sheet.getStyleTags();\n  const meta = helmetContext ? [...helmetContext.helmet.meta] : [];\n\n  if (helmetContext) {\n    return {\n      ...helmetContext.helmet,\n      style,\n      meta,\n    };\n  }\n\n  return {\n    style,\n    meta,\n  };\n};\n\nexport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  createHead,\n  handleErrors,\n  dehydrate,\n};\n"],"mappings":"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"}
+{"version":3,"file":"serverUtil.js","names":["_history","require","_objects","_deepmerge","_interopRequireDefault","_configureStore","_Locales","_interopRequireWildcard","_requestInformation","_I18nActions","_Preferences","_Settings","_exceptions","_redux","_i18n","_ModularUIRequest","_getRequireWildcardCache","nodeInterop","_WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","_Object$getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","createReduxStore","requestHref","customReducers","initialState","history","createMemoryHistory","initialEntries","toString","store","configureStore","exports","setI18n","locales","arguments","length","undefined","request","Array","isArray","IllegalArgumentException","mergedLocales","_map","availableLocales","locale","code","customLocale","_find","custLocale","deepmerge","forEach","some","push","enabledLocales","_filter","_context","_includes","getSetting","localesInstance","Locales","preferredLocale","getPreferredLocale","dispatch","setLocales","setServerPreferencesFromArray","serverPreferences","serverPreference","name","defaultValue","type","setServerPreference","setServerPreferences","setAllContentInDataSetting","setLoginPreferences","preferencesProvider","isStudioContext","setPreference","setConfigurationTheme","configTheme","configFileLocation","getLayoutConfigFileLocation","configFilePath","_startsWith","dataFetcher","fetch","setThemePreference","Error","setApplication","getLocale","getState","application","ModularUIRequest","fetchSync","connectKey","initModels","model","e","handleErrors","state","error","shouldThrowOnServer","dehydrate","modularui","status","lastModification","filteredState","_stringify","replace","createHead","sheet","UUID","helmetContext","style","getStyleTags","meta","helmet"],"sources":["../../src/react-server/serverUtil.js"],"sourcesContent":["// @flow\nimport { createMemoryHistory } from \"history\";\nimport { has } from \"../utils/helpers/objects\";\nimport deepmerge from \"deepmerge\";\n\nimport configureStore from \"../redux/store/configureStore\";\n\nimport { availableLocales } from \"../i18n/Locales\";\nimport Locales from \"../i18n/Locales\";\n\nimport { getPreferredLocale } from \"./requestInformation\";\nimport { setLocales } from \"../redux/_i18n/I18nActions\";\n\nimport {\n  setServerPreference,\n  setThemePreference,\n  setPreference,\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\n\nimport { getSetting } from \"../constants/Settings\";\n\nimport { IllegalArgumentException } from \"../exceptions\";\n\nimport { initModels } from \"../redux\";\nimport { getLocale } from \"../redux/selectors/i18n\";\n\nimport ModularUIRequest from \"../modularui/ModularUIRequest\";\n\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { ReduxState, ReduxStore } from \"../redux/types\";\nimport type Href from \"../models/href/Href\";\nimport type { RouterHistory } from \"react-router\";\n\nexport type PreferenceValue = {\n  name: string,\n  defaultValue?: string | null,\n  type?: string,\n};\n\n/**\n */\nconst createReduxStore = (\n  requestHref: Href,\n  customReducers: Object,\n  initialState?: $Shape<ReduxState>\n): ReduxStore => {\n  // $FlowExpectedError\n  const history: RouterHistory = createMemoryHistory({\n    initialEntries: [requestHref.toString()],\n  });\n\n  const { store } = configureStore(history, customReducers, initialState);\n\n  return store;\n};\n\n/**\n */\nconst setI18n = (\n  store: ReduxStore,\n  locales: Array<LocaleConfiguration> = [],\n  request: HttpServletRequestJava\n) => {\n  if (!Array.isArray(locales)) {\n    throw new IllegalArgumentException(\"locales must be an array of objects\");\n  }\n  if (!request) {\n    throw new IllegalArgumentException(\"missing request argument\");\n  }\n\n  const mergedLocales = availableLocales.map((locale) => {\n    const code = locale.code;\n    const customLocale = locales.find((custLocale) => custLocale.code === code);\n\n    if (customLocale) {\n      return deepmerge(locale, customLocale);\n    }\n\n    return locale;\n  });\n\n  locales.forEach((customLocale) => {\n    if (!mergedLocales.some((locale) => locale.code === customLocale.code)) {\n      mergedLocales.push(customLocale);\n    }\n  });\n\n  const enabledLocales = mergedLocales.filter((locale: LocaleConfiguration) =>\n    getSetting(\"ENABLED_LOCALES\").includes(locale.code)\n  );\n\n  const localesInstance = new Locales(enabledLocales);\n  const preferredLocale = getPreferredLocale(request, localesInstance);\n  store.dispatch(setLocales(localesInstance, preferredLocale ?? \"en\"));\n};\n\nconst setServerPreferencesFromArray = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  serverPreferences.forEach((serverPreference) => {\n    if (typeof serverPreference === \"object\") {\n      const { name, defaultValue, type } = serverPreference;\n      store.dispatch(setServerPreference(name, defaultValue, type));\n    } else {\n      store.dispatch(setServerPreference(serverPreference, null));\n    }\n  });\n};\n\n/**\n * Server preferences can be suplied by an array of preference names,\n * or an array of objects which has the name, an optional default value and an optional type.<br>\n * When the type is set to string, a comma separated value is not converted to an array:\n *\n * @example\n * // value becomes an array [default1, default2]\n * { name: \"prefName\", defaultValue: \"default1, default2\" }\n * // value remains a string \"default1, default2\"\n * { name: \"prefName\", defaultValue: \"default1, default2\", type: \"string\" }\n *\n * @param store\n * @param serverPreferences\n */\nconst setServerPreferences = (\n  store: ReduxStore,\n  serverPreferences: Array<string | PreferenceValue>\n) => {\n  if (Array.isArray(serverPreferences)) {\n    setServerPreferencesFromArray(store, serverPreferences);\n  }\n\n  store.dispatch(setAllContentInDataSetting());\n  store.dispatch(setLoginPreferences());\n\n  if (\n    preferencesProvider &&\n    preferencesProvider.isStudioContext &&\n    preferencesProvider.isStudioContext()\n  ) {\n    store.dispatch(setPreference(\"isStudioContext\", true));\n  }\n};\n\n/**\n */\nconst setConfigurationTheme = (store: ReduxStore) => {\n  let configTheme = null;\n\n  const configFileLocation = preferencesProvider.getLayoutConfigFileLocation();\n  if (typeof configFileLocation === \"string\") {\n    const configFilePath = configFileLocation.startsWith(\"/\")\n      ? `/resource${configFileLocation}`\n      : `/resource/${configFileLocation}`;\n\n    configTheme = dataFetcher.fetch(configFilePath);\n\n    if (configTheme) {\n      store.dispatch(setThemePreference(configTheme));\n    } else {\n      throw new Error(\n        `Could not read theme configuration file from: ${configFilePath}`\n      );\n    }\n  }\n};\n\n/**\n */\nconst setApplication = (store: ReduxStore) => {\n  try {\n    const locale = getLocale(store.getState());\n    const application = new ModularUIRequest(\"/\", {\n      locale: locale,\n    }).fetchSync();\n\n    application.connectKey = `application(/)(${locale})`;\n\n    store.dispatch(\n      initModels([\n        {\n          key: `application(/)(${locale})`,\n          model: application,\n        },\n      ])\n    );\n  } catch (e) {\n    // swallow error, in this case we just don't pre-cache the webapplication,\n    // which has not much difference for the end user\n  }\n};\n\n/**\n */\nconst handleErrors = (store: ReduxStore) => {\n  const state = store.getState();\n\n  if (\n    state.error &&\n    (state.error.shouldThrowOnServer ||\n      !has(state.error, \"shouldThrowOnServer\"))\n  ) {\n    throw state.error;\n  }\n};\n\n/**\n */\nconst dehydrate = (store: ReduxStore): string => {\n  const state = store.getState();\n\n  const modularui: {\n    [key: string]: { status: string, lastModification: number, model: ?Object },\n  } = {};\n\n  for (const key in state.modularui) {\n    const { status, model, lastModification } = state.modularui[key];\n\n    if (model) {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: model.dehydrate(),\n      };\n    } else {\n      modularui[key] = {\n        status,\n        lastModification,\n        model: undefined,\n      };\n    }\n  }\n\n  const filteredState = {\n    ...state,\n    modularui,\n  };\n\n  return JSON.stringify(filteredState).replace(/</g, \"\\\\u003c\");\n};\n\n/**\n */\nconst createHead = (\n  sheet: any,\n  UUID: string,\n  helmetContext?: Object\n): Object => {\n  const style = sheet.getStyleTags();\n  const meta = helmetContext ? [...helmetContext.helmet.meta] : [];\n\n  if (helmetContext) {\n    return {\n      ...helmetContext.helmet,\n      style,\n      meta,\n    };\n  }\n\n  return {\n    style,\n    meta,\n  };\n};\n\nexport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  createHead,\n  handleErrors,\n  dehydrate,\n};\n"],"mappings":";;;;;;;;;;;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,eAAA,GAAAD,sBAAA,CAAAH,OAAA;AAEA,IAAAK,QAAA,GAAAC,uBAAA,CAAAN,OAAA;AAGA,IAAAO,mBAAA,GAAAP,OAAA;AACA,IAAAQ,YAAA,GAAAR,OAAA;AAEA,IAAAS,YAAA,GAAAT,OAAA;AAQA,IAAAU,SAAA,GAAAV,OAAA;AAEA,IAAAW,WAAA,GAAAX,OAAA;AAEA,IAAAY,MAAA,GAAAZ,OAAA;AACA,IAAAa,KAAA,GAAAb,OAAA;AAEA,IAAAc,iBAAA,GAAAX,sBAAA,CAAAH,OAAA;AAA6D,SAAAe,yBAAAC,WAAA,eAAAC,QAAA,kCAAAC,iBAAA,OAAAD,QAAA,QAAAE,gBAAA,OAAAF,QAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAV,wBAAAc,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAC,gCAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAG,gCAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAa7D;AACA;AACA,MAAMW,gBAAgB,GAAGA,CACvBC,WAAiB,EACjBC,cAAsB,EACtBC,YAAiC,KAClB;EACf;EACA,MAAMC,OAAsB,GAAG,IAAAC,4BAAmB,EAAC;IACjDC,cAAc,EAAE,CAACL,WAAW,CAACM,QAAQ,EAAE;EACzC,CAAC,CAAC;EAEF,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,uBAAc,EAACL,OAAO,EAAEF,cAAc,EAAEC,YAAY,CAAC;EAEvE,OAAOK,KAAK;AACd,CAAC;;AAED;AACA;AADAE,OAAA,CAAAV,gBAAA,GAAAA,gBAAA;AAEA,MAAMW,OAAO,GAAG,SAAAA,CACdH,KAAiB,EAGd;EAAA,IAFHI,OAAmC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAAA,IACxCG,OAA+B,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAE/B,IAAI,CAACE,KAAK,CAACC,OAAO,CAACN,OAAO,CAAC,EAAE;IAC3B,MAAM,IAAIO,oCAAwB,CAAC,qCAAqC,CAAC;EAC3E;EACA,IAAI,CAACH,OAAO,EAAE;IACZ,MAAM,IAAIG,oCAAwB,CAAC,0BAA0B,CAAC;EAChE;EAEA,MAAMC,aAAa,GAAG,IAAAC,IAAA,CAAApC,OAAA,EAAAqC,yBAAgB,EAAAzB,IAAA,CAAhByB,yBAAgB,EAAMC,MAAM,IAAK;IACrD,MAAMC,IAAI,GAAGD,MAAM,CAACC,IAAI;IACxB,MAAMC,YAAY,GAAG,IAAAC,KAAA,CAAAzC,OAAA,EAAA2B,OAAO,EAAAf,IAAA,CAAPe,OAAO,EAAOe,UAAU,IAAKA,UAAU,CAACH,IAAI,KAAKA,IAAI,CAAC;IAE3E,IAAIC,YAAY,EAAE;MAChB,OAAO,IAAAG,kBAAS,EAACL,MAAM,EAAEE,YAAY,CAAC;IACxC;IAEA,OAAOF,MAAM;EACf,CAAC,CAAC;EAEFX,OAAO,CAACiB,OAAO,CAAEJ,YAAY,IAAK;IAChC,IAAI,CAACL,aAAa,CAACU,IAAI,CAAEP,MAAM,IAAKA,MAAM,CAACC,IAAI,KAAKC,YAAY,CAACD,IAAI,CAAC,EAAE;MACtEJ,aAAa,CAACW,IAAI,CAACN,YAAY,CAAC;IAClC;EACF,CAAC,CAAC;EAEF,MAAMO,cAAc,GAAG,IAAAC,OAAA,CAAAhD,OAAA,EAAAmC,aAAa,EAAAvB,IAAA,CAAbuB,aAAa,EAASG,MAA2B;IAAA,IAAAW,QAAA;IAAA,OACtE,IAAAC,SAAA,CAAAlD,OAAA,EAAAiD,QAAA,OAAAE,oBAAU,EAAC,iBAAiB,CAAC,EAAAvC,IAAA,CAAAqC,QAAA,EAAUX,MAAM,CAACC,IAAI,CAAC;EAAA,EACpD;EAED,MAAMa,eAAe,GAAG,IAAIC,gBAAO,CAACN,cAAc,CAAC;EACnD,MAAMO,eAAe,GAAG,IAAAC,sCAAkB,EAACxB,OAAO,EAAEqB,eAAe,CAAC;EACpE7B,KAAK,CAACiC,QAAQ,CAAC,IAAAC,uBAAU,EAACL,eAAe,EAAEE,eAAe,IAAI,IAAI,CAAC,CAAC;AACtE,CAAC;AAAC7B,OAAA,CAAAC,OAAA,GAAAA,OAAA;AAEF,MAAMgC,6BAA6B,GAAGA,CACpCnC,KAAiB,EACjBoC,iBAAkD,KAC/C;EACHA,iBAAiB,CAACf,OAAO,CAAEgB,gBAAgB,IAAK;IAC9C,IAAI,OAAOA,gBAAgB,KAAK,QAAQ,EAAE;MACxC,MAAM;QAAEC,IAAI;QAAEC,YAAY;QAAEC;MAAK,CAAC,GAAGH,gBAAgB;MACrDrC,KAAK,CAACiC,QAAQ,CAAC,IAAAQ,gCAAmB,EAACH,IAAI,EAAEC,YAAY,EAAEC,IAAI,CAAC,CAAC;IAC/D,CAAC,MAAM;MACLxC,KAAK,CAACiC,QAAQ,CAAC,IAAAQ,gCAAmB,EAACJ,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC7D;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMK,oBAAoB,GAAGA,CAC3B1C,KAAiB,EACjBoC,iBAAkD,KAC/C;EACH,IAAI3B,KAAK,CAACC,OAAO,CAAC0B,iBAAiB,CAAC,EAAE;IACpCD,6BAA6B,CAACnC,KAAK,EAAEoC,iBAAiB,CAAC;EACzD;EAEApC,KAAK,CAACiC,QAAQ,CAAC,IAAAU,uCAA0B,GAAE,CAAC;EAC5C3C,KAAK,CAACiC,QAAQ,CAAC,IAAAW,gCAAmB,GAAE,CAAC;EAErC,IACEC,mBAAmB,IACnBA,mBAAmB,CAACC,eAAe,IACnCD,mBAAmB,CAACC,eAAe,EAAE,EACrC;IACA9C,KAAK,CAACiC,QAAQ,CAAC,IAAAc,0BAAa,EAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;EACxD;AACF,CAAC;;AAED;AACA;AADA7C,OAAA,CAAAwC,oBAAA,GAAAA,oBAAA;AAEA,MAAMM,qBAAqB,GAAIhD,KAAiB,IAAK;EACnD,IAAIiD,WAAW,GAAG,IAAI;EAEtB,MAAMC,kBAAkB,GAAGL,mBAAmB,CAACM,2BAA2B,EAAE;EAC5E,IAAI,OAAOD,kBAAkB,KAAK,QAAQ,EAAE;IAC1C,MAAME,cAAc,GAAG,IAAAC,WAAA,CAAA5E,OAAA,EAAAyE,kBAAkB,EAAA7D,IAAA,CAAlB6D,kBAAkB,EAAY,GAAG,CAAC,GACpD,YAAWA,kBAAmB,EAAC,GAC/B,aAAYA,kBAAmB,EAAC;IAErCD,WAAW,GAAGK,WAAW,CAACC,KAAK,CAACH,cAAc,CAAC;IAE/C,IAAIH,WAAW,EAAE;MACfjD,KAAK,CAACiC,QAAQ,CAAC,IAAAuB,+BAAkB,EAACP,WAAW,CAAC,CAAC;IACjD,CAAC,MAAM;MACL,MAAM,IAAIQ,KAAK,CACZ,iDAAgDL,cAAe,EAAC,CAClE;IACH;EACF;AACF,CAAC;;AAED;AACA;AADAlD,OAAA,CAAA8C,qBAAA,GAAAA,qBAAA;AAEA,MAAMU,cAAc,GAAI1D,KAAiB,IAAK;EAC5C,IAAI;IACF,MAAMe,MAAM,GAAG,IAAA4C,eAAS,EAAC3D,KAAK,CAAC4D,QAAQ,EAAE,CAAC;IAC1C,MAAMC,WAAW,GAAG,IAAIC,yBAAgB,CAAC,GAAG,EAAE;MAC5C/C,MAAM,EAAEA;IACV,CAAC,CAAC,CAACgD,SAAS,EAAE;IAEdF,WAAW,CAACG,UAAU,GAAI,kBAAiBjD,MAAO,GAAE;IAEpDf,KAAK,CAACiC,QAAQ,CACZ,IAAAgC,iBAAU,EAAC,CACT;MACE/E,GAAG,EAAG,kBAAiB6B,MAAO,GAAE;MAChCmD,KAAK,EAAEL;IACT,CAAC,CACF,CAAC,CACH;EACH,CAAC,CAAC,OAAOM,CAAC,EAAE;IACV;IACA;EAAA;AAEJ,CAAC;;AAED;AACA;AADAjE,OAAA,CAAAwD,cAAA,GAAAA,cAAA;AAEA,MAAMU,YAAY,GAAIpE,KAAiB,IAAK;EAC1C,MAAMqE,KAAK,GAAGrE,KAAK,CAAC4D,QAAQ,EAAE;EAE9B,IACES,KAAK,CAACC,KAAK,KACVD,KAAK,CAACC,KAAK,CAACC,mBAAmB,IAC9B,CAAC,IAAA5F,YAAG,EAAC0F,KAAK,CAACC,KAAK,EAAE,qBAAqB,CAAC,CAAC,EAC3C;IACA,MAAMD,KAAK,CAACC,KAAK;EACnB;AACF,CAAC;;AAED;AACA;AADApE,OAAA,CAAAkE,YAAA,GAAAA,YAAA;AAEA,MAAMI,SAAS,GAAIxE,KAAiB,IAAa;EAC/C,MAAMqE,KAAK,GAAGrE,KAAK,CAAC4D,QAAQ,EAAE;EAE9B,MAAMa,SAEL,GAAG,CAAC,CAAC;EAEN,KAAK,MAAMvF,GAAG,IAAImF,KAAK,CAACI,SAAS,EAAE;IACjC,MAAM;MAAEC,MAAM;MAAER,KAAK;MAAES;IAAiB,CAAC,GAAGN,KAAK,CAACI,SAAS,CAACvF,GAAG,CAAC;IAEhE,IAAIgF,KAAK,EAAE;MACTO,SAAS,CAACvF,GAAG,CAAC,GAAG;QACfwF,MAAM;QACNC,gBAAgB;QAChBT,KAAK,EAAEA,KAAK,CAACM,SAAS;MACxB,CAAC;IACH,CAAC,MAAM;MACLC,SAAS,CAACvF,GAAG,CAAC,GAAG;QACfwF,MAAM;QACNC,gBAAgB;QAChBT,KAAK,EAAE3D;MACT,CAAC;IACH;EACF;EAEA,MAAMqE,aAAa,GAAG;IACpB,GAAGP,KAAK;IACRI;EACF,CAAC;EAED,OAAO,IAAAI,UAAA,CAAApG,OAAA,EAAemG,aAAa,CAAC,CAACE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;AAC/D,CAAC;;AAED;AACA;AADA5E,OAAA,CAAAsE,SAAA,GAAAA,SAAA;AAEA,MAAMO,UAAU,GAAGA,CACjBC,KAAU,EACVC,IAAY,EACZC,aAAsB,KACX;EACX,MAAMC,KAAK,GAAGH,KAAK,CAACI,YAAY,EAAE;EAClC,MAAMC,IAAI,GAAGH,aAAa,GAAG,CAAC,GAAGA,aAAa,CAACI,MAAM,CAACD,IAAI,CAAC,GAAG,EAAE;EAEhE,IAAIH,aAAa,EAAE;IACjB,OAAO;MACL,GAAGA,aAAa,CAACI,MAAM;MACvBH,KAAK;MACLE;IACF,CAAC;EACH;EAEA,OAAO;IACLF,KAAK;IACLE;EACF,CAAC;AACH,CAAC;AAACnF,OAAA,CAAA6E,UAAA,GAAAA,UAAA"}

package/lib/redux/actions/SignIn.js

@@ -72,7 +72,8 @@ const login = (username, password) => dispatch => {
       const dispatchedReloadApplication = dispatch((0, _Application.reloadApplication)());
       return _promise.default.resolve(dispatchedReloadApplication).then(() => {
         _Cache.default.addItem("auth", true);
-        return dispatch(changePassword());
+        dispatch(changePassword());
+        return dispatch((0, _ProgressIndicator.finishProgress)());
       });
     }
     dispatch(loginFailed(error.id));

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

@@ -86,7 +86,8 @@ export const login =
 
           return Promise.resolve(dispatchedReloadApplication).then(() => {
             Cache.addItem("auth", true);
-            return dispatch(changePassword());
+            dispatch(changePassword());
+            return dispatch(finishProgress());
           });
         }
 

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

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["_Cache","_interopRequireDefault","require","_Authenticate","_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","finishProgress","catch","error","id","dispatchedReloadApplication","_promise","default","resolve"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\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) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\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            return dispatch(changePassword());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(finishProgress());\n      });\n  };\n"],"mappings":"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"}
+{"version":3,"file":"SignIn.js","names":["_Cache","_interopRequireDefault","require","_Authenticate","_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","finishProgress","catch","error","id","dispatchedReloadApplication","_promise","default","resolve"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\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) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\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(finishProgress());\n      });\n  };\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.28.4",
+  "version": "1.28.6",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -118,7 +118,7 @@
     "commit-and-tag-version": "^11.1.0",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.1",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^2.0.3",
@@ -128,7 +128,7 @@
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
-    "flow-bin": "^0.200.0",
+    "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.8.0",
     "glob": "^8.1.0",

package/src/react-server/serverUtil.js

@@ -187,8 +187,8 @@ const setApplication = (store: ReduxStore) => {
       ])
     );
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.info("Could not load webapplication on server");
+    // swallow error, in this case we just don't pre-cache the webapplication,
+    // which has not much difference for the end user
   }
 };
 

package/src/redux/actions/SignIn.js

@@ -86,7 +86,8 @@ export const login =
 
           return Promise.resolve(dispatchedReloadApplication).then(() => {
             Cache.addItem("auth", true);
-            return dispatch(changePassword());
+            dispatch(changePassword());
+            return dispatch(finishProgress());
           });
         }