@beinformed/ui 1.34.0 → 1.34.2

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(fs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("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

@@ -32,8 +32,6 @@ import { Init } from "./Init";
 
 import { handleBeforeRenderHooks } from "../redux/store/beforeRenderHooks";
 
-import UnauthorizedException from "../exceptions/UnauthorizedException";
-
 import type {
   ComponentType,
   Element as ReactElement,
@@ -110,7 +108,12 @@ const handleRedirectURI = (store: ReduxStore) => {
   const redirectURI = urlParams.get("redirectURI");
   if (redirectURI) {
     xhr({ url: `${getBasePath()}${redirectURI}` }).catch((e) => {
-      if (e instanceof UnauthorizedException) {
+      if (
+        e.id === "UnauthorizedException" ||
+        e.id === "Error.NotAuthorized" ||
+        e.id === "Error.Authentication.Required" ||
+        e.id === "Error.Authentication.InvalidCredentials"
+      ) {
         const LOGIN_PATH = getSetting("LOGIN_PATH", "/signin");
         store.dispatch(
           replace(LOGIN_PATH, {

package/types/models/filters/StringFilterModel.d.ts

@@ -11,5 +11,20 @@ export default class StringFilterModel extends BaseFilterModel {
     /**
      */
     formatValue(value: string): string;
+    /**
+     */
+    isBSN(): boolean;
+    /**
+     */
+    isIBAN(): boolean;
+    /**
+     */
+    isZipcode(): boolean;
+    /**
+     */
+    removeFormat(value: string | null): string;
+    /**
+     */
+    shouldHandleFormat(): boolean;
 }
 import BaseFilterModel from "./BaseFilterModel";