@beinformed/ui 1.57.2 → 1.57.3

package/src/models/list/ListModel.js

@@ -180,6 +180,7 @@ export default class ListModel extends ResourceModel {
     return new GroupingModel(
       { ...this.data.grouping, dynamicschema: this.data.dynamicschema },
       this.contributions.contexts,
+      this.modelOptions,
     );
   }
 
@@ -285,12 +286,16 @@ export default class ListModel extends ResourceModel {
   /**
    */
   setFilters(): FilterCollection {
-    return new FilterCollection(this.data.filter, {
-      listkey: this.key,
-      filter: this.contributions.filter,
-      contexts: this.contributions.contexts,
-      dynamicschema: this.data.dynamicschema,
-    });
+    return new FilterCollection(
+      this.data.filter,
+      {
+        listkey: this.key,
+        filter: this.contributions.filter,
+        contexts: this.contributions.contexts,
+        dynamicschema: this.data.dynamicschema,
+      },
+      this.modelOptions,
+    );
   }
 
   /**
@@ -316,8 +321,7 @@ export default class ListModel extends ResourceModel {
     return new ActionCollection(
       this.data.actions,
       this.contributions.actions,
-      this.origin,
-      this.contextPath,
+      this.modelOptions,
     );
   }
 

package/src/models/lookup/LookupOptionCollection.js

@@ -1,23 +1,34 @@
 // @flow
 import ResourceCollection from "../base/ResourceCollection";
 import ChoiceAttributeOptionModel from "../attributes/ChoiceAttributeOptionModel";
+import { DateUtil } from "../../utils";
+
+import type { ModelOptions } from "../types";
 
 /**
  */
 class LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel> {
   /**
    */
-  static create(data: Object, contributions: Object): LookupOptionCollection {
+  static create(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ): LookupOptionCollection {
     const collection = new LookupOptionCollection();
 
     if (data.options && contributions.options) {
       data.options.forEach((option) => {
         collection.add(
-          new ChoiceAttributeOptionModel([], {
-            ...option,
-            optionType: this.getOptionType(option, contributions),
-            elementsContributions: contributions.options[0].elements,
-          }),
+          new ChoiceAttributeOptionModel(
+            [],
+            {
+              ...option,
+              optionType: this.getOptionType(option, contributions),
+              elementsContributions: contributions.options[0].elements,
+            },
+            { ...modelOptions, referenceDate: DateUtil.now() },
+          ),
         );
       });
     }

package/src/models/lookup/LookupOptionsModel.js

@@ -19,6 +19,7 @@ export default class LookupOptionsModel extends ResourceModel {
     this._options = LookupOptionCollection.create(
       this.data,
       this.contributions,
+      this.modelOptions,
     );
 
     this._filterCollection = this.createFilterCollection(
@@ -64,6 +65,7 @@ export default class LookupOptionsModel extends ResourceModel {
       return new FilterCollection(
         { [data.name]: data },
         { filter: contributions },
+        this.modelOptions,
       );
     }
 

package/src/models/panels/GroupingPanelModel.js

@@ -129,8 +129,7 @@ export default class GroupingPanelModel extends ResourceModel {
           taskgroup.name,
           taskgroup,
           taskgroupContributions,
-          this.origin,
-          this.contextPath,
+          this.modelOptions,
         );
       });
   }

package/src/models/tab/TabModel.js

@@ -26,8 +26,7 @@ export default class TabModel extends ResourceModel {
     this._actionCollection = new ActionCollection(
       this.data.actions,
       this.contributions.actions,
-      this.origin,
-      this.contextPath,
+      this.modelOptions,
     );
   }
 
@@ -95,8 +94,7 @@ export default class TabModel extends ResourceModel {
                 taskgroup.name,
                 taskgroup,
                 taskgroupContributions,
-                this.origin,
-                this.contextPath,
+                this.modelOptions,
               );
             }
 

package/src/models/taskgroup/TaskGroupModel.js

@@ -3,6 +3,7 @@ import ActionCollection from "../actions/ActionCollection";
 import ResourceModel from "../base/ResourceModel";
 
 import ModularUIResponse from "../../modularui/ModularUIResponse";
+import type { ModelOptions } from "../types";
 
 /**
  * TaskGroupModel
@@ -19,8 +20,7 @@ export default class TaskGroupModel extends ResourceModel {
     this._actionCollection = new ActionCollection(
       this.data.actions,
       this.contributions.actions,
-      this.origin,
-      this.contextPath,
+      this.modelOptions,
     );
 
     const selfHref = this.links.getLinkByKey("self")
@@ -38,15 +38,14 @@ export default class TaskGroupModel extends ResourceModel {
     key: string,
     data: Object,
     contributions: Object,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ): TaskGroupModel {
     const taskgroup = new ModularUIResponse();
     taskgroup.key = key;
     taskgroup.data = data;
     taskgroup.contributions = contributions;
-    taskgroup.origin = origin;
-    taskgroup.contextPath = contextPath;
+    taskgroup.origin = modelOptions?.origin;
+    taskgroup.contextPath = modelOptions?.contextPath;
 
     return new TaskGroupModel(taskgroup);
   }

package/src/models/types.js

@@ -261,3 +261,8 @@ export type ContentData = {
   label?: string,
   elements: Array<PropertyElement | TextFragmentElement | ContentElement>,
 };
+
+export type ModelOptions = {
+  origin?: ?string,
+  contextPath?: ?string,
+};

package/src/models/user/UserProfileModel.js

@@ -29,6 +29,7 @@ export default class UserProfileModel extends UserModel {
     this._attributeCollection = new AttributeCollection(
       this.data,
       attributeContributions,
+      { ...this.modelOptions, isReadonly: true },
     );
   }
 

package/src/modularui/CaptchaRequest.js

@@ -1,6 +1,10 @@
 // @flow
 import xhr from "../utils/fetch/xhr";
-import { getBasePath, getCaptchaPath, HTTP_METHODS } from "../constants";
+import {
+  getBasePathModularUI,
+  getCaptchaPath,
+  HTTP_METHODS,
+} from "../constants";
 
 type CaptchaInitialResponse = {
   tokenId: string,
@@ -36,13 +40,13 @@ class CaptchaRequest {
   _tokenId: string;
   _image: string;
   _origin: string = "";
-  _contextPath: string = getBasePath();
+  _contextPath: string = getBasePathModularUI();
 
   /**
    */
   CaptchaRequest(options?: CaptchaRequestOptions) {
     this._origin = options?.origin || "";
-    this._contextPath = options?.contextPath || getBasePath();
+    this._contextPath = options?.contextPath || getBasePathModularUI();
   }
 
   /**

package/src/modularui/ModularUIRequest.js

@@ -5,7 +5,7 @@ import { HTTP_METHODS, TIMEVERSION_FILTER_NAME } from "../constants/Constants";
 
 import { HIDE_WHEN_EMPTY } from "../constants/LayoutHints";
 
-import { getBasePath, getSetting } from "../constants/Settings";
+import { getBasePathModularUI, getSetting } from "../constants/Settings";
 
 import Href from "../models/href/Href";
 
@@ -47,7 +47,7 @@ class ModularUIRequest {
   _progressEvent: ProgressEventHandler;
 
   _origin: string = "";
-  _contextPath: string = getBasePath();
+  _contextPath: string = getBasePathModularUI();
 
   /**
    */
@@ -117,8 +117,8 @@ class ModularUIRequest {
   /**
    */
   set contextPath(contextPath: ?string) {
-    this._contextPath = contextPath ?? getBasePath();
-    this._response.contextPath = contextPath ?? getBasePath();
+    this._contextPath = contextPath ?? getBasePathModularUI();
+    this._response.contextPath = contextPath ?? getBasePathModularUI();
   }
 
   /**
@@ -725,7 +725,10 @@ class ModularUIRequest {
             );
           }
           errorChildModels.push(
-            new ErrorResponse(reason, "", this.origin, this.contextPath),
+            new ErrorResponse(reason, "", {
+              origin: this.origin,
+              contextPath: this.contextPath,
+            }),
           );
         } else {
           resolvedChildModels.push(childModel.value);

package/src/modularui/ModularUIResponse.js

@@ -1,8 +1,9 @@
 // @flow
 import { has } from "../utils/helpers/objects";
-import { getBasePath } from "../constants";
+import { getBasePathModularUI } from "../constants";
 
 import type Parameter from "../models/parameter/Parameter";
+import type { ModelOptions } from "../models";
 
 /**
  */
@@ -12,7 +13,7 @@ class ModularUIResponse {
   _contributions: Object;
   _locale: string = "en";
   _parameters: Array<Parameter> = [];
-  _contextPath: string = getBasePath();
+  _contextPath: string = getBasePathModularUI();
   _origin: string = "";
 
   /**
@@ -40,6 +41,15 @@ class ModularUIResponse {
     return response;
   }
 
+  /**
+   */
+  get modelOptions(): ModelOptions {
+    return {
+      origin: this.origin,
+      contextPath: this.contextPath,
+    };
+  }
+
   /**
    */
   set origin(origin: ?string) {
@@ -55,7 +65,7 @@ class ModularUIResponse {
   /**
    */
   set contextPath(contextPath: ?string) {
-    this._contextPath = contextPath ?? getBasePath();
+    this._contextPath = contextPath ?? getBasePathModularUI();
   }
 
   /**

package/src/modularui/UploadRequest.js

@@ -1,5 +1,9 @@
 // @flow
-import { getBasePath, getUploadPath, HTTP_METHODS } from "../constants";
+import {
+  getBasePathModularUI,
+  getUploadPath,
+  HTTP_METHODS,
+} from "../constants";
 
 import xhr from "../utils/fetch/xhr";
 
@@ -31,7 +35,7 @@ class UploadRequest {
   };
   _progressHandler: ProgressHandler;
   _origin: string = "";
-  _contextPath: string = getBasePath();
+  _contextPath: string = getBasePathModularUI();
 
   constructor(
     uploadConstraints: {
@@ -45,7 +49,7 @@ class UploadRequest {
     this._uploadConstraints = uploadConstraints;
     this._progressHandler = progressHandler;
     this._origin = options?.origin || "";
-    this._contextPath = options?.contextPath || getBasePath();
+    this._contextPath = options?.contextPath || getBasePathModularUI();
   }
 
   /**

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,20 +10,23 @@ 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);
@@ -36,21 +39,17 @@ export const useUrl = (resource: string | Function, props: Object): string => {
     return url;
   }
 
-  const isDifferentUrl = url !== previousUrl;
-  if (!isDifferentUrl) {
-    return previousUrl;
+  if (url.equals(previousUrl)) {
+    return 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 +57,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)) {