@beinformed/ui 1.14.5 → 1.16.0

package/lib/redux/reducers/__tests__/AuthReducer.spec.js.flow

@@ -17,9 +17,12 @@ describe("authentication reducer", () => {
 
   it("should handle AUTHENTICATION_SUCCESS", () => {
     expect(
-      AuthReducer([], {
-        type: "AUTHENTICATION_SUCCESS",
-      })
+      AuthReducer(
+        {},
+        {
+          type: "AUTHENTICATION_SUCCESS",
+        }
+      )
     ).toStrictEqual({
       isAuthenticated: true,
       mustChangePassword: false,
@@ -29,10 +32,13 @@ describe("authentication reducer", () => {
 
   it("should handle AUTHENTICATION_ERROR", () => {
     expect(
-      AuthReducer([], {
-        type: "AUTHENTICATION_ERROR",
-        payload: "error",
-      })
+      AuthReducer(
+        {},
+        {
+          type: "AUTHENTICATION_ERROR",
+          payload: "error",
+        }
+      )
     ).toStrictEqual({
       mustChangePassword: false,
       error: "error",
@@ -41,9 +47,35 @@ describe("authentication reducer", () => {
 
   it("should handle AUTHENTICATION_LOGOUT", () => {
     expect(
-      AuthReducer([], {
-        type: "AUTHENTICATION_LOGOUT",
-      })
+      AuthReducer(
+        {
+          isAuthenticated: true,
+          mustChangePassword: false,
+          error: null,
+        },
+        {
+          type: "AUTHENTICATION_LOGOUT",
+        }
+      )
+    ).toStrictEqual({
+      isAuthenticated: false,
+      mustChangePassword: false,
+      error: null,
+    });
+  });
+
+  it("should handle AUTHENTICATION_RESET_ERRORS", () => {
+    expect(
+      AuthReducer(
+        {
+          isAuthenticated: false,
+          mustChangePassword: false,
+          error: "In error",
+        },
+        {
+          type: "AUTHENTICATION_RESET_ERRORS",
+        }
+      )
     ).toStrictEqual({
       isAuthenticated: false,
       mustChangePassword: false,
@@ -53,9 +85,16 @@ describe("authentication reducer", () => {
 
   it("should handle CHANGE_PASSWORD", () => {
     expect(
-      AuthReducer([], {
-        type: "CHANGE_PASSWORD",
-      })
+      AuthReducer(
+        {
+          isAuthenticated: true,
+          mustChangePassword: false,
+          error: null,
+        },
+        {
+          type: "CHANGE_PASSWORD",
+        }
+      )
     ).toStrictEqual({
       isAuthenticated: true,
       mustChangePassword: true,

package/lib/redux/types.js.flow

@@ -46,7 +46,7 @@ export type UpdateFormOptions = {
   autosave: boolean,
   forceUpdate?: boolean,
   /** Default true: Activate/deactivate the form object validate by an update */
-  validate?:boolean
+  validate?: boolean,
 };
 
 export type NoAction = {
@@ -104,6 +104,10 @@ export type LoginFailedAction = {
   payload: string,
 };
 
+export type ResetAuthErrorsAction = {
+  type: "AUTHENTICATION_RESET_ERRORS",
+};
+
 export type LoginSuccessAction = {
   type: "AUTHENTICATION_SUCCESS",
 };
@@ -143,6 +147,7 @@ export type ReduxAction =
   | ResetProgressAction
   | UpdateProgressAction
   | LoginFailedAction
+  | ResetAuthErrorsAction
   | LoginSuccessAction
   | ChangePasswordAction
   | LogoutSuccessAction

package/lib/utils/helpers/__tests__/checkResource.spec.js.flow

@@ -0,0 +1,56 @@
+import {
+  resourceExists,
+  resourceRedirectsToSecureLogin,
+} from "../checkResource";
+
+const mockXMLHttpRequest = () => {
+  const mock = {
+    open: jest.fn(),
+    addEventListener: jest.fn(),
+    setRequestHeader: jest.fn(),
+    send: jest.fn(),
+    getResponseHeader: jest.fn(),
+
+    upload: {
+      addEventListener: jest.fn(),
+    },
+  };
+
+  jest.spyOn(global, "XMLHttpRequest").mockImplementation(() => mock);
+
+  return mock;
+};
+
+describe("checkResource", () => {
+  it("indicates a resource exists if it has a status code other then 404", () => {
+    const mock = mockXMLHttpRequest();
+    mock.status = 200;
+
+    expect.assertions(1);
+
+    const exists = resourceExists("/");
+
+    expect(exists).toBe(true);
+  });
+
+  it("indicates a resource does not exists if it has a status code of 404", () => {
+    const mock = mockXMLHttpRequest();
+    mock.status = 404;
+
+    expect.assertions(1);
+
+    const exists = resourceExists("/");
+
+    expect(exists).toBe(false);
+  });
+
+  it("indicates resource request redirects to secureLogin", () => {
+    const mock = mockXMLHttpRequest();
+    mock.responseURL = "/BeInformed/secureLogin";
+    mock.status = 400;
+
+    const toLogin = resourceRedirectsToSecureLogin("/");
+
+    expect(toLogin).toBe(true);
+  });
+});

package/lib/utils/helpers/checkResource.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resourceRedirectsToSecureLogin = exports.resourceExists = void 0;
+
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+
+var _endsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/ends-with"));
+
+var _Constants = require("../../constants/Constants");
+
+/**
+ * Checks if a given url to a modular ui resource exists using a HEAD request to the resource (synchronous)
+ * When the resource returns a 404, the resource does not exists and the method returns false
+ *
+ * @param url
+ * @returns {boolean}
+ */
+var resourceExists = function resourceExists(url) {
+  var _context;
+
+  var fullUrl = (0, _concat.default)(_context = "".concat(_Constants.BASE, "/")).call(_context, url).replace(/\/\//g, "/");
+  var xhr = new XMLHttpRequest();
+  xhr.open("HEAD", fullUrl, false);
+  xhr.setRequestHeader("Accept", "application/json");
+  xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.send();
+  return xhr.status !== 404;
+};
+/**
+ * Indicates if a request to the given url resuls in a redirect to /secureRedirect
+ * @param url
+ * @returns {boolean}
+ */
+
+
+exports.resourceExists = resourceExists;
+
+var resourceRedirectsToSecureLogin = function resourceRedirectsToSecureLogin(url) {
+  var _context2, _xhr$responseURL;
+
+  var fullUrl = (0, _concat.default)(_context2 = "".concat(_Constants.BASE, "/")).call(_context2, url).replace(/\/\//g, "/");
+  var xhr = new XMLHttpRequest();
+  xhr.open("HEAD", fullUrl, false);
+  xhr.setRequestHeader("Accept", "application/json");
+  xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.send();
+  var responseURL = (_xhr$responseURL = xhr.responseURL) !== null && _xhr$responseURL !== void 0 ? _xhr$responseURL : "";
+  return xhr.status === 400 && (0, _endsWith.default)(responseURL).call(responseURL, "/secureLogin");
+};
+
+exports.resourceRedirectsToSecureLogin = resourceRedirectsToSecureLogin;
+//# sourceMappingURL=checkResource.js.map

package/{src/utils/helpers/checkResourceExists.js → lib/utils/helpers/checkResource.js.flow}

@@ -19,3 +19,22 @@ export const resourceExists = (url: string): boolean => {
 
   return xhr.status !== 404;
 };
+
+/**
+ * Indicates if a request to the given url resuls in a redirect to /secureRedirect
+ * @param url
+ * @returns {boolean}
+ */
+export const resourceRedirectsToSecureLogin = (url: string): boolean => {
+  const fullUrl = `${BASE}/${url}`.replace(/\/\//g, "/");
+
+  const xhr = new XMLHttpRequest();
+  xhr.open("HEAD", fullUrl, false);
+  xhr.setRequestHeader("Accept", "application/json");
+  xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.send();
+
+  const responseURL = xhr.responseURL ?? "";
+
+  return xhr.status === 400 && responseURL.endsWith("/secureLogin");
+};

package/lib/utils/helpers/checkResource.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/utils/helpers/checkResource.js"],"names":["resourceExists","url","fullUrl","BASE","replace","xhr","XMLHttpRequest","open","setRequestHeader","send","status","resourceRedirectsToSecureLogin","responseURL"],"mappings":";;;;;;;;;;;;;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,IAAMA,cAAc,GAAG,SAAjBA,cAAiB,CAACC,GAAD,EAA0B;AAAA;;AACtD,MAAMC,OAAO,GAAG,0CAAGC,eAAH,uBAAWF,GAAX,EAAiBG,OAAjB,CAAyB,OAAzB,EAAkC,GAAlC,CAAhB;AAEA,MAAMC,GAAG,GAAG,IAAIC,cAAJ,EAAZ;AACAD,EAAAA,GAAG,CAACE,IAAJ,CAAS,MAAT,EAAiBL,OAAjB,EAA0B,KAA1B;AACAG,EAAAA,GAAG,CAACG,gBAAJ,CAAqB,QAArB,EAA+B,kBAA/B;AACAH,EAAAA,GAAG,CAACG,gBAAJ,CAAqB,cAArB,EAAqC,kBAArC;AACAH,EAAAA,GAAG,CAACI,IAAJ;AAEA,SAAOJ,GAAG,CAACK,MAAJ,KAAe,GAAtB;AACD,CAVM;AAYP;AACA;AACA;AACA;AACA;;;;;AACO,IAAMC,8BAA8B,GAAG,SAAjCA,8BAAiC,CAACV,GAAD,EAA0B;AAAA;;AACtE,MAAMC,OAAO,GAAG,2CAAGC,eAAH,wBAAWF,GAAX,EAAiBG,OAAjB,CAAyB,OAAzB,EAAkC,GAAlC,CAAhB;AAEA,MAAMC,GAAG,GAAG,IAAIC,cAAJ,EAAZ;AACAD,EAAAA,GAAG,CAACE,IAAJ,CAAS,MAAT,EAAiBL,OAAjB,EAA0B,KAA1B;AACAG,EAAAA,GAAG,CAACG,gBAAJ,CAAqB,QAArB,EAA+B,kBAA/B;AACAH,EAAAA,GAAG,CAACG,gBAAJ,CAAqB,cAArB,EAAqC,kBAArC;AACAH,EAAAA,GAAG,CAACI,IAAJ;AAEA,MAAMG,WAAW,uBAAGP,GAAG,CAACO,WAAP,+DAAsB,EAAvC;AAEA,SAAOP,GAAG,CAACK,MAAJ,KAAe,GAAf,IAAsB,uBAAAE,WAAW,MAAX,CAAAA,WAAW,EAAU,cAAV,CAAxC;AACD,CAZM","sourcesContent":["// @flow\nimport { BASE } from \"../../constants/Constants\";\n\n/**\n * Checks if a given url to a modular ui resource exists using a HEAD request to the resource (synchronous)\n * When the resource returns a 404, the resource does not exists and the method returns false\n *\n * @param url\n * @returns {boolean}\n */\nexport const resourceExists = (url: string): boolean => {\n  const fullUrl = `${BASE}/${url}`.replace(/\\/\\//g, \"/\");\n\n  const xhr = new XMLHttpRequest();\n  xhr.open(\"HEAD\", fullUrl, false);\n  xhr.setRequestHeader(\"Accept\", \"application/json\");\n  xhr.setRequestHeader(\"Content-Type\", \"application/json\");\n  xhr.send();\n\n  return xhr.status !== 404;\n};\n\n/**\n * Indicates if a request to the given url resuls in a redirect to /secureRedirect\n * @param url\n * @returns {boolean}\n */\nexport const resourceRedirectsToSecureLogin = (url: string): boolean => {\n  const fullUrl = `${BASE}/${url}`.replace(/\\/\\//g, \"/\");\n\n  const xhr = new XMLHttpRequest();\n  xhr.open(\"HEAD\", fullUrl, false);\n  xhr.setRequestHeader(\"Accept\", \"application/json\");\n  xhr.setRequestHeader(\"Content-Type\", \"application/json\");\n  xhr.send();\n\n  const responseURL = xhr.responseURL ?? \"\";\n\n  return xhr.status === 400 && responseURL.endsWith(\"/secureLogin\");\n};\n"],"file":"checkResource.js"}

package/lib/utils/index.js

@@ -153,16 +153,16 @@ _Object$keys(_text).forEach(function (key) {
   });
 });
 
-var _checkResourceExists = require("./helpers/checkResourceExists");
+var _checkResource = require("./helpers/checkResource");
 
-_Object$keys(_checkResourceExists).forEach(function (key) {
+_Object$keys(_checkResource).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _checkResourceExists[key]) return;
+  if (key in exports && exports[key] === _checkResource[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _checkResourceExists[key];
+      return _checkResource[key];
     }
   });
 });

package/lib/utils/index.js.flow

@@ -19,7 +19,7 @@ export { default as createUUID } from "./helpers/createUUID";
 export * from "./helpers/sanitizeHtml";
 export * from "./helpers/objects";
 export * from "./helpers/text";
-export * from "./helpers/checkResourceExists";
+export * from "./helpers/checkResource";
 
 // number
 export { default as DecimalFormat } from "./number/DecimalFormat";

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAGA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAGA;;AACA;;AACA;;AAIA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAGA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["// @flow\n\n// browser\nexport { default as Cache } from \"./browser/Cache\";\nexport * from \"./browser/Cookies\";\n\n// datetime\nexport * from \"./datetime/DateTimeUtil\";\n\n// fetch\nexport { default as serverFetch } from \"./fetch/serverFetch\";\nexport { default as universalFetch } from \"./fetch/universalFetch\";\nexport { default as xhr } from \"./fetch/xhr\";\nexport type * from \"./fetch/types\";\n\n// helpers\nexport * from \"./helpers/createHash\";\nexport { default as createUUID } from \"./helpers/createUUID\";\nexport * from \"./helpers/sanitizeHtml\";\nexport * from \"./helpers/objects\";\nexport * from \"./helpers/text\";\nexport * from \"./helpers/checkResourceExists\";\n\n// number\nexport { default as DecimalFormat } from \"./number/DecimalFormat\";\nexport { default as formatValue } from \"./number/formatValue\";\nexport * from \"./number/parseNumbers\";\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/utils/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAGA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAGA;;AACA;;AACA;;AAIA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAGA;;AACA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["// @flow\n\n// browser\nexport { default as Cache } from \"./browser/Cache\";\nexport * from \"./browser/Cookies\";\n\n// datetime\nexport * from \"./datetime/DateTimeUtil\";\n\n// fetch\nexport { default as serverFetch } from \"./fetch/serverFetch\";\nexport { default as universalFetch } from \"./fetch/universalFetch\";\nexport { default as xhr } from \"./fetch/xhr\";\nexport type * from \"./fetch/types\";\n\n// helpers\nexport * from \"./helpers/createHash\";\nexport { default as createUUID } from \"./helpers/createUUID\";\nexport * from \"./helpers/sanitizeHtml\";\nexport * from \"./helpers/objects\";\nexport * from \"./helpers/text\";\nexport * from \"./helpers/checkResource\";\n\n// number\nexport { default as DecimalFormat } from \"./number/DecimalFormat\";\nexport { default as formatValue } from \"./number/formatValue\";\nexport * from \"./number/parseNumbers\";\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.14.5",
+  "version": "1.16.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -78,7 +78,7 @@
     "styled-components": "^5.2.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.17.2",
+    "@babel/runtime-corejs3": "^7.17.8",
     "big.js": "^6.1.1",
     "date-fns": "^2.28.0",
     "deepmerge": "^4.2.2",
@@ -96,7 +96,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.17.3",
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.17.8",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/eslint-plugin": "^7.16.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
@@ -104,7 +104,7 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-flow": "^7.16.7",
     "@babel/preset-react": "^7.16.7",
-    "@commitlint/cli": "^16.2.1",
+    "@commitlint/cli": "^16.2.3",
     "@commitlint/config-conventional": "^16.2.1",
     "@testing-library/react-hooks": "^7.0.2",
     "auditjs": "^4.0.36",
@@ -118,11 +118,11 @@
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^2.0.1",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jest": "^26.1.1",
-    "eslint-plugin-jsdoc": "^38.0.4",
+    "eslint-plugin-jest": "^26.1.2",
+    "eslint-plugin-jsdoc": "^38.0.6",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "flow-bin": "^0.173.0",
+    "flow-bin": "^0.174.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.6.1",
     "glob": "^7.2.0",
@@ -132,9 +132,9 @@
     "jest-junit": "^13.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.13.1",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^12.3.7",
     "polished": "^4.1.4",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet-async": "^1.2.3",

package/src/hooks/index.js

@@ -14,3 +14,4 @@ export * from "./useNotification";
 export * from "./usePreference";
 export * from "./useProgressIndicator";
 export * from "./useRouter";
+export * from "./useAllFormsOnModel";

package/src/hooks/useAllFormsOnModel.js

@@ -0,0 +1,92 @@
+// @flow
+import { useState, useEffect } from "react";
+
+import { useModularUIRequest } from "./useModularUIRequest";
+
+import { HTTP_METHODS } from "../constants";
+
+import ListModel from "../models/list/ListModel";
+import FormModel from "../models/form/FormModel";
+
+import type DetailModel from "../models/detail/DetailModel";
+import type TabModel from "../models/tab/TabModel";
+import type ActionModel from "../models/actions/ActionModel";
+
+/**
+ * Retrieve all forms configured on a model with actions
+ * @param model
+ * @returns Object - { actionName: FormModel }
+ */
+export const useRetrieveFormsOnModel = (
+  model: ListModel | DetailModel | TabModel
+): null | { [actionName: string]: FormModel } => {
+  const modularui = useModularUIRequest();
+  const [forms, setForms] = useState(null);
+  const [requestCount, setRequestCount] = useState(0);
+  const [responseCount, setResponseCount] = useState(0);
+
+  useEffect(() => {
+    const requests = getActions(model).map((action) => {
+      const href = action.selfhref.addParameter("commit", "false");
+
+      return modularui(href, { method: HTTP_METHODS.POST })
+        .fetch()
+        .then((form) => {
+          if (form instanceof FormModel) {
+            form.tokens = [];
+          }
+          return { [action.name]: form };
+        });
+    });
+
+    setRequestCount(requests.length);
+
+    Promise.all(requests).then((responses) => {
+      // put response array in object
+      const actionForms = Object.assign({}, ...responses);
+      setForms(actionForms);
+      setResponseCount(responses.length);
+    });
+  }, [model, modularui]);
+
+  if (responseCount === requestCount) {
+    return forms;
+  }
+
+  return null;
+};
+
+const getActions = (
+  model: ListModel | DetailModel | TabModel
+): Array<ActionModel> => {
+  if (!model.actionCollection) {
+    return [];
+  }
+
+  const createActions = model.actionCollection
+    .getActionsByType("create")
+    .filter((action) => !action.isDisabled);
+
+  const allActions = [...createActions];
+
+  if (model instanceof ListModel) {
+    model.listItemCollection.forEach((listItem) => {
+      const updateActions = listItem.actionCollection
+        .getActionsByType("update")
+        .filter((action) => !action.isDisabled);
+
+      allActions.push(...updateActions);
+    });
+  }
+
+  const actions = [];
+  const unique = [];
+  allActions.forEach((action) => {
+    if (!unique.includes(action.name)) {
+      unique.push(action.name);
+      actions.push(action);
+    }
+  });
+
+  return actions;
+};

package/src/hooks/useAuthentication.js

@@ -1,13 +1,15 @@
 // @flow
 import { useSelector, useDispatch } from "react-redux";
 import { getApplication } from "../redux/_modularui/selectors";
-import { login, logout } from "../redux/actions";
+import { login, logout, resetAuthErrors } from "../redux/actions";
 import UserServicesModel from "../models/user/UserServicesModel";
 import { useState, useEffect } from "react";
 
+import type { ResetAuthErrorsAction } from "../redux/types";
 type LoginHook = {
   isAuthenticated: boolean,
   errorMessage: ?string,
+  resetErrors: () => ResetAuthErrorsAction,
   login: (username: string, password: string) => void,
 };
 type LogoutHook = {
@@ -39,6 +41,7 @@ export const useLogin = (): LoginHook => {
   return {
     isAuthenticated: getIsAuthenticated(auth.isAuthenticated, application),
     errorMessage: auth.error,
+    resetErrors: () => dispatch(resetAuthErrors()),
     login: (username: string, password: string) =>
       dispatch(login(username, password)),
   };
@@ -66,12 +69,11 @@ export const useLogout = (): LogoutHook => {
 
   return {
     isAuthenticated,
-    logout: () => {
-      return dispatch(logout()).then(() => {
+    logout: () =>
+      dispatch(logout()).then(() => {
         if (!cancel) {
           setIsAuthenticated(false);
         }
-      });
-    },
+      }),
   };
 };

package/src/models/attributes/AttributeContent.js

@@ -62,7 +62,7 @@ class AttributeContent {
     if (this._content?.elements) {
       return this._content.elements?.map((element) => {
         if ("propertyElement" in element) {
-          // $FlowIssue[prop-missing]
+          // $FlowIssue[incompatible-use]
           const { label, layouthint, properties } = element.propertyElement;
 
           return {
@@ -75,8 +75,8 @@ class AttributeContent {
         }
 
         if ("textFragmentElement" in element) {
+          // $FlowIssue[incompatible-use]
           const { label, layouthint, textfragments } =
-            // $FlowIssue[prop-missing]
             element.textFragmentElement;
           return {
             textFragmentElement: {
@@ -91,7 +91,7 @@ class AttributeContent {
         }
 
         if ("contentElement" in element) {
-          // $FlowIssue[prop-missing]
+          // $FlowIssue[incompatible-use]
           const { label, layouthint, sections } = element.contentElement;
           return {
             contentElement: {

package/src/redux/actions/FormAttributeSet.js

@@ -25,12 +25,16 @@ export const updateFormAttribute =
       autosubmit: false,
       autosave: false,
       forceUpdate: false,
-      validate: true
+      validate: true,
     }
   ): ThunkAction =>
   (dispatch: Dispatch) => {
     const newForm = form.clone();
 
+    if (!options.validate) {
+      options.validate = true;
+    }
+
     if (
       newForm.currentFormObject &&
       newForm.currentFormObject.equals(formObject)
@@ -60,7 +64,8 @@ export const updateFormAttribute =
     }
 
     if (
-      newForm.currentFormObject && options.validate &&
+      newForm.currentFormObject &&
+      options.validate &&
       newForm.currentFormObject.hasDynamicValidations &&
       getSetting("USE_INSTANT_SERVER_VALIDATION")
     ) {

package/src/redux/actions/SignIn.js

@@ -10,6 +10,7 @@ import { CHANGEPASSWORD_PATH } from "../../constants/Constants";
 
 import type {
   LoginFailedAction,
+  ResetAuthErrorsAction,
   LoginSuccessAction,
   ThunkAction,
 } from "../types";
@@ -22,6 +23,13 @@ export const loginFailed = (errorMessage: string): LoginFailedAction => ({
   payload: errorMessage,
 });
 
+/**
+ * Resets any authentication errors
+ */
+export const resetAuthErrors = (): ResetAuthErrorsAction => ({
+  type: "AUTHENTICATION_RESET_ERRORS",
+});
+
 /**
  * Send login success action
  */

package/src/redux/reducers/AuthReducer.js

@@ -34,6 +34,9 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
     case "AUTHENTICATION_ERROR":
       return { ...state, mustChangePassword: false, error: action.payload };
 
+    case "AUTHENTICATION_RESET_ERRORS":
+      return { ...state, error: null };
+
     case "AUTHENTICATION_LOGOUT": {
       // clear cache because of cached contributions
       if (state.isAuthenticated) {