@beinformed/ui 1.65.23 → 1.65.24

package/esm/redux/actions/__tests__/Authorization.spec.js.flow

@@ -1,121 +1,115 @@
+// @flow
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import { handleUnauthorized } from "../Authorization";
 
 import application from "../../../models/application/__mock__/application";
-import Href from "../../../models/href/Href";
 import { MODULARUI_STATUS } from "../../../constants";
 import { ErrorResponse } from "../../../models";
 import { Cache } from "../../../utils";
 
-const middlewares = [thunk];
-const mockStore = configureMockStore(middlewares);
+const thunkExtra = {
+  subscribe: jest.fn((cb) => {
+    if (typeof cb === "function") {
+      setImmediate(cb);
+    }
+    return jest.fn();
+  }),
+};
+
+const middlewares = [thunk.withExtraArgument(thunkExtra)];
+
+/**
+ * We cast the creator to 'any' then to a function that returns 'any'
+ * to bypass the strict Dispatch definition in the redux-mock-store flow-typed file.
+ */
+const mockStoreCreator: (state: Object) => any =
+  configureMockStore(middlewares);
 
 describe("authorization actions", () => {
-  it("handle unauthorized with application present when logged in", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    Cache.removeItem("auth");
+  });
+
+  it("handle unauthorized with application present when logged in", async () => {
+    const connectKey = "application(/)(en)";
     Cache.setItem("auth", true);
-    application.connectKey = "/";
-    const store = mockStore({
+
+    const store = mockStoreCreator({
       modularui: {
-        "/": {
-          connectKey: "/",
+        [connectKey]: {
+          connectKey: connectKey,
           model: application,
           status: MODULARUI_STATUS.FINISHED,
         },
       },
-      router: {},
+      router: { location: { pathname: "/current-page" } },
+      i18n: { locale: "en" },
     });
 
     const errorResponse = new ErrorResponse(
-      {
-        id: "Error.Authentication.InvalidUsername",
-      },
-      "/",
+      { id: "Error.Authentication.InvalidUsername" },
+      connectKey,
     );
-    store.dispatch(handleUnauthorized(errorResponse));
 
-    expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/REMOVE_KEY",
-        payload: "/",
-      },
-      {
-        type: "MODULARUI/REMOVE_KEY",
-        payload: "/",
-      },
-      {
-        type: "START_PROGRESS",
-      },
-      {
-        type: "MODULARUI/FETCH",
-        payload: expect.objectContaining({
-          href: new Href("/", "Application"),
-        }),
-      },
-      {
-        type: "AUTHENTICATION_LOGOUT",
-      },
-      {
-        type: "AUTHENTICATION_ERROR",
-        payload: "Error.Authentication.InvalidUsername",
-      },
-      {
-        type: "ROUTER/REPLACE",
-        payload: {
-          location: "/signin",
-          state: {
-            from: undefined,
-            modal: false,
-          },
-        },
-      },
-    ]);
+    await store.dispatch(handleUnauthorized(errorResponse));
+
+    const actions = store.getActions();
+
+    expect(actions).toEqual(
+      expect.arrayContaining([
+        { type: "MODULARUI/REMOVE_KEY", payload: connectKey },
+        { type: "START_PROGRESS" },
+        { type: "AUTHENTICATION_LOGOUT" },
+      ]),
+    );
   });
 
-  it("handle unauthorized with application present when logged out", () => {
-    Cache.removeItem("auth");
-    application.connectKey = "/";
-    const store = mockStore({
+  it("handle unauthorized when no auth cache and logged out", async () => {
+    const store = mockStoreCreator({
       modularui: {
         "/": {
           connectKey: "/",
-          model: application,
+          model: { ...application, isLoggedIn: false },
           status: MODULARUI_STATUS.FINISHED,
         },
       },
-      router: {},
+      router: { location: { pathname: "/dashboard" } },
+      i18n: { locale: "en" },
     });
 
     const errorResponse = new ErrorResponse(
-      {
-        id: "Error.Authentication.InvalidUsername",
-      },
+      { id: "Error.Authentication.InvalidUsername" },
       "/",
     );
-    store.dispatch(handleUnauthorized(errorResponse));
 
-    expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/REMOVE_KEY",
-        payload: "/",
-      },
-      {
-        type: "AUTHENTICATION_LOGOUT",
-      },
-      {
-        type: "AUTHENTICATION_ERROR",
-        payload: "Error.Authentication.InvalidUsername",
-      },
-      {
-        type: "ROUTER/REPLACE",
-        payload: {
-          location: "/signin",
-          state: {
-            from: undefined,
-            modal: false,
-          },
-        },
-      },
-    ]);
+    await store.dispatch(handleUnauthorized(errorResponse));
+
+    expect(store.getActions()).toEqual(
+      expect.arrayContaining([{ type: "AUTHENTICATION_LOGOUT" }]),
+    );
+  });
+
+  it("adds current location to 'from' state during redirect", async () => {
+    const currentLocation = { pathname: "/orders", search: "?id=1" };
+    const store = mockStoreCreator({
+      modularui: {},
+      router: { location: currentLocation },
+      i18n: { locale: "en" },
+    });
+
+    // Fix: ErrorResponse expects string or undefined, not null
+    const errorResponse = new ErrorResponse({ id: "ERR" }, undefined);
+
+    await store.dispatch(handleUnauthorized(errorResponse));
+
+    const actions = store.getActions();
+    // Fix: Cast the found action to ReplaceAction to allow .payload access
+    const replaceAction = (actions.find(
+      (a) => typeof a === "object" && a.type === "ROUTER/REPLACE",
+    ): any);
+
+    expect(replaceAction?.payload.state.from).toEqual(currentLocation);
   });
 });

package/esm/redux/connectors/Form.js.flow

