@beinformed/ui 1.12.2 → 1.13.3

package/src/modularui/ModularUIRequest.js

@@ -386,6 +386,20 @@ class ModularUIRequest {
     return Promise.resolve();
   }
 
+  /**
+   * Retrieve an object of key: link
+   */
+  dataLinksPerName(dataLinks: any): { [linkName: string]: any } {
+    if (Array.isArray(dataLinks)) {
+      const links = {};
+      for (const dataLink of dataLinks) {
+        links[dataLink.name] = dataLink;
+      }
+      return links;
+    }
+    return dataLinks;
+  }
+
   /**
    * Check if links are empty and hide them when hide-when-empty hint exists
    */
@@ -393,42 +407,44 @@ class ModularUIRequest {
     dataLinks: any,
     contributionLinks: any
   ): Promise<Object | Array<Object>> {
+    const linksPerName = this.dataLinksPerName(dataLinks);
+    const hideWhenEmptyLinks = contributionLinks.filter((contributionLink) =>
+      contributionLink.layouthint?.includes(HIDE_WHEN_EMPTY)
+    );
+
     const isHiddenListChecks = [];
-    for (const contributionLink of contributionLinks) {
-      if (contributionLink.layouthint?.includes(HIDE_WHEN_EMPTY)) {
-        const dataLink = Array.isArray(dataLinks)
-          ? dataLinks.find((link) => link.name === contributionLink.name)
-          : dataLinks[contributionLink.name];
-
-        if (dataLink?.href) {
-          isHiddenListChecks.push(
-            this.isHiddenList(contributionLink.name, dataLink.href)
-          );
-        }
+
+    for (const contributionLink of hideWhenEmptyLinks) {
+      const dataLink = linksPerName[contributionLink.name];
+      if (dataLink?.href) {
+        isHiddenListChecks.push(
+          this.isHiddenList(contributionLink.name, dataLink.href)
+        );
       }
     }
 
-    return Promise.all(isHiddenListChecks).then((hiddenLinks) => {
-      let newDataLinks;
-      if (Array.isArray(dataLinks)) {
-        newDataLinks = dataLinks.filter(
-          (dataLink) => !hiddenLinks.includes(dataLink.name)
-        );
-      } else {
-        newDataLinks = {};
+    return Promise.all(isHiddenListChecks).then(
+      (hiddenLinks: Array<string>) => {
+        if (Array.isArray(dataLinks)) {
+          return dataLinks.filter(
+            (dataLink) => !hiddenLinks.includes(dataLink.name)
+          );
+        }
+
+        const newDataLinks = {};
         for (const dataLinkKey in dataLinks) {
           if (!hiddenLinks.includes(dataLinkKey)) {
             newDataLinks[dataLinkKey] = dataLinks[dataLinkKey];
           }
         }
+        return newDataLinks;
       }
-      return newDataLinks;
-    });
+    );
   }
 
   /**
    */
-  isHiddenList(name: string, href: string): Promise<?string> {
+  isHiddenList(name: string, href: string): Promise<string> {
     return universalFetch({
       ...this.options,
       url: `${BASE}${href}`,

package/src/utils/browser/Cookies.js

@@ -1,4 +1,6 @@
 // @flow
+import Cookies from "js-cookie";
+
 import { BASE } from "../../constants/Constants";
 
 type CookieOptions = {
@@ -7,18 +9,17 @@ type CookieOptions = {
   secure?: boolean,
 };
 
+type CookieAttributes = {
+  path: string,
+  expires?: number,
+  sameSite?: string,
+  secure?: boolean,
+};
+
 /**
  */
 const getCookie = (name: string): null | string => {
-  if (typeof document !== "undefined") {
-    const value = `;${document.cookie}`;
-    const parts = value.split(`; ${name}=`);
-    if (parts.length === 2) {
-      return parts.pop().split(";").shift();
-    }
-  }
-
-  return null;
+  return Cookies.get(name);
 };
 
 /**
@@ -28,31 +29,24 @@ const setCookie = (
   value: any,
   { days, sameSite = "Strict", secure }: CookieOptions = {}
 ) => {
-  if (typeof document !== "undefined") {
-    const valuePart = `${name}=${value || ""}`;
-
-    let expires = "";
-    if (days) {
-      const date = new Date();
-      date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
-      expires = `; expires=${date.toUTCString()}`;
-    }
-    let sameSitePart = "";
-    if (sameSite) {
-      sameSitePart = `; SameSite=${sameSite}`;
-    }
-    const securePart = secure ? "Secure" : "";
-
-    document.cookie = `${valuePart}${expires}${sameSitePart}${securePart}; path=${BASE}`;
+  const attributes: CookieAttributes = { path: BASE };
+  if (days) {
+    attributes.expires = days;
+  }
+  if (sameSite) {
+    attributes.sameSite = sameSite;
+  }
+  if (secure) {
+    attributes.secure = secure;
   }
+
+  Cookies.set(name, value, attributes);
 };
 
 /**
  */
 const clearCookie = (name: string) => {
-  if (typeof document !== "undefined") {
-    document.cookie = `${name}=; Max-Age=-99999999;`;
-  }
+  Cookies.remove(name, { path: BASE });
 };
 
 export { getCookie, setCookie, clearCookie };

package/src/utils/browser/__tests__/Cookies.spec.js

@@ -0,0 +1,51 @@
+import { getCookie, setCookie, clearCookie } from "../Cookies";
+
+describe("cookies util", () => {
+  beforeEach(() => {
+    Object.defineProperty(
+      window.document,
+      "cookie",
+      (function (cookies) {
+        return {
+          get: function _get() {
+            const output = [];
+            for (const cookieName in cookies) {
+              output.push(cookieName + "=" + cookies[cookieName]);
+            }
+            return output.join("; ");
+          },
+          set: function _set(s) {
+            const indexOfSeparator = s.indexOf("=");
+            const key = s.substr(0, indexOfSeparator);
+            const value = s.substring(indexOfSeparator + 1);
+            const valueWithoutAttributes = value.substr(0, value.indexOf(";"));
+
+            if (valueWithoutAttributes === "") {
+              delete cookies[key];
+            } else {
+              cookies[key] = value;
+            }
+            return key + "=" + value;
+          },
+          reset: function _reset() {
+            cookies = {};
+          },
+          configurable: true,
+        };
+      })({})
+    );
+  });
+
+  it("should be able retrieve cookies by name", () => {
+    setCookie("newCookie", "test");
+    expect(getCookie("newCookie")).toBe("test");
+
+    setCookie("newCookie2", "test2");
+    expect(getCookie("newCookie")).toBe("test");
+    expect(getCookie("newCookie2")).toBe("test2");
+
+    clearCookie("newCookie2");
+    expect(getCookie("newCookie")).toBe("test");
+    expect(getCookie("newCookie2")).toBeUndefined();
+  });
+});

package/src/utils/fetch/xhr.js

@@ -15,6 +15,8 @@ import Cache from "../browser/Cache";
 
 import { HTTP_METHODS } from "../../constants/Constants";
 
+import { getSetting } from "../../constants/Settings";
+
 import type { RequestOptions } from "./types";
 
 const NETWORK_ERROR_CODE = 0;
@@ -116,7 +118,7 @@ class XHR {
   /**
    */
   get timeout() {
-    return this.options.timeout || 300000;
+    return this.options.timeout || getSetting("XHR_TIMEOUT_MS", 300000);
   }
 
   /**
@@ -132,7 +134,9 @@ class XHR {
       return this.options.onProgress;
     }
 
-    return () => {};
+    return () => {
+      // do nothing
+    };
   }
 
   /**