@beinformed/ui 1.28.2 → 1.28.4

package/lib/utils/number/parseNumbers.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseNumbers.js","names":["removeGroupingSeparator","input","groupingSeparator","escapedGroupingSeparator","replace","RegExp","updateDecimalSeparator","decimalSeparator","parseToNumber","NaN","inputNoGrouping","inputCorrectDecimalSeparator","Number","parseNumberToString","big","toFixed","error"],"sources":["../../../src/utils/number/parseNumbers.js"],"sourcesContent":["// @flow\nimport big from \"big.js\";\n\n/**\n * @private\n */\nconst removeGroupingSeparator = (\n  input: string | number,\n  groupingSeparator?: ?string\n) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (groupingSeparator == null) {\n    return input;\n  }\n\n  const escapedGroupingSeparator = groupingSeparator.replace(\n    /[$()*+.?[\\\\\\]^{|}]/g,\n    \"\\\\$&\"\n  );\n\n  return input.replace(new RegExp(escapedGroupingSeparator, \"g\"), \"\");\n};\n\n/**\n * @private\n */\nconst updateDecimalSeparator = (\n  input: string | number,\n  decimalSeparator?: ?string\n) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (decimalSeparator == null || decimalSeparator === \"\") {\n    return input;\n  }\n\n  return input.replace(decimalSeparator, \".\");\n};\n\n/**\n * Parses input into a number, removes the grouping separator from the input and\n * replaces the decimal separator with a dot to make it a JavaScript parseable number\n */\nconst parseToNumber = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): number => {\n  if (input == null || input === \"\") {\n    return NaN;\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  return Number(inputCorrectDecimalSeparator);\n};\n\n/**\n * parses Numbers To String\n */\nconst parseNumberToString = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): string => {\n  if (input == null || input === \"\") {\n    return \"NaN\";\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  try {\n    return big(inputCorrectDecimalSeparator).toFixed();\n  } catch (error) {\n    return \"NaN\";\n  }\n};\n\nexport { parseToNumber, parseNumberToString };\n"],"mappings":";;;;;;;AACA;AAEA;AACA;AACA;AACA,MAAMA,uBAAuB,GAAG,CAC9BC,KAAsB,EACtBC,iBAA2B,KACxB;EACH,IAAI,OAAOD,KAAK,KAAK,QAAQ,EAAE;IAC7B,OAAOA,KAAK;EACd;EAEA,IAAIC,iBAAiB,IAAI,IAAI,EAAE;IAC7B,OAAOD,KAAK;EACd;EAEA,MAAME,wBAAwB,GAAGD,iBAAiB,CAACE,OAAO,CACxD,qBAAqB,EACrB,MAAM,CACP;EAED,OAAOH,KAAK,CAACG,OAAO,CAAC,IAAIC,MAAM,CAACF,wBAAwB,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;AACrE,CAAC;;AAED;AACA;AACA;AACA,MAAMG,sBAAsB,GAAG,CAC7BL,KAAsB,EACtBM,gBAA0B,KACvB;EACH,IAAI,OAAON,KAAK,KAAK,QAAQ,EAAE;IAC7B,OAAOA,KAAK;EACd;EAEA,IAAIM,gBAAgB,IAAI,IAAI,IAAIA,gBAAgB,KAAK,EAAE,EAAE;IACvD,OAAON,KAAK;EACd;EAEA,OAAOA,KAAK,CAACG,OAAO,CAACG,gBAAgB,EAAE,GAAG,CAAC;AAC7C,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAa,GAAG,UACpBP,KAAwB,EAGb;EAAA,IAFXC,iBAA0B,uEAAG,GAAG;EAAA,IAChCK,gBAAyB,uEAAG,GAAG;EAE/B,IAAIN,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE,EAAE;IACjC,OAAOQ,GAAG;EACZ;EAEA,MAAMC,eAAe,GAAGV,uBAAuB,CAACC,KAAK,EAAEC,iBAAiB,CAAC;EAEzE,MAAMS,4BAA4B,GAAGL,sBAAsB,CACzDI,eAAe,EACfH,gBAAgB,CACjB;EAED,OAAOK,MAAM,CAACD,4BAA4B,CAAC;AAC7C,CAAC;;AAED;AACA;AACA;AAFA;AAGA,MAAME,mBAAmB,GAAG,UAC1BZ,KAAwB,EAGb;EAAA,IAFXC,iBAA0B,uEAAG,GAAG;EAAA,IAChCK,gBAAyB,uEAAG,GAAG;EAE/B,IAAIN,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE,EAAE;IACjC,OAAO,KAAK;EACd;EAEA,MAAMS,eAAe,GAAGV,uBAAuB,CAACC,KAAK,EAAEC,iBAAiB,CAAC;EAEzE,MAAMS,4BAA4B,GAAGL,sBAAsB,CACzDI,eAAe,EACfH,gBAAgB,CACjB;EAED,IAAI;IACF,OAAO,IAAAO,YAAG,EAACH,4BAA4B,CAAC,CAACI,OAAO,EAAE;EACpD,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,OAAO,KAAK;EACd;AACF,CAAC;AAAC"}
+{"version":3,"file":"parseNumbers.js","names":["_big","_interopRequireDefault","require","removeGroupingSeparator","input","groupingSeparator","escapedGroupingSeparator","replace","RegExp","updateDecimalSeparator","decimalSeparator","parseToNumber","arguments","length","undefined","NaN","inputNoGrouping","inputCorrectDecimalSeparator","Number","exports","parseNumberToString","big","toFixed","error"],"sources":["../../../src/utils/number/parseNumbers.js"],"sourcesContent":["// @flow\nimport big from \"big.js\";\n\n/**\n * @private\n */\nconst removeGroupingSeparator = (\n  input: string | number,\n  groupingSeparator?: ?string\n) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (groupingSeparator == null) {\n    return input;\n  }\n\n  const escapedGroupingSeparator = groupingSeparator.replace(\n    /[$()*+.?[\\\\\\]^{|}]/g,\n    \"\\\\$&\"\n  );\n\n  return input.replace(new RegExp(escapedGroupingSeparator, \"g\"), \"\");\n};\n\n/**\n * @private\n */\nconst updateDecimalSeparator = (\n  input: string | number,\n  decimalSeparator?: ?string\n) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (decimalSeparator == null || decimalSeparator === \"\") {\n    return input;\n  }\n\n  return input.replace(decimalSeparator, \".\");\n};\n\n/**\n * Parses input into a number, removes the grouping separator from the input and\n * replaces the decimal separator with a dot to make it a JavaScript parseable number\n */\nconst parseToNumber = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): number => {\n  if (input == null || input === \"\") {\n    return NaN;\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  return Number(inputCorrectDecimalSeparator);\n};\n\n/**\n * parses Numbers To String\n */\nconst parseNumberToString = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): string => {\n  if (input == null || input === \"\") {\n    return \"NaN\";\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  try {\n    return big(inputCorrectDecimalSeparator).toFixed();\n  } catch (error) {\n    return \"NaN\";\n  }\n};\n\nexport { parseToNumber, parseNumberToString };\n"],"mappings":";;;;;;;AACA,IAAAA,IAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA;AACA;AACA;AACA,MAAMC,uBAAuB,GAAGA,CAC9BC,KAAsB,EACtBC,iBAA2B,KACxB;EACH,IAAI,OAAOD,KAAK,KAAK,QAAQ,EAAE;IAC7B,OAAOA,KAAK;EACd;EAEA,IAAIC,iBAAiB,IAAI,IAAI,EAAE;IAC7B,OAAOD,KAAK;EACd;EAEA,MAAME,wBAAwB,GAAGD,iBAAiB,CAACE,OAAO,CACxD,qBAAqB,EACrB,MAAM,CACP;EAED,OAAOH,KAAK,CAACG,OAAO,CAAC,IAAIC,MAAM,CAACF,wBAAwB,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;AACrE,CAAC;;AAED;AACA;AACA;AACA,MAAMG,sBAAsB,GAAGA,CAC7BL,KAAsB,EACtBM,gBAA0B,KACvB;EACH,IAAI,OAAON,KAAK,KAAK,QAAQ,EAAE;IAC7B,OAAOA,KAAK;EACd;EAEA,IAAIM,gBAAgB,IAAI,IAAI,IAAIA,gBAAgB,KAAK,EAAE,EAAE;IACvD,OAAON,KAAK;EACd;EAEA,OAAOA,KAAK,CAACG,OAAO,CAACG,gBAAgB,EAAE,GAAG,CAAC;AAC7C,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAa,GAAG,SAAAA,CACpBP,KAAwB,EAGb;EAAA,IAFXC,iBAA0B,GAAAO,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAAA,IAChCF,gBAAyB,GAAAE,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAE/B,IAAIR,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE,EAAE;IACjC,OAAOW,GAAG;EACZ;EAEA,MAAMC,eAAe,GAAGb,uBAAuB,CAACC,KAAK,EAAEC,iBAAiB,CAAC;EAEzE,MAAMY,4BAA4B,GAAGR,sBAAsB,CACzDO,eAAe,EACfN,gBAAgB,CACjB;EAED,OAAOQ,MAAM,CAACD,4BAA4B,CAAC;AAC7C,CAAC;;AAED;AACA;AACA;AAFAE,OAAA,CAAAR,aAAA,GAAAA,aAAA;AAGA,MAAMS,mBAAmB,GAAG,SAAAA,CAC1BhB,KAAwB,EAGb;EAAA,IAFXC,iBAA0B,GAAAO,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAAA,IAChCF,gBAAyB,GAAAE,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,GAAG;EAE/B,IAAIR,KAAK,IAAI,IAAI,IAAIA,KAAK,KAAK,EAAE,EAAE;IACjC,OAAO,KAAK;EACd;EAEA,MAAMY,eAAe,GAAGb,uBAAuB,CAACC,KAAK,EAAEC,iBAAiB,CAAC;EAEzE,MAAMY,4BAA4B,GAAGR,sBAAsB,CACzDO,eAAe,EACfN,gBAAgB,CACjB;EAED,IAAI;IACF,OAAO,IAAAW,YAAG,EAACJ,4BAA4B,CAAC,CAACK,OAAO,EAAE;EACpD,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,OAAO,KAAK;EACd;AACF,CAAC;AAACJ,OAAA,CAAAC,mBAAA,GAAAA,mBAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.28.2",
+  "version": "1.28.4",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -82,7 +82,7 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.13",
+    "@babel/runtime-corejs3": "^7.21.0",
     "big.js": "^6.2.1",
     "date-fns": "^2.29.3",
     "deepmerge": "^4.3.0",
@@ -98,13 +98,13 @@
     "setimmediate": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
+    "@babel/cli": "^7.21.0",
+    "@babel/core": "^7.21.0",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/eslint-plugin": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-flow": "^7.18.6",
     "@babel/preset-react": "^7.18.6",

package/src/react-client/client.js

@@ -40,10 +40,16 @@ import type { RouterHistory } from "react-router";
 import type { BeforeRenderHook } from "../redux/store/beforeRenderHooks";
 import type { Props as FallbackProps } from "../react/ErrorBoundaryFallback";
 
+type RenderFunction = () => ReactElement<ElementType>;
+type MountFunction = (
+  applicationNode: Element,
+  element: ReactElement<ElementType>
+) => void;
 type Props = {
   customReducers?: CustomReducers,
   theme?: Theme | Array<Theme>,
-  render: Function,
+  render: RenderFunction,
+  mount: MountFunction,
   beforeRenderHooks?: Array<BeforeRenderHook>,
   ErrorFallbackComponent?: ComponentType<FallbackProps>,
 };
@@ -158,9 +164,9 @@ export const addContentLoadedEvent = (
   store: ReduxStore,
   routerHistory: RouterHistory,
   theme?: Theme | Array<Theme>,
-  render: Function,
+  render: RenderFunction,
   ErrorFallbackComponent?: ComponentType<FallbackProps>,
-  mount: Function
+  mount: MountFunction
 ) => {
   window.addEventListener("DOMContentLoaded", () => {
     const applicationNode = document.querySelector("#application");
@@ -189,13 +195,13 @@ export const addContentLoadedEvent = (
  */
 const mountClient = (
   applicationNode: Element,
-  initComponent: ReactElement<ElementType>
+  element: ReactElement<ElementType>
 ) => {
   const isSSR = applicationNode.querySelector(".application");
   if (isSSR) {
-    hydrate(initComponent, applicationNode);
+    hydrate(element, applicationNode);
   } else {
-    render(initComponent, applicationNode);
+    render(element, applicationNode);
   }
 };
 
@@ -208,6 +214,7 @@ export const client = ({
   render,
   beforeRenderHooks,
   ErrorFallbackComponent,
+  mount,
 }: Props) => {
   const { store, routerHistory } = setupClient(
     customReducers,
@@ -220,6 +227,6 @@ export const client = ({
     theme,
     render,
     ErrorFallbackComponent,
-    mountClient
+    mount ?? mountClient
   );
 };

package/src/react-server/__tests__/serverUtil.spec.js

@@ -112,8 +112,8 @@ describe("serverUtil", () => {
       {
         type: "SET_PREFERENCES",
         payload: {
-          "FormClient.login_url": "/j_security_check",
-          "FormClient.logout_url": "/Logoff",
+          "FormClient.login_url": "/callback?client_name=FormClient",
+          "FormClient.logout_url": "/logout",
           "FormClient.password_field_name": "j_password",
           "FormClient.username_field_name": "j_username",
           "security.clients": null,
@@ -159,8 +159,8 @@ describe("serverUtil", () => {
       {
         type: "SET_PREFERENCES",
         payload: {
-          "FormClient.login_url": "/j_security_check",
-          "FormClient.logout_url": "/Logoff",
+          "FormClient.login_url": "/callback?client_name=FormClient",
+          "FormClient.logout_url": "/logout",
           "FormClient.password_field_name": "j_password",
           "FormClient.username_field_name": "j_username",
           "security.clients": null,

package/src/redux/actions/Preferences.js

@@ -129,7 +129,8 @@ export const setLoginPreferences = (
     ),
     [LOGIN_PATH_SETTING]: getServerPreferenceValue(
       LOGIN_PATH_SETTING,
-      state?.preferences[LOGIN_PATH_SETTING] ?? `/j_security_check`
+      state?.preferences[LOGIN_PATH_SETTING] ??
+        `/callback?client_name=FormClient`
     ),
     [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(
       LOGIN_USERNAME_SETTING,
@@ -141,7 +142,7 @@ export const setLoginPreferences = (
     ),
     [LOGOUT_PATH_SETTING]: getServerPreferenceValue(
       LOGOUT_PATH_SETTING,
-      state?.preferences[LOGOUT_PATH_SETTING] ?? `/Logoff`
+      state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`
     ),
   };