@@ -31,8 +31,8 @@ type StateProps = {
 
 type DispatchProps = {
   onPrevious: (form: FormModel) => UpdateFormAction,
-  onCancel: (form: FormModel) => ThunkAction,
-  showFormNotification: (form: FormModel) => ThunkAction,
+  onCancel: (form: FormModel) => ThunkAction<>,
+  showFormNotification: (form: FormModel) => ThunkAction<>,
 };
 
 type Props = {

package/esm/redux/connectors/Form.js.map

@@ -1 +1 @@
-{"version":3,"file":"Form.js","names":["compose","connect","modularui","HTTP_METHODS","getSetting","cancelForm","previousObject","showFormNotification","Href","mapStateToProps","state","ownProps","isModal","router","location","modal","mapDispatchToProps","onPrevious","onCancel","reduxConnectedForm","moduiConnectedForm","href","formHref","pathname","search","addParameter","propName","method","POST","connectForm"],"sources":["../../../src/redux/connectors/Form.js"],"sourcesContent":["// @flow\nimport { compose } from \"redux\";\nimport { connect } from \"react-redux\";\n\nimport modularui from \"../_modularui/ModularUIConnector\";\n\nimport { HTTP_METHODS } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { cancelForm, previousObject } from \"../actions/Form\";\nimport { showFormNotification } from \"../actions/Notification\";\n\nimport Href from \"../../models/href/Href\";\n\nimport type { AbstractComponent } from \"react\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type { ContextRouter } from \"react-router\";\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ModularUIConnector, UpdateFormAction } from \"../_modularui/types\";\n\ntype OwnProps = {\n  ...?ContextRouter,\n  href?: Href,\n  isModal?: boolean,\n  redirectTo?: string,\n};\n\ntype StateProps = {\n  isModal: boolean,\n};\n\ntype DispatchProps = {\n  onPrevious: (form: FormModel) => UpdateFormAction,\n  onCancel: (form: FormModel) => ThunkAction,\n  showFormNotification: (form: FormModel) => ThunkAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (\n  state: ReduxState,\n  ownProps: OwnProps,\n): StateProps => ({\n  isModal: state.router.location?.state?.modal || ownProps.isModal || false,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  onPrevious: previousObject,\n  onCancel: cancelForm,\n  showFormNotification,\n};\n\nconst reduxConnectedForm = connect<Props, OwnProps, StateProps, _, _, _>(\n  mapStateToProps,\n  mapDispatchToProps,\n);\n\nconst moduiConnectedForm: ModularUIConnector = modularui(\n  \"Form\",\n  ({ href, location }) => {\n    const formHref = href || new Href(`${location.pathname}${location.search}`);\n\n    if (getSetting(\"ALWAYS_COMMIT_FORM\")) {\n      return formHref;\n    }\n\n    return formHref.addParameter(\"commit\", \"false\");\n  },\n  { propName: \"form\", method: HTTP_METHODS.POST },\n);\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useForm' instead\n */\nexport const connectForm: (\n  Component: AbstractComponent<Props>,\n) => AbstractComponent<OwnProps> = compose(\n  moduiConnectedForm,\n  reduxConnectedForm,\n);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,OAAO,QAAQ,aAAa;AAErC,OAAOC,SAAS,MAAM,kCAAkC;AAExD,SAASC,YAAY,QAAQ,2BAA2B;AACxD,SAASC,UAAU,QAAQ,0BAA0B;AAErD,SAASC,UAAU,EAAEC,cAAc,QAAQ,iBAAiB;AAC5D,SAASC,oBAAoB,QAAQ,yBAAyB;AAE9D,OAAOC,IAAI,MAAM,wBAAwB;AA+BzC,MAAMC,eAAe,GAAGA,CACtBC,KAAiB,EACjBC,QAAkB,MACF;EAChBC,OAAO,EAAEF,KAAK,CAACG,MAAM,CAACC,QAAQ,EAAEJ,KAAK,EAAEK,KAAK,IAAIJ,QAAQ,CAACC,OAAO,IAAI;AACtE,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,UAAU,EAAEX,cAAc;EAC1BY,QAAQ,EAAEb,UAAU;EACpBE;AACF,CAAC;AAED,MAAMY,kBAAkB,GAAGlB,OAAO,CAChCQ,eAAe,EACfO,kBACF,CAAC;AAED,MAAMI,kBAAsC,GAAGlB,SAAS,CACtD,MAAM,EACN,CAAC;EAAEmB,IAAI;EAAEP;AAAS,CAAC,KAAK;EACtB,MAAMQ,QAAQ,GAAGD,IAAI,IAAI,IAAIb,IAAI,CAAC,GAAGM,QAAQ,CAACS,QAAQ,GAAGT,QAAQ,CAACU,MAAM,EAAE,CAAC;EAE3E,IAAIpB,UAAU,CAAC,oBAAoB,CAAC,EAAE;IACpC,OAAOkB,QAAQ;EACjB;EAEA,OAAOA,QAAQ,CAACG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;AACjD,CAAC,EACD;EAAEC,QAAQ,EAAE,MAAM;EAAEC,MAAM,EAAExB,YAAY,CAACyB;AAAK,CAChD,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,WAEmB,GAAG7B,OAAO,CACxCoB,kBAAkB,EAClBD,kBACF,CAAC","ignoreList":[]}
+{"version":3,"file":"Form.js","names":["compose","connect","modularui","HTTP_METHODS","getSetting","cancelForm","previousObject","showFormNotification","Href","mapStateToProps","state","ownProps","isModal","router","location","modal","mapDispatchToProps","onPrevious","onCancel","reduxConnectedForm","moduiConnectedForm","href","formHref","pathname","search","addParameter","propName","method","POST","connectForm"],"sources":["../../../src/redux/connectors/Form.js"],"sourcesContent":["// @flow\nimport { compose } from \"redux\";\nimport { connect } from \"react-redux\";\n\nimport modularui from \"../_modularui/ModularUIConnector\";\n\nimport { HTTP_METHODS } from \"../../constants/Constants\";\nimport { getSetting } from \"../../constants/Settings\";\n\nimport { cancelForm, previousObject } from \"../actions/Form\";\nimport { showFormNotification } from \"../actions/Notification\";\n\nimport Href from \"../../models/href/Href\";\n\nimport type { AbstractComponent } from \"react\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type { ContextRouter } from \"react-router\";\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ModularUIConnector, UpdateFormAction } from \"../_modularui/types\";\n\ntype OwnProps = {\n  ...?ContextRouter,\n  href?: Href,\n  isModal?: boolean,\n  redirectTo?: string,\n};\n\ntype StateProps = {\n  isModal: boolean,\n};\n\ntype DispatchProps = {\n  onPrevious: (form: FormModel) => UpdateFormAction,\n  onCancel: (form: FormModel) => ThunkAction<>,\n  showFormNotification: (form: FormModel) => ThunkAction<>,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (\n  state: ReduxState,\n  ownProps: OwnProps,\n): StateProps => ({\n  isModal: state.router.location?.state?.modal || ownProps.isModal || false,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  onPrevious: previousObject,\n  onCancel: cancelForm,\n  showFormNotification,\n};\n\nconst reduxConnectedForm = connect<Props, OwnProps, StateProps, _, _, _>(\n  mapStateToProps,\n  mapDispatchToProps,\n);\n\nconst moduiConnectedForm: ModularUIConnector = modularui(\n  \"Form\",\n  ({ href, location }) => {\n    const formHref = href || new Href(`${location.pathname}${location.search}`);\n\n    if (getSetting(\"ALWAYS_COMMIT_FORM\")) {\n      return formHref;\n    }\n\n    return formHref.addParameter(\"commit\", \"false\");\n  },\n  { propName: \"form\", method: HTTP_METHODS.POST },\n);\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useForm' instead\n */\nexport const connectForm: (\n  Component: AbstractComponent<Props>,\n) => AbstractComponent<OwnProps> = compose(\n  moduiConnectedForm,\n  reduxConnectedForm,\n);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,OAAO,QAAQ,aAAa;AAErC,OAAOC,SAAS,MAAM,kCAAkC;AAExD,SAASC,YAAY,QAAQ,2BAA2B;AACxD,SAASC,UAAU,QAAQ,0BAA0B;AAErD,SAASC,UAAU,EAAEC,cAAc,QAAQ,iBAAiB;AAC5D,SAASC,oBAAoB,QAAQ,yBAAyB;AAE9D,OAAOC,IAAI,MAAM,wBAAwB;AA+BzC,MAAMC,eAAe,GAAGA,CACtBC,KAAiB,EACjBC,QAAkB,MACF;EAChBC,OAAO,EAAEF,KAAK,CAACG,MAAM,CAACC,QAAQ,EAAEJ,KAAK,EAAEK,KAAK,IAAIJ,QAAQ,CAACC,OAAO,IAAI;AACtE,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,UAAU,EAAEX,cAAc;EAC1BY,QAAQ,EAAEb,UAAU;EACpBE;AACF,CAAC;AAED,MAAMY,kBAAkB,GAAGlB,OAAO,CAChCQ,eAAe,EACfO,kBACF,CAAC;AAED,MAAMI,kBAAsC,GAAGlB,SAAS,CACtD,MAAM,EACN,CAAC;EAAEmB,IAAI;EAAEP;AAAS,CAAC,KAAK;EACtB,MAAMQ,QAAQ,GAAGD,IAAI,IAAI,IAAIb,IAAI,CAAC,GAAGM,QAAQ,CAACS,QAAQ,GAAGT,QAAQ,CAACU,MAAM,EAAE,CAAC;EAE3E,IAAIpB,UAAU,CAAC,oBAAoB,CAAC,EAAE;IACpC,OAAOkB,QAAQ;EACjB;EAEA,OAAOA,QAAQ,CAACG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;AACjD,CAAC,EACD;EAAEC,QAAQ,EAAE,MAAM;EAAEC,MAAM,EAAExB,YAAY,CAACyB;AAAK,CAChD,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,WAEmB,GAAG7B,OAAO,CACxCoB,kBAAkB,EAClBD,kBACF,CAAC","ignoreList":[]}

package/esm/redux/connectors/FormAttributeSet.js.flow

@@ -8,16 +8,13 @@ import {
   removeRepeatableAttributeSet,
 } from "../actions/FormAttributeSetRepeatable";
 
-import type { ThunkAction, UpdateFormOptions } from "../types";
+import type { ThunkAction, UpdateFormOptions, Dispatch } from "../types";
 import type { UpdateFormAction } from "../_modularui/types";
 import type { AttributeType } from "../../models/types";
 import type FormModel from "../../models/form/FormModel";
 import type FormObjectModel from "../../models/form/FormObjectModel";
-import type { DispatchAPI } from "redux";
 import type { ComponentType } from "react";
 
-type Dispatch = DispatchAPI<UpdateFormAction> & DispatchAPI<ThunkAction>;
-
 type OwnProps = {
   form: FormModel,
   object: FormObjectModel,
@@ -32,7 +29,7 @@ type DispatchProps = {
     attribute: AttributeType,
     value: string,
     options: UpdateFormOptions,
-  ) => ThunkAction,
+  ) => ThunkAction<>,
   onAddAttributeSetClick: () => UpdateFormAction,
   onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,
   onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,

package/esm/redux/connectors/FormAttributeSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormAttributeSet.js","names":["connect","updateFormAttribute","addRepeatableAttributeSet","cancelRepeatableAttributeSet","removeRepeatableAttributeSet","mapDispatchToProps","dispatch","ownProps","onAttributeChange","attribute","value","options","autosubmit","autosave","autoupdate","form","object","onAddAttributeSetClick","onCancelAttributeSetClick","formObject","onRemoveAttributeSetClick","connectFormAttributeSet"],"sources":["../../../src/redux/connectors/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { updateFormAttribute } from \"../actions/FormAttributeSet\";\nimport {\n  addRepeatableAttributeSet,\n  cancelRepeatableAttributeSet,\n  removeRepeatableAttributeSet,\n} from \"../actions/FormAttributeSetRepeatable\";\n\nimport type { ThunkAction, UpdateFormOptions } from \"../types\";\nimport type { UpdateFormAction } from \"../_modularui/types\";\nimport type { AttributeType } from \"../../models/types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\nimport type { DispatchAPI } from \"redux\";\nimport type { ComponentType } from \"react\";\n\ntype Dispatch = DispatchAPI<UpdateFormAction> & DispatchAPI<ThunkAction>;\n\ntype OwnProps = {\n  form: FormModel,\n  object: FormObjectModel,\n  formLayout?: \"vertical\" | \"horizontal\" | \"compact\",\n  autosubmit?: boolean,\n  autosave?: boolean,\n  autoupdate?: boolean,\n};\n\ntype DispatchProps = {\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions,\n  ) => ThunkAction,\n  onAddAttributeSetClick: () => UpdateFormAction,\n  onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...DispatchProps,\n};\n\nconst mapDispatchToProps = (\n  dispatch: Dispatch,\n  ownProps: OwnProps,\n): DispatchProps => ({\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions = {\n      autosubmit: ownProps.autosubmit ?? false,\n      autosave: ownProps.autosave ?? false,\n      autoupdate: ownProps.autoupdate ?? false,\n    },\n  ) =>\n    dispatch(\n      updateFormAttribute(\n        ownProps.form,\n        ownProps.object,\n        attribute,\n        value,\n        options,\n      ),\n    ),\n  onAddAttributeSetClick: () =>\n    dispatch(addRepeatableAttributeSet(ownProps.form)),\n  onCancelAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(cancelRepeatableAttributeSet(ownProps.form, formObject)),\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(removeRepeatableAttributeSet(ownProps.form, formObject)),\n});\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useAttributeSet' or 'useFormNavigation' instead\n */\nexport const connectFormAttributeSet: ComponentType<any> = connect<\n  Props,\n  OwnProps,\n  _,\n  DispatchProps,\n  _,\n  _,\n>(null, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,mBAAmB,QAAQ,6BAA6B;AACjE,SACEC,yBAAyB,EACzBC,4BAA4B,EAC5BC,4BAA4B,QACvB,uCAAuC;AAqC9C,MAAMC,kBAAkB,GAAGA,CACzBC,QAAkB,EAClBC,QAAkB,MACC;EACnBC,iBAAiB,EAAEA,CACjBC,SAAwB,EACxBC,KAAa,EACbC,OAA0B,GAAG;IAC3BC,UAAU,EAAEL,QAAQ,CAACK,UAAU,IAAI,KAAK;IACxCC,QAAQ,EAAEN,QAAQ,CAACM,QAAQ,IAAI,KAAK;IACpCC,UAAU,EAAEP,QAAQ,CAACO,UAAU,IAAI;EACrC,CAAC,KAEDR,QAAQ,CACNL,mBAAmB,CACjBM,QAAQ,CAACQ,IAAI,EACbR,QAAQ,CAACS,MAAM,EACfP,SAAS,EACTC,KAAK,EACLC,OACF,CACF,CAAC;EACHM,sBAAsB,EAAEA,CAAA,KACtBX,QAAQ,CAACJ,yBAAyB,CAACK,QAAQ,CAACQ,IAAI,CAAC,CAAC;EACpDG,yBAAyB,EAAGC,UAA2B,IACrDb,QAAQ,CAACH,4BAA4B,CAACI,QAAQ,CAACQ,IAAI,EAAEI,UAAU,CAAC,CAAC;EACnEC,yBAAyB,EAAGD,UAA2B,IACrDb,QAAQ,CAACF,4BAA4B,CAACG,QAAQ,CAACQ,IAAI,EAAEI,UAAU,CAAC;AACpE,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAME,uBAA2C,GAAGrB,OAAO,CAOhE,IAAI,EAAEK,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"file":"FormAttributeSet.js","names":["connect","updateFormAttribute","addRepeatableAttributeSet","cancelRepeatableAttributeSet","removeRepeatableAttributeSet","mapDispatchToProps","dispatch","ownProps","onAttributeChange","attribute","value","options","autosubmit","autosave","autoupdate","form","object","onAddAttributeSetClick","onCancelAttributeSetClick","formObject","onRemoveAttributeSetClick","connectFormAttributeSet"],"sources":["../../../src/redux/connectors/FormAttributeSet.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { updateFormAttribute } from \"../actions/FormAttributeSet\";\nimport {\n  addRepeatableAttributeSet,\n  cancelRepeatableAttributeSet,\n  removeRepeatableAttributeSet,\n} from \"../actions/FormAttributeSetRepeatable\";\n\nimport type { ThunkAction, UpdateFormOptions, Dispatch } from \"../types\";\nimport type { UpdateFormAction } from \"../_modularui/types\";\nimport type { AttributeType } from \"../../models/types\";\nimport type FormModel from \"../../models/form/FormModel\";\nimport type FormObjectModel from \"../../models/form/FormObjectModel\";\nimport type { ComponentType } from \"react\";\n\ntype OwnProps = {\n  form: FormModel,\n  object: FormObjectModel,\n  formLayout?: \"vertical\" | \"horizontal\" | \"compact\",\n  autosubmit?: boolean,\n  autosave?: boolean,\n  autoupdate?: boolean,\n};\n\ntype DispatchProps = {\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions,\n  ) => ThunkAction<>,\n  onAddAttributeSetClick: () => UpdateFormAction,\n  onCancelAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) => UpdateFormAction,\n};\n\ntype Props = {\n  ...OwnProps,\n  ...DispatchProps,\n};\n\nconst mapDispatchToProps = (\n  dispatch: Dispatch,\n  ownProps: OwnProps,\n): DispatchProps => ({\n  onAttributeChange: (\n    attribute: AttributeType,\n    value: string,\n    options: UpdateFormOptions = {\n      autosubmit: ownProps.autosubmit ?? false,\n      autosave: ownProps.autosave ?? false,\n      autoupdate: ownProps.autoupdate ?? false,\n    },\n  ) =>\n    dispatch(\n      updateFormAttribute(\n        ownProps.form,\n        ownProps.object,\n        attribute,\n        value,\n        options,\n      ),\n    ),\n  onAddAttributeSetClick: () =>\n    dispatch(addRepeatableAttributeSet(ownProps.form)),\n  onCancelAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(cancelRepeatableAttributeSet(ownProps.form, formObject)),\n  onRemoveAttributeSetClick: (formObject: FormObjectModel) =>\n    dispatch(removeRepeatableAttributeSet(ownProps.form, formObject)),\n});\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useAttributeSet' or 'useFormNavigation' instead\n */\nexport const connectFormAttributeSet: ComponentType<any> = connect<\n  Props,\n  OwnProps,\n  _,\n  DispatchProps,\n  _,\n  _,\n>(null, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,mBAAmB,QAAQ,6BAA6B;AACjE,SACEC,yBAAyB,EACzBC,4BAA4B,EAC5BC,4BAA4B,QACvB,uCAAuC;AAkC9C,MAAMC,kBAAkB,GAAGA,CACzBC,QAAkB,EAClBC,QAAkB,MACC;EACnBC,iBAAiB,EAAEA,CACjBC,SAAwB,EACxBC,KAAa,EACbC,OAA0B,GAAG;IAC3BC,UAAU,EAAEL,QAAQ,CAACK,UAAU,IAAI,KAAK;IACxCC,QAAQ,EAAEN,QAAQ,CAACM,QAAQ,IAAI,KAAK;IACpCC,UAAU,EAAEP,QAAQ,CAACO,UAAU,IAAI;EACrC,CAAC,KAEDR,QAAQ,CACNL,mBAAmB,CACjBM,QAAQ,CAACQ,IAAI,EACbR,QAAQ,CAACS,MAAM,EACfP,SAAS,EACTC,KAAK,EACLC,OACF,CACF,CAAC;EACHM,sBAAsB,EAAEA,CAAA,KACtBX,QAAQ,CAACJ,yBAAyB,CAACK,QAAQ,CAACQ,IAAI,CAAC,CAAC;EACpDG,yBAAyB,EAAGC,UAA2B,IACrDb,QAAQ,CAACH,4BAA4B,CAACI,QAAQ,CAACQ,IAAI,EAAEI,UAAU,CAAC,CAAC;EACnEC,yBAAyB,EAAGD,UAA2B,IACrDb,QAAQ,CAACF,4BAA4B,CAACG,QAAQ,CAACQ,IAAI,EAAEI,UAAU,CAAC;AACpE,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAME,uBAA2C,GAAGrB,OAAO,CAOhE,IAAI,EAAEK,kBAAkB,CAAC","ignoreList":[]}

package/esm/redux/connectors/Progress.js.flow

@@ -14,7 +14,7 @@ import type { ComponentType } from "react";
 type DispatchProps = {
   onStartProgress: () => StartProgressAction,
   onFinishProgress: () => FinishProgressAction,
-  onError: (error: Error | FetchException) => ThunkAction,
+  onError: (error: Error | FetchException) => ThunkAction<>,
 };
 
 const mapDispatchToProps: DispatchProps = {

package/esm/redux/connectors/Progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"Progress.js","names":["connect","finishProgress","startProgress","handleError","mapDispatchToProps","onStartProgress","onFinishProgress","onError","connectProgress"],"sources":["../../../src/redux/connectors/Progress.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type {\n  StartProgressAction,\n  FinishProgressAction,\n  ThunkAction,\n} from \"../types\";\nimport type FetchException from \"../../exceptions/FetchException\";\nimport type { ComponentType } from \"react\";\n\ntype DispatchProps = {\n  onStartProgress: () => StartProgressAction,\n  onFinishProgress: () => FinishProgressAction,\n  onError: (error: Error | FetchException) => ThunkAction,\n};\n\nconst mapDispatchToProps: DispatchProps = {\n  onStartProgress: startProgress,\n  onFinishProgress: finishProgress,\n  onError: handleError,\n};\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useProgressIndicator' instead\n */\nexport const connectProgress: ComponentType<any> = connect<\n  DispatchProps,\n  {},\n  _,\n  _,\n  _,\n  _,\n>(null, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AACrC,SAASC,cAAc,EAAEC,aAAa,QAAQ,8BAA8B;AAC5E,SAASC,WAAW,QAAQ,kBAAkB;AAgB9C,MAAMC,kBAAiC,GAAG;EACxCC,eAAe,EAAEH,aAAa;EAC9BI,gBAAgB,EAAEL,cAAc;EAChCM,OAAO,EAAEJ;AACX,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMK,eAAmC,GAAGR,OAAO,CAOxD,IAAI,EAAEI,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"file":"Progress.js","names":["connect","finishProgress","startProgress","handleError","mapDispatchToProps","onStartProgress","onFinishProgress","onError","connectProgress"],"sources":["../../../src/redux/connectors/Progress.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type {\n  StartProgressAction,\n  FinishProgressAction,\n  ThunkAction,\n} from \"../types\";\nimport type FetchException from \"../../exceptions/FetchException\";\nimport type { ComponentType } from \"react\";\n\ntype DispatchProps = {\n  onStartProgress: () => StartProgressAction,\n  onFinishProgress: () => FinishProgressAction,\n  onError: (error: Error | FetchException) => ThunkAction<>,\n};\n\nconst mapDispatchToProps: DispatchProps = {\n  onStartProgress: startProgress,\n  onFinishProgress: finishProgress,\n  onError: handleError,\n};\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useProgressIndicator' instead\n */\nexport const connectProgress: ComponentType<any> = connect<\n  DispatchProps,\n  {},\n  _,\n  _,\n  _,\n  _,\n>(null, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AACrC,SAASC,cAAc,EAAEC,aAAa,QAAQ,8BAA8B;AAC5E,SAASC,WAAW,QAAQ,kBAAkB;AAgB9C,MAAMC,kBAAiC,GAAG;EACxCC,eAAe,EAAEH,aAAa;EAC9BI,gBAAgB,EAAEL,cAAc;EAChCM,OAAO,EAAEJ;AACX,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMK,eAAmC,GAAGR,OAAO,CAOxD,IAAI,EAAEI,kBAAkB,CAAC","ignoreList":[]}

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

@@ -14,7 +14,7 @@ type StateProps = {
 };
 
 type DispatchProps = {
-  onSubmit: (username: string, password: string) => ThunkAction,
+  onSubmit: (username: string, password: string) => ThunkAction<>,
 };
 
 type Props = {

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

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["connect","login","getApplication","mapStateToProps","state","application","isAuthenticated","isLoggedIn","errorMessage","auth","error","mapDispatchToProps","onSubmit","connectSignIn"],"sources":["../../../src/redux/connectors/SignIn.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { login } from \"../actions/SignIn\";\n\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ComponentType } from \"react\";\n\ntype StateProps = {\n  isAuthenticated: boolean,\n  errorMessage: ?string,\n};\n\ntype DispatchProps = {\n  onSubmit: (username: string, password: string) => ThunkAction,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (state: ReduxState): StateProps => {\n  const application = getApplication(state);\n\n  return {\n    isAuthenticated: application?.isLoggedIn ?? false,\n    errorMessage: state.auth.error,\n  };\n};\n\nconst mapDispatchToProps: DispatchProps = {\n  onSubmit: login,\n};\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useLogin' instead\n */\nexport const connectSignIn: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _,\n>(mapStateToProps, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,KAAK,QAAQ,mBAAmB;AAEzC,SAASC,cAAc,QAAQ,kCAAkC;AAmBjE,MAAMC,eAAe,GAAIC,KAAiB,IAAiB;EACzD,MAAMC,WAAW,GAAGH,cAAc,CAACE,KAAK,CAAC;EAEzC,OAAO;IACLE,eAAe,EAAED,WAAW,EAAEE,UAAU,IAAI,KAAK;IACjDC,YAAY,EAAEJ,KAAK,CAACK,IAAI,CAACC;EAC3B,CAAC;AACH,CAAC;AAED,MAAMC,kBAAiC,GAAG;EACxCC,QAAQ,EAAEX;AACZ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMY,aAAiC,GAAGb,OAAO,CAOtDG,eAAe,EAAEQ,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"file":"SignIn.js","names":["connect","login","getApplication","mapStateToProps","state","application","isAuthenticated","isLoggedIn","errorMessage","auth","error","mapDispatchToProps","onSubmit","connectSignIn"],"sources":["../../../src/redux/connectors/SignIn.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { login } from \"../actions/SignIn\";\n\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ComponentType } from \"react\";\n\ntype StateProps = {\n  isAuthenticated: boolean,\n  errorMessage: ?string,\n};\n\ntype DispatchProps = {\n  onSubmit: (username: string, password: string) => ThunkAction<>,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (state: ReduxState): StateProps => {\n  const application = getApplication(state);\n\n  return {\n    isAuthenticated: application?.isLoggedIn ?? false,\n    errorMessage: state.auth.error,\n  };\n};\n\nconst mapDispatchToProps: DispatchProps = {\n  onSubmit: login,\n};\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useLogin' instead\n */\nexport const connectSignIn: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _,\n>(mapStateToProps, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,KAAK,QAAQ,mBAAmB;AAEzC,SAASC,cAAc,QAAQ,kCAAkC;AAmBjE,MAAMC,eAAe,GAAIC,KAAiB,IAAiB;EACzD,MAAMC,WAAW,GAAGH,cAAc,CAACE,KAAK,CAAC;EAEzC,OAAO;IACLE,eAAe,EAAED,WAAW,EAAEE,UAAU,IAAI,KAAK;IACjDC,YAAY,EAAEJ,KAAK,CAACK,IAAI,CAACC;EAC3B,CAAC;AACH,CAAC;AAED,MAAMC,kBAAiC,GAAG;EACxCC,QAAQ,EAAEX;AACZ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMY,aAAiC,GAAGb,OAAO,CAOtDG,eAAe,EAAEQ,kBAAkB,CAAC","ignoreList":[]}

package/esm/redux/connectors/SignOut.js.flow

@@ -12,7 +12,7 @@ type StateProps = {
 };
 
 type DispatchProps = {
-  doLogout: () => ThunkAction,
+  doLogout: () => ThunkAction<>,
 };
 
 type Props = {

package/esm/redux/connectors/SignOut.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignOut.js","names":["connect","logout","getApplication","mapStateToProps","state","isAuthenticated","isLoggedIn","mapDispatchToProps","doLogout","connectSignOut"],"sources":["../../../src/redux/connectors/SignOut.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { logout } from \"../actions/SignOut\";\n\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ComponentType } from \"react\";\nimport { getApplication } from \"../_modularui\";\n\ntype StateProps = {\n  isAuthenticated: boolean,\n};\n\ntype DispatchProps = {\n  doLogout: () => ThunkAction,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (state: ReduxState): StateProps => ({\n  isAuthenticated: getApplication(state)?.isLoggedIn ?? false,\n});\n\nconst mapDispatchToProps = { doLogout: logout };\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useLogout' instead\n */\nexport const connectSignOut: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _,\n>(mapStateToProps, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,MAAM,QAAQ,oBAAoB;AAI3C,SAASC,cAAc,QAAQ,eAAe;AAe9C,MAAMC,eAAe,GAAIC,KAAiB,KAAkB;EAC1DC,eAAe,EAAEH,cAAc,CAACE,KAAK,CAAC,EAAEE,UAAU,IAAI;AACxD,CAAC,CAAC;AAEF,MAAMC,kBAAkB,GAAG;EAAEC,QAAQ,EAAEP;AAAO,CAAC;;AAE/C;AACA;AACA;AACA,OAAO,MAAMQ,cAAkC,GAAGT,OAAO,CAOvDG,eAAe,EAAEI,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"file":"SignOut.js","names":["connect","logout","getApplication","mapStateToProps","state","isAuthenticated","isLoggedIn","mapDispatchToProps","doLogout","connectSignOut"],"sources":["../../../src/redux/connectors/SignOut.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { logout } from \"../actions/SignOut\";\n\nimport type { ReduxState, ThunkAction } from \"../types\";\nimport type { ComponentType } from \"react\";\nimport { getApplication } from \"../_modularui\";\n\ntype StateProps = {\n  isAuthenticated: boolean,\n};\n\ntype DispatchProps = {\n  doLogout: () => ThunkAction<>,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst mapStateToProps = (state: ReduxState): StateProps => ({\n  isAuthenticated: getApplication(state)?.isLoggedIn ?? false,\n});\n\nconst mapDispatchToProps = { doLogout: logout };\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useLogout' instead\n */\nexport const connectSignOut: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _,\n>(mapStateToProps, mapDispatchToProps);\n"],"mappings":"AACA,SAASA,OAAO,QAAQ,aAAa;AAErC,SAASC,MAAM,QAAQ,oBAAoB;AAI3C,SAASC,cAAc,QAAQ,eAAe;AAe9C,MAAMC,eAAe,GAAIC,KAAiB,KAAkB;EAC1DC,eAAe,EAAEH,cAAc,CAACE,KAAK,CAAC,EAAEE,UAAU,IAAI;AACxD,CAAC,CAAC;AAEF,MAAMC,kBAAkB,GAAG;EAAEC,QAAQ,EAAEP;AAAO,CAAC;;AAE/C;AACA;AACA;AACA,OAAO,MAAMQ,cAAkC,GAAGT,OAAO,CAOvDG,eAAe,EAAEI,kBAAkB,CAAC","ignoreList":[]}

package/esm/redux/store/configureStore.js

@@ -11,13 +11,17 @@ const configureStore = (routerHistory, customReducers, initialState) => {
   if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
     composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
   }
+  const thunkExtra = {};
   const combinedReducers = combineReducers({
     ...customReducers,
     ...createReducer()
   });
-  const middleware = applyMiddleware(modularUIMiddleware, routerMiddleware(routerHistory), thunk);
+  const middleware = applyMiddleware(modularUIMiddleware, routerMiddleware(routerHistory), thunk.withExtraArgument(thunkExtra));
   const enhancers = composeEnhancers(middleware);
   const store = createReduxStore(combinedReducers, initialState, enhancers);
+
+  // Populate the extra argument with the store's subscribe method -> use to wait on store updates
+  thunkExtra.subscribe = store.subscribe;
   if (!initialState?.router) {
     store.dispatch(locationChange(routerHistory.location, "PUSH"));
   }

package/esm/redux/store/configureStore.js.flow

@@ -17,6 +17,10 @@ import type { RouterHistory } from "react-router";
 import type { ReduxAction, ReduxState, ReduxStore } from "../types";
 import type { Reducer } from "redux";
 
+type ThunkExtra = {
+  subscribe?: $PropertyType<ReduxStore, "subscribe">,
+};
+
 /**
  */
 const configureStore = (
@@ -30,6 +34,8 @@ const configureStore = (
     composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
   }
 
+  const thunkExtra: ThunkExtra = {};
+
   const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({
     ...customReducers,
     ...createReducer(),
@@ -38,7 +44,7 @@ const configureStore = (
   const middleware = applyMiddleware(
     modularUIMiddleware,
     routerMiddleware(routerHistory),
-    thunk,
+    thunk.withExtraArgument(thunkExtra),
   );
 
   const enhancers = composeEnhancers(middleware);
@@ -49,6 +55,9 @@ const configureStore = (
     enhancers,
   );
 
+  // Populate the extra argument with the store's subscribe method -> use to wait on store updates
+  thunkExtra.subscribe = store.subscribe;
+
   if (!initialState?.router) {
     store.dispatch(locationChange(routerHistory.location, "PUSH"));
   }

package/esm/redux/store/configureStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureStore.js","names":["applyMiddleware","compose","combineReducers","createStore","createReduxStore","thunk","routerMiddleware","modularUIMiddleware","createReducer","locationChange","configureStore","routerHistory","customReducers","initialState","composeEnhancers","process","env","NODE_ENV","window","__REDUX_DEVTOOLS_EXTENSION_COMPOSE__","combinedReducers","middleware","enhancers","store","router","dispatch","location"],"sources":["../../../src/redux/store/configureStore.js"],"sourcesContent":["// @flow\nimport {\n  applyMiddleware,\n  compose,\n  combineReducers,\n  createStore as createReduxStore,\n} from \"redux\";\nimport thunk from \"redux-thunk\";\n\nimport { routerMiddleware } from \"../_router/RouterMiddleware\";\nimport { modularUIMiddleware } from \"../_modularui/ModularUIMiddleware\";\n\nimport { createReducer } from \"../reducers/createReducer\";\nimport { locationChange } from \"../_router/RouterActions\";\n\nimport type { RouterHistory } from \"react-router\";\nimport type { ReduxAction, ReduxState, ReduxStore } from \"../types\";\nimport type { Reducer } from \"redux\";\n\n/**\n */\nconst configureStore = (\n  routerHistory: RouterHistory,\n  customReducers?: Object,\n  initialState?: $Shape<ReduxState>,\n): { routerHistory: RouterHistory, store: ReduxStore } => {\n  let composeEnhancers = compose;\n\n  if (process.env.NODE_ENV !== \"production\" && typeof window !== \"undefined\") {\n    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;\n  }\n\n  const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({\n    ...customReducers,\n    ...createReducer(),\n  });\n\n  const middleware = applyMiddleware(\n    modularUIMiddleware,\n    routerMiddleware(routerHistory),\n    thunk,\n  );\n\n  const enhancers = composeEnhancers(middleware);\n\n  const store: ReduxStore = createReduxStore(\n    combinedReducers,\n    initialState,\n    enhancers,\n  );\n\n  if (!initialState?.router) {\n    store.dispatch(locationChange(routerHistory.location, \"PUSH\"));\n  }\n\n  return { routerHistory, store };\n};\n\nexport default configureStore;\n"],"mappings":"AACA,SACEA,eAAe,EACfC,OAAO,EACPC,eAAe,EACfC,WAAW,IAAIC,gBAAgB,QAC1B,OAAO;AACd,OAAOC,KAAK,MAAM,aAAa;AAE/B,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,mBAAmB,QAAQ,mCAAmC;AAEvE,SAASC,aAAa,QAAQ,2BAA2B;AACzD,SAASC,cAAc,QAAQ,0BAA0B;AAMzD;AACA;AACA,MAAMC,cAAc,GAAGA,CACrBC,aAA4B,EAC5BC,cAAuB,EACvBC,YAAiC,KACuB;EACxD,IAAIC,gBAAgB,GAAGb,OAAO;EAE9B,IAAIc,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IAC1EJ,gBAAgB,GAAGI,MAAM,CAACC,oCAAoC,IAAIlB,OAAO;EAC3E;EAEA,MAAMmB,gBAAkD,GAAGlB,eAAe,CAAC;IACzE,GAAGU,cAAc;IACjB,GAAGJ,aAAa,CAAC;EACnB,CAAC,CAAC;EAEF,MAAMa,UAAU,GAAGrB,eAAe,CAChCO,mBAAmB,EACnBD,gBAAgB,CAACK,aAAa,CAAC,EAC/BN,KACF,CAAC;EAED,MAAMiB,SAAS,GAAGR,gBAAgB,CAACO,UAAU,CAAC;EAE9C,MAAME,KAAiB,GAAGnB,gBAAgB,CACxCgB,gBAAgB,EAChBP,YAAY,EACZS,SACF,CAAC;EAED,IAAI,CAACT,YAAY,EAAEW,MAAM,EAAE;IACzBD,KAAK,CAACE,QAAQ,CAAChB,cAAc,CAACE,aAAa,CAACe,QAAQ,EAAE,MAAM,CAAC,CAAC;EAChE;EAEA,OAAO;IAAEf,aAAa;IAAEY;EAAM,CAAC;AACjC,CAAC;AAED,eAAeb,cAAc","ignoreList":[]}
+{"version":3,"file":"configureStore.js","names":["applyMiddleware","compose","combineReducers","createStore","createReduxStore","thunk","routerMiddleware","modularUIMiddleware","createReducer","locationChange","configureStore","routerHistory","customReducers","initialState","composeEnhancers","process","env","NODE_ENV","window","__REDUX_DEVTOOLS_EXTENSION_COMPOSE__","thunkExtra","combinedReducers","middleware","withExtraArgument","enhancers","store","subscribe","router","dispatch","location"],"sources":["../../../src/redux/store/configureStore.js"],"sourcesContent":["// @flow\nimport {\n  applyMiddleware,\n  compose,\n  combineReducers,\n  createStore as createReduxStore,\n} from \"redux\";\nimport thunk from \"redux-thunk\";\n\nimport { routerMiddleware } from \"../_router/RouterMiddleware\";\nimport { modularUIMiddleware } from \"../_modularui/ModularUIMiddleware\";\n\nimport { createReducer } from \"../reducers/createReducer\";\nimport { locationChange } from \"../_router/RouterActions\";\n\nimport type { RouterHistory } from \"react-router\";\nimport type { ReduxAction, ReduxState, ReduxStore } from \"../types\";\nimport type { Reducer } from \"redux\";\n\ntype ThunkExtra = {\n  subscribe?: $PropertyType<ReduxStore, \"subscribe\">,\n};\n\n/**\n */\nconst configureStore = (\n  routerHistory: RouterHistory,\n  customReducers?: Object,\n  initialState?: $Shape<ReduxState>,\n): { routerHistory: RouterHistory, store: ReduxStore } => {\n  let composeEnhancers = compose;\n\n  if (process.env.NODE_ENV !== \"production\" && typeof window !== \"undefined\") {\n    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;\n  }\n\n  const thunkExtra: ThunkExtra = {};\n\n  const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({\n    ...customReducers,\n    ...createReducer(),\n  });\n\n  const middleware = applyMiddleware(\n    modularUIMiddleware,\n    routerMiddleware(routerHistory),\n    thunk.withExtraArgument(thunkExtra),\n  );\n\n  const enhancers = composeEnhancers(middleware);\n\n  const store: ReduxStore = createReduxStore(\n    combinedReducers,\n    initialState,\n    enhancers,\n  );\n\n  // Populate the extra argument with the store's subscribe method -> use to wait on store updates\n  thunkExtra.subscribe = store.subscribe;\n\n  if (!initialState?.router) {\n    store.dispatch(locationChange(routerHistory.location, \"PUSH\"));\n  }\n\n  return { routerHistory, store };\n};\n\nexport default configureStore;\n"],"mappings":"AACA,SACEA,eAAe,EACfC,OAAO,EACPC,eAAe,EACfC,WAAW,IAAIC,gBAAgB,QAC1B,OAAO;AACd,OAAOC,KAAK,MAAM,aAAa;AAE/B,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,mBAAmB,QAAQ,mCAAmC;AAEvE,SAASC,aAAa,QAAQ,2BAA2B;AACzD,SAASC,cAAc,QAAQ,0BAA0B;AAUzD;AACA;AACA,MAAMC,cAAc,GAAGA,CACrBC,aAA4B,EAC5BC,cAAuB,EACvBC,YAAiC,KACuB;EACxD,IAAIC,gBAAgB,GAAGb,OAAO;EAE9B,IAAIc,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IAC1EJ,gBAAgB,GAAGI,MAAM,CAACC,oCAAoC,IAAIlB,OAAO;EAC3E;EAEA,MAAMmB,UAAsB,GAAG,CAAC,CAAC;EAEjC,MAAMC,gBAAkD,GAAGnB,eAAe,CAAC;IACzE,GAAGU,cAAc;IACjB,GAAGJ,aAAa,CAAC;EACnB,CAAC,CAAC;EAEF,MAAMc,UAAU,GAAGtB,eAAe,CAChCO,mBAAmB,EACnBD,gBAAgB,CAACK,aAAa,CAAC,EAC/BN,KAAK,CAACkB,iBAAiB,CAACH,UAAU,CACpC,CAAC;EAED,MAAMI,SAAS,GAAGV,gBAAgB,CAACQ,UAAU,CAAC;EAE9C,MAAMG,KAAiB,GAAGrB,gBAAgB,CACxCiB,gBAAgB,EAChBR,YAAY,EACZW,SACF,CAAC;;EAED;EACAJ,UAAU,CAACM,SAAS,GAAGD,KAAK,CAACC,SAAS;EAEtC,IAAI,CAACb,YAAY,EAAEc,MAAM,EAAE;IACzBF,KAAK,CAACG,QAAQ,CAACnB,cAAc,CAACE,aAAa,CAACkB,QAAQ,EAAE,MAAM,CAAC,CAAC;EAChE;EAEA,OAAO;IAAElB,aAAa;IAAEc;EAAM,CAAC;AACjC,CAAC;AAED,eAAef,cAAc","ignoreList":[]}

package/esm/redux/types.js.flow

@@ -1,5 +1,5 @@
 // @flow
-import type { Store, DispatchAPI } from "redux";
+import type { Store } from "redux";
 
 import type ErrorResponse from "../models/error/ErrorResponse";
 
@@ -231,11 +231,30 @@ export type ReduxState = {
 };
 
 export type GetState = () => ReduxState;
-export type ThunkAction = (dispatch: Dispatch, getState: GetState) => any;
-export type PromiseAction = Promise<PossibleAction>;
-export type Dispatch = DispatchAPI<PossibleAction>;
+export type ThunkExtra = { subscribe: any };
+
+// 1. Define ThunkAction first.
+// We use 'any' for Dispatch here temporarily to break the circularity
+// or use the specialized function type.
+export type ThunkAction<R = any> = (
+  dispatch: Dispatch,
+  getState: GetState,
+  extra: ThunkExtra,
+) => R;
+
+export type PromiseAction = Promise<ReduxAction | ThunkAction<any>>;
+
+// 2. Define Dispatch as a naked function type.
+// This is much more reliable in modern Flow than DispatchAPI<...>.
+export type Dispatch = (
+  action: ReduxAction | ThunkAction<any> | PromiseAction,
+) => any;
+
+// 3. Update ReduxStore to use the ReduxAction for the base reducer
+// but our custom Dispatch for the store instance.
 export type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;
 
-export type PossibleAction = ReduxAction | ThunkAction | PromiseAction;
+// 4. Clean up PossibleAction if you still use it elsewhere
+export type PossibleAction = ReduxAction | ThunkAction<any> | PromiseAction;
 
 export type CustomReducers = { [reducerKey: string]: any };

package/esm/redux/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/redux/types.js"],"sourcesContent":["// @flow\nimport type { Store, DispatchAPI } from \"redux\";\n\nimport type ErrorResponse from \"../models/error/ErrorResponse\";\n\nimport type FormModel from \"../models/form/FormModel\";\nimport typeof {\n  NOTIFICATION_TYPES,\n  AUTOSAVE_STATUS,\n} from \"../constants/Constants\";\n\nimport type { MessageObject } from \"../i18n/types\";\nimport type {\n  I18nState,\n  UpdateLocaleAction,\n  SetLocalesAction,\n} from \"./_i18n/types\";\nimport type {\n  ModularUIState,\n  ModularUIAction,\n  UpdateStatusAction,\n  SetModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  InitModelAction,\n} from \"./_modularui/types\";\nimport type {\n  RouterState,\n  LocationChangeAction,\n  PushAction,\n  ReplaceAction,\n  GoAction,\n  GoBackAction,\n  GoForwardAction,\n} from \"./_router/types\";\n\nexport type PreferenceValue =\n  | null\n  | string\n  | boolean\n  | { [key: string]: any }\n  | Array<PreferenceValue>;\n\nexport type UpdateFormOptions = {\n  autosubmit: boolean,\n  autosave: boolean,\n  autoupdate: boolean,\n  forceUpdate?: boolean,\n  /** Default true: Activate/deactivate the form object validate by an update */\n  validate?: boolean,\n};\n\nexport type NoAction = {\n  type: \"NO_ACTION\",\n};\n\nexport type SaveErrorAction = {\n  type: \"SAVE_ERROR\",\n  payload: ErrorResponse,\n};\n\nexport type ShowModalAction = {\n  type: \"SHOW_MODAL\",\n  payload: string,\n};\n\nexport type CloseModalAction = {\n  type: \"CLOSE_MODAL\",\n  payload: string,\n};\n\nexport type DismissNotificationAction = {\n  type: \"DISMISS_NOTIFICATION\",\n};\nexport type ShowNotificationAction = {\n  type: \"SHOW_NOTIFICATION\",\n  payload: {\n    type: $Keys<NOTIFICATION_TYPES>,\n    message: MessageObject,\n    error: ?ErrorResponse,\n  },\n};\n\nexport type SetPreferenceAction = {\n  type: \"SET_PREFERENCE\",\n  payload: { [name: string]: PreferenceValue },\n};\nexport type SetPreferencesAction = {\n  type: \"SET_PREFERENCES\",\n  payload: { [name: string]: PreferenceValue },\n};\n\nexport type StartProgressAction = {\n  type: \"START_PROGRESS\",\n};\nexport type FinishProgressAction = {\n  type: \"FINISH_PROGRESS\",\n};\nexport type ResetProgressAction = {\n  type: \"RESET_PROGRESS\",\n};\nexport type UpdateProgressAction = {\n  type: \"UPDATE_PROGRESS\",\n  payload: { percentComplete: number },\n};\n\nexport type SendAuthenticationErrorAction = {\n  type: \"AUTHENTICATION_ERROR\",\n  payload: string,\n};\n\nexport type ResetAuthErrorsAction = {\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n};\n\nexport type LoginSuccessAction = {\n  type: \"AUTHENTICATION_SUCCESS\",\n};\n\nexport type ChangePasswordAction = {\n  type: \"CHANGE_PASSWORD\",\n};\n\nexport type LogoutSuccessAction = {\n  type: \"AUTHENTICATION_LOGOUT\",\n};\n\nexport type UpdateAutosaveAction = {\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status: $Keys<AUTOSAVE_STATUS>,\n    model: FormModel,\n  },\n};\n\nexport type UpdateEntryDateAction = {\n  type: \"UPDATE_ENTRYDATE\",\n  payload: ISO_DATE,\n};\n\nexport type ReduxAction =\n  | UpdateStatusAction\n  | SetModelAction\n  | InitModelAction\n  | UpdateModelAction\n  | UpdateFormAction\n  | RemoveModelByKeyAction\n  | ResetModularUIAction\n  | SaveErrorAction\n  | UpdateLocaleAction\n  | SetLocalesAction\n  | ShowModalAction\n  | CloseModalAction\n  | DismissNotificationAction\n  | ShowNotificationAction\n  | SetPreferenceAction\n  | SetPreferencesAction\n  | StartProgressAction\n  | FinishProgressAction\n  | ResetProgressAction\n  | UpdateProgressAction\n  | ResetAuthErrorsAction\n  | SendAuthenticationErrorAction\n  | LoginSuccessAction\n  | ChangePasswordAction\n  | LogoutSuccessAction\n  | UpdateAutosaveAction\n  | UpdateEntryDateAction\n  | LocationChangeAction\n  | PushAction\n  | ReplaceAction\n  | GoAction\n  | GoBackAction\n  | GoForwardAction\n  | ModularUIAction\n  | NoAction;\n\n// Redux state\nexport type AuthState = {\n  +mustChangePassword: boolean,\n  +error: ?string,\n};\n\nexport type ErrorState = null | ErrorResponse;\n\nexport type ModalState = {\n  +key: string,\n  +visible: boolean,\n  +size?: string,\n};\n\nexport type ModalsState = {\n  +modals: Array<ModalState>,\n};\n\nexport type NotificationState = {\n  +render: boolean,\n  +messageType: string | null,\n  +message: MessageObject | null,\n  +error: ?ErrorResponse | null,\n};\n\nexport type PreferencesState = {\n  +[name: string]: PreferenceValue,\n};\n\nexport type ProgressIndicatorState = {\n  +count: number,\n  +timestamp: number,\n  +percentComplete: number,\n};\n\nexport type ModelCatalogState = {\n  entryDate: ISO_DATE | null,\n};\n\nexport type ReduxState = {\n  +router: RouterState,\n  +modularui: ModularUIState,\n  +i18n: I18nState,\n  +auth: AuthState,\n  +modelcatalog: ModelCatalogState,\n  +error: ErrorState,\n  +modals: ModalsState,\n  +notification: NotificationState,\n  +progressindicator: ProgressIndicatorState,\n  +preferences: PreferencesState,\n  ...\n};\n\nexport type GetState = () => ReduxState;\nexport type ThunkAction = (dispatch: Dispatch, getState: GetState) => any;\nexport type PromiseAction = Promise<PossibleAction>;\nexport type Dispatch = DispatchAPI<PossibleAction>;\nexport type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;\n\nexport type PossibleAction = ReduxAction | ThunkAction | PromiseAction;\n\nexport type CustomReducers = { [reducerKey: string]: any };\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/redux/types.js"],"sourcesContent":["// @flow\nimport type { Store } from \"redux\";\n\nimport type ErrorResponse from \"../models/error/ErrorResponse\";\n\nimport type FormModel from \"../models/form/FormModel\";\nimport typeof {\n  NOTIFICATION_TYPES,\n  AUTOSAVE_STATUS,\n} from \"../constants/Constants\";\n\nimport type { MessageObject } from \"../i18n/types\";\nimport type {\n  I18nState,\n  UpdateLocaleAction,\n  SetLocalesAction,\n} from \"./_i18n/types\";\nimport type {\n  ModularUIState,\n  ModularUIAction,\n  UpdateStatusAction,\n  SetModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  InitModelAction,\n} from \"./_modularui/types\";\nimport type {\n  RouterState,\n  LocationChangeAction,\n  PushAction,\n  ReplaceAction,\n  GoAction,\n  GoBackAction,\n  GoForwardAction,\n} from \"./_router/types\";\n\nexport type PreferenceValue =\n  | null\n  | string\n  | boolean\n  | { [key: string]: any }\n  | Array<PreferenceValue>;\n\nexport type UpdateFormOptions = {\n  autosubmit: boolean,\n  autosave: boolean,\n  autoupdate: boolean,\n  forceUpdate?: boolean,\n  /** Default true: Activate/deactivate the form object validate by an update */\n  validate?: boolean,\n};\n\nexport type NoAction = {\n  type: \"NO_ACTION\",\n};\n\nexport type SaveErrorAction = {\n  type: \"SAVE_ERROR\",\n  payload: ErrorResponse,\n};\n\nexport type ShowModalAction = {\n  type: \"SHOW_MODAL\",\n  payload: string,\n};\n\nexport type CloseModalAction = {\n  type: \"CLOSE_MODAL\",\n  payload: string,\n};\n\nexport type DismissNotificationAction = {\n  type: \"DISMISS_NOTIFICATION\",\n};\nexport type ShowNotificationAction = {\n  type: \"SHOW_NOTIFICATION\",\n  payload: {\n    type: $Keys<NOTIFICATION_TYPES>,\n    message: MessageObject,\n    error: ?ErrorResponse,\n  },\n};\n\nexport type SetPreferenceAction = {\n  type: \"SET_PREFERENCE\",\n  payload: { [name: string]: PreferenceValue },\n};\nexport type SetPreferencesAction = {\n  type: \"SET_PREFERENCES\",\n  payload: { [name: string]: PreferenceValue },\n};\n\nexport type StartProgressAction = {\n  type: \"START_PROGRESS\",\n};\nexport type FinishProgressAction = {\n  type: \"FINISH_PROGRESS\",\n};\nexport type ResetProgressAction = {\n  type: \"RESET_PROGRESS\",\n};\nexport type UpdateProgressAction = {\n  type: \"UPDATE_PROGRESS\",\n  payload: { percentComplete: number },\n};\n\nexport type SendAuthenticationErrorAction = {\n  type: \"AUTHENTICATION_ERROR\",\n  payload: string,\n};\n\nexport type ResetAuthErrorsAction = {\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n};\n\nexport type LoginSuccessAction = {\n  type: \"AUTHENTICATION_SUCCESS\",\n};\n\nexport type ChangePasswordAction = {\n  type: \"CHANGE_PASSWORD\",\n};\n\nexport type LogoutSuccessAction = {\n  type: \"AUTHENTICATION_LOGOUT\",\n};\n\nexport type UpdateAutosaveAction = {\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status: $Keys<AUTOSAVE_STATUS>,\n    model: FormModel,\n  },\n};\n\nexport type UpdateEntryDateAction = {\n  type: \"UPDATE_ENTRYDATE\",\n  payload: ISO_DATE,\n};\n\nexport type ReduxAction =\n  | UpdateStatusAction\n  | SetModelAction\n  | InitModelAction\n  | UpdateModelAction\n  | UpdateFormAction\n  | RemoveModelByKeyAction\n  | ResetModularUIAction\n  | SaveErrorAction\n  | UpdateLocaleAction\n  | SetLocalesAction\n  | ShowModalAction\n  | CloseModalAction\n  | DismissNotificationAction\n  | ShowNotificationAction\n  | SetPreferenceAction\n  | SetPreferencesAction\n  | StartProgressAction\n  | FinishProgressAction\n  | ResetProgressAction\n  | UpdateProgressAction\n  | ResetAuthErrorsAction\n  | SendAuthenticationErrorAction\n  | LoginSuccessAction\n  | ChangePasswordAction\n  | LogoutSuccessAction\n  | UpdateAutosaveAction\n  | UpdateEntryDateAction\n  | LocationChangeAction\n  | PushAction\n  | ReplaceAction\n  | GoAction\n  | GoBackAction\n  | GoForwardAction\n  | ModularUIAction\n  | NoAction;\n\n// Redux state\nexport type AuthState = {\n  +mustChangePassword: boolean,\n  +error: ?string,\n};\n\nexport type ErrorState = null | ErrorResponse;\n\nexport type ModalState = {\n  +key: string,\n  +visible: boolean,\n  +size?: string,\n};\n\nexport type ModalsState = {\n  +modals: Array<ModalState>,\n};\n\nexport type NotificationState = {\n  +render: boolean,\n  +messageType: string | null,\n  +message: MessageObject | null,\n  +error: ?ErrorResponse | null,\n};\n\nexport type PreferencesState = {\n  +[name: string]: PreferenceValue,\n};\n\nexport type ProgressIndicatorState = {\n  +count: number,\n  +timestamp: number,\n  +percentComplete: number,\n};\n\nexport type ModelCatalogState = {\n  entryDate: ISO_DATE | null,\n};\n\nexport type ReduxState = {\n  +router: RouterState,\n  +modularui: ModularUIState,\n  +i18n: I18nState,\n  +auth: AuthState,\n  +modelcatalog: ModelCatalogState,\n  +error: ErrorState,\n  +modals: ModalsState,\n  +notification: NotificationState,\n  +progressindicator: ProgressIndicatorState,\n  +preferences: PreferencesState,\n  ...\n};\n\nexport type GetState = () => ReduxState;\nexport type ThunkExtra = { subscribe: any };\n\n// 1. Define ThunkAction first.\n// We use 'any' for Dispatch here temporarily to break the circularity\n// or use the specialized function type.\nexport type ThunkAction<R = any> = (\n  dispatch: Dispatch,\n  getState: GetState,\n  extra: ThunkExtra,\n) => R;\n\nexport type PromiseAction = Promise<ReduxAction | ThunkAction<any>>;\n\n// 2. Define Dispatch as a naked function type.\n// This is much more reliable in modern Flow than DispatchAPI<...>.\nexport type Dispatch = (\n  action: ReduxAction | ThunkAction<any> | PromiseAction,\n) => any;\n\n// 3. Update ReduxStore to use the ReduxAction for the base reducer\n// but our custom Dispatch for the store instance.\nexport type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;\n\n// 4. Clean up PossibleAction if you still use it elsewhere\nexport type PossibleAction = ReduxAction | ThunkAction<any> | PromiseAction;\n\nexport type CustomReducers = { [reducerKey: string]: any };\n"],"mappings":"","ignoreList":[]}

package/lib/hooks/useAuthentication.js

@@ -13,6 +13,7 @@ var _exceptions = require("../exceptions");
 var _modularui = require("../modularui");
 var _useModularUIModel = require("./useModularUIModel");
 /**
+ * Hook for handling login logic
  */
 const useLogin = () => {
   _Cache.default.setItem("isRedirectLogin", false);
@@ -20,17 +21,17 @@ const useLogin = () => {
   const application = (0, _useModularUIModel.useApplication)();
   const auth = (0, _reactRedux.useSelector)(state => state.auth);
   const isAuthenticated = application?.isLoggedIn ?? false;
-  const primaryAuthenticationType = _Cache.default.getItem("primaryAuthenticationType");
+  const cachedType = _Cache.default.getItem("primaryAuthenticationType");
   return {
     isAuthenticated,
-    primaryAuthenticationType: primaryAuthenticationType ?? application?.authenticationTypes[0],
+    // Safely fallback to the first available type if nothing is cached
+    primaryAuthenticationType: cachedType ?? application?.authenticationTypes?.[0],
     authenticationTypes: application?.authenticationTypes ?? [],
     errorMessage: auth.error,
     resetErrors: () => dispatch((0, _actions.resetAuthErrors)()),
     login: (username, password) => dispatch((0, _actions.login)(username, password)),
     redirectLogin: authenticationType => {
       if (_Cache.default.getItem("isRedirectLogin")) {
-        // prevent endless loop in redirects when authentication type can't be redirected
         throw new _exceptions.IllegalStateException(`Could not redirect to '${authenticationType.authentication}' using url: '${authenticationType.redirectUri ?? ""}'`);
       }
       if (!isAuthenticated) {
@@ -42,6 +43,7 @@ const useLogin = () => {
 };
 
 /**
+ * Hook for handling logout logic
  */
 exports.useLogin = useLogin;
 const useLogout = () => {
@@ -49,24 +51,28 @@ const useLogout = () => {
   const application = (0, _useModularUIModel.useApplication)();
   const BASE_PATH = (0, _constants.getBasePath)();
   const authenticate = new _modularui.Authenticate();
-  const primaryAuthenticationType = _Cache.default.getItem("primaryAuthenticationType");
   const isAuthenticated = application?.isLoggedIn ?? false;
+  const cachedType = _Cache.default.getItem("primaryAuthenticationType");
   return {
     isAuthenticated,
-    primaryAuthenticationType: primaryAuthenticationType ?? application?.authenticationTypes[0],
+    primaryAuthenticationType: cachedType ?? application?.authenticationTypes?.[0],
     authenticationTypes: application?.authenticationTypes ?? [],
     logout: () => {
       const type = authenticate.authenticationType;
       if (type === _constants.INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
         authenticate.redirectToLogout();
-      } else if (_Cache.default.getItem("isRedirectLogin")) {
+        return; // Redirects stop execution
+      }
+      if (_Cache.default.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;
         _Cache.default.setItem("isRedirectLogin", false);
         window.location.assign(url);
-      } else {
-        return dispatch((0, _actions.logout)());
+        return;
       }
+
+      // Returns the Promise from the logout thunk
+      return dispatch((0, _actions.logout)());
     },
     logoutUrl: authenticate.getLogoutUrl()
   };

package/lib/hooks/useAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","_modularui","_useModularUIModel","useLogin","Cache","setItem","dispatch","useDispatch","application","useApplication","auth","useSelector","state","isAuthenticated","isLoggedIn","primaryAuthenticationType","getItem","authenticationTypes","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","IllegalStateException","authentication","redirectUri","window","location","assign","getBasePathServer","exports","useLogout","BASE_PATH","getBasePath","authenticate","Authenticate","logout","type","INTERNAL_LOGIN_TYPE","PAC4J_INDIRECT","redirectToLogout","origin","url","getLogoutUrl","logoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  getBasePath,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\nimport { useApplication } from \"./useModularUIModel\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  primaryAuthenticationType: AuthenticationType,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  primaryAuthenticationType: AuthenticationType,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useApplication();\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  const primaryAuthenticationType = Cache.getItem(\"primaryAuthenticationType\");\n\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      primaryAuthenticationType ?? application?.authenticationTypes[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n\n  const application = useApplication();\n\n  const BASE_PATH = getBasePath();\n\n  const authenticate = new Authenticate();\n\n  const primaryAuthenticationType = Cache.getItem(\"primaryAuthenticationType\");\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      primaryAuthenticationType ?? application?.authenticationTypes[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\n    logout: () => {\n      const type = authenticate.authenticationType;\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        authenticate.redirectToLogout();\n      } else if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n    logoutUrl: authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","_modularui","_useModularUIModel","useLogin","Cache","setItem","dispatch","useDispatch","application","useApplication","auth","useSelector","state","isAuthenticated","isLoggedIn","cachedType","getItem","primaryAuthenticationType","authenticationTypes","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","IllegalStateException","authentication","redirectUri","window","location","assign","getBasePathServer","exports","useLogout","BASE_PATH","getBasePath","authenticate","Authenticate","logout","type","INTERNAL_LOGIN_TYPE","PAC4J_INDIRECT","redirectToLogout","origin","url","getLogoutUrl","logoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  getBasePath,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\nimport { useApplication } from \"./useModularUIModel\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  primaryAuthenticationType: ?AuthenticationType,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => any, // Changed to any for Promise support\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\n\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  primaryAuthenticationType: ?AuthenticationType,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => any, // Changed to any for Promise support\n  logoutUrl: string,\n};\n\n/**\n * Hook for handling login logic\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n  const application = useApplication();\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  const cachedType = Cache.getItem(\"primaryAuthenticationType\");\n\n  return {\n    isAuthenticated,\n    // Safely fallback to the first available type if nothing is cached\n    primaryAuthenticationType:\n      cachedType ?? application?.authenticationTypes?.[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        throw new IllegalStateException(\n          `Could not redirect to '${authenticationType.authentication}' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n * Hook for handling logout logic\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useApplication();\n  const BASE_PATH = getBasePath();\n  const authenticate = new Authenticate();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  const cachedType = Cache.getItem(\"primaryAuthenticationType\");\n\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      cachedType ?? application?.authenticationTypes?.[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\n    logout: () => {\n      const type = authenticate.authenticationType;\n\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        authenticate.redirectToLogout();\n        return; // Redirects stop execution\n      }\n\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n        return;\n      }\n\n      // Returns the Promise from the logout thunk\n      return dispatch(logout());\n    },\n    logoutUrl: authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}