@beinformed/ui 1.33.0-beta.7 → 1.34.0

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.34.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.33.0...v1.34.0) (2023-09-13)
+
+
+### Features
+
+* **redirectUri:** the redirectURI to a secure page is now handled through the UI library ([cc54f8e](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/cc54f8e5d436d2c14e6f50dd3793ac074a8dcc2f))
+
+## [1.33.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.33.0-beta.7...v1.33.0) (2023-08-29)
+
+
+### Bug Fixes
+
+* **filters:** only handle filter formatting on bsn, iban and zip code with exact and not ([4ebe97c](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/4ebe97c593380a9837460eb1ad9bbf26d1c7e106))
+* **sanitize-html:** handle escaped html ([2e9aa73](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/2e9aa730fb9c48ea69cd7d29419e635b6384c723))
+
 ## [1.33.0-beta.7](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.33.0-beta.6...v1.33.0-beta.7) (2023-08-28)
 
 

package/esm/models/filters/StringFilterModel.js

@@ -66,7 +66,7 @@ export default class StringFilterModel extends BaseFilterModel {
   update(attribute, value) {
     this._isValid = true;
     this._inputvalue = typeof value !== "string" ? value.toString() : value;
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       var _context, _context2;
       const values = this.isMultiple ? _mapInstanceProperty(_context = this._inputvalue.split(",")).call(_context, val => _trimInstanceProperty(val).call(val)) : [_trimInstanceProperty(_context2 = this._inputvalue).call(_context2)];
       const outputValues = [];
@@ -94,7 +94,7 @@ export default class StringFilterModel extends BaseFilterModel {
   /**
    */
   formatValue(value) {
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       return this.attribute.formatValue(value);
     }
     return value;
@@ -124,10 +124,16 @@ export default class StringFilterModel extends BaseFilterModel {
     if (value == null || value.toString() === "") {
       return "";
     }
-    if ((this.operator === "exactly" || this.operator === "isNot") && (this.isIBAN() || this.isZipcode() || this.isBSN())) {
+    if (this.shouldHandleFormat()) {
       return value.replace(/[^a-z0-9,]/gi, "");
     }
     return value;
   }
+
+  /**
+   */
+  shouldHandleFormat() {
+    return (this.operator === "exactly" || this.operator === "isNot") && (this.isIBAN() || this.isZipcode() || this.isBSN());
+  }
 }
 //# sourceMappingURL=StringFilterModel.js.map

package/esm/models/filters/StringFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"StringFilterModel.js","names":["BaseFilterModel","StringFilterModel","constructor","data","contributions","_defineProperty","update","attribute","value","_inputvalue","_value","params","param","name","removeFormat","inputvalue","reset","isValid","_isValid","toString","operator","_context","_context2","values","isMultiple","_mapInstanceProperty","split","call","val","_trimInstanceProperty","outputValues","formattedValue","formatValue","push","validate","join","getContribution","isBSN","layouthint","has","isIBAN","isZipcode","replace"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value ?? \"\";\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.removeFormat(this.value),\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = \"\";\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._isValid = true;\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          if (!this.attribute.validate(formattedValue)) {\n            this._isValid = false;\n          }\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n\n  /**\n   */\n  isBSN(): boolean {\n    return this.layouthint.has(\"bsn\");\n  }\n\n  /**\n   */\n  isIBAN(): boolean {\n    return this.layouthint.has(\"iban\");\n  }\n\n  /**\n   */\n  isZipcode(): boolean {\n    return this.layouthint.has(\"zipcode\");\n  }\n\n  /**\n   */\n  removeFormat(value: ?string): string {\n    if (value == null || value.toString() === \"\") {\n      return \"\";\n    }\n\n    if (\n      (this.operator === \"exactly\" || this.operator === \"isNot\") &&\n      (this.isIBAN() || this.isZipcode() || this.isBSN())\n    ) {\n      return value.replace(/[^a-z0-9,]/gi, \"\");\n    }\n\n    return value;\n  }\n}\n"],"mappings":";;;AACA,OAAOA,eAAe,MAAM,mBAAmB;AAI/C;AACA;AACA;AACA,eAAe,MAAMC,iBAAiB,SAASD,eAAe,CAAC;EAK7D;AACF;EACEE,WAAWA,CAACC,IAAY,EAAEC,aAAqB,EAAE;IAC/C,KAAK,CAACD,IAAI,EAAEC,aAAa,CAAC;IAACC,eAAA,mBAPT,IAAI;IAAAA,eAAA;IAAAA,eAAA;IAStB,IAAI,CAACC,MAAM,CAAC,IAAI,CAACC,SAAS,EAAEJ,IAAI,CAACK,KAAK,IAAI,EAAE,CAAC;;IAE7C;IACA,IAAI,CAACC,WAAW,GAAG,IAAI,CAACC,MAAM,IAAI,EAAE;EACtC;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAA4C;IACpD,IAAI,CAAC,IAAI,CAACC,KAAK,EAAE;MACf,OAAO,EAAE;IACX;IAEA,OAAO,CACL;MACEC,IAAI,EAAE,IAAI,CAACD,KAAK;MAChBJ,KAAK,EAAE,IAAI,CAACM,YAAY,CAAC,IAAI,CAACN,KAAK;IACrC,CAAC,CACF;EACH;;EAEA;AACF;AACA;EACE,IAAIA,KAAKA,CAAA,EAAkB;IACzB,OAAO,IAAI,CAACE,MAAM;EACpB;;EAEA;AACF;EACE,IAAIK,UAAUA,CAAA,EAAW;IACvB,OAAO,IAAI,CAACN,WAAW;EACzB;;EAEA;AACF;AACA;EACEO,KAAKA,CAAA,EAAe;IAClB,IAAI,CAACP,WAAW,GAAG,EAAE;IACrB,IAAI,CAACC,MAAM,GAAG,IAAI;IAElB,OAAO,IAAI;EACb;;EAEA;AACF;EACE,IAAIO,OAAOA,CAAA,EAAY;IACrB,OAAO,IAAI,CAACC,QAAQ;EACtB;;EAEA;AACF;AACA;EACEZ,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,CAACU,QAAQ,GAAG,IAAI;IACpB,IAAI,CAACT,WAAW,GAAG,OAAOD,KAAK,KAAK,QAAQ,GAAGA,KAAK,CAACW,QAAQ,CAAC,CAAC,GAAGX,KAAK;IAEvE,IAAI,IAAI,CAACY,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,EAAE;MAAA,IAAAC,QAAA,EAAAC,SAAA;MAC5D,MAAMC,MAAM,GAAG,IAAI,CAACC,UAAU,GAC1BC,oBAAA,CAAAJ,QAAA,OAAI,CAACZ,WAAW,CAACiB,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAN,QAAA,EAAMO,GAAG,IAAKC,qBAAA,CAAAD,GAAG,EAAAD,IAAA,CAAHC,GAAS,CAAC,CAAC,GACpD,CAACC,qBAAA,CAAAP,SAAA,OAAI,CAACb,WAAW,EAAAkB,IAAA,CAAAL,SAAM,CAAC,CAAC;MAE7B,MAAMQ,YAAY,GAAG,EAAE;MACvB,KAAK,MAAMF,GAAG,IAAIL,MAAM,EAAE;QACxB,MAAMQ,cAAc,GAAG,IAAI,CAACC,WAAW,CAACJ,GAAG,CAAC;QAC5C,IAAIG,cAAc,KAAK,EAAE,EAAE;UACzBD,YAAY,CAACG,IAAI,CAACF,cAAc,CAAC;UAEjC,IAAI,CAAC,IAAI,CAACxB,SAAS,CAAC2B,QAAQ,CAACH,cAAc,CAAC,EAAE;YAC5C,IAAI,CAACb,QAAQ,GAAG,KAAK;UACvB;QACF;MACF;MAEA,IAAI,CAACR,MAAM,GAAGoB,YAAY,CAACK,IAAI,CAAC,GAAG,CAAC;IACtC,CAAC,MAAM;MACL,IAAI,CAACzB,MAAM,GAAGF,KAAK;IACrB;EACF;;EAEA;AACF;EACE,IAAIY,QAAQA,CAAA,EAAW;IACrB,OAAO,IAAI,CAACgB,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC;EAC7C;;EAEA;AACF;EACEJ,WAAWA,CAACxB,KAAa,EAAU;IACjC,IAAI,IAAI,CAACY,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,EAAE;MAC5D,OAAO,IAAI,CAACb,SAAS,CAACyB,WAAW,CAACxB,KAAK,CAAC;IAC1C;IACA,OAAOA,KAAK;EACd;;EAEA;AACF;EACE6B,KAAKA,CAAA,EAAY;IACf,OAAO,IAAI,CAACC,UAAU,CAACC,GAAG,CAAC,KAAK,CAAC;EACnC;;EAEA;AACF;EACEC,MAAMA,CAAA,EAAY;IAChB,OAAO,IAAI,CAACF,UAAU,CAACC,GAAG,CAAC,MAAM,CAAC;EACpC;;EAEA;AACF;EACEE,SAASA,CAAA,EAAY;IACnB,OAAO,IAAI,CAACH,UAAU,CAACC,GAAG,CAAC,SAAS,CAAC;EACvC;;EAEA;AACF;EACEzB,YAAYA,CAACN,KAAc,EAAU;IACnC,IAAIA,KAAK,IAAI,IAAI,IAAIA,KAAK,CAACW,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;MAC5C,OAAO,EAAE;IACX;IAEA,IACE,CAAC,IAAI,CAACC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,MACxD,IAAI,CAACoB,MAAM,CAAC,CAAC,IAAI,IAAI,CAACC,SAAS,CAAC,CAAC,IAAI,IAAI,CAACJ,KAAK,CAAC,CAAC,CAAC,EACnD;MACA,OAAO7B,KAAK,CAACkC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;IAC1C;IAEA,OAAOlC,KAAK;EACd;AACF"}
+{"version":3,"file":"StringFilterModel.js","names":["BaseFilterModel","StringFilterModel","constructor","data","contributions","_defineProperty","update","attribute","value","_inputvalue","_value","params","param","name","removeFormat","inputvalue","reset","isValid","_isValid","toString","shouldHandleFormat","_context","_context2","values","isMultiple","_mapInstanceProperty","split","call","val","_trimInstanceProperty","outputValues","formattedValue","formatValue","push","validate","join","operator","getContribution","isBSN","layouthint","has","isIBAN","isZipcode","replace"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value ?? \"\";\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.removeFormat(this.value),\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = \"\";\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._isValid = true;\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.shouldHandleFormat()) {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          if (!this.attribute.validate(formattedValue)) {\n            this._isValid = false;\n          }\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.shouldHandleFormat()) {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n\n  /**\n   */\n  isBSN(): boolean {\n    return this.layouthint.has(\"bsn\");\n  }\n\n  /**\n   */\n  isIBAN(): boolean {\n    return this.layouthint.has(\"iban\");\n  }\n\n  /**\n   */\n  isZipcode(): boolean {\n    return this.layouthint.has(\"zipcode\");\n  }\n\n  /**\n   */\n  removeFormat(value: ?string): string {\n    if (value == null || value.toString() === \"\") {\n      return \"\";\n    }\n\n    if (this.shouldHandleFormat()) {\n      return value.replace(/[^a-z0-9,]/gi, \"\");\n    }\n\n    return value;\n  }\n\n  /**\n   */\n  shouldHandleFormat(): boolean {\n    return (\n      (this.operator === \"exactly\" || this.operator === \"isNot\") &&\n      (this.isIBAN() || this.isZipcode() || this.isBSN())\n    );\n  }\n}\n"],"mappings":"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"}

package/esm/react-client/client.js

@@ -1,21 +1,24 @@
 import _trimInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/trim";
+import _URLSearchParams from "@babel/runtime-corejs3/core-js-stable/url-search-params";
 // eslint-disable-next-line react/no-deprecated
 import { hydrate, render } from "react-dom";
 import { has } from "../utils/helpers/objects";
 import setImmediate from "setimmediate";
 import Cache from "../utils/browser/Cache";
+import xhr from "../utils/fetch/xhr";
 import { createBrowserHistory } from "history";
 import configureStore from "../redux/store/configureStore";
 import rehydrate from "./rehydrate";
-import { getBasePath } from "../constants/Settings";
+import { getBasePath, getSetting } from "../constants/Settings";
 import { setAllContentInDataSetting, setLoginPreferences } from "../redux/actions/Preferences";
 import { showXHRErrorNotification } from "../redux/actions/Notification";
 import { handleError } from "../redux/actions/Error";
 import { loginSuccess } from "../redux/actions/SignIn";
-import { locationChange } from "../redux/_router/RouterActions";
+import { locationChange, replace } from "../redux/_router/RouterActions";
 import { JsonParseException, FetchException } from "../exceptions";
 import { Init } from "./Init";
 import { handleBeforeRenderHooks } from "../redux/store/beforeRenderHooks";
+import UnauthorizedException from "../exceptions/UnauthorizedException";
 import { jsx as _jsx } from "react/jsx-runtime";
 /*
  * deserialize serialized data from the server to provide a smooth dehydration.
@@ -53,6 +56,30 @@ export const setUnhandledRejectionEvent = store => {
   };
 };
 
+/**
+ * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link
+ * @param store
+ */
+const handleRedirectURI = store => {
+  const urlParams = new _URLSearchParams(window.location.search);
+  const redirectURI = urlParams.get("redirectURI");
+  if (redirectURI) {
+    xhr({
+      url: `${getBasePath()}${redirectURI}`
+    }).catch(e => {
+      if (e instanceof UnauthorizedException) {
+        const LOGIN_PATH = getSetting("LOGIN_PATH", "/signin");
+        store.dispatch(replace(LOGIN_PATH, {
+          from: {
+            pathname: redirectURI
+          },
+          modal: false
+        }));
+      }
+    });
+  }
+};
+
 /**
  */
 export const setupClient = function () {
@@ -74,6 +101,7 @@ export const setupClient = function () {
     routerHistory,
     store
   } = configureStore(browserHistory, customReducers, rehydrate(data));
+  handleRedirectURI(store);
   setAllContentInDataSetting(store.getState());
   setLoginPreferences(store.getState());
 

package/esm/react-client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":["hydrate","render","has","setImmediate","Cache","createBrowserHistory","configureStore","rehydrate","getBasePath","setAllContentInDataSetting","setLoginPreferences","showXHRErrorNotification","handleError","loginSuccess","locationChange","JsonParseException","FetchException","Init","handleBeforeRenderHooks","jsx","_jsx","parseDataToJSON","data","JSON","parse","error","getDataFromServer","_context","dataElement","document","querySelector","Error","_trimInstanceProperty","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","errorMessage","reason","message","toString","dispatch","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","clear","browserHistory","basename","routerHistory","getState","loadOtherBrowserTabs","getItem","response","listen","location","action","body","className","addContentLoadedEvent","theme","ErrorFallbackComponent","mount","addEventListener","applicationNode","children","mountClient","element","isSSR","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport { getBasePath } from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\n\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\n\nimport { locationChange } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePath(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(element, applicationNode);\n  } else {\n    render(element, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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"}
+{"version":3,"file":"client.js","names":["hydrate","render","has","setImmediate","Cache","xhr","createBrowserHistory","configureStore","rehydrate","getBasePath","getSetting","setAllContentInDataSetting","setLoginPreferences","showXHRErrorNotification","handleError","loginSuccess","locationChange","replace","JsonParseException","FetchException","Init","handleBeforeRenderHooks","UnauthorizedException","jsx","_jsx","parseDataToJSON","data","JSON","parse","error","getDataFromServer","_context","dataElement","document","querySelector","Error","_trimInstanceProperty","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","errorMessage","reason","message","toString","dispatch","handleRedirectURI","urlParams","_URLSearchParams","location","search","redirectURI","get","url","catch","e","LOGIN_PATH","from","pathname","modal","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","clear","browserHistory","basename","routerHistory","getState","loadOtherBrowserTabs","getItem","response","listen","action","body","className","addContentLoadedEvent","theme","ErrorFallbackComponent","mount","addEventListener","applicationNode","children","mountClient","element","isSSR","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport { getBasePath, getSetting } from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\n\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\n\nimport { locationChange, replace } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport UnauthorizedException from \"../exceptions/UnauthorizedException\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link\n * @param store\n */\nconst handleRedirectURI = (store: ReduxStore) => {\n  const urlParams = new URLSearchParams(window.location.search);\n  const redirectURI = urlParams.get(\"redirectURI\");\n  if (redirectURI) {\n    xhr({ url: `${getBasePath()}${redirectURI}` }).catch((e) => {\n      if (e instanceof UnauthorizedException) {\n        const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n        store.dispatch(\n          replace(LOGIN_PATH, {\n            from: { pathname: redirectURI },\n            modal: false,\n          }),\n        );\n      }\n    });\n  }\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePath(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  handleRedirectURI(store);\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(element, applicationNode);\n  } else {\n    render(element, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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"}

package/esm/utils/helpers/sanitizeHtml.js

@@ -1,19 +1,14 @@
-import he from "he";
+import { encode } from "html-entities";
 import { IllegalArgumentException } from "../../exceptions";
 /**
  * Translates html entities to their correct decimal equivalent
  * When path is only one deep better use optional chaining
  */
 const properEntityEncoding = html => {
-  const htmlDecoded = he.decode(html, {
-    decimal: true,
-    allowUnsafeSymbols: true
+  return encode(html, {
+    mode: "nonAsciiPrintableOnly",
+    level: "xml"
   });
-  const htmlEncoded = he.encode(htmlDecoded, {
-    decimal: true,
-    allowUnsafeSymbols: true
-  });
-  return htmlEncoded;
 };
 
 /**

package/esm/utils/helpers/sanitizeHtml.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeHtml.js","names":["he","IllegalArgumentException","properEntityEncoding","html","htmlDecoded","decode","decimal","allowUnsafeSymbols","htmlEncoded","encode","removeUnwantedHtml","options","arguments","length","undefined","allowedTags","correctEntityHtml","htmlWithoutAttributes","replace","htmlWithCorrectBR","Array","isArray","join","pattern","regex","RegExp"],"sources":["../../../src/utils/helpers/sanitizeHtml.js"],"sourcesContent":["// @flow\nimport he from \"he\";\n\nimport { IllegalArgumentException } from \"../../exceptions\";\n\ntype removeUnwantedHtmlOptions = {\n  allowedTags?: Array<string>,\n};\n\n/**\n * Translates html entities to their correct decimal equivalent\n * When path is only one deep better use optional chaining\n */\nconst properEntityEncoding = (html: string) => {\n  const htmlDecoded = he.decode(html, {\n    decimal: true,\n    allowUnsafeSymbols: true,\n  });\n\n  const htmlEncoded = he.encode(htmlDecoded, {\n    decimal: true,\n    allowUnsafeSymbols: true,\n  });\n\n  return htmlEncoded;\n};\n\n/**\n * removes unwanted html, this might result in incorrect html, as it removes all html that we don't except,\n * like <b style=\"font-weight: 400\">bold</b> will result in bold</b>\n */\nconst removeUnwantedHtml = (\n  html: string,\n  options: removeUnwantedHtmlOptions = {\n    allowedTags: [\"p\", \"br\", \"b\", \"i\", \"u\", \"strike\"],\n  },\n): string => {\n  if (typeof html !== \"string\") {\n    throw new IllegalArgumentException(\"sanitizeHTML method expects a string\");\n  }\n\n  const correctEntityHtml = properEntityEncoding(html);\n\n  // remove attributes from html elements\n  const htmlWithoutAttributes = correctEntityHtml.replace(\n    /<(\\w+)(.|[\\r\\n])*?>/gi,\n    \"<$1>\",\n  );\n\n  const htmlWithCorrectBR = htmlWithoutAttributes.replace(\n    /<br\\s*>/gi,\n    \"<br />\",\n  );\n\n  // remove not allowed tags\n  const allowedTags = Array.isArray(options.allowedTags)\n    ? options.allowedTags.join(\"|\")\n    : \"\";\n  const pattern = `<(?!\\\\/?(${allowedTags})(>|\\\\s\\\\/))[^<]+?>`;\n  const regex = new RegExp(pattern, \"gi\");\n\n  return htmlWithCorrectBR.replace(regex, \"\");\n};\n\nexport { removeUnwantedHtml };\n"],"mappings":"AACA,OAAOA,EAAE,MAAM,IAAI;AAEnB,SAASC,wBAAwB,QAAQ,kBAAkB;AAM3D;AACA;AACA;AACA;AACA,MAAMC,oBAAoB,GAAIC,IAAY,IAAK;EAC7C,MAAMC,WAAW,GAAGJ,EAAE,CAACK,MAAM,CAACF,IAAI,EAAE;IAClCG,OAAO,EAAE,IAAI;IACbC,kBAAkB,EAAE;EACtB,CAAC,CAAC;EAEF,MAAMC,WAAW,GAAGR,EAAE,CAACS,MAAM,CAACL,WAAW,EAAE;IACzCE,OAAO,EAAE,IAAI;IACbC,kBAAkB,EAAE;EACtB,CAAC,CAAC;EAEF,OAAOC,WAAW;AACpB,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAME,kBAAkB,GAAG,SAAAA,CACzBP,IAAY,EAID;EAAA,IAHXQ,OAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACnCG,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;EAClD,CAAC;EAED,IAAI,OAAOZ,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIF,wBAAwB,CAAC,sCAAsC,CAAC;EAC5E;EAEA,MAAMe,iBAAiB,GAAGd,oBAAoB,CAACC,IAAI,CAAC;;EAEpD;EACA,MAAMc,qBAAqB,GAAGD,iBAAiB,CAACE,OAAO,CACrD,uBAAuB,EACvB,MACF,CAAC;EAED,MAAMC,iBAAiB,GAAGF,qBAAqB,CAACC,OAAO,CACrD,WAAW,EACX,QACF,CAAC;;EAED;EACA,MAAMH,WAAW,GAAGK,KAAK,CAACC,OAAO,CAACV,OAAO,CAACI,WAAW,CAAC,GAClDJ,OAAO,CAACI,WAAW,CAACO,IAAI,CAAC,GAAG,CAAC,GAC7B,EAAE;EACN,MAAMC,OAAO,GAAI,YAAWR,WAAY,qBAAoB;EAC5D,MAAMS,KAAK,GAAG,IAAIC,MAAM,CAACF,OAAO,EAAE,IAAI,CAAC;EAEvC,OAAOJ,iBAAiB,CAACD,OAAO,CAACM,KAAK,EAAE,EAAE,CAAC;AAC7C,CAAC;AAED,SAASd,kBAAkB"}
+{"version":3,"file":"sanitizeHtml.js","names":["encode","IllegalArgumentException","properEntityEncoding","html","mode","level","removeUnwantedHtml","options","arguments","length","undefined","allowedTags","correctEntityHtml","htmlWithoutAttributes","replace","htmlWithCorrectBR","Array","isArray","join","pattern","regex","RegExp"],"sources":["../../../src/utils/helpers/sanitizeHtml.js"],"sourcesContent":["// @flow\nimport { encode } from \"html-entities\";\n\nimport { IllegalArgumentException } from \"../../exceptions\";\n\ntype removeUnwantedHtmlOptions = {\n  allowedTags?: Array<string>,\n};\n\n/**\n * Translates html entities to their correct decimal equivalent\n * When path is only one deep better use optional chaining\n */\nconst properEntityEncoding = (html: string) => {\n  return encode(html, { mode: \"nonAsciiPrintableOnly\", level: \"xml\" });\n};\n\n/**\n * removes unwanted html, this might result in incorrect html, as it removes all html that we don't except,\n * like <b style=\"font-weight: 400\">bold</b> will result in bold</b>\n */\nconst removeUnwantedHtml = (\n  html: string,\n  options: removeUnwantedHtmlOptions = {\n    allowedTags: [\"p\", \"br\", \"b\", \"i\", \"u\", \"strike\"],\n  },\n): string => {\n  if (typeof html !== \"string\") {\n    throw new IllegalArgumentException(\"sanitizeHTML method expects a string\");\n  }\n\n  const correctEntityHtml = properEntityEncoding(html);\n\n  // remove attributes from html elements\n  const htmlWithoutAttributes = correctEntityHtml.replace(\n    /<(\\w+)(.|[\\r\\n])*?>/gi,\n    \"<$1>\",\n  );\n\n  const htmlWithCorrectBR = htmlWithoutAttributes.replace(\n    /<br\\s*>/gi,\n    \"<br />\",\n  );\n\n  // remove not allowed tags\n  const allowedTags = Array.isArray(options.allowedTags)\n    ? options.allowedTags.join(\"|\")\n    : \"\";\n  const pattern = `<(?!\\\\/?(${allowedTags})(>|\\\\s\\\\/))[^<]+?>`;\n  const regex = new RegExp(pattern, \"gi\");\n\n  return htmlWithCorrectBR.replace(regex, \"\");\n};\n\nexport { removeUnwantedHtml };\n"],"mappings":"AACA,SAASA,MAAM,QAAQ,eAAe;AAEtC,SAASC,wBAAwB,QAAQ,kBAAkB;AAM3D;AACA;AACA;AACA;AACA,MAAMC,oBAAoB,GAAIC,IAAY,IAAK;EAC7C,OAAOH,MAAM,CAACG,IAAI,EAAE;IAAEC,IAAI,EAAE,uBAAuB;IAAEC,KAAK,EAAE;EAAM,CAAC,CAAC;AACtE,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,kBAAkB,GAAG,SAAAA,CACzBH,IAAY,EAID;EAAA,IAHXI,OAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACnCG,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;EAClD,CAAC;EAED,IAAI,OAAOR,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIF,wBAAwB,CAAC,sCAAsC,CAAC;EAC5E;EAEA,MAAMW,iBAAiB,GAAGV,oBAAoB,CAACC,IAAI,CAAC;;EAEpD;EACA,MAAMU,qBAAqB,GAAGD,iBAAiB,CAACE,OAAO,CACrD,uBAAuB,EACvB,MACF,CAAC;EAED,MAAMC,iBAAiB,GAAGF,qBAAqB,CAACC,OAAO,CACrD,WAAW,EACX,QACF,CAAC;;EAED;EACA,MAAMH,WAAW,GAAGK,KAAK,CAACC,OAAO,CAACV,OAAO,CAACI,WAAW,CAAC,GAClDJ,OAAO,CAACI,WAAW,CAACO,IAAI,CAAC,GAAG,CAAC,GAC7B,EAAE;EACN,MAAMC,OAAO,GAAI,YAAWR,WAAY,qBAAoB;EAC5D,MAAMS,KAAK,GAAG,IAAIC,MAAM,CAACF,OAAO,EAAE,IAAI,CAAC;EAEvC,OAAOJ,iBAAiB,CAACD,OAAO,CAACM,KAAK,EAAE,EAAE,CAAC;AAC7C,CAAC;AAED,SAASd,kBAAkB"}

package/lib/models/filters/StringFilterModel.js

@@ -73,7 +73,7 @@ class StringFilterModel extends _BaseFilterModel.default {
   update(attribute, value) {
     this._isValid = true;
     this._inputvalue = typeof value !== "string" ? value.toString() : value;
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       var _context, _context2;
       const values = this.isMultiple ? (0, _map.default)(_context = this._inputvalue.split(",")).call(_context, val => (0, _trim.default)(val).call(val)) : [(0, _trim.default)(_context2 = this._inputvalue).call(_context2)];
       const outputValues = [];
@@ -101,7 +101,7 @@ class StringFilterModel extends _BaseFilterModel.default {
   /**
    */
   formatValue(value) {
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       return this.attribute.formatValue(value);
     }
     return value;
@@ -131,11 +131,17 @@ class StringFilterModel extends _BaseFilterModel.default {
     if (value == null || value.toString() === "") {
       return "";
     }
-    if ((this.operator === "exactly" || this.operator === "isNot") && (this.isIBAN() || this.isZipcode() || this.isBSN())) {
+    if (this.shouldHandleFormat()) {
       return value.replace(/[^a-z0-9,]/gi, "");
     }
     return value;
   }
+
+  /**
+   */
+  shouldHandleFormat() {
+    return (this.operator === "exactly" || this.operator === "isNot") && (this.isIBAN() || this.isZipcode() || this.isBSN());
+  }
 }
 exports.default = StringFilterModel;
 //# sourceMappingURL=StringFilterModel.js.map

package/lib/models/filters/StringFilterModel.js.flow

@@ -74,7 +74,7 @@ export default class StringFilterModel extends BaseFilterModel {
     this._isValid = true;
     this._inputvalue = typeof value !== "string" ? value.toString() : value;
 
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       const values = this.isMultiple
         ? this._inputvalue.split(",").map((val) => val.trim())
         : [this._inputvalue.trim()];
@@ -106,7 +106,7 @@ export default class StringFilterModel extends BaseFilterModel {
   /**
    */
   formatValue(value: string): string {
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       return this.attribute.formatValue(value);
     }
     return value;
@@ -137,13 +137,19 @@ export default class StringFilterModel extends BaseFilterModel {
       return "";
     }
 
-    if (
-      (this.operator === "exactly" || this.operator === "isNot") &&
-      (this.isIBAN() || this.isZipcode() || this.isBSN())
-    ) {
+    if (this.shouldHandleFormat()) {
       return value.replace(/[^a-z0-9,]/gi, "");
     }
 
     return value;
   }
+
+  /**
+   */
+  shouldHandleFormat(): boolean {
+    return (
+      (this.operator === "exactly" || this.operator === "isNot") &&
+      (this.isIBAN() || this.isZipcode() || this.isBSN())
+    );
+  }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"StringFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","StringFilterModel","BaseFilterModel","constructor","data","contributions","_defineProperty2","default","update","attribute","value","_inputvalue","_value","params","param","name","removeFormat","inputvalue","reset","isValid","_isValid","toString","operator","_context","_context2","values","isMultiple","_map","split","call","val","_trim","outputValues","formattedValue","formatValue","push","validate","join","getContribution","isBSN","layouthint","has","isIBAN","isZipcode","replace","exports"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value ?? \"\";\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.removeFormat(this.value),\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = \"\";\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._isValid = true;\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          if (!this.attribute.validate(formattedValue)) {\n            this._isValid = false;\n          }\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n\n  /**\n   */\n  isBSN(): boolean {\n    return this.layouthint.has(\"bsn\");\n  }\n\n  /**\n   */\n  isIBAN(): boolean {\n    return this.layouthint.has(\"iban\");\n  }\n\n  /**\n   */\n  isZipcode(): boolean {\n    return this.layouthint.has(\"zipcode\");\n  }\n\n  /**\n   */\n  removeFormat(value: ?string): string {\n    if (value == null || value.toString() === \"\") {\n      return \"\";\n    }\n\n    if (\n      (this.operator === \"exactly\" || this.operator === \"isNot\") &&\n      (this.isIBAN() || this.isZipcode() || this.isBSN())\n    ) {\n      return value.replace(/[^a-z0-9,]/gi, \"\");\n    }\n\n    return value;\n  }\n}\n"],"mappings":";;;;;;;;;;AACA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACA;AACe,MAAMC,iBAAiB,SAASC,wBAAe,CAAC;EAK7D;AACF;EACEC,WAAWA,CAACC,IAAY,EAAEC,aAAqB,EAAE;IAC/C,KAAK,CAACD,IAAI,EAAEC,aAAa,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA,oBAPT,IAAI;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAStB,IAAI,CAACC,MAAM,CAAC,IAAI,CAACC,SAAS,EAAEL,IAAI,CAACM,KAAK,IAAI,EAAE,CAAC;;IAE7C;IACA,IAAI,CAACC,WAAW,GAAG,IAAI,CAACC,MAAM,IAAI,EAAE;EACtC;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAA4C;IACpD,IAAI,CAAC,IAAI,CAACC,KAAK,EAAE;MACf,OAAO,EAAE;IACX;IAEA,OAAO,CACL;MACEC,IAAI,EAAE,IAAI,CAACD,KAAK;MAChBJ,KAAK,EAAE,IAAI,CAACM,YAAY,CAAC,IAAI,CAACN,KAAK;IACrC,CAAC,CACF;EACH;;EAEA;AACF;AACA;EACE,IAAIA,KAAKA,CAAA,EAAkB;IACzB,OAAO,IAAI,CAACE,MAAM;EACpB;;EAEA;AACF;EACE,IAAIK,UAAUA,CAAA,EAAW;IACvB,OAAO,IAAI,CAACN,WAAW;EACzB;;EAEA;AACF;AACA;EACEO,KAAKA,CAAA,EAAe;IAClB,IAAI,CAACP,WAAW,GAAG,EAAE;IACrB,IAAI,CAACC,MAAM,GAAG,IAAI;IAElB,OAAO,IAAI;EACb;;EAEA;AACF;EACE,IAAIO,OAAOA,CAAA,EAAY;IACrB,OAAO,IAAI,CAACC,QAAQ;EACtB;;EAEA;AACF;AACA;EACEZ,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,CAACU,QAAQ,GAAG,IAAI;IACpB,IAAI,CAACT,WAAW,GAAG,OAAOD,KAAK,KAAK,QAAQ,GAAGA,KAAK,CAACW,QAAQ,CAAC,CAAC,GAAGX,KAAK;IAEvE,IAAI,IAAI,CAACY,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,EAAE;MAAA,IAAAC,QAAA,EAAAC,SAAA;MAC5D,MAAMC,MAAM,GAAG,IAAI,CAACC,UAAU,GAC1B,IAAAC,IAAA,CAAApB,OAAA,EAAAgB,QAAA,OAAI,CAACZ,WAAW,CAACiB,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAN,QAAA,EAAMO,GAAG,IAAK,IAAAC,KAAA,CAAAxB,OAAA,EAAAuB,GAAG,EAAAD,IAAA,CAAHC,GAAS,CAAC,CAAC,GACpD,CAAC,IAAAC,KAAA,CAAAxB,OAAA,EAAAiB,SAAA,OAAI,CAACb,WAAW,EAAAkB,IAAA,CAAAL,SAAM,CAAC,CAAC;MAE7B,MAAMQ,YAAY,GAAG,EAAE;MACvB,KAAK,MAAMF,GAAG,IAAIL,MAAM,EAAE;QACxB,MAAMQ,cAAc,GAAG,IAAI,CAACC,WAAW,CAACJ,GAAG,CAAC;QAC5C,IAAIG,cAAc,KAAK,EAAE,EAAE;UACzBD,YAAY,CAACG,IAAI,CAACF,cAAc,CAAC;UAEjC,IAAI,CAAC,IAAI,CAACxB,SAAS,CAAC2B,QAAQ,CAACH,cAAc,CAAC,EAAE;YAC5C,IAAI,CAACb,QAAQ,GAAG,KAAK;UACvB;QACF;MACF;MAEA,IAAI,CAACR,MAAM,GAAGoB,YAAY,CAACK,IAAI,CAAC,GAAG,CAAC;IACtC,CAAC,MAAM;MACL,IAAI,CAACzB,MAAM,GAAGF,KAAK;IACrB;EACF;;EAEA;AACF;EACE,IAAIY,QAAQA,CAAA,EAAW;IACrB,OAAO,IAAI,CAACgB,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC;EAC7C;;EAEA;AACF;EACEJ,WAAWA,CAACxB,KAAa,EAAU;IACjC,IAAI,IAAI,CAACY,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,EAAE;MAC5D,OAAO,IAAI,CAACb,SAAS,CAACyB,WAAW,CAACxB,KAAK,CAAC;IAC1C;IACA,OAAOA,KAAK;EACd;;EAEA;AACF;EACE6B,KAAKA,CAAA,EAAY;IACf,OAAO,IAAI,CAACC,UAAU,CAACC,GAAG,CAAC,KAAK,CAAC;EACnC;;EAEA;AACF;EACEC,MAAMA,CAAA,EAAY;IAChB,OAAO,IAAI,CAACF,UAAU,CAACC,GAAG,CAAC,MAAM,CAAC;EACpC;;EAEA;AACF;EACEE,SAASA,CAAA,EAAY;IACnB,OAAO,IAAI,CAACH,UAAU,CAACC,GAAG,CAAC,SAAS,CAAC;EACvC;;EAEA;AACF;EACEzB,YAAYA,CAACN,KAAc,EAAU;IACnC,IAAIA,KAAK,IAAI,IAAI,IAAIA,KAAK,CAACW,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;MAC5C,OAAO,EAAE;IACX;IAEA,IACE,CAAC,IAAI,CAACC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,MACxD,IAAI,CAACoB,MAAM,CAAC,CAAC,IAAI,IAAI,CAACC,SAAS,CAAC,CAAC,IAAI,IAAI,CAACJ,KAAK,CAAC,CAAC,CAAC,EACnD;MACA,OAAO7B,KAAK,CAACkC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;IAC1C;IAEA,OAAOlC,KAAK;EACd;AACF;AAACmC,OAAA,CAAAtC,OAAA,GAAAN,iBAAA"}
+{"version":3,"file":"StringFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","StringFilterModel","BaseFilterModel","constructor","data","contributions","_defineProperty2","default","update","attribute","value","_inputvalue","_value","params","param","name","removeFormat","inputvalue","reset","isValid","_isValid","toString","shouldHandleFormat","_context","_context2","values","isMultiple","_map","split","call","val","_trim","outputValues","formattedValue","formatValue","push","validate","join","operator","getContribution","isBSN","layouthint","has","isIBAN","isZipcode","replace","exports"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value ?? \"\";\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.removeFormat(this.value),\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = \"\";\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._isValid = true;\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.shouldHandleFormat()) {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          if (!this.attribute.validate(formattedValue)) {\n            this._isValid = false;\n          }\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.shouldHandleFormat()) {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n\n  /**\n   */\n  isBSN(): boolean {\n    return this.layouthint.has(\"bsn\");\n  }\n\n  /**\n   */\n  isIBAN(): boolean {\n    return this.layouthint.has(\"iban\");\n  }\n\n  /**\n   */\n  isZipcode(): boolean {\n    return this.layouthint.has(\"zipcode\");\n  }\n\n  /**\n   */\n  removeFormat(value: ?string): string {\n    if (value == null || value.toString() === \"\") {\n      return \"\";\n    }\n\n    if (this.shouldHandleFormat()) {\n      return value.replace(/[^a-z0-9,]/gi, \"\");\n    }\n\n    return value;\n  }\n\n  /**\n   */\n  shouldHandleFormat(): boolean {\n    return (\n      (this.operator === \"exactly\" || this.operator === \"isNot\") &&\n      (this.isIBAN() || this.isZipcode() || this.isBSN())\n    );\n  }\n}\n"],"mappings":";;;;;;;;;;AACA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACA;AACe,MAAMC,iBAAiB,SAASC,wBAAe,CAAC;EAK7D;AACF;EACEC,WAAWA,CAACC,IAAY,EAAEC,aAAqB,EAAE;IAC/C,KAAK,CAACD,IAAI,EAAEC,aAAa,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA,oBAPT,IAAI;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAStB,IAAI,CAACC,MAAM,CAAC,IAAI,CAACC,SAAS,EAAEL,IAAI,CAACM,KAAK,IAAI,EAAE,CAAC;;IAE7C;IACA,IAAI,CAACC,WAAW,GAAG,IAAI,CAACC,MAAM,IAAI,EAAE;EACtC;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAA4C;IACpD,IAAI,CAAC,IAAI,CAACC,KAAK,EAAE;MACf,OAAO,EAAE;IACX;IAEA,OAAO,CACL;MACEC,IAAI,EAAE,IAAI,CAACD,KAAK;MAChBJ,KAAK,EAAE,IAAI,CAACM,YAAY,CAAC,IAAI,CAACN,KAAK;IACrC,CAAC,CACF;EACH;;EAEA;AACF;AACA;EACE,IAAIA,KAAKA,CAAA,EAAkB;IACzB,OAAO,IAAI,CAACE,MAAM;EACpB;;EAEA;AACF;EACE,IAAIK,UAAUA,CAAA,EAAW;IACvB,OAAO,IAAI,CAACN,WAAW;EACzB;;EAEA;AACF;AACA;EACEO,KAAKA,CAAA,EAAe;IAClB,IAAI,CAACP,WAAW,GAAG,EAAE;IACrB,IAAI,CAACC,MAAM,GAAG,IAAI;IAElB,OAAO,IAAI;EACb;;EAEA;AACF;EACE,IAAIO,OAAOA,CAAA,EAAY;IACrB,OAAO,IAAI,CAACC,QAAQ;EACtB;;EAEA;AACF;AACA;EACEZ,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,CAACU,QAAQ,GAAG,IAAI;IACpB,IAAI,CAACT,WAAW,GAAG,OAAOD,KAAK,KAAK,QAAQ,GAAGA,KAAK,CAACW,QAAQ,CAAC,CAAC,GAAGX,KAAK;IAEvE,IAAI,IAAI,CAACY,kBAAkB,CAAC,CAAC,EAAE;MAAA,IAAAC,QAAA,EAAAC,SAAA;MAC7B,MAAMC,MAAM,GAAG,IAAI,CAACC,UAAU,GAC1B,IAAAC,IAAA,CAAApB,OAAA,EAAAgB,QAAA,OAAI,CAACZ,WAAW,CAACiB,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAN,QAAA,EAAMO,GAAG,IAAK,IAAAC,KAAA,CAAAxB,OAAA,EAAAuB,GAAG,EAAAD,IAAA,CAAHC,GAAS,CAAC,CAAC,GACpD,CAAC,IAAAC,KAAA,CAAAxB,OAAA,EAAAiB,SAAA,OAAI,CAACb,WAAW,EAAAkB,IAAA,CAAAL,SAAM,CAAC,CAAC;MAE7B,MAAMQ,YAAY,GAAG,EAAE;MACvB,KAAK,MAAMF,GAAG,IAAIL,MAAM,EAAE;QACxB,MAAMQ,cAAc,GAAG,IAAI,CAACC,WAAW,CAACJ,GAAG,CAAC;QAC5C,IAAIG,cAAc,KAAK,EAAE,EAAE;UACzBD,YAAY,CAACG,IAAI,CAACF,cAAc,CAAC;UAEjC,IAAI,CAAC,IAAI,CAACxB,SAAS,CAAC2B,QAAQ,CAACH,cAAc,CAAC,EAAE;YAC5C,IAAI,CAACb,QAAQ,GAAG,KAAK;UACvB;QACF;MACF;MAEA,IAAI,CAACR,MAAM,GAAGoB,YAAY,CAACK,IAAI,CAAC,GAAG,CAAC;IACtC,CAAC,MAAM;MACL,IAAI,CAACzB,MAAM,GAAGF,KAAK;IACrB;EACF;;EAEA;AACF;EACE,IAAI4B,QAAQA,CAAA,EAAW;IACrB,OAAO,IAAI,CAACC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC;EAC7C;;EAEA;AACF;EACEL,WAAWA,CAACxB,KAAa,EAAU;IACjC,IAAI,IAAI,CAACY,kBAAkB,CAAC,CAAC,EAAE;MAC7B,OAAO,IAAI,CAACb,SAAS,CAACyB,WAAW,CAACxB,KAAK,CAAC;IAC1C;IACA,OAAOA,KAAK;EACd;;EAEA;AACF;EACE8B,KAAKA,CAAA,EAAY;IACf,OAAO,IAAI,CAACC,UAAU,CAACC,GAAG,CAAC,KAAK,CAAC;EACnC;;EAEA;AACF;EACEC,MAAMA,CAAA,EAAY;IAChB,OAAO,IAAI,CAACF,UAAU,CAACC,GAAG,CAAC,MAAM,CAAC;EACpC;;EAEA;AACF;EACEE,SAASA,CAAA,EAAY;IACnB,OAAO,IAAI,CAACH,UAAU,CAACC,GAAG,CAAC,SAAS,CAAC;EACvC;;EAEA;AACF;EACE1B,YAAYA,CAACN,KAAc,EAAU;IACnC,IAAIA,KAAK,IAAI,IAAI,IAAIA,KAAK,CAACW,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;MAC5C,OAAO,EAAE;IACX;IAEA,IAAI,IAAI,CAACC,kBAAkB,CAAC,CAAC,EAAE;MAC7B,OAAOZ,KAAK,CAACmC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;IAC1C;IAEA,OAAOnC,KAAK;EACd;;EAEA;AACF;EACEY,kBAAkBA,CAAA,EAAY;IAC5B,OACE,CAAC,IAAI,CAACgB,QAAQ,KAAK,SAAS,IAAI,IAAI,CAACA,QAAQ,KAAK,OAAO,MACxD,IAAI,CAACK,MAAM,CAAC,CAAC,IAAI,IAAI,CAACC,SAAS,CAAC,CAAC,IAAI,IAAI,CAACJ,KAAK,CAAC,CAAC,CAAC;EAEvD;AACF;AAACM,OAAA,CAAAvC,OAAA,GAAAN,iBAAA"}

package/lib/react-client/client.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setupClient = exports.setUnhandledRejectionEvent = exports.client = exports.addContentLoadedEvent = void 0;
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
+var _urlSearchParams = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/url-search-params"));
 var _reactDom = require("react-dom");
 var _objects = require("../utils/helpers/objects");
 var _setimmediate = _interopRequireDefault(require("setimmediate"));
 var _Cache = _interopRequireDefault(require("../utils/browser/Cache"));
+var _xhr = _interopRequireDefault(require("../utils/fetch/xhr"));
 var _history = require("history");
 var _configureStore = _interopRequireDefault(require("../redux/store/configureStore"));
 var _rehydrate = _interopRequireDefault(require("./rehydrate"));
@@ -22,6 +24,7 @@ var _RouterActions = require("../redux/_router/RouterActions");
 var _exceptions = require("../exceptions");
 var _Init = require("./Init");
 var _beforeRenderHooks = require("../redux/store/beforeRenderHooks");
+var _UnauthorizedException = _interopRequireDefault(require("../exceptions/UnauthorizedException"));
 var _jsxRuntime = require("react/jsx-runtime");
 // eslint-disable-next-line react/no-deprecated
 /*
@@ -61,8 +64,32 @@ const setUnhandledRejectionEvent = store => {
 };
 
 /**
+ * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link
+ * @param store
  */
 exports.setUnhandledRejectionEvent = setUnhandledRejectionEvent;
+const handleRedirectURI = store => {
+  const urlParams = new _urlSearchParams.default(window.location.search);
+  const redirectURI = urlParams.get("redirectURI");
+  if (redirectURI) {
+    (0, _xhr.default)({
+      url: `${(0, _Settings.getBasePath)()}${redirectURI}`
+    }).catch(e => {
+      if (e instanceof _UnauthorizedException.default) {
+        const LOGIN_PATH = (0, _Settings.getSetting)("LOGIN_PATH", "/signin");
+        store.dispatch((0, _RouterActions.replace)(LOGIN_PATH, {
+          from: {
+            pathname: redirectURI
+          },
+          modal: false
+        }));
+      }
+    });
+  }
+};
+
+/**
+ */
 const setupClient = function () {
   let customReducers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   let beforeRenderHooks = arguments.length > 1 ? arguments[1] : undefined;
@@ -82,6 +109,7 @@ const setupClient = function () {
     routerHistory,
     store
   } = (0, _configureStore.default)(browserHistory, customReducers, (0, _rehydrate.default)(data));
+  handleRedirectURI(store);
   (0, _Preferences.setAllContentInDataSetting)(store.getState());
   (0, _Preferences.setLoginPreferences)(store.getState());
 

package/lib/react-client/client.js.flow

@@ -7,11 +7,13 @@ import setImmediate from "setimmediate";
 
 import Cache from "../utils/browser/Cache";
 
+import xhr from "../utils/fetch/xhr";
+
 import { createBrowserHistory } from "history";
 import configureStore from "../redux/store/configureStore";
 
 import rehydrate from "./rehydrate";
-import { getBasePath } from "../constants/Settings";
+import { getBasePath, getSetting } from "../constants/Settings";
 
 import {
   setAllContentInDataSetting,
@@ -22,7 +24,7 @@ import { showXHRErrorNotification } from "../redux/actions/Notification";
 import { handleError } from "../redux/actions/Error";
 import { loginSuccess } from "../redux/actions/SignIn";
 
-import { locationChange } from "../redux/_router/RouterActions";
+import { locationChange, replace } from "../redux/_router/RouterActions";
 
 import { JsonParseException, FetchException } from "../exceptions";
 
@@ -30,6 +32,8 @@ import { Init } from "./Init";
 
 import { handleBeforeRenderHooks } from "../redux/store/beforeRenderHooks";
 
+import UnauthorizedException from "../exceptions/UnauthorizedException";
+
 import type {
   ComponentType,
   Element as ReactElement,
@@ -97,6 +101,28 @@ export const setUnhandledRejectionEvent = (store: ReduxStore) => {
   };
 };
 
+/**
+ * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link
+ * @param store
+ */
+const handleRedirectURI = (store: ReduxStore) => {
+  const urlParams = new URLSearchParams(window.location.search);
+  const redirectURI = urlParams.get("redirectURI");
+  if (redirectURI) {
+    xhr({ url: `${getBasePath()}${redirectURI}` }).catch((e) => {
+      if (e instanceof UnauthorizedException) {
+        const LOGIN_PATH = getSetting("LOGIN_PATH", "/signin");
+        store.dispatch(
+          replace(LOGIN_PATH, {
+            from: { pathname: redirectURI },
+            modal: false,
+          }),
+        );
+      }
+    });
+  }
+};
+
 /**
  */
 export const setupClient = (
@@ -122,6 +148,8 @@ export const setupClient = (
     rehydrate(data),
   );
 
+  handleRedirectURI(store);
+
   setAllContentInDataSetting(store.getState());
   setLoginPreferences(store.getState());
 

package/lib/react-client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":["_reactDom","require","_objects","_setimmediate","_interopRequireDefault","_Cache","_history","_configureStore","_rehydrate","_Settings","_Preferences","_Notification","_Error","_SignIn","_RouterActions","_exceptions","_Init","_beforeRenderHooks","_jsxRuntime","parseDataToJSON","data","JSON","parse","error","JsonParseException","getDataFromServer","_context","dataElement","document","querySelector","Error","_trim","default","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","setImmediate","errorMessage","reason","message","toString","dispatch","showXHRErrorNotification","exports","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","Cache","clear","browserHistory","createBrowserHistory","basename","getBasePath","routerHistory","configureStore","rehydrate","setAllContentInDataSetting","getState","setLoginPreferences","loadOtherBrowserTabs","getItem","loginSuccess","has","FetchException","response","handleError","listen","location","action","locationChange","body","className","handleBeforeRenderHooks","addContentLoadedEvent","theme","render","ErrorFallbackComponent","mount","addEventListener","applicationNode","jsx","Init","children","mountClient","element","isSSR","hydrate","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport { getBasePath } from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\n\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\n\nimport { locationChange } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePath(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(element, applicationNode);\n  } else {\n    render(element, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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"}
+{"version":3,"file":"client.js","names":["_reactDom","require","_objects","_setimmediate","_interopRequireDefault","_Cache","_xhr","_history","_configureStore","_rehydrate","_Settings","_Preferences","_Notification","_Error","_SignIn","_RouterActions","_exceptions","_Init","_beforeRenderHooks","_UnauthorizedException","_jsxRuntime","parseDataToJSON","data","JSON","parse","error","JsonParseException","getDataFromServer","_context","dataElement","document","querySelector","Error","_trim","default","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","setImmediate","errorMessage","reason","message","toString","dispatch","showXHRErrorNotification","exports","handleRedirectURI","urlParams","_urlSearchParams","location","search","redirectURI","get","xhr","url","getBasePath","catch","e","UnauthorizedException","LOGIN_PATH","getSetting","replace","from","pathname","modal","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","Cache","clear","browserHistory","createBrowserHistory","basename","routerHistory","configureStore","rehydrate","setAllContentInDataSetting","getState","setLoginPreferences","loadOtherBrowserTabs","getItem","loginSuccess","has","FetchException","response","handleError","listen","action","locationChange","body","className","handleBeforeRenderHooks","addContentLoadedEvent","theme","render","ErrorFallbackComponent","mount","addEventListener","applicationNode","jsx","Init","children","mountClient","element","isSSR","hydrate","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport { getBasePath, getSetting } from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\n\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\n\nimport { locationChange, replace } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport UnauthorizedException from \"../exceptions/UnauthorizedException\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link\n * @param store\n */\nconst handleRedirectURI = (store: ReduxStore) => {\n  const urlParams = new URLSearchParams(window.location.search);\n  const redirectURI = urlParams.get(\"redirectURI\");\n  if (redirectURI) {\n    xhr({ url: `${getBasePath()}${redirectURI}` }).catch((e) => {\n      if (e instanceof UnauthorizedException) {\n        const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n        store.dispatch(\n          replace(LOGIN_PATH, {\n            from: { pathname: redirectURI },\n            modal: false,\n          }),\n        );\n      }\n    });\n  }\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePath(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  handleRedirectURI(store);\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(element, applicationNode);\n  } else {\n    render(element, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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"}

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

@@ -29,13 +29,17 @@ describe("sanitizeHTML", () => {
     ).toBe("<p>String <b>not allowed attribute</b> string</p>");
   });
 
-  it("Can convert html entities to numerical entities", () => {
+  it("Should keep escaped html", () => {
     expect(
-      removeUnwantedHtml("f&ouml;o &hearts; b&aring;r &#x1D306; baz"),
-    ).toBe("f&#246;o &#9829; b&#229;r &#119558; baz");
+      removeUnwantedHtml(
+        "<p>Keep &lt;cite&gt;cite tag&lt;/cite&gt; and remove <cite>real cite tag</cite>",
+      ),
+    ).toBe(
+      "<p>Keep &lt;cite&gt;cite tag&lt;/cite&gt; and remove real cite tag",
+    );
   });
 
-  it("Can encode special charcaters to numerical characters", () => {
+  it("Can encode special characters to numerical characters", () => {
     expect(removeUnwantedHtml("<p>foo © bar ≠ baz 𝌆 qux   bla</p>")).toBe(
       "<p>foo &#169; bar &#8800; baz &#119558; qux   bla</p>",
     );

package/lib/utils/helpers/sanitizeHtml.js

@@ -1,26 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.removeUnwantedHtml = void 0;
-var _he = _interopRequireDefault(require("he"));
+var _htmlEntities = require("html-entities");
 var _exceptions = require("../../exceptions");
 /**
  * Translates html entities to their correct decimal equivalent
  * When path is only one deep better use optional chaining
  */
 const properEntityEncoding = html => {
-  const htmlDecoded = _he.default.decode(html, {
-    decimal: true,
-    allowUnsafeSymbols: true
+  return (0, _htmlEntities.encode)(html, {
+    mode: "nonAsciiPrintableOnly",
+    level: "xml"
   });
-  const htmlEncoded = _he.default.encode(htmlDecoded, {
-    decimal: true,
-    allowUnsafeSymbols: true
-  });
-  return htmlEncoded;
 };
 
 /**

package/lib/utils/helpers/sanitizeHtml.js.flow

@@ -1,5 +1,5 @@
 // @flow
-import he from "he";
+import { encode } from "html-entities";
 
 import { IllegalArgumentException } from "../../exceptions";
 
@@ -12,17 +12,7 @@ type removeUnwantedHtmlOptions = {
  * When path is only one deep better use optional chaining
  */
 const properEntityEncoding = (html: string) => {
-  const htmlDecoded = he.decode(html, {
-    decimal: true,
-    allowUnsafeSymbols: true,
-  });
-
-  const htmlEncoded = he.encode(htmlDecoded, {
-    decimal: true,
-    allowUnsafeSymbols: true,
-  });
-
-  return htmlEncoded;
+  return encode(html, { mode: "nonAsciiPrintableOnly", level: "xml" });
 };
 
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"sanitizeHtml.js","names":["_he","_interopRequireDefault","require","_exceptions","properEntityEncoding","html","htmlDecoded","he","decode","decimal","allowUnsafeSymbols","htmlEncoded","encode","removeUnwantedHtml","options","arguments","length","undefined","allowedTags","IllegalArgumentException","correctEntityHtml","htmlWithoutAttributes","replace","htmlWithCorrectBR","Array","isArray","join","pattern","regex","RegExp","exports"],"sources":["../../../src/utils/helpers/sanitizeHtml.js"],"sourcesContent":["// @flow\nimport he from \"he\";\n\nimport { IllegalArgumentException } from \"../../exceptions\";\n\ntype removeUnwantedHtmlOptions = {\n  allowedTags?: Array<string>,\n};\n\n/**\n * Translates html entities to their correct decimal equivalent\n * When path is only one deep better use optional chaining\n */\nconst properEntityEncoding = (html: string) => {\n  const htmlDecoded = he.decode(html, {\n    decimal: true,\n    allowUnsafeSymbols: true,\n  });\n\n  const htmlEncoded = he.encode(htmlDecoded, {\n    decimal: true,\n    allowUnsafeSymbols: true,\n  });\n\n  return htmlEncoded;\n};\n\n/**\n * removes unwanted html, this might result in incorrect html, as it removes all html that we don't except,\n * like <b style=\"font-weight: 400\">bold</b> will result in bold</b>\n */\nconst removeUnwantedHtml = (\n  html: string,\n  options: removeUnwantedHtmlOptions = {\n    allowedTags: [\"p\", \"br\", \"b\", \"i\", \"u\", \"strike\"],\n  },\n): string => {\n  if (typeof html !== \"string\") {\n    throw new IllegalArgumentException(\"sanitizeHTML method expects a string\");\n  }\n\n  const correctEntityHtml = properEntityEncoding(html);\n\n  // remove attributes from html elements\n  const htmlWithoutAttributes = correctEntityHtml.replace(\n    /<(\\w+)(.|[\\r\\n])*?>/gi,\n    \"<$1>\",\n  );\n\n  const htmlWithCorrectBR = htmlWithoutAttributes.replace(\n    /<br\\s*>/gi,\n    \"<br />\",\n  );\n\n  // remove not allowed tags\n  const allowedTags = Array.isArray(options.allowedTags)\n    ? options.allowedTags.join(\"|\")\n    : \"\";\n  const pattern = `<(?!\\\\/?(${allowedTags})(>|\\\\s\\\\/))[^<]+?>`;\n  const regex = new RegExp(pattern, \"gi\");\n\n  return htmlWithCorrectBR.replace(regex, \"\");\n};\n\nexport { removeUnwantedHtml };\n"],"mappings":";;;;;;;AACA,IAAAA,GAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAMA;AACA;AACA;AACA;AACA,MAAME,oBAAoB,GAAIC,IAAY,IAAK;EAC7C,MAAMC,WAAW,GAAGC,WAAE,CAACC,MAAM,CAACH,IAAI,EAAE;IAClCI,OAAO,EAAE,IAAI;IACbC,kBAAkB,EAAE;EACtB,CAAC,CAAC;EAEF,MAAMC,WAAW,GAAGJ,WAAE,CAACK,MAAM,CAACN,WAAW,EAAE;IACzCG,OAAO,EAAE,IAAI;IACbC,kBAAkB,EAAE;EACtB,CAAC,CAAC;EAEF,OAAOC,WAAW;AACpB,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAME,kBAAkB,GAAG,SAAAA,CACzBR,IAAY,EAID;EAAA,IAHXS,OAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACnCG,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;EAClD,CAAC;EAED,IAAI,OAAOb,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIc,oCAAwB,CAAC,sCAAsC,CAAC;EAC5E;EAEA,MAAMC,iBAAiB,GAAGhB,oBAAoB,CAACC,IAAI,CAAC;;EAEpD;EACA,MAAMgB,qBAAqB,GAAGD,iBAAiB,CAACE,OAAO,CACrD,uBAAuB,EACvB,MACF,CAAC;EAED,MAAMC,iBAAiB,GAAGF,qBAAqB,CAACC,OAAO,CACrD,WAAW,EACX,QACF,CAAC;;EAED;EACA,MAAMJ,WAAW,GAAGM,KAAK,CAACC,OAAO,CAACX,OAAO,CAACI,WAAW,CAAC,GAClDJ,OAAO,CAACI,WAAW,CAACQ,IAAI,CAAC,GAAG,CAAC,GAC7B,EAAE;EACN,MAAMC,OAAO,GAAI,YAAWT,WAAY,qBAAoB;EAC5D,MAAMU,KAAK,GAAG,IAAIC,MAAM,CAACF,OAAO,EAAE,IAAI,CAAC;EAEvC,OAAOJ,iBAAiB,CAACD,OAAO,CAACM,KAAK,EAAE,EAAE,CAAC;AAC7C,CAAC;AAACE,OAAA,CAAAjB,kBAAA,GAAAA,kBAAA"}
+{"version":3,"file":"sanitizeHtml.js","names":["_htmlEntities","require","_exceptions","properEntityEncoding","html","encode","mode","level","removeUnwantedHtml","options","arguments","length","undefined","allowedTags","IllegalArgumentException","correctEntityHtml","htmlWithoutAttributes","replace","htmlWithCorrectBR","Array","isArray","join","pattern","regex","RegExp","exports"],"sources":["../../../src/utils/helpers/sanitizeHtml.js"],"sourcesContent":["// @flow\nimport { encode } from \"html-entities\";\n\nimport { IllegalArgumentException } from \"../../exceptions\";\n\ntype removeUnwantedHtmlOptions = {\n  allowedTags?: Array<string>,\n};\n\n/**\n * Translates html entities to their correct decimal equivalent\n * When path is only one deep better use optional chaining\n */\nconst properEntityEncoding = (html: string) => {\n  return encode(html, { mode: \"nonAsciiPrintableOnly\", level: \"xml\" });\n};\n\n/**\n * removes unwanted html, this might result in incorrect html, as it removes all html that we don't except,\n * like <b style=\"font-weight: 400\">bold</b> will result in bold</b>\n */\nconst removeUnwantedHtml = (\n  html: string,\n  options: removeUnwantedHtmlOptions = {\n    allowedTags: [\"p\", \"br\", \"b\", \"i\", \"u\", \"strike\"],\n  },\n): string => {\n  if (typeof html !== \"string\") {\n    throw new IllegalArgumentException(\"sanitizeHTML method expects a string\");\n  }\n\n  const correctEntityHtml = properEntityEncoding(html);\n\n  // remove attributes from html elements\n  const htmlWithoutAttributes = correctEntityHtml.replace(\n    /<(\\w+)(.|[\\r\\n])*?>/gi,\n    \"<$1>\",\n  );\n\n  const htmlWithCorrectBR = htmlWithoutAttributes.replace(\n    /<br\\s*>/gi,\n    \"<br />\",\n  );\n\n  // remove not allowed tags\n  const allowedTags = Array.isArray(options.allowedTags)\n    ? options.allowedTags.join(\"|\")\n    : \"\";\n  const pattern = `<(?!\\\\/?(${allowedTags})(>|\\\\s\\\\/))[^<]+?>`;\n  const regex = new RegExp(pattern, \"gi\");\n\n  return htmlWithCorrectBR.replace(regex, \"\");\n};\n\nexport { removeUnwantedHtml };\n"],"mappings":";;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAMA;AACA;AACA;AACA;AACA,MAAME,oBAAoB,GAAIC,IAAY,IAAK;EAC7C,OAAO,IAAAC,oBAAM,EAACD,IAAI,EAAE;IAAEE,IAAI,EAAE,uBAAuB;IAAEC,KAAK,EAAE;EAAM,CAAC,CAAC;AACtE,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,kBAAkB,GAAG,SAAAA,CACzBJ,IAAY,EAID;EAAA,IAHXK,OAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACnCG,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;EAClD,CAAC;EAED,IAAI,OAAOT,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIU,oCAAwB,CAAC,sCAAsC,CAAC;EAC5E;EAEA,MAAMC,iBAAiB,GAAGZ,oBAAoB,CAACC,IAAI,CAAC;;EAEpD;EACA,MAAMY,qBAAqB,GAAGD,iBAAiB,CAACE,OAAO,CACrD,uBAAuB,EACvB,MACF,CAAC;EAED,MAAMC,iBAAiB,GAAGF,qBAAqB,CAACC,OAAO,CACrD,WAAW,EACX,QACF,CAAC;;EAED;EACA,MAAMJ,WAAW,GAAGM,KAAK,CAACC,OAAO,CAACX,OAAO,CAACI,WAAW,CAAC,GAClDJ,OAAO,CAACI,WAAW,CAACQ,IAAI,CAAC,GAAG,CAAC,GAC7B,EAAE;EACN,MAAMC,OAAO,GAAI,YAAWT,WAAY,qBAAoB;EAC5D,MAAMU,KAAK,GAAG,IAAIC,MAAM,CAACF,OAAO,EAAE,IAAI,CAAC;EAEvC,OAAOJ,iBAAiB,CAACD,OAAO,CAACM,KAAK,EAAE,EAAE,CAAC;AAC7C,CAAC;AAACE,OAAA,CAAAjB,kBAAA,GAAAA,kBAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.33.0-beta.7",
+  "version": "1.34.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -82,14 +82,15 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.22.11",
+    "@babel/runtime-corejs3": "^7.22.15",
     "big.js": "^6.2.1",
     "date-fns": "^2.30.0",
     "deepmerge": "^4.3.1",
     "dequal": "^2.0.3",
     "file-size": "^1.0.0",
     "format-message": "^6.2.4",
-    "he": "^1.2.0",
+    "glob": "^10.3.4",
+    "html-entities": "^2.4.0",
     "iban": "^0.0.14",
     "js-cookie": "^3.0.5",
     "klona": "^2.0.6",
@@ -98,50 +99,49 @@
     "setimmediate": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.11",
-    "@babel/eslint-parser": "^7.22.11",
+    "@babel/cli": "^7.22.15",
+    "@babel/core": "^7.22.17",
+    "@babel/eslint-parser": "^7.22.15",
     "@babel/eslint-plugin": "^7.22.10",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/preset-env": "^7.22.10",
-    "@babel/preset-flow": "^7.22.5",
-    "@babel/preset-react": "^7.22.5",
+    "@babel/plugin-transform-runtime": "^7.22.15",
+    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-flow": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
     "@testing-library/react": "^14.0.0",
     "auditjs": "^4.0.41",
-    "babel-jest": "^29.6.4",
+    "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
     "cherry-pick": "^0.5.0",
     "commit-and-tag-version": "^11.2.3",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jest": "^27.2.3",
-    "eslint-plugin-jsdoc": "^46.5.0",
+    "eslint-plugin-jsdoc": "^46.6.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.13.0",
     "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.9.0",
-    "glob": "^10.3.3",
     "history": "^4.0.0",
     "husky": "^8.0.3",
-    "jest": "^29.6.4",
-    "jest-environment-jsdom": "^29.6.4",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.15.0",
     "lint-staged": "^13.2.3",
     "polished": "^4.0.0",
-    "prettier": "^3.0.2",
+    "prettier": "^3.0.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-helmet-async": "^1.0.0",

package/src/models/filters/StringFilterModel.js

@@ -74,7 +74,7 @@ export default class StringFilterModel extends BaseFilterModel {
     this._isValid = true;
     this._inputvalue = typeof value !== "string" ? value.toString() : value;
 
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       const values = this.isMultiple
         ? this._inputvalue.split(",").map((val) => val.trim())
         : [this._inputvalue.trim()];
@@ -106,7 +106,7 @@ export default class StringFilterModel extends BaseFilterModel {
   /**
    */
   formatValue(value: string): string {
-    if (this.operator === "exactly" || this.operator === "isNot") {
+    if (this.shouldHandleFormat()) {
       return this.attribute.formatValue(value);
     }
     return value;
@@ -137,13 +137,19 @@ export default class StringFilterModel extends BaseFilterModel {
       return "";
     }
 
-    if (
-      (this.operator === "exactly" || this.operator === "isNot") &&
-      (this.isIBAN() || this.isZipcode() || this.isBSN())
-    ) {
+    if (this.shouldHandleFormat()) {
       return value.replace(/[^a-z0-9,]/gi, "");
     }
 
     return value;
   }
+
+  /**
+   */
+  shouldHandleFormat(): boolean {
+    return (
+      (this.operator === "exactly" || this.operator === "isNot") &&
+      (this.isIBAN() || this.isZipcode() || this.isBSN())
+    );
+  }
 }

package/src/react-client/client.js

@@ -7,11 +7,13 @@ import setImmediate from "setimmediate";
 
 import Cache from "../utils/browser/Cache";
 
+import xhr from "../utils/fetch/xhr";
+
 import { createBrowserHistory } from "history";
 import configureStore from "../redux/store/configureStore";
 
 import rehydrate from "./rehydrate";
-import { getBasePath } from "../constants/Settings";
+import { getBasePath, getSetting } from "../constants/Settings";
 
 import {
   setAllContentInDataSetting,
@@ -22,7 +24,7 @@ import { showXHRErrorNotification } from "../redux/actions/Notification";
 import { handleError } from "../redux/actions/Error";
 import { loginSuccess } from "../redux/actions/SignIn";
 
-import { locationChange } from "../redux/_router/RouterActions";
+import { locationChange, replace } from "../redux/_router/RouterActions";
 
 import { JsonParseException, FetchException } from "../exceptions";
 
@@ -30,6 +32,8 @@ import { Init } from "./Init";
 
 import { handleBeforeRenderHooks } from "../redux/store/beforeRenderHooks";
 
+import UnauthorizedException from "../exceptions/UnauthorizedException";
+
 import type {
   ComponentType,
   Element as ReactElement,
@@ -97,6 +101,28 @@ export const setUnhandledRejectionEvent = (store: ReduxStore) => {
   };
 };
 
+/**
+ * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link
+ * @param store
+ */
+const handleRedirectURI = (store: ReduxStore) => {
+  const urlParams = new URLSearchParams(window.location.search);
+  const redirectURI = urlParams.get("redirectURI");
+  if (redirectURI) {
+    xhr({ url: `${getBasePath()}${redirectURI}` }).catch((e) => {
+      if (e instanceof UnauthorizedException) {
+        const LOGIN_PATH = getSetting("LOGIN_PATH", "/signin");
+        store.dispatch(
+          replace(LOGIN_PATH, {
+            from: { pathname: redirectURI },
+            modal: false,
+          }),
+        );
+      }
+    });
+  }
+};
+
 /**
  */
 export const setupClient = (
@@ -122,6 +148,8 @@ export const setupClient = (
     rehydrate(data),
   );
 
+  handleRedirectURI(store);
+
   setAllContentInDataSetting(store.getState());
   setLoginPreferences(store.getState());
 

package/src/utils/helpers/__tests__/sanitizeHTML.spec.js

@@ -29,13 +29,17 @@ describe("sanitizeHTML", () => {
     ).toBe("<p>String <b>not allowed attribute</b> string</p>");
   });
 
-  it("Can convert html entities to numerical entities", () => {
+  it("Should keep escaped html", () => {
     expect(
-      removeUnwantedHtml("f&ouml;o &hearts; b&aring;r &#x1D306; baz"),
-    ).toBe("f&#246;o &#9829; b&#229;r &#119558; baz");
+      removeUnwantedHtml(
+        "<p>Keep &lt;cite&gt;cite tag&lt;/cite&gt; and remove <cite>real cite tag</cite>",
+      ),
+    ).toBe(
+      "<p>Keep &lt;cite&gt;cite tag&lt;/cite&gt; and remove real cite tag",
+    );
   });
 
-  it("Can encode special charcaters to numerical characters", () => {
+  it("Can encode special characters to numerical characters", () => {
     expect(removeUnwantedHtml("<p>foo © bar ≠ baz 𝌆 qux   bla</p>")).toBe(
       "<p>foo &#169; bar &#8800; baz &#119558; qux   bla</p>",
     );

package/src/utils/helpers/sanitizeHtml.js

@@ -1,5 +1,5 @@
 // @flow
-import he from "he";
+import { encode } from "html-entities";
 
 import { IllegalArgumentException } from "../../exceptions";
 
@@ -12,17 +12,7 @@ type removeUnwantedHtmlOptions = {
  * When path is only one deep better use optional chaining
  */
 const properEntityEncoding = (html: string) => {
-  const htmlDecoded = he.decode(html, {
-    decimal: true,
-    allowUnsafeSymbols: true,
-  });
-
-  const htmlEncoded = he.encode(htmlDecoded, {
-    decimal: true,
-    allowUnsafeSymbols: true,
-  });
-
-  return htmlEncoded;
+  return encode(html, { mode: "nonAsciiPrintableOnly", level: "xml" });
 };
 
 /**