@beinformed/ui 1.33.0 → 1.34.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.34.0...v1.34.1) (2023-09-13)
+
+
+### Bug Fixes
+
+* **layout-hint-json:** replace glob with node packages ([c25b89f](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c25b89f811a934cf2ce57254e5d06a574b674561))
+
+## [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)
 
 

package/esm/builder/mergeLayoutHintConfigurations.js

@@ -1,24 +1,33 @@
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
-const glob = require("glob");
-const fs = require("fs");
+import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 const path = require("path");
+const {
+  readdirSync,
+  statSync,
+  readFileSync,
+  writeFileSync
+} = require("fs");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
-const readFiles = files => {
-  const filePromises = _mapInstanceProperty(files).call(files, file => new _Promise((resolve, reject) => {
-    fs.readFile(file, "utf-8", (err, data) => {
-      if (err) {
-        return reject(err);
-      } else {
-        return resolve(JSON.parse(data));
+const findFiles = dir => {
+  const matchedFiles = [];
+  const files = readdirSync(dir);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
       }
-    });
-  }));
-  return _Promise.all(filePromises);
+    }
+  }
+  return matchedFiles;
 };
 
 /**
@@ -28,21 +37,13 @@ const readFiles = files => {
  */
 exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new _Promise((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
-      readFiles(files).then(jsons => {
-        const newConfig = _Object$assign(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(path.join(outputFolder, "LayoutHintConfig.json"), _JSON$stringify(newConfig), writeErr => {
-          if (writeErr) {
-            return reject(writeErr);
-          }
-          return resolve();
-        });
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+  const jsons = _mapInstanceProperty(files).call(files, file => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+  const newConfig = _Object$assign(LayoutHintConfiguration, ...jsons);
+  writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), _JSON$stringify(newConfig));
+  return _Promise.resolve();
 };
 //# sourceMappingURL=mergeLayoutHintConfigurations.js.map

package/esm/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["glob","require","fs","path","LayoutHintConfiguration","readFiles","files","filePromises","_mapInstanceProperty","call","file","_Promise","resolve","reject","readFile","err","data","JSON","parse","all","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","then","jsons","newConfig","_Object$assign","writeFile","join","_JSON$stringify","writeErr"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst glob = require(\"glob\");\nconst fs = require(\"fs\");\nconst path = require(\"path\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst readFiles = (files: Array<string>) => {\n  const filePromises = files.map(\n    (file) =>\n      new Promise((resolve, reject) => {\n        fs.readFile(file, \"utf-8\", (err, data) => {\n          if (err) {\n            return reject(err);\n          } else {\n            return resolve(JSON.parse(data));\n          }\n        });\n      }),\n  );\n\n  return Promise.all(filePromises);\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n  return new Promise((resolve, reject) => {\n    glob(escapedSrcFolder + \"/**/LayoutHintConfig.json\", {}, (err, files) => {\n      if (err) {\n        return reject(err);\n      }\n\n      readFiles(files).then((jsons) => {\n        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n        fs.writeFile(\n          path.join(outputFolder, \"LayoutHintConfig.json\"),\n          JSON.stringify(newConfig),\n\n          (writeErr) => {\n            if (writeErr) {\n              return reject(writeErr);\n            }\n\n            return resolve();\n          },\n        );\n      });\n    });\n  });\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAMC,EAAE,GAAGD,OAAO,CAAC,IAAI,CAAC;AACxB,MAAME,IAAI,GAAGF,OAAO,CAAC,MAAM,CAAC;AAE5B,MAAM;EAAEG;AAAwB,CAAC,GAAGH,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMI,SAAS,GAAIC,KAAoB,IAAK;EAC1C,MAAMC,YAAY,GAAGC,oBAAA,CAAAF,KAAK,EAAAG,IAAA,CAALH,KAAK,EACvBI,IAAI,IACH,IAAAC,QAAA,CAAY,CAACC,OAAO,EAAEC,MAAM,KAAK;IAC/BX,EAAE,CAACY,QAAQ,CAACJ,IAAI,EAAE,OAAO,EAAE,CAACK,GAAG,EAAEC,IAAI,KAAK;MACxC,IAAID,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB,CAAC,MAAM;QACL,OAAOH,OAAO,CAACK,IAAI,CAACC,KAAK,CAACF,IAAI,CAAC,CAAC;MAClC;IACF,CAAC,CAAC;EACJ,CAAC,CACL,CAAC;EAED,OAAOL,QAAA,CAAQQ,GAAG,CAACZ,YAAY,CAAC;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAa,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EACtD,OAAO,IAAAd,QAAA,CAAY,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCb,IAAI,CAACwB,gBAAgB,GAAG,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAACT,GAAG,EAAET,KAAK,KAAK;MACvE,IAAIS,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB;MAEAV,SAAS,CAACC,KAAK,CAAC,CAACoB,IAAI,CAAEC,KAAK,IAAK;QAC/B,MAAMC,SAAS,GAAGC,cAAA,CAAczB,uBAAuB,EAAE,GAAGuB,KAAK,CAAC;QAClEzB,EAAE,CAAC4B,SAAS,CACV3B,IAAI,CAAC4B,IAAI,CAACR,YAAY,EAAE,uBAAuB,CAAC,EAChDS,eAAA,CAAeJ,SAAS,CAAC,EAExBK,QAAQ,IAAK;UACZ,IAAIA,QAAQ,EAAE;YACZ,OAAOpB,MAAM,CAACoB,QAAQ,CAAC;UACzB;UAEA,OAAOrB,OAAO,CAAC,CAAC;QAClB,CACF,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_mapInstanceProperty","call","content","JSON","parse","newConfig","_Object$assign","_JSON$stringify","_Promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAM;EAAEK;AAAwB,CAAC,GAAGL,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMM,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGR,WAAW,CAACM,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGZ,IAAI,CAACa,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIR,QAAQ,CAACS,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGjB,IAAI,CAACkB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAGC,oBAAA,CAAAhB,KAAK,EAAAiB,IAAA,CAALjB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMiB,OAAO,GAAGxB,YAAY,CAACO,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOkB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;EAEF,MAAMG,SAAS,GAAGC,cAAA,CAAc1B,uBAAuB,EAAE,GAAGmB,KAAK,CAAC;EAElEpB,aAAa,CACXL,IAAI,CAACa,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChDW,eAAA,CAAeF,SAAS,CAC1B,CAAC;EAED,OAAOG,QAAA,CAAQC,OAAO,CAAC,CAAC;AAC1B,CAAC"}

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/lib/builder/__tests__/mergeLayoutHintConfigurations.spec.js.flow

@@ -1,8 +1,8 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
-
-const projectJson = {
+//
+const projectJson1 = {
   MOCK: {
     hint: "mock",
     description: {
@@ -14,31 +14,38 @@ const projectJson = {
   },
 };
 
+const projectJson2 = {
+  MOCK2: {
+    hint: "mock2",
+    description: {
+      NL: "mock2 dutch description",
+      EN: "mock2 english description",
+    },
+    link: "",
+    component: ["attribute"],
+  },
+};
+
 jest.mock("fs", () => ({
-  readFile: jest.fn((path, options, callback) =>
-    callback(null, JSON.stringify(projectJson)),
-  ),
-  writeFile: jest.fn((path, options, callback) => callback(null)),
+  ...jest.requireActual("fs"),
+  writeFileSync: jest.fn(),
 }));
 
-jest.mock("glob", () =>
-  jest.fn((pattern, options, callback) =>
-    callback(null, ["/input/LayoutHintConfig.json"]),
-  ),
-);
-
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
     expect.assertions(1);
 
-    const expectedJson = { ...LayoutHintConfiguration, ...projectJson };
+    const expectedJson = {
+      ...LayoutHintConfiguration,
+      ...projectJson1,
+      ...projectJson2,
+    };
 
-    await mergeLayoutHintConfigurations("/input", "/output");
+    await mergeLayoutHintConfigurations("./src", "/output");
 
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expect.stringContaining("LayoutHintConfig.json"),
+    expect(fs.writeFileSync).toHaveBeenCalledWith(
+      "\\output\\LayoutHintConfig.json",
       JSON.stringify(expectedJson),
-      expect.anything(),
     );
   });
 });

package/lib/builder/mergeLayoutHintConfigurations.js

@@ -2,26 +2,35 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
-const glob = require("glob");
-const fs = require("fs");
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 const path = require("path");
+const {
+  readdirSync,
+  statSync,
+  readFileSync,
+  writeFileSync
+} = require("fs");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
-const readFiles = files => {
-  const filePromises = (0, _map.default)(files).call(files, file => new _promise.default((resolve, reject) => {
-    fs.readFile(file, "utf-8", (err, data) => {
-      if (err) {
-        return reject(err);
-      } else {
-        return resolve(JSON.parse(data));
+const findFiles = dir => {
+  const matchedFiles = [];
+  const files = readdirSync(dir);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
       }
-    });
-  }));
-  return _promise.default.all(filePromises);
+    }
+  }
+  return matchedFiles;
 };
 
 /**
@@ -31,21 +40,13 @@ const readFiles = files => {
  */
 exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new _promise.default((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
-      readFiles(files).then(jsons => {
-        const newConfig = (0, _assign.default)(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(path.join(outputFolder, "LayoutHintConfig.json"), (0, _stringify.default)(newConfig), writeErr => {
-          if (writeErr) {
-            return reject(writeErr);
-          }
-          return resolve();
-        });
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+  const jsons = (0, _map.default)(files).call(files, file => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+  const newConfig = (0, _assign.default)(LayoutHintConfiguration, ...jsons);
+  writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), (0, _stringify.default)(newConfig));
+  return _promise.default.resolve();
 };
 //# sourceMappingURL=mergeLayoutHintConfigurations.js.map

package/lib/builder/mergeLayoutHintConfigurations.js.flow

@@ -1,25 +1,28 @@
 // @flow
-const glob = require("glob");
-const fs = require("fs");
 const path = require("path");
+const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
-const readFiles = (files: Array<string>) => {
-  const filePromises = files.map(
-    (file) =>
-      new Promise((resolve, reject) => {
-        fs.readFile(file, "utf-8", (err, data) => {
-          if (err) {
-            return reject(err);
-          } else {
-            return resolve(JSON.parse(data));
-          }
-        });
-      }),
-  );
+const findFiles = (dir: string): Array<string> => {
+  const matchedFiles = [];
+
+  const files = readdirSync(dir);
 
-  return Promise.all(filePromises);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
+      }
+    }
+  }
+
+  return matchedFiles;
 };
 
 /**
@@ -32,27 +35,20 @@ exports.mergeLayoutHintConfigurations = async (
   outputFolder: string,
 ): Promise<void> => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new Promise((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
 
-      readFiles(files).then((jsons) => {
-        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(
-          path.join(outputFolder, "LayoutHintConfig.json"),
-          JSON.stringify(newConfig),
-
-          (writeErr) => {
-            if (writeErr) {
-              return reject(writeErr);
-            }
-
-            return resolve();
-          },
-        );
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+
+  const jsons = files.map((file) => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+
+  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+
+  writeFileSync(
+    path.join(outputFolder, "LayoutHintConfig.json"),
+    JSON.stringify(newConfig),
+  );
+
+  return Promise.resolve();
 };

package/lib/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["glob","require","fs","path","LayoutHintConfiguration","readFiles","files","filePromises","_map","default","call","file","_promise","resolve","reject","readFile","err","data","JSON","parse","all","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","then","jsons","newConfig","_assign","writeFile","join","_stringify","writeErr"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst glob = require(\"glob\");\nconst fs = require(\"fs\");\nconst path = require(\"path\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst readFiles = (files: Array<string>) => {\n  const filePromises = files.map(\n    (file) =>\n      new Promise((resolve, reject) => {\n        fs.readFile(file, \"utf-8\", (err, data) => {\n          if (err) {\n            return reject(err);\n          } else {\n            return resolve(JSON.parse(data));\n          }\n        });\n      }),\n  );\n\n  return Promise.all(filePromises);\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n  return new Promise((resolve, reject) => {\n    glob(escapedSrcFolder + \"/**/LayoutHintConfig.json\", {}, (err, files) => {\n      if (err) {\n        return reject(err);\n      }\n\n      readFiles(files).then((jsons) => {\n        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n        fs.writeFile(\n          path.join(outputFolder, \"LayoutHintConfig.json\"),\n          JSON.stringify(newConfig),\n\n          (writeErr) => {\n            if (writeErr) {\n              return reject(writeErr);\n            }\n\n            return resolve();\n          },\n        );\n      });\n    });\n  });\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAMC,EAAE,GAAGD,OAAO,CAAC,IAAI,CAAC;AACxB,MAAME,IAAI,GAAGF,OAAO,CAAC,MAAM,CAAC;AAE5B,MAAM;EAAEG;AAAwB,CAAC,GAAGH,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMI,SAAS,GAAIC,KAAoB,IAAK;EAC1C,MAAMC,YAAY,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAH,KAAK,EAAAI,IAAA,CAALJ,KAAK,EACvBK,IAAI,IACH,IAAAC,QAAA,CAAAH,OAAA,CAAY,CAACI,OAAO,EAAEC,MAAM,KAAK;IAC/BZ,EAAE,CAACa,QAAQ,CAACJ,IAAI,EAAE,OAAO,EAAE,CAACK,GAAG,EAAEC,IAAI,KAAK;MACxC,IAAID,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB,CAAC,MAAM;QACL,OAAOH,OAAO,CAACK,IAAI,CAACC,KAAK,CAACF,IAAI,CAAC,CAAC;MAClC;IACF,CAAC,CAAC;EACJ,CAAC,CACL,CAAC;EAED,OAAOL,QAAA,CAAAH,OAAA,CAAQW,GAAG,CAACb,YAAY,CAAC;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAc,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EACtD,OAAO,IAAAd,QAAA,CAAAH,OAAA,CAAY,CAACI,OAAO,EAAEC,MAAM,KAAK;IACtCd,IAAI,CAACyB,gBAAgB,GAAG,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAACT,GAAG,EAAEV,KAAK,KAAK;MACvE,IAAIU,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB;MAEAX,SAAS,CAACC,KAAK,CAAC,CAACqB,IAAI,CAAEC,KAAK,IAAK;QAC/B,MAAMC,SAAS,GAAG,IAAAC,OAAA,CAAArB,OAAA,EAAcL,uBAAuB,EAAE,GAAGwB,KAAK,CAAC;QAClE1B,EAAE,CAAC6B,SAAS,CACV5B,IAAI,CAAC6B,IAAI,CAACR,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAS,UAAA,CAAAxB,OAAA,EAAeoB,SAAS,CAAC,EAExBK,QAAQ,IAAK;UACZ,IAAIA,QAAQ,EAAE;YACZ,OAAOpB,MAAM,CAACoB,QAAQ,CAAC;UACzB;UAEA,OAAOrB,OAAO,CAAC,CAAC;QAClB,CACF,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_map","default","call","content","JSON","parse","newConfig","_assign","_stringify","_promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAM;EAAEK;AAAwB,CAAC,GAAGL,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMM,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGR,WAAW,CAACM,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGZ,IAAI,CAACa,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIR,QAAQ,CAACS,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGjB,IAAI,CAACkB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAjB,KAAK,EAAAkB,IAAA,CAALlB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMkB,OAAO,GAAGzB,YAAY,CAACO,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOmB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;EAEF,MAAMG,SAAS,GAAG,IAAAC,OAAA,CAAAN,OAAA,EAAcrB,uBAAuB,EAAE,GAAGmB,KAAK,CAAC;EAElEpB,aAAa,CACXL,IAAI,CAACa,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAY,UAAA,CAAAP,OAAA,EAAeK,SAAS,CAC1B,CAAC;EAED,OAAOG,QAAA,CAAAR,OAAA,CAAQS,OAAO,CAAC,CAAC;AAC1B,CAAC"}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.33.0",
+  "version": "1.34.1",
   "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.22.11",
+    "@babel/runtime-corejs3": "^7.22.15",
     "big.js": "^6.2.1",
     "date-fns": "^2.30.0",
     "deepmerge": "^4.3.1",
@@ -98,50 +98,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/builder/__tests__/LayoutHintConfig.json

@@ -0,0 +1,11 @@
+{
+  "MOCK": {
+    "hint": "mock",
+    "description": {
+      "NL": "mock dutch description",
+      "EN": "mock english description"
+    },
+    "link": "",
+    "component": ["attribute"]
+  }
+}

package/src/builder/__tests__/mergeLayoutHintConfigurations.spec.js

@@ -1,8 +1,8 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
-
-const projectJson = {
+//
+const projectJson1 = {
   MOCK: {
     hint: "mock",
     description: {
@@ -14,31 +14,38 @@ const projectJson = {
   },
 };
 
+const projectJson2 = {
+  MOCK2: {
+    hint: "mock2",
+    description: {
+      NL: "mock2 dutch description",
+      EN: "mock2 english description",
+    },
+    link: "",
+    component: ["attribute"],
+  },
+};
+
 jest.mock("fs", () => ({
-  readFile: jest.fn((path, options, callback) =>
-    callback(null, JSON.stringify(projectJson)),
-  ),
-  writeFile: jest.fn((path, options, callback) => callback(null)),
+  ...jest.requireActual("fs"),
+  writeFileSync: jest.fn(),
 }));
 
-jest.mock("glob", () =>
-  jest.fn((pattern, options, callback) =>
-    callback(null, ["/input/LayoutHintConfig.json"]),
-  ),
-);
-
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
     expect.assertions(1);
 
-    const expectedJson = { ...LayoutHintConfiguration, ...projectJson };
+    const expectedJson = {
+      ...LayoutHintConfiguration,
+      ...projectJson1,
+      ...projectJson2,
+    };
 
-    await mergeLayoutHintConfigurations("/input", "/output");
+    await mergeLayoutHintConfigurations("./src", "/output");
 
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expect.stringContaining("LayoutHintConfig.json"),
+    expect(fs.writeFileSync).toHaveBeenCalledWith(
+      "\\output\\LayoutHintConfig.json",
       JSON.stringify(expectedJson),
-      expect.anything(),
     );
   });
 });

package/src/builder/__tests__/subdir/LayoutHintConfig.json

@@ -0,0 +1,11 @@
+{
+  "MOCK2": {
+    "hint": "mock2",
+    "description": {
+      "NL": "mock2 dutch description",
+      "EN": "mock2 english description"
+    },
+    "link": "",
+    "component": ["attribute"]
+  }
+}

package/src/builder/mergeLayoutHintConfigurations.js

@@ -1,25 +1,28 @@
 // @flow
-const glob = require("glob");
-const fs = require("fs");
 const path = require("path");
+const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
-const readFiles = (files: Array<string>) => {
-  const filePromises = files.map(
-    (file) =>
-      new Promise((resolve, reject) => {
-        fs.readFile(file, "utf-8", (err, data) => {
-          if (err) {
-            return reject(err);
-          } else {
-            return resolve(JSON.parse(data));
-          }
-        });
-      }),
-  );
+const findFiles = (dir: string): Array<string> => {
+  const matchedFiles = [];
+
+  const files = readdirSync(dir);
 
-  return Promise.all(filePromises);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
+      }
+    }
+  }
+
+  return matchedFiles;
 };
 
 /**
@@ -32,27 +35,20 @@ exports.mergeLayoutHintConfigurations = async (
   outputFolder: string,
 ): Promise<void> => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new Promise((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
 
-      readFiles(files).then((jsons) => {
-        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(
-          path.join(outputFolder, "LayoutHintConfig.json"),
-          JSON.stringify(newConfig),
-
-          (writeErr) => {
-            if (writeErr) {
-              return reject(writeErr);
-            }
-
-            return resolve();
-          },
-        );
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+
+  const jsons = files.map((file) => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+
+  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+
+  writeFileSync(
+    path.join(outputFolder, "LayoutHintConfig.json"),
+    JSON.stringify(newConfig),
+  );
+
+  return Promise.resolve();
 };

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());