@beinformed/ui 1.57.2 → 1.57.4

package/lib/redux/_modularui/ModularUIUtils.js.flow

@@ -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/lib/redux/_modularui/ModularUIUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIUtils.js","names":["_react","require","_utils","_Constants","_Href","_interopRequireDefault","getUrl","resource","props","url","Href","toString","useUrl","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","isDifferentUrl","hasDifferentStartUriPart","_startsWith","default","call","isExact","exports","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function, props: Object) => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url.toString();\n  }\n\n  return url || \"\";\n};\n\n/**\n */\nexport const useUrl = (resource: string | Function, props: Object): string => {\n  const [previousUrl, setPreviousUrl] = useState(\"\");\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  const isDifferentUrl = url !== previousUrl;\n  if (!isDifferentUrl) {\n    return previousUrl;\n  }\n\n  const hasDifferentStartUriPart =\n    previousUrl !== \"\" && !previousUrl.startsWith(match.url);\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    hasDifferentStartUriPart\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl;\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAIA;AACA;AACA;AACA,MAAMK,MAAM,GAAGA,CAACC,QAA2B,EAAEC,KAAa,KAAK;EAC7D,MAAMC,GAAG,GAAG,OAAOF,QAAQ,KAAK,UAAU,GAAGA,QAAQ,CAACC,KAAK,CAAC,GAAGD,QAAQ;EAEvE,IAAIE,GAAG,YAAYC,aAAI,EAAE;IACvB,OAAOD,GAAG,CAACE,QAAQ,CAAC,CAAC;EACvB;EAEA,OAAOF,GAAG,IAAI,EAAE;AAClB,CAAC;;AAED;AACA;AACO,MAAMG,MAAM,GAAGA,CAACL,QAA2B,EAAEC,KAAa,KAAa;EAC5E,MAAM,CAACK,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAC,eAAQ,EAAC,EAAE,CAAC;EAClD,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAF,eAAQ,EAAC,KAAK,CAAC;EAEzD,MAAMN,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,MAAM;IAAEU;EAAM,CAAC,GAAGV,KAAK;;EAEvB;EACA;EACA,IAAI,CAACU,KAAK,EAAE;IACV,OAAOT,GAAG;EACZ;EAEA,MAAMU,cAAc,GAAGV,GAAG,KAAKI,WAAW;EAC1C,IAAI,CAACM,cAAc,EAAE;IACnB,OAAON,WAAW;EACpB;EAEA,MAAMO,wBAAwB,GAC5BP,WAAW,KAAK,EAAE,IAAI,CAAC,IAAAQ,WAAA,CAAAC,OAAA,EAAAT,WAAW,EAAAU,IAAA,CAAXV,WAAW,EAAYK,KAAK,CAACT,GAAG,CAAC;;EAE1D;EACA;EACA;EACA,IACES,KAAK,CAACM,OAAO,KAAK,IAAI,IACtBR,aAAa,KAAKE,KAAK,CAACM,OAAO,IAC/BJ,wBAAwB,EACxB;IACAN,cAAc,CAACL,GAAG,CAAC;IACnBQ,gBAAgB,CAACC,KAAK,CAACM,OAAO,CAAC;IAE/B,OAAOf,GAAG;EACZ;EAEA,OAAOI,WAAW;AACpB,CAAC;;AAED;AACA;AACA;AAFAY,OAAA,CAAAb,MAAA,GAAAA,MAAA;AAGO,MAAMc,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZnB,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAG,IAAAoB,qBAAc,EAACF,gBAAgB,EAAEC,IAAI,CAAC,IAAInB,GAAG,CAACqB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAO,IAAAD,qBAAc,EAACF,gBAAgB,EAAEC,IAAI,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AAFAH,OAAA,CAAAC,MAAA,GAAAA,MAAA;AAGO,MAAMK,SAAS,GAAG,SAAAA,CAACC,UAAkB,EAAkC;EAAA,IAAhCC,MAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAC9D,IAAID,MAAM,GAAG,CAAC,EAAE;IACd,MAAMI,aAAa,GAAGL,UAAU,EAAEM,MAAM,KAAKC,2BAAgB,CAACC,QAAQ;IACtE,MAAMC,gBAAgB,GAAGT,UAAU,EAAES,gBAAgB,IAAI,CAAC;IAE1D,IAAIJ,aAAa,IAAII,gBAAgB,GAAGR,MAAM,EAAE;MAC9C,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC;AAACR,OAAA,CAAAM,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"file":"ModularUIUtils.js","names":["_react","require","_utils","_Constants","_Href","_interopRequireDefault","getUrl","resource","props","url","Href","useUrl","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","equalsWithParameters","isExact","startsWith","exports","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","arguments","length","undefined","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/ModularUIUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function | Href, props: Object): Href => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url;\n  }\n\n  return new Href(url);\n};\n\n/**\n */\nexport const useUrl = (\n  resource: string | Function | Href,\n  props: Object,\n): Href => {\n  const [previousUrl, setPreviousUrl] = useState(null);\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  if (url == null && previousUrl == null) {\n    return new Href(\"\");\n  }\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  if (url.equalsWithParameters(previousUrl)) {\n    return previousUrl || url;\n  }\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url --> different resource for same panel\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    !previousUrl?.startsWith(match.url)\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl || new Href(\"\");\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string,\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAIA;AACA;AACA;AACA,MAAMK,MAAM,GAAGA,CAACC,QAAkC,EAAEC,KAAa,KAAW;EAC1E,MAAMC,GAAG,GAAG,OAAOF,QAAQ,KAAK,UAAU,GAAGA,QAAQ,CAACC,KAAK,CAAC,GAAGD,QAAQ;EAEvE,IAAIE,GAAG,YAAYC,aAAI,EAAE;IACvB,OAAOD,GAAG;EACZ;EAEA,OAAO,IAAIC,aAAI,CAACD,GAAG,CAAC;AACtB,CAAC;;AAED;AACA;AACO,MAAME,MAAM,GAAGA,CACpBJ,QAAkC,EAClCC,KAAa,KACJ;EACT,MAAM,CAACI,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAC,eAAQ,EAAC,IAAI,CAAC;EACpD,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAF,eAAQ,EAAC,KAAK,CAAC;EAEzD,MAAML,GAAG,GAAGH,MAAM,CAACC,QAAQ,EAAEC,KAAK,CAAC;EAEnC,IAAIC,GAAG,IAAI,IAAI,IAAIG,WAAW,IAAI,IAAI,EAAE;IACtC,OAAO,IAAIF,aAAI,CAAC,EAAE,CAAC;EACrB;EAEA,MAAM;IAAEO;EAAM,CAAC,GAAGT,KAAK;;EAEvB;EACA;EACA,IAAI,CAACS,KAAK,EAAE;IACV,OAAOR,GAAG;EACZ;EAEA,IAAIA,GAAG,CAACS,oBAAoB,CAACN,WAAW,CAAC,EAAE;IACzC,OAAOA,WAAW,IAAIH,GAAG;EAC3B;;EAEA;EACA;EACA;EACA,IACEQ,KAAK,CAACE,OAAO,KAAK,IAAI,IACtBJ,aAAa,KAAKE,KAAK,CAACE,OAAO,IAC/B,CAACP,WAAW,EAAEQ,UAAU,CAACH,KAAK,CAACR,GAAG,CAAC,EACnC;IACAI,cAAc,CAACJ,GAAG,CAAC;IACnBO,gBAAgB,CAACC,KAAK,CAACE,OAAO,CAAC;IAE/B,OAAOV,GAAG;EACZ;EAEA,OAAOG,WAAW,IAAI,IAAIF,aAAI,CAAC,EAAE,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AAFAW,OAAA,CAAAV,MAAA,GAAAA,MAAA;AAGO,MAAMW,MAAM,GAAGA,CACpBC,gBAAoC,EACpCC,IAAY,EACZf,GAAW,KACA;EACX,IAAIA,GAAG,EAAE;IACP,OAAO,GAAG,IAAAgB,qBAAc,EAACF,gBAAgB,EAAEC,IAAI,CAAC,IAAIf,GAAG,CAACiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;EAC1E;EAEA,OAAO,IAAAD,qBAAc,EAACF,gBAAgB,EAAEC,IAAI,CAAC;AAC/C,CAAC;;AAED;AACA;AACA;AAFAH,OAAA,CAAAC,MAAA,GAAAA,MAAA;AAGO,MAAMK,SAAS,GAAG,SAAAA,CAACC,UAAkB,EAAkC;EAAA,IAAhCC,MAAc,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC;EAC9D,IAAID,MAAM,GAAG,CAAC,EAAE;IACd,MAAMI,aAAa,GAAGL,UAAU,EAAEM,MAAM,KAAKC,2BAAgB,CAACC,QAAQ;IACtE,MAAMC,gBAAgB,GAAGT,UAAU,EAAES,gBAAgB,IAAI,CAAC;IAE1D,IAAIJ,aAAa,IAAII,gBAAgB,GAAGR,MAAM,EAAE;MAC9C,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC;AAACR,OAAA,CAAAM,SAAA,GAAAA,SAAA","ignoreList":[]}

package/lib/utils/browser/Cookies.js

@@ -18,7 +18,7 @@ const getCookie = name => {
 exports.getCookie = getCookie;
 const setCookie = (name, value, options) => {
   const attributes = {
-    path: (0, _Settings.getBasePath)()
+    path: (0, _Settings.getBasePathServer)()
   };
   attributes.expires = options?.days;
   attributes.sameSite = options?.sameSite ?? "Strict";
@@ -31,7 +31,7 @@ const setCookie = (name, value, options) => {
 exports.setCookie = setCookie;
 const clearCookie = name => {
   _jsCookie.default.remove(name, {
-    path: (0, _Settings.getBasePath)()
+    path: (0, _Settings.getBasePathServer)()
   });
 };
 exports.clearCookie = clearCookie;

package/lib/utils/browser/Cookies.js.flow

@@ -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/lib/utils/browser/Cookies.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cookies.js","names":["_jsCookie","_interopRequireDefault","require","_Settings","getCookie","name","Cookies","get","exports","setCookie","value","options","attributes","path","getBasePath","expires","days","sameSite","secure","set","clearCookie","remove"],"sources":["../../../src/utils/browser/Cookies.js"],"sourcesContent":["// @flow\nimport Cookies from \"js-cookie\";\n\nimport { getBasePath } from \"../../constants/Settings\";\n\ntype CookieOptions = {\n  days?: number,\n  sameSite?: \"None\" | \"Lax\" | \"Strict\",\n  secure?: boolean,\n};\n\ntype CookieAttributes = {\n  path: string,\n  expires?: number,\n  sameSite?: string,\n  secure?: boolean,\n};\n\n/**\n */\nexport const getCookie = (name: string): null | string => {\n  return Cookies.get(name);\n};\n\n/**\n */\nexport const setCookie = (\n  name: string,\n  value: any,\n  options?: CookieOptions,\n) => {\n  const attributes: CookieAttributes = { path: getBasePath() };\n  attributes.expires = options?.days;\n  attributes.sameSite = options?.sameSite ?? \"Strict\";\n  attributes.secure = options?.secure;\n\n  Cookies.set(name, value, attributes);\n};\n\n/**\n */\nexport const clearCookie = (name: string) => {\n  Cookies.remove(name, { path: getBasePath() });\n};\n"],"mappings":";;;;;;;AACA,IAAAA,SAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAeA;AACA;AACO,MAAME,SAAS,GAAIC,IAAY,IAAoB;EACxD,OAAOC,iBAAO,CAACC,GAAG,CAACF,IAAI,CAAC;AAC1B,CAAC;;AAED;AACA;AADAG,OAAA,CAAAJ,SAAA,GAAAA,SAAA;AAEO,MAAMK,SAAS,GAAGA,CACvBJ,IAAY,EACZK,KAAU,EACVC,OAAuB,KACpB;EACH,MAAMC,UAA4B,GAAG;IAAEC,IAAI,EAAE,IAAAC,qBAAW,EAAC;EAAE,CAAC;EAC5DF,UAAU,CAACG,OAAO,GAAGJ,OAAO,EAAEK,IAAI;EAClCJ,UAAU,CAACK,QAAQ,GAAGN,OAAO,EAAEM,QAAQ,IAAI,QAAQ;EACnDL,UAAU,CAACM,MAAM,GAAGP,OAAO,EAAEO,MAAM;EAEnCZ,iBAAO,CAACa,GAAG,CAACd,IAAI,EAAEK,KAAK,EAAEE,UAAU,CAAC;AACtC,CAAC;;AAED;AACA;AADAJ,OAAA,CAAAC,SAAA,GAAAA,SAAA;AAEO,MAAMW,WAAW,GAAIf,IAAY,IAAK;EAC3CC,iBAAO,CAACe,MAAM,CAAChB,IAAI,EAAE;IAAEQ,IAAI,EAAE,IAAAC,qBAAW,EAAC;EAAE,CAAC,CAAC;AAC/C,CAAC;AAACN,OAAA,CAAAY,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"file":"Cookies.js","names":["_jsCookie","_interopRequireDefault","require","_Settings","getCookie","name","Cookies","get","exports","setCookie","value","options","attributes","path","getBasePathServer","expires","days","sameSite","secure","set","clearCookie","remove"],"sources":["../../../src/utils/browser/Cookies.js"],"sourcesContent":["// @flow\nimport Cookies from \"js-cookie\";\n\nimport { getBasePathServer } from \"../../constants/Settings\";\n\ntype CookieOptions = {\n  days?: number,\n  sameSite?: \"None\" | \"Lax\" | \"Strict\",\n  secure?: boolean,\n};\n\ntype CookieAttributes = {\n  path: string,\n  expires?: number,\n  sameSite?: string,\n  secure?: boolean,\n};\n\n/**\n */\nexport const getCookie = (name: string): null | string => {\n  return Cookies.get(name);\n};\n\n/**\n */\nexport const setCookie = (\n  name: string,\n  value: any,\n  options?: CookieOptions,\n) => {\n  const attributes: CookieAttributes = { path: getBasePathServer() };\n  attributes.expires = options?.days;\n  attributes.sameSite = options?.sameSite ?? \"Strict\";\n  attributes.secure = options?.secure;\n\n  Cookies.set(name, value, attributes);\n};\n\n/**\n */\nexport const clearCookie = (name: string) => {\n  Cookies.remove(name, { path: getBasePathServer() });\n};\n"],"mappings":";;;;;;;AACA,IAAAA,SAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AAeA;AACA;AACO,MAAME,SAAS,GAAIC,IAAY,IAAoB;EACxD,OAAOC,iBAAO,CAACC,GAAG,CAACF,IAAI,CAAC;AAC1B,CAAC;;AAED;AACA;AADAG,OAAA,CAAAJ,SAAA,GAAAA,SAAA;AAEO,MAAMK,SAAS,GAAGA,CACvBJ,IAAY,EACZK,KAAU,EACVC,OAAuB,KACpB;EACH,MAAMC,UAA4B,GAAG;IAAEC,IAAI,EAAE,IAAAC,2BAAiB,EAAC;EAAE,CAAC;EAClEF,UAAU,CAACG,OAAO,GAAGJ,OAAO,EAAEK,IAAI;EAClCJ,UAAU,CAACK,QAAQ,GAAGN,OAAO,EAAEM,QAAQ,IAAI,QAAQ;EACnDL,UAAU,CAACM,MAAM,GAAGP,OAAO,EAAEO,MAAM;EAEnCZ,iBAAO,CAACa,GAAG,CAACd,IAAI,EAAEK,KAAK,EAAEE,UAAU,CAAC;AACtC,CAAC;;AAED;AACA;AADAJ,OAAA,CAAAC,SAAA,GAAAA,SAAA;AAEO,MAAMW,WAAW,GAAIf,IAAY,IAAK;EAC3CC,iBAAO,CAACe,MAAM,CAAChB,IAAI,EAAE;IAAEQ,IAAI,EAAE,IAAAC,2BAAiB,EAAC;EAAE,CAAC,CAAC;AACrD,CAAC;AAACN,OAAA,CAAAY,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/utils/helpers/__tests__/createHref.spec.js.flow

@@ -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/lib/utils/helpers/createHref.js

@@ -10,9 +10,17 @@ var _urlSearchParams = _interopRequireDefault(require("@babel/runtime-corejs3/co
 var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/keys"));
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
+var _Href = _interopRequireDefault(require("../../models/href/Href"));
 /**
  */
 const parseUrl = href => {
+  if (href instanceof _Href.default) {
+    return {
+      path: href.path,
+      querystring: href.querystring,
+      hash: href.hash
+    };
+  }
   let path = href;
   let hash = null;
   let querystring = null;
@@ -38,7 +46,7 @@ const parseUrl = href => {
 exports.parseUrl = parseUrl;
 const filterParameters = (href, allowedParameters) => {
   if (!Array.isArray(allowedParameters)) {
-    return href;
+    return new _Href.default(href);
   }
   const url = parseUrl(href);
   let filteredUrl = url.path;
@@ -55,14 +63,20 @@ const filterParameters = (href, allowedParameters) => {
   if (url.hash) {
     filteredUrl = filteredUrl + "#" + url.hash;
   }
-  return filteredUrl;
+  if (href instanceof _Href.default) {
+    return new _Href.default(filteredUrl, href.resourcetype, {
+      origin: href.origin,
+      contextPath: href.contextPath
+    });
+  }
+  return new _Href.default(filteredUrl);
 };
 
 /**
  */
 exports.filterParameters = filterParameters;
 const createHref = (context, dynamicPart, location, allowedParameters) => {
-  let href = dynamicPart;
+  let href = dynamicPart.toString();
   if (!(0, _startsWith.default)(href).call(href, `/${context}/`)) {
     href = `/${context}/${href}`;
   }
@@ -72,6 +86,12 @@ const createHref = (context, dynamicPart, location, allowedParameters) => {
     const search = (0, _startsWith.default)(_context = location.search).call(_context, "?") ? location.search.substring(1) : location.search;
     href = `${href}?${search}`;
   }
+  if (dynamicPart instanceof _Href.default) {
+    return filterParameters(new _Href.default(href, dynamicPart.resourcetype, {
+      origin: dynamicPart.origin,
+      contextPath: dynamicPart.contextPath
+    }), allowedParameters);
+  }
   return filterParameters(href, allowedParameters);
 };
 exports.createHref = createHref;

package/lib/utils/helpers/createHref.js.flow

@@ -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/lib/utils/helpers/createHref.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHref.js","names":["parseUrl","href","path","hash","querystring","_includes","default","call","hashSplit","split","qsSplit","exports","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_urlSearchParams","params","_from","_keys","param","delete","toString","createHref","context","dynamicPart","location","_startsWith","replace","search","_context","substring"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string,\n): { path: string, querystring: null | string, hash: null | string } => {\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string,\n  allowedParameters?: Array<string>,\n): string => {\n  if (!Array.isArray(allowedParameters)) {\n    return href;\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n  return filteredUrl;\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): string => {\n  let href = dynamicPart;\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  return filterParameters(href, allowedParameters);\n};\n"],"mappings":";;;;;;;;;;;;AAGA;AACA;AACO,MAAMA,QAAQ,GACnBC,IAAY,IAC0D;EACtE,IAAIC,IAAI,GAAGD,IAAI;EACf,IAAIE,IAAI,GAAG,IAAI;EACf,IAAIC,WAAW,GAAG,IAAI;EACtB,IAAI,IAAAC,SAAA,CAAAC,OAAA,EAAAL,IAAI,EAAAM,IAAA,CAAJN,IAAI,EAAU,GAAG,CAAC,EAAE;IACtB,MAAMO,SAAS,GAAGP,IAAI,CAACQ,KAAK,CAAC,GAAG,CAAC;IACjCP,IAAI,GAAGM,SAAS,CAAC,CAAC,CAAC;IACnBL,IAAI,GAAGK,SAAS,CAAC,CAAC,CAAC;EACrB;EACA,IAAI,IAAAH,SAAA,CAAAC,OAAA,EAAAL,IAAI,EAAAM,IAAA,CAAJN,IAAI,EAAU,GAAG,CAAC,EAAE;IACtB,MAAMS,OAAO,GAAGR,IAAI,CAACO,KAAK,CAAC,GAAG,CAAC;IAC/BP,IAAI,GAAGQ,OAAO,CAAC,CAAC,CAAC;IACjBN,WAAW,GAAGM,OAAO,CAAC,CAAC,CAAC;EAC1B;EACA,OAAO;IACLR,IAAI;IACJE,WAAW;IACXD;EACF,CAAC;AACH,CAAC;;AAED;AACA;AADAQ,OAAA,CAAAX,QAAA,GAAAA,QAAA;AAEO,MAAMY,gBAAgB,GAAGA,CAC9BX,IAAY,EACZY,iBAAiC,KACtB;EACX,IAAI,CAACC,KAAK,CAACC,OAAO,CAACF,iBAAiB,CAAC,EAAE;IACrC,OAAOZ,IAAI;EACb;EAEA,MAAMe,GAAG,GAAGhB,QAAQ,CAACC,IAAI,CAAC;EAC1B,IAAIgB,WAAW,GAAGD,GAAG,CAACd,IAAI;EAC1B,IAAIc,GAAG,CAACZ,WAAW,EAAE;IACnB,MAAMc,YAAY,GAAG,IAAAC,gBAAA,CAAAb,OAAA,CAAoBU,GAAG,CAACZ,WAAW,CAAC;IACzD,MAAMgB,MAAM,GAAG,IAAAC,KAAA,CAAAf,OAAA,EAAW,IAAAgB,KAAA,CAAAhB,OAAA,EAAAY,YAAY,EAAAX,IAAA,CAAZW,YAAkB,CAAC,CAAC;IAC9C,KAAK,MAAMK,KAAK,IAAIH,MAAM,EAAE;MAC1B,IAAI,CAAC,IAAAf,SAAA,CAAAC,OAAA,EAAAO,iBAAiB,EAAAN,IAAA,CAAjBM,iBAAiB,EAAUU,KAAK,CAAC,EAAE;QACtCL,YAAY,CAACM,MAAM,CAACD,KAAK,CAAC;MAC5B;IACF;IACAN,WAAW,GAAGA,WAAW,GAAG,GAAG,GAAGC,YAAY,CAACO,QAAQ,CAAC,CAAC;EAC3D;EACA,IAAIT,GAAG,CAACb,IAAI,EAAE;IACZc,WAAW,GAAGA,WAAW,GAAG,GAAG,GAAGD,GAAG,CAACb,IAAI;EAC5C;EACA,OAAOc,WAAW;AACpB,CAAC;;AAED;AACA;AADAN,OAAA,CAAAC,gBAAA,GAAAA,gBAAA;AAEO,MAAMc,UAAU,GAAGA,CACxBC,OAAe,EACfC,WAAmB,EACnBC,QAAoB,EACpBhB,iBAAiC,KACtB;EACX,IAAIZ,IAAI,GAAG2B,WAAW;EACtB,IAAI,CAAC,IAAAE,WAAA,CAAAxB,OAAA,EAAAL,IAAI,EAAAM,IAAA,CAAJN,IAAI,EAAY,IAAI0B,OAAO,GAAG,CAAC,EAAE;IACpC1B,IAAI,GAAG,IAAI0B,OAAO,IAAI1B,IAAI,EAAE;EAC9B;EAEAA,IAAI,GAAGA,IAAI,CAAC8B,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;EAEjC,IAAIF,QAAQ,EAAEG,MAAM,IAAI,CAAC,IAAA3B,SAAA,CAAAC,OAAA,EAAAL,IAAI,EAAAM,IAAA,CAAJN,IAAI,EAAU,GAAG,CAAC,EAAE;IAAA,IAAAgC,QAAA;IAC3C,MAAMD,MAAM,GAAG,IAAAF,WAAA,CAAAxB,OAAA,EAAA2B,QAAA,GAAAJ,QAAQ,CAACG,MAAM,EAAAzB,IAAA,CAAA0B,QAAA,EAAY,GAAG,CAAC,GAC1CJ,QAAQ,CAACG,MAAM,CAACE,SAAS,CAAC,CAAC,CAAC,GAC5BL,QAAQ,CAACG,MAAM;IACnB/B,IAAI,GAAG,GAAGA,IAAI,IAAI+B,MAAM,EAAE;EAC5B;EAEA,OAAOpB,gBAAgB,CAACX,IAAI,EAAEY,iBAAiB,CAAC;AAClD,CAAC;AAACF,OAAA,CAAAe,UAAA,GAAAA,UAAA","ignoreList":[]}
+{"version":3,"file":"createHref.js","names":["_Href","_interopRequireDefault","require","parseUrl","href","Href","path","querystring","hash","_includes","default","call","hashSplit","split","qsSplit","exports","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_urlSearchParams","params","_from","_keys","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","location","_startsWith","replace","search","_context","substring"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  if (dynamicPart instanceof Href) {\n    return filterParameters(\n      new Href(href, dynamicPart.resourcetype, {\n        origin: dynamicPart.origin,\n        contextPath: dynamicPart.contextPath,\n      }),\n      allowedParameters,\n    );\n  }\n\n  return filterParameters(href, allowedParameters);\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/utils/helpers/repositoryResource.js

@@ -12,7 +12,7 @@ var _constants = require("../../constants");
  * Only possible when serving using the UI Servlet of Be Informed
  */
 const getRepositoryResourceUrl = function (resourceUrl) {
-  let contextPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (0, _constants.getBasePath)();
+  let contextPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (0, _constants.getBasePathServer)();
   let origin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
   if ((0, _startsWith.default)(resourceUrl).call(resourceUrl, origin + contextPath)) {
     return resourceUrl;

package/lib/utils/helpers/repositoryResource.js.flow

@@ -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)) {

package/lib/utils/helpers/repositoryResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"repositoryResource.js","names":["_constants","require","getRepositoryResourceUrl","resourceUrl","contextPath","arguments","length","undefined","getBasePath","origin","_startsWith","default","call","RESOURCE_PATH","exports"],"sources":["../../../src/utils/helpers/repositoryResource.js"],"sourcesContent":["// @flow\nimport { getBasePath, RESOURCE_PATH } from \"../../constants\";\n\n/**\n * Creates an url to a resource in the Be Informed repository\n * Only possible when serving using the UI Servlet of Be Informed\n */\nexport const getRepositoryResourceUrl = (\n  resourceUrl: string,\n  contextPath: string = getBasePath(),\n  origin: string = \"\",\n): string => {\n  if (resourceUrl.startsWith(origin + contextPath)) {\n    return resourceUrl;\n  }\n\n  if (resourceUrl.startsWith(RESOURCE_PATH)) {\n    return `${origin}${contextPath}${resourceUrl}`;\n  }\n\n  return `${origin}${contextPath}${RESOURCE_PATH}${resourceUrl}`;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACO,MAAMC,wBAAwB,GAAG,SAAAA,CACtCC,WAAmB,EAGR;EAAA,IAFXC,WAAmB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAAG,sBAAW,EAAC,CAAC;EAAA,IACnCC,MAAc,GAAAJ,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEnB,IAAI,IAAAK,WAAA,CAAAC,OAAA,EAAAR,WAAW,EAAAS,IAAA,CAAXT,WAAW,EAAYM,MAAM,GAAGL,WAAW,CAAC,EAAE;IAChD,OAAOD,WAAW;EACpB;EAEA,IAAI,IAAAO,WAAA,CAAAC,OAAA,EAAAR,WAAW,EAAAS,IAAA,CAAXT,WAAW,EAAYU,wBAAa,CAAC,EAAE;IACzC,OAAO,GAAGJ,MAAM,GAAGL,WAAW,GAAGD,WAAW,EAAE;EAChD;EAEA,OAAO,GAAGM,MAAM,GAAGL,WAAW,GAAGS,wBAAa,GAAGV,WAAW,EAAE;AAChE,CAAC;AAACW,OAAA,CAAAZ,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"file":"repositoryResource.js","names":["_constants","require","getRepositoryResourceUrl","resourceUrl","contextPath","arguments","length","undefined","getBasePathServer","origin","_startsWith","default","call","RESOURCE_PATH","exports"],"sources":["../../../src/utils/helpers/repositoryResource.js"],"sourcesContent":["// @flow\nimport { getBasePathServer, RESOURCE_PATH } from \"../../constants\";\n\n/**\n * Creates an url to a resource in the Be Informed repository\n * Only possible when serving using the UI Servlet of Be Informed\n */\nexport const getRepositoryResourceUrl = (\n  resourceUrl: string,\n  contextPath: string = getBasePathServer(),\n  origin: string = \"\",\n): string => {\n  if (resourceUrl.startsWith(origin + contextPath)) {\n    return resourceUrl;\n  }\n\n  if (resourceUrl.startsWith(RESOURCE_PATH)) {\n    return `${origin}${contextPath}${resourceUrl}`;\n  }\n\n  return `${origin}${contextPath}${RESOURCE_PATH}${resourceUrl}`;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACO,MAAMC,wBAAwB,GAAG,SAAAA,CACtCC,WAAmB,EAGR;EAAA,IAFXC,WAAmB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAAG,4BAAiB,EAAC,CAAC;EAAA,IACzCC,MAAc,GAAAJ,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEnB,IAAI,IAAAK,WAAA,CAAAC,OAAA,EAAAR,WAAW,EAAAS,IAAA,CAAXT,WAAW,EAAYM,MAAM,GAAGL,WAAW,CAAC,EAAE;IAChD,OAAOD,WAAW;EACpB;EAEA,IAAI,IAAAO,WAAA,CAAAC,OAAA,EAAAR,WAAW,EAAAS,IAAA,CAAXT,WAAW,EAAYU,wBAAa,CAAC,EAAE;IACzC,OAAO,GAAGJ,MAAM,GAAGL,WAAW,GAAGD,WAAW,EAAE;EAChD;EAEA,OAAO,GAAGM,MAAM,GAAGL,WAAW,GAAGS,wBAAa,GAAGV,WAAW,EAAE;AAChE,CAAC;AAACW,OAAA,CAAAZ,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.57.2",
+  "version": "1.57.4",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -82,7 +82,7 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.25.9",
+    "@babel/runtime-corejs3": "^7.26.0",
     "big.js": "^6.2.2",
     "date-fns": "^4.1.0",
     "deepmerge": "^4.3.1",
@@ -99,13 +99,13 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.25.9",
-    "@babel/core": "^7.25.9",
+    "@babel/core": "^7.26.0",
     "@babel/eslint-parser": "^7.25.9",
     "@babel/eslint-plugin": "^7.25.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.25.9",
-    "@babel/preset-env": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
     "@babel/preset-flow": "^7.25.9",
     "@babel/preset-react": "^7.25.9",
     "@commitlint/cli": "^19.5.0",

package/src/constants/Settings.js

@@ -161,19 +161,29 @@ export const cacheContributions = (): boolean =>
   getSetting("CACHE_CONTRIBUTIONS", true);
 
 /**
- * Base path
- * This uses contextPath set from property from server
- * When requesting a remote server with CORS enabled, add the origin, for example:
- * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';
+ * The context path is retrieved on the server using the context path property as set in the runtime properties
+ * This can be manually override by setting the UI setting 'CONTEXT_PATH'
  */
 export const getBasePath = (): string =>
   getSetting("CONTEXT_PATH", "/BeInformed");
 
+/**
+ * The context path to modular ui rest services
+ */
+export const getBasePathModularUI = (): string =>
+  getSetting("CONTEXT_PATH_SERVER", getBasePath());
+
+/**
+ * Used to link the css and js files in the server templates
+ */
+export const getBasePathServer = (): string =>
+  getSetting("CONTEXT_PATH_SERVER", getBasePath());
+
 /**
  * Path to upload service
  */
 export const getUploadPath = (
-  contextPath: string = getBasePath(),
+  contextPath: string = getBasePathModularUI(),
   origin: string = "",
 ): string => `${origin}${contextPath}${UPLOAD_PATH}`;
 
@@ -181,7 +191,7 @@ export const getUploadPath = (
  * Path to captcha service
  */
 export const getCaptchaPath = (
-  contextPath: string = getBasePath(),
+  contextPath: string = getBasePathModularUI(),
   origin: string = "",
 ): string => `${origin}${contextPath}${CAPTCHA_PATH}`;
 

package/src/hooks/useAuthentication.js

@@ -7,7 +7,7 @@ import { login, logout, resetAuthErrors } from "../redux/actions";
 import Cache from "../utils/browser/Cache";
 import {
   DEFAULT_AUTHENTICATION_TYPE,
-  getBasePath,
+  getBasePathServer,
   logoutPath,
 } from "../constants";
 
@@ -62,7 +62,7 @@ export const useLogin = (): LoginHook => {
       if (!isAuthenticated) {
         Cache.setItem("isRedirectLogin", true);
         window.location.assign(
-          `${getBasePath()}${authenticationType.redirectUri ?? ""}`,
+          `${getBasePathServer()}${authenticationType.redirectUri ?? ""}`,
         );
       }
     },
@@ -76,7 +76,7 @@ export const useLogout = (): LogoutHook => {
   const application = useSelector(getApplication);
 
   const LOGOUT_PATH = logoutPath();
-  const BASE_PATH = getBasePath();
+  const BASE_PATH = getBasePathServer();
 
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {

package/src/hooks/useModelCatalog.js

@@ -14,6 +14,7 @@ import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
 
+import type Href from "../models/href/Href";
 import type { UseModularUIBasicOptions } from "./useModularUIBasic";
 export type SearchFilter = {
   index?: string,
@@ -37,7 +38,7 @@ export const useModelCatalog = (
 /**
  */
 export const useConceptIndex = (
-  href: string,
+  href: string | Href,
   key?: string = "conceptindex",
   options?: UseModularUIBasicOptions<ConceptIndexModel>,
 ): ?ConceptIndexModel => {
@@ -58,7 +59,7 @@ export const useConceptIndex = (
 /**
  */
 export const useConceptDetail = (
-  concept: string,
+  concept: string | Href,
   key?: string = "conceptdetail",
   options?: UseModularUIBasicOptions<
     ConceptDetailModel | BusinessScenarioModel,
@@ -76,7 +77,7 @@ export const useConceptDetail = (
 /**
  */
 export const useContentIndex = (
-  href: string,
+  href: string | Href,
   key?: string = "contentindex",
   options?: UseModularUIBasicOptions<ContentIndexModel>,
 ): ?ContentIndexModel => {
@@ -91,7 +92,7 @@ export const useContentIndex = (
 /**
  */
 export const useContentTOC = (
-  content: string,
+  content: string | Href,
   key?: string = "contenttoc",
   options?: UseModularUIBasicOptions<ContentTOCModel>,
 ): ?ContentTOCModel => {
@@ -107,7 +108,7 @@ export const useContentTOC = (
 /**
  */
 export const useContent = (
-  contentSection: string,
+  contentSection: string | Href,
   key?: string = "content",
   options?: UseModularUIBasicOptions<ContentModel>,
 ): ?ContentModel => {
@@ -122,7 +123,7 @@ export const useContent = (
 /**
  */
 export const useContentType = (
-  contentType: string,
+  contentType: string | Href,
   key?: string = "contenttypes",
   options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {

package/src/hooks/useModularUIBasic.js

@@ -85,7 +85,7 @@ export const useModularUIBasic = <T: ModularUIModel>(
     [options, memoizedHref, location],
   );
 
-  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);
+  const modularUI = useModularUI(key, href, useModularUIOptions);
   const expectedModels = useMemo(
     () => options.expectedModels ?? [],
     [options.expectedModels],