@beinformed/ui 1.57.2 → 1.57.4

package/src/models/href/Href.js

@@ -1,10 +1,14 @@
 // @flow
-import { getBasePath, HTTP_METHODS, CONTENT_PATH } from "../../constants";
+import {
+  getBasePathModularUI,
+  HTTP_METHODS,
+  CONTENT_PATH,
+} from "../../constants";
 
 import Parameter from "../parameter/Parameter";
-import { IllegalArgumentException } from "../../exceptions";
 
 import type { LocationShape } from "react-router";
+import type { ModelOptions } from "../types";
 
 type HrefObject = {
   _path: string,
@@ -30,7 +34,7 @@ class Href {
   _state: any = null;
   _referenceHash: ?number;
   _origin: string = "";
-  _contextPath: string = getBasePath();
+  _contextPath: string = getBasePathModularUI();
 
   /**
    * Create a Href
@@ -38,8 +42,7 @@ class Href {
   constructor(
     href?: HrefInput,
     resourcetype?: string,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ?ModelOptions,
   ) {
     this.resourcetype = resourcetype ?? "";
 
@@ -51,12 +54,12 @@ class Href {
       this.setFromLocationOrObject(href);
     }
 
-    if (typeof origin === "string") {
-      this.origin = origin;
+    if (typeof modelOptions?.origin === "string") {
+      this.origin = modelOptions.origin;
     }
 
-    if (typeof contextPath === "string") {
-      this.contextPath = contextPath;
+    if (typeof modelOptions?.contextPath === "string") {
+      this.contextPath = modelOptions.contextPath;
     }
   }
 
@@ -478,7 +481,7 @@ class Href {
   /**
    * Checks if the given Href equals this Href
    */
-  equals(href: Href | string): boolean {
+  equals(href: Href | string | null): boolean {
     if (href instanceof Href) {
       return this.path === href.path;
     }
@@ -488,35 +491,39 @@ class Href {
 
   /**
    */
-  equalsWithParameters(href: Href): boolean {
-    if (!this.equals(href)) {
+  equalsWithParameters(other: Href | string | null): boolean {
+    if (other == null) {
       return false;
     }
 
-    if (href instanceof Href) {
-      if (this.parameters.length !== href.parameters.length) {
-        return false;
-      }
+    const href = other instanceof Href ? other : new Href(other);
 
-      if (this.parameters.length === 0 && href.parameters.length === 0) {
-        return true;
-      }
+    if (!this.equals(href)) {
+      return false;
+    }
 
-      const thisParams = this.parameters.map((param) => param.toString());
+    if (this.parameters.length !== href.parameters.length) {
+      return false;
+    }
 
-      return href.parameters.every((param) =>
-        thisParams.includes(param.toString()),
-      );
+    if (this.parameters.length === 0 && href.parameters.length === 0) {
+      return true;
     }
 
-    throw new IllegalArgumentException(`${href} is not an instance of Href`);
+    const thisParams = this.parameters.map((param) => param.toString());
+
+    return href.parameters.every((param) =>
+      thisParams.includes(param.toString()),
+    );
   }
 
   /**
    * Indicates if the link is a content link
    */
   get isContent(): boolean {
-    return this.absolutepath.startsWith(`${getBasePath()}${CONTENT_PATH}`);
+    return this.absolutepath.startsWith(
+      `${getBasePathModularUI()}${CONTENT_PATH}`,
+    );
   }
 
   /**
@@ -546,6 +553,7 @@ class Href {
       search: this.querystring.length > 0 ? `?${this.querystring}` : "",
       hash: this.hash.length > 0 ? `#${this.hash}` : "",
       state: {
+        origin: this.origin,
         contextPath: this.contextPath,
         ...this.state,
       },

package/src/models/href/__tests__/Href.spec.js

@@ -1,4 +1,4 @@
-import { getBasePath } from "../../../constants";
+import { getBasePathModularUI } from "../../../constants";
 import Href from "../Href";
 
 describe("href spec", () => {
@@ -90,13 +90,18 @@ describe("href spec", () => {
     const samePathHref = new Href("/url?param1=value2");
     const otherHref = new Href("/path?param1=value1");
 
-    expect(baseHref.equals(sameHref)).toBeTruthy();
-    expect(baseHref.equals(samePathHref)).toBeTruthy();
-    expect(baseHref.equals(otherHref)).toBeFalsy();
+    expect(baseHref.equals(sameHref)).toBe(true);
+    expect(baseHref.equals(samePathHref)).toBe(true);
+    expect(baseHref.equals(otherHref)).toBe(false);
 
-    expect(baseHref.equalsWithParameters(sameHref)).toBeTruthy();
-    expect(baseHref.equalsWithParameters(samePathHref)).toBeFalsy();
-    expect(baseHref.equalsWithParameters(otherHref)).toBeFalsy();
+    expect(baseHref.equalsWithParameters(sameHref)).toBe(true);
+    expect(baseHref.equalsWithParameters(samePathHref)).toBe(false);
+    expect(baseHref.equalsWithParameters(otherHref)).toBe(false);
+
+    expect(baseHref.equalsWithParameters("/url?param1=value1")).toBe(true);
+    expect(baseHref.equalsWithParameters(null)).toBe(false);
+    expect(baseHref.equalsWithParameters("/url?param1=value2")).toBe(false);
+    expect(baseHref.equalsWithParameters("/path?param1=value1")).toBe(false);
   });
 
   it("can make distinction between relative and absolute urls", () => {
@@ -142,7 +147,7 @@ describe("href spec", () => {
   });
 
   it("a tab can have the same uri as the contextPath", () => {
-    expect(getBasePath()).toBe("/BeInformed");
+    expect(getBasePathModularUI()).toBe("/BeInformed");
 
     const tabHref = new Href("/BeInformed");
 
@@ -152,6 +157,7 @@ describe("href spec", () => {
       pathname: "/BeInformed",
       search: "",
       state: {
+        origin: "",
         contextPath: "/BeInformed",
       },
     });
@@ -163,9 +169,7 @@ describe("href spec", () => {
       hash: "",
       pathname: "/BeInformed/list",
       search: "",
-      state: {
-        contextPath: "/BeInformed",
-      },
+      state: { origin: "", contextPath: "/BeInformed" },
     });
 
     const listHrefFromHref = new Href(listHref);
@@ -174,9 +178,7 @@ describe("href spec", () => {
       hash: "",
       pathname: "/BeInformed/list",
       search: "",
-      state: {
-        contextPath: "/BeInformed",
-      },
+      state: { origin: "", contextPath: "/BeInformed" },
     });
   });
 });

package/src/models/links/LinkCollection.js

@@ -4,6 +4,7 @@ import normalizeLinkJSON from "./normalizeLinkJSON";
 import LinkModel from "./LinkModel";
 
 import type Href from "../href/Href";
+import type { ModelOptions } from "../types";
 
 /**
  * Collection of links
@@ -17,15 +18,14 @@ export default class LinkCollection extends BaseCollection<LinkModel> {
   constructor(
     linkData: Object = {},
     linkContributions: Object = {},
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
     super();
 
     // There can be links in data and/or contributions (e.g. concept link is available through contributions)
     this.collection = normalizeLinkJSON(linkData, linkContributions).map(
       ({ data, contributions }) =>
-        new LinkModel(data, contributions, origin, contextPath),
+        new LinkModel(data, contributions, modelOptions),
     );
   }
 

package/src/models/links/LinkModel.js

@@ -7,7 +7,7 @@ import Href from "../href/Href";
 import LinkCollection from "../links/LinkCollection";
 import { INITIAL_FILTER } from "../../constants/LayoutHints";
 
-import type { ModularUIModel } from "../types";
+import type { ModelOptions, ModularUIModel } from "../types";
 import Parameter from "../parameter/Parameter";
 
 /**
@@ -30,12 +30,11 @@ class LinkModel extends BaseModel {
   constructor(
     data: Object,
     contributions: Object,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
-    super(data, contributions);
+    super(data, contributions, modelOptions);
 
-    this.createHref(origin, contextPath);
+    this.createHref(modelOptions);
 
     this._isCacheable = false;
   }
@@ -47,23 +46,17 @@ class LinkModel extends BaseModel {
     name: string,
     href: string | Href,
     label: string,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ): LinkModel {
     const data = { name, href };
     const contributions = { label };
-    return new LinkModel(data, contributions, origin, contextPath);
+    return new LinkModel(data, contributions, modelOptions);
   }
 
   /**
    */
-  createHref(origin?: string, contextPath?: string) {
-    const href = new Href(
-      this.data.href,
-      this.resourcetype,
-      origin,
-      contextPath,
-    );
+  createHref(modelOptions: ?ModelOptions) {
+    const href = new Href(this.data.href, this.resourcetype, modelOptions);
     this.handleInitialFilters(href);
 
     this.href = href;

package/src/models/list/ListDetailModel.js

@@ -278,7 +278,12 @@ export default class ListDetailModel extends DetailModel {
    */
   addAttributes(key: string, eventData: Object, eventContributions: Object) {
     this._eventdata.push(
-      new AttributeSetModel(key, eventData, eventContributions),
+      new AttributeSetModel(
+        key,
+        eventData,
+        eventContributions,
+        this.modelOptions,
+      ),
     );
   }
 

package/src/models/list/ListItemCollection.js

@@ -36,8 +36,7 @@ class ListItemCollection extends BaseCollection<ListItemModel> {
           key,
           listitemData,
           listitemContributions,
-          list.origin,
-          list.contextPath,
+          list.modelOptions,
         );
       });
 

package/src/models/list/ListItemModel.js

@@ -9,6 +9,7 @@ import { CASEVIEW_LINK } from "../../constants/LayoutHints";
 import type ChoiceAttributeOptionModel from "../attributes/ChoiceAttributeOptionModel";
 import type ActionCollection from "../actions/ActionCollection";
 import type LinkCollection from "../links/LinkCollection";
+import type { ModelOptions } from "../types";
 
 /**
  * List Item
@@ -20,15 +21,14 @@ export default class ListItemModel extends DetailModel {
     key: string,
     data: Object,
     contributions: Object,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ): ListItemModel {
     const listitemInput = new ModularUIResponse();
     listitemInput.key = key;
     listitemInput.data = data;
     listitemInput.contributions = contributions;
-    listitemInput.origin = origin;
-    listitemInput.contextPath = contextPath;
+    listitemInput.origin = modelOptions?.origin;
+    listitemInput.contextPath = modelOptions?.contextPath;
 
     return new ListItemModel(listitemInput);
   }

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();
   }
 
   /**