@beinformed/ui 1.57.2 → 1.57.4

package/src/react-client/client.js

@@ -13,7 +13,11 @@ import { createBrowserHistory } from "history";
 import configureStore from "../redux/store/configureStore";
 
 import rehydrate from "./rehydrate";
-import { getBasePath, getSetting } from "../constants/Settings";
+import {
+  getBasePathModularUI,
+  getBasePathServer,
+  getSetting,
+} from "../constants/Settings";
 
 import {
   setAllContentInDataSetting,
@@ -107,7 +111,7 @@ const handleRedirectURI = (store: ReduxStore) => {
   const urlParams = new URLSearchParams(window.location.search);
   const redirectURI = urlParams.get("redirectURI");
   if (redirectURI) {
-    xhr({ url: `${getBasePath()}${redirectURI}` }).catch((e) => {
+    xhr({ url: `${getBasePathModularUI()}${redirectURI}` }).catch((e) => {
       if (
         e.id === "UnauthorizedException" ||
         e.id === "Error.NotAuthorized" ||
@@ -143,7 +147,7 @@ export const setupClient = (
 
   // $FlowExpectedError
   const browserHistory: RouterHistory = createBrowserHistory({
-    basename: getBasePath(),
+    basename: getBasePathServer(),
   });
   const { routerHistory, store } = configureStore(
     browserHistory,

package/src/react-server/renderSSRComplete.js

@@ -10,7 +10,7 @@ import { ServerStyleSheet, StyleSheetManager } from "styled-components";
 import createSSRComplete from "./createSSRComplete";
 import htmlpage from "./htmlpage";
 
-import { getBasePath } from "../constants/Settings";
+import { getBasePathServer } from "../constants/Settings";
 
 import ThemeProvider from "../react-theme/ThemeProvider";
 import ErrorBoundary from "../react/ErrorBoundary";
@@ -52,7 +52,7 @@ const renderSSRComplete = ({
   // $FlowFixMe[prop-missing]
   const location: Location = requestHref.toLocation();
 
-  const basePath = getBasePath();
+  const basePath = getBasePathServer();
 
   return createSSRComplete(store, () =>
     renderToString(

package/src/react-server/renderSSRMinimal.js

@@ -6,7 +6,7 @@ import { Provider } from "react-redux";
 import { ServerStyleSheet, StyleSheetManager } from "styled-components";
 import ThemeProvider from "../react-theme/ThemeProvider";
 
-import { getBasePath } from "../constants/Settings";
+import { getBasePathServer } from "../constants/Settings";
 
 import { createHead, dehydrate } from "./serverUtil";
 import htmlpage from "./htmlpage";
@@ -43,7 +43,7 @@ const renderSSRMinimal = ({
 
   const head = createHead(sheet, UUID);
   return template({
-    contextPath: getBasePath(),
+    contextPath: getBasePathServer(),
     html: appHTML,
     head,
     state: dehydrate(store),

package/src/redux/_modularui/ModularUIActions.js

@@ -115,7 +115,10 @@ export const loadModel = (
     href:
       href instanceof Href
         ? href
-        : new Href(href, "", options?.origin, options?.contextPath),
+        : new Href(href, "", {
+            origin: options?.origin,
+            contextPath: options?.contextPath,
+          }),
     method: options?.method ?? HTTP_METHODS.GET,
     data: options?.data,
     locale: options?.locale ?? "en",
@@ -130,12 +133,10 @@ export const loadModel = (
     /**
      */
     errorAction: (error) => {
-      const errorResponse = new ErrorResponse(
-        error,
-        key,
-        options?.origin,
-        options?.contextPath,
-      );
+      const errorResponse = new ErrorResponse(error, key, {
+        origin: options?.origin,
+        contextPath: options?.contextPath,
+      });
       if (errorResponse.isChangePassword) {
         return {
           type: "NO_ACTION",

package/src/redux/_modularui/ModularUIUtils.js

@@ -10,24 +10,31 @@ import type { ComponentType } from "react";
 /**
  * Generate modular ui url
  */
-const getUrl = (resource: string | Function, props: Object) => {
+const getUrl = (resource: string | Function | Href, props: Object): Href => {
   const url = typeof resource === "function" ? resource(props) : resource;
 
   if (url instanceof Href) {
-    return url.toString();
+    return url;
   }
 
-  return url || "";
+  return new Href(url);
 };
 
 /**
  */
-export const useUrl = (resource: string | Function, props: Object): string => {
-  const [previousUrl, setPreviousUrl] = useState("");
+export const useUrl = (
+  resource: string | Function | Href,
+  props: Object,
+): Href => {
+  const [previousUrl, setPreviousUrl] = useState(null);
   const [previousExact, setPreviousExact] = useState(false);
 
   const url = getUrl(resource, props);
 
+  if (url == null && previousUrl == null) {
+    return new Href("");
+  }
+
   const { match } = props;
 
   // when match is not available through props,
@@ -36,21 +43,17 @@ export const useUrl = (resource: string | Function, props: Object): string => {
     return url;
   }
 
-  const isDifferentUrl = url !== previousUrl;
-  if (!isDifferentUrl) {
-    return previousUrl;
+  if (url.equalsWithParameters(previousUrl)) {
+    return previousUrl || url;
   }
 
-  const hasDifferentStartUriPart =
-    previousUrl !== "" && !previousUrl.startsWith(match.url);
-
   // Always create an url when the match is exact
   // Or when the match is not exact AND the original match also was not exact
-  // Or when the new start uri is different from the previous url
+  // Or when the new start uri is different from the previous url --> different resource for same panel
   if (
     match.isExact === true ||
     previousExact === match.isExact ||
-    hasDifferentStartUriPart
+    !previousUrl?.startsWith(match.url)
   ) {
     setPreviousUrl(url);
     setPreviousExact(match.isExact);
@@ -58,7 +61,7 @@ export const useUrl = (resource: string | Function, props: Object): string => {
     return url;
   }
 
-  return previousUrl;
+  return previousUrl || new Href("");
 };
 
 /**

package/src/utils/browser/Cookies.js

@@ -1,7 +1,7 @@
 // @flow
 import Cookies from "js-cookie";
 
-import { getBasePath } from "../../constants/Settings";
+import { getBasePathServer } from "../../constants/Settings";
 
 type CookieOptions = {
   days?: number,
@@ -29,7 +29,7 @@ export const setCookie = (
   value: any,
   options?: CookieOptions,
 ) => {
-  const attributes: CookieAttributes = { path: getBasePath() };
+  const attributes: CookieAttributes = { path: getBasePathServer() };
   attributes.expires = options?.days;
   attributes.sameSite = options?.sameSite ?? "Strict";
   attributes.secure = options?.secure;
@@ -40,5 +40,5 @@ export const setCookie = (
 /**
  */
 export const clearCookie = (name: string) => {
-  Cookies.remove(name, { path: getBasePath() });
+  Cookies.remove(name, { path: getBasePathServer() });
 };

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

@@ -1,4 +1,5 @@
 import { createHref } from "../createHref";
+import Href from "../../../models/href/Href";
 
 describe("createHref", () => {
   it("can filter out qs parameters", () => {
@@ -7,24 +8,28 @@ describe("createHref", () => {
       search: "?entryDate=2024-03-08&index=C&notAllowed=true",
     };
 
-    expect(createHref("concepts", dynamicPart)).toBe(
-      "/concepts/" + dynamicPart,
+    expect(createHref("concepts", dynamicPart)).toEqual(
+      new Href("/concepts/" + dynamicPart),
     );
-    expect(createHref("concepts", dynamicPart, location)).toBe(
-      "/concepts/" + dynamicPart + location.search,
+    expect(createHref("concepts", dynamicPart, location)).toEqual(
+      new Href("/concepts/" + dynamicPart + location.search),
     );
     expect(
       createHref("concepts", dynamicPart, location, ["entryDate", "index"]),
-    ).toBe("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C");
+    ).toEqual(
+      new Href("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C"),
+    );
     expect(
       createHref("concepts", dynamicPart + location.search, location, [
         "entryDate",
         "index",
       ]),
-    ).toBe("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C");
+    ).toEqual(
+      new Href("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C"),
+    );
 
-    expect(createHref("concepts", dynamicPart + "#hash")).toBe(
-      "/concepts/" + dynamicPart + "#hash",
+    expect(createHref("concepts", dynamicPart + "#hash")).toEqual(
+      new Href("/concepts/" + dynamicPart + "#hash"),
     );
   });
 });

package/src/utils/helpers/createHref.js

@@ -1,11 +1,21 @@
 // @flow
+import Href from "../../models/href/Href";
+
 import type { Location } from "react-router";
 
 /**
  */
 export const parseUrl = (
-  href: string,
+  href: string | Href,
 ): { path: string, querystring: null | string, hash: null | string } => {
+  if (href instanceof Href) {
+    return {
+      path: href.path,
+      querystring: href.querystring,
+      hash: href.hash,
+    };
+  }
+
   let path = href;
   let hash = null;
   let querystring = null;
@@ -29,11 +39,11 @@ export const parseUrl = (
 /**
  */
 export const filterParameters = (
-  href: string,
+  href: string | Href,
   allowedParameters?: Array<string>,
-): string => {
+): Href => {
   if (!Array.isArray(allowedParameters)) {
-    return href;
+    return new Href(href);
   }
 
   const url = parseUrl(href);
@@ -51,18 +61,27 @@ export const filterParameters = (
   if (url.hash) {
     filteredUrl = filteredUrl + "#" + url.hash;
   }
-  return filteredUrl;
+
+  if (href instanceof Href) {
+    return new Href(filteredUrl, href.resourcetype, {
+      origin: href.origin,
+      contextPath: href.contextPath,
+    });
+  }
+
+  return new Href(filteredUrl);
 };
 
 /**
  */
 export const createHref = (
   context: string,
-  dynamicPart: string,
+  dynamicPart: string | Href,
   location?: ?Location,
   allowedParameters?: Array<string>,
-): string => {
-  let href = dynamicPart;
+): Href => {
+  let href = dynamicPart.toString();
+
   if (!href.startsWith(`/${context}/`)) {
     href = `/${context}/${href}`;
   }
@@ -76,5 +95,15 @@ export const createHref = (
     href = `${href}?${search}`;
   }
 
+  if (dynamicPart instanceof Href) {
+    return filterParameters(
+      new Href(href, dynamicPart.resourcetype, {
+        origin: dynamicPart.origin,
+        contextPath: dynamicPart.contextPath,
+      }),
+      allowedParameters,
+    );
+  }
+
   return filterParameters(href, allowedParameters);
 };

package/src/utils/helpers/repositoryResource.js

@@ -1,5 +1,5 @@
 // @flow
-import { getBasePath, RESOURCE_PATH } from "../../constants";
+import { getBasePathServer, RESOURCE_PATH } from "../../constants";
 
 /**
  * Creates an url to a resource in the Be Informed repository
@@ -7,7 +7,7 @@ import { getBasePath, RESOURCE_PATH } from "../../constants";
  */
 export const getRepositoryResourceUrl = (
   resourceUrl: string,
-  contextPath: string = getBasePath(),
+  contextPath: string = getBasePathServer(),
   origin: string = "",
 ): string => {
   if (resourceUrl.startsWith(origin + contextPath)) {