@beinformed/ui 1.57.2 → 1.57.3

package/src/models/attributes/AttributeModel.js

@@ -30,6 +30,7 @@ import type {
   AttributeType,
   FormErrorAnchor,
   IModelWithChildModels,
+  ModelOptions,
   ModularUIModel,
 } from "../types";
 import type LinkModel from "../links/LinkModel";
@@ -74,8 +75,12 @@ export default class AttributeModel
 
   /**
    */
-  constructor(attribute: Object, attributeContributions: Object) {
-    super(attribute, attributeContributions);
+  constructor(
+    attribute: Object,
+    attributeContributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(attribute, attributeContributions, modelOptions);
 
     if (this.hasContentFromData && this.content.label) {
       this._label = this.content.label;
@@ -108,6 +113,7 @@ export default class AttributeModel
     this._links = new LinkCollection(
       this.data._links,
       this.contributions._links,
+      modelOptions,
     );
   }
 

package/src/models/attributes/AttributeSetModel.js

@@ -4,6 +4,8 @@ import { has } from "../../utils/helpers/objects";
 import BaseModel from "../base/BaseModel";
 import AttributeCollection from "./AttributeCollection";
 
+import type { ModelOptions } from "../types";
+
 /**
  */
 export default class AttributeSetModel extends BaseModel {
@@ -12,8 +14,13 @@ export default class AttributeSetModel extends BaseModel {
 
   /**
    */
-  constructor(key: string = "", data: Object = {}, contributions: Object = {}) {
-    super(data, contributions);
+  constructor(
+    key: string = "",
+    data: Object = {},
+    contributions: Object = {},
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
 
     const attributeContributions = this.contributions.attributes
       ? this.contributions.attributes.filter((contribution) => {
@@ -25,7 +32,7 @@ export default class AttributeSetModel extends BaseModel {
     this._attributeCollection = new AttributeCollection(
       this.data,
       attributeContributions,
-      true,
+      { ...modelOptions, isReadonly: true },
     );
 
     this._key = key;
@@ -77,6 +84,7 @@ export default class AttributeSetModel extends BaseModel {
         dynamicschema: this.data.dynamicschema,
       },
       this.contributions.objects[key],
+      this.modelOptions,
     );
   }
 

package/src/models/attributes/BooleanAttributeModel.js

@@ -10,7 +10,7 @@ import ChoiceAttributeOptionModel from "./ChoiceAttributeOptionModel";
 import { RENDER_SECTION_LABEL } from "../../constants/LayoutHints";
 import { ATTRIBUTE_WIDTH } from "../../constants";
 
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 
 /**
  * Model for a boolean attribute
@@ -22,14 +22,18 @@ export default class BooleanAttributeModel extends AttributeModel {
 
   /**
    */
-  constructor(attribute: Object, attributeContributions: Object) {
-    super(attribute, attributeContributions);
+  constructor(
+    attribute: Object,
+    attributeContributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(attribute, attributeContributions, modelOptions);
 
     this._referenceDate = this.getData("referenceDate", DateUtil.now());
     this._options = ChoiceAttributeOptionCollection.create(
       attribute,
       attributeContributions,
-      this.referenceDate,
+      { ...modelOptions, referenceDate: this.referenceDate },
     );
   }
 

package/src/models/attributes/ChoiceAttributeModel.js

@@ -16,7 +16,12 @@ import {
 } from "../../constants/LayoutHints";
 import { ATTRIBUTE_WIDTH } from "../../constants";
 
-import type { ModularUIModel, AttributeType, FormErrorAnchor } from "../types";
+import type {
+  ModularUIModel,
+  AttributeType,
+  FormErrorAnchor,
+  ModelOptions,
+} from "../types";
 import type LinkModel from "../links/LinkModel";
 import type ErrorResponse from "../error/ErrorResponse";
 
@@ -31,14 +36,18 @@ export default class ChoiceAttributeModel extends AttributeModel {
   /**
    * Constructs a choice attribute
    */
-  constructor(attribute: Object, attributeContributions: Object) {
-    super(attribute, attributeContributions);
+  constructor(
+    attribute: Object,
+    attributeContributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(attribute, attributeContributions, modelOptions);
 
     this._referenceDate = this.getData("referenceDate", DateUtil.now());
     this._options = ChoiceAttributeOptionCollection.create(
       attribute,
       attributeContributions,
-      this.referenceDate,
+      { ...modelOptions, referenceDate: this.referenceDate },
     );
 
     if (this.layouthint.has(SORT_OPTIONS)) {

package/src/models/attributes/ChoiceAttributeOptionCollection.js

@@ -3,14 +3,27 @@ import ResourceCollection from "../base/ResourceCollection";
 import ChoiceAttributeOptionModel from "./ChoiceAttributeOptionModel";
 import ListHeaderModel from "../list/ListHeaderModel";
 
-import { DateUtil } from "../../utils/datetime/DateTimeUtil";
+import { getBasePathModularUI } from "../../constants";
 
+import { DateUtil } from "../../utils";
+
+import type { ChoiceAttributeOptionModelOptions } from "./ChoiceAttributeOptionModel";
 /**
  */
 class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel> {
+  _modelOptions: ChoiceAttributeOptionModelOptions;
   _headers: Array<ListHeaderModel> = [];
   _sortOptions: boolean = false;
 
+  constructor(modelOptions?: ChoiceAttributeOptionModelOptions) {
+    super();
+    this._modelOptions = modelOptions || {
+      origin: "",
+      contextPath: getBasePathModularUI(),
+      referenceDate: DateUtil.now(),
+    };
+  }
+
   /**
    */
   set sortOptions(sortOptions: boolean) {
@@ -34,16 +47,16 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   static create(
     data: Object = {},
     contributions: Object = {},
-    referenceDate: ISO_DATE = DateUtil.now(),
+    modelOptions?: ChoiceAttributeOptionModelOptions,
   ): ChoiceAttributeOptionCollection {
-    const collection = new ChoiceAttributeOptionCollection();
+    const collection = new ChoiceAttributeOptionCollection(modelOptions);
 
     if (contributions.type === "boolean") {
       collection.addBooleanOptions(data.value, contributions);
     } else if (data.dynamicschema != null) {
-      collection.addDynamicSchema(data, contributions, referenceDate);
+      collection.addDynamicSchema(data, contributions);
     } else if (contributions.options != null) {
-      collection.addOptions(data, contributions, referenceDate);
+      collection.addOptions(data, contributions);
     }
 
     if (contributions.children != null) {
@@ -102,22 +115,17 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   addOptions(
     data: Object,
     contributions: Object,
-    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const selectedValues = this.getSelectedOptions(data);
 
     contributions.options.forEach((optionContributions) => {
       const optionCode = optionContributions.code || optionContributions.key;
 
-      this.addOption(
-        selectedValues,
-        {
-          ...optionContributions,
-          count: this.getOptionCount(optionCode, data.options),
-          optionType: contributions.optionType ?? "generic",
-        },
-        referenceDate,
-      );
+      this.addOption(selectedValues, {
+        ...optionContributions,
+        count: this.getOptionCount(optionCode, data.options),
+        optionType: contributions.optionType ?? "generic",
+      });
     });
 
     return this;
@@ -129,20 +137,15 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   addDynamicSchema(
     data: Object,
     contributions: Object,
-    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const selectedValues = this.getSelectedOptions(data);
     data.dynamicschema.forEach((optionDynamicschema) => {
-      this.addOption(
-        selectedValues,
-        {
-          ...optionDynamicschema,
-          count: this.getOptionCount(optionDynamicschema.code, data.options),
-          optionType: contributions.optionType ?? "generic",
-          elementsContributions: contributions.children,
-        },
-        referenceDate,
-      );
+      this.addOption(selectedValues, {
+        ...optionDynamicschema,
+        count: this.getOptionCount(optionDynamicschema.code, data.options),
+        optionType: contributions.optionType ?? "generic",
+        elementsContributions: contributions.children,
+      });
     });
 
     return this;
@@ -189,12 +192,11 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   addOption(
     data: string | Array<string>,
     contributions: Object,
-    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const optionModel = new ChoiceAttributeOptionModel(
       Array.isArray(data) ? data : [data],
       contributions,
-      referenceDate,
+      this._modelOptions,
     );
 
     this.add(optionModel);

package/src/models/attributes/ChoiceAttributeOptionModel.js

@@ -13,11 +13,20 @@ import AttributeCollection from "./AttributeCollection";
 import ConceptDetailModel from "../concepts/ConceptDetailModel";
 import AttributeContent from "./AttributeContent";
 
-import type { IModelWithChildModels, ModularUIModel } from "../types";
+import type {
+  IModelWithChildModels,
+  ModelOptions,
+  ModularUIModel,
+} from "../types";
 import type ListItemModel from "../list/ListItemModel";
 import type LinkModel from "../links/LinkModel";
 import type ErrorResponse from "../error/ErrorResponse";
 
+export type ChoiceAttributeOptionModelOptions = {
+  ...ModelOptions,
+  referenceDate: ISO_DATE,
+};
+
 /**
  */
 class ChoiceAttributeOptionModel
@@ -40,7 +49,7 @@ class ChoiceAttributeOptionModel
   constructor(
     selectedValues: Array<string> = [],
     option: Object = {},
-    referenceDate: ISO_DATE = DateUtil.now(),
+    modelOptions?: ChoiceAttributeOptionModelOptions,
   ) {
     super({}, option);
 
@@ -48,14 +57,18 @@ class ChoiceAttributeOptionModel
 
     this._isSelected = selectedValues.includes(this.code);
 
-    this._referenceDate = referenceDate;
+    this._referenceDate = modelOptions?.referenceDate || DateUtil.now();
 
     this._level = 0;
 
-    this._attributeCollection = this.createAttributeCollection();
-    this._children = this.addChildren(selectedValues, option, referenceDate);
+    this._attributeCollection = this.createAttributeCollection(modelOptions);
+    this._children = this.addChildren(selectedValues, option, modelOptions);
 
-    this._links = new LinkCollection(this.contributions._links);
+    this._links = new LinkCollection(
+      this.contributions._links,
+      {},
+      { origin: modelOptions?.origin, contextPath: modelOptions?.contextPath },
+    );
 
     this._content = new AttributeContent(option.content);
 
@@ -150,12 +163,18 @@ class ChoiceAttributeOptionModel
 
   /**
    */
-  createAttributeCollection(): AttributeCollection {
+  createAttributeCollection(
+    modelOptions?: ChoiceAttributeOptionModelOptions,
+  ): AttributeCollection {
     const contributions = this.getContribution("elementsContributions", []);
 
     if (has(this.contributions, "elements")) {
       const data = this.getContribution("elements", {});
-      return new AttributeCollection(data, contributions, true);
+      return new AttributeCollection(data, contributions, {
+        origin: modelOptions?.origin,
+        contextPath: modelOptions?.contextPath,
+        isReadonly: true,
+      });
     }
 
     return new AttributeCollection();
@@ -250,11 +269,11 @@ class ChoiceAttributeOptionModel
   addChildren(
     selectedValues: Array<string> = [],
     option: Object = {},
-    referenceDate: ISO_DATE = DateUtil.now(),
+    modelOptions?: ChoiceAttributeOptionModelOptions,
   ): ChoiceAttributeOptionCollection {
     // When contributions contain elements this is a list not nested options
     if (has(option, "elements")) {
-      return new ChoiceAttributeOptionCollection();
+      return new ChoiceAttributeOptionCollection(modelOptions);
     }
 
     return ChoiceAttributeOptionCollection.create(
@@ -262,7 +281,7 @@ class ChoiceAttributeOptionModel
         value: selectedValues,
       },
       { options: option?.children ?? [] },
-      referenceDate,
+      modelOptions,
     );
   }
 

package/src/models/attributes/CompositeAttributeChildCollection.js

@@ -4,7 +4,7 @@ import ErrorCollection from "../error/ErrorCollection";
 
 import createAttribute from "./_createAttribute";
 
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 
 /**
  * Collection of choice attribute options
@@ -15,6 +15,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
   static create(
     data: Object,
     contributions: Object,
+    modelOptions?: ModelOptions,
   ): CompositeAttributeChildCollection {
     if (
       data &&
@@ -29,12 +30,14 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
         return CompositeAttributeChildCollection.createMultiData(
           data,
           contributions,
+          modelOptions,
         );
       }
 
       return CompositeAttributeChildCollection.createStandard(
         data,
         contributions,
+        modelOptions,
       );
     }
 
@@ -46,6 +49,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
   static createStandard(
     data: Object,
     contributions: Object,
+    modelOptions?: ModelOptions,
   ): CompositeAttributeChildCollection {
     const compositeChildCollection = new CompositeAttributeChildCollection();
 
@@ -76,6 +80,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
             ...attributeContribution,
             readonly: attributeContribution.readonly || contributions.readonly,
           },
+          modelOptions,
         );
 
         if (attribute) {
@@ -97,6 +102,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
   static createMultiData(
     data: Object,
     contributions: Object,
+    modelOptions?: ModelOptions,
   ): CompositeAttributeChildCollection {
     const compositeChildCollection = new CompositeAttributeChildCollection();
 
@@ -107,6 +113,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
           children: childData,
         },
         contributions,
+        modelOptions,
       ),
     );
 

package/src/models/attributes/CompositeAttributeModel.js

@@ -12,7 +12,7 @@ import { IllegalArgumentException } from "../../exceptions";
 import NumberAttributeModel from "./NumberAttributeModel";
 import DatetimeAttributeModel from "./DatetimeAttributeModel";
 
-import type { ModularUIModel, AttributeType } from "../types";
+import type { ModularUIModel, AttributeType, ModelOptions } from "../types";
 import type ContentConfiguration from "../contentconfiguration/ContentConfiguration";
 import type LinkModel from "../links/LinkModel";
 import type ErrorResponse from "../error/ErrorResponse";
@@ -24,12 +24,17 @@ class CompositeAttributeModel extends AttributeModel {
 
   /**
    */
-  constructor(data: Object, contributions: Object) {
-    super(data, contributions);
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
 
     this._children = CompositeAttributeChildCollection.create(
       data,
       contributions,
+      modelOptions,
     );
 
     this.setChildrenOptionality();

package/src/models/attributes/DatetimeAttributeModel.js

@@ -22,6 +22,7 @@ import type {
   FormErrorAnchor,
   IConstraintModel,
   AttributeType,
+  ModelOptions,
 } from "../types";
 
 /**
@@ -29,8 +30,12 @@ import type {
 class DatetimeAttributeModel extends StringAttributeModel {
   /**
    */
-  constructor(attribute: Object, attributeContributions: Object) {
-    super(attribute, attributeContributions);
+  constructor(
+    attribute: Object,
+    attributeContributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(attribute, attributeContributions, modelOptions);
 
     this.updateInitValue();
   }

package/src/models/attributes/StringAttributeModel.js

@@ -7,7 +7,7 @@ import IBANConstraint from "./input-constraints/IBANConstraint";
 
 import { ATTRIBUTE_WIDTH } from "../../constants";
 
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 
 /**
  * String attribute
@@ -17,8 +17,12 @@ export default class StringAttributeModel extends AttributeModel {
 
   /**
    */
-  constructor(attribute: Object, attributeContributions: Object) {
-    super(attribute, attributeContributions);
+  constructor(
+    attribute: Object,
+    attributeContributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(attribute, attributeContributions, modelOptions);
 
     this._placeholder = this.getContribution("placeholder", "");
   }

package/src/models/attributes/__tests__/ChoiceAttributeOptionModel.spec.js

@@ -50,7 +50,7 @@ describe("choiceAttributeOptionModel", () => {
           },
         ],
       },
-      "2016-01-01",
+      { referenceDate: "2016-01-01" },
     );
 
     expect(option.getInitialChildModelLinks()).toHaveLength(0);

package/src/models/attributes/_createAttribute.js

@@ -22,7 +22,7 @@ import BooleanAttributeModel from "./BooleanAttributeModel";
 
 import AttributeDataHelper from "./AttributeDataHelper";
 
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 
 /**
  * @private
@@ -121,6 +121,7 @@ const createAttribute = (
   key: string,
   data: Object | Array<Object>,
   contributions: Object,
+  modelOptions?: ModelOptions,
 ): AttributeType => {
   const updatedContributions = updateContributions(key, data, contributions);
   const updatedData = updateData(key, data, contributions);
@@ -138,7 +139,7 @@ const createAttribute = (
     childrenKeys,
   ).getData();
 
-  const attribute = new Model(dataHelper, updatedContributions);
+  const attribute = new Model(dataHelper, updatedContributions, modelOptions);
 
   return LayoutHintRuleCollection.setLayoutHintRules(attribute);
 };

package/src/models/base/BaseModel.js

@@ -2,6 +2,8 @@
 import { klona } from "klona/full";
 
 import LayoutHintCollection from "../layouthint/LayoutHintCollection";
+import type { ModelOptions } from "../types";
+import { getBasePathModularUI } from "../../constants";
 
 export type BaseDehydrateData = {
   +data: Object,
@@ -21,16 +23,25 @@ class BaseModel {
   _contributions: Object;
   _layouthint: LayoutHintCollection;
   _connectKey: string;
+  _modelOptions: ModelOptions;
 
   /**
    * constructor
    */
-  constructor(data: Object, contributions: Object) {
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions: ModelOptions = {
+      origin: "",
+      contextPath: getBasePathModularUI(),
+    },
+  ) {
     this._data = data;
     this._contributions = contributions;
     this._layouthint = new LayoutHintCollection(
       this.getContribution("layouthint", []),
     );
+    this._modelOptions = modelOptions;
   }
 
   /**
@@ -61,6 +72,24 @@ class BaseModel {
     return this.contributions[propName] ?? defaultValue;
   }
 
+  /**
+   */
+  get modelOptions(): ModelOptions {
+    return this._modelOptions;
+  }
+
+  /**
+   */
+  get origin(): string {
+    return this.modelOptions.origin || "";
+  }
+
+  /**
+   */
+  get contextPath(): string {
+    return this.modelOptions.contextPath || getBasePathModularUI();
+  }
+
   /**
    * Getting the layouthint
    */
@@ -104,6 +133,7 @@ class BaseModel {
       data: this._data,
       contributions: this._contributions,
       connectKey: this._connectKey,
+      options: this._modelOptions,
     };
   }
 

package/src/models/base/ResourceModel.js

@@ -13,7 +13,6 @@ import type LinkModel from "../links/LinkModel";
 import type Href from "../href/Href";
 import type { ModularUIModel, IModelWithChildModels } from "../types";
 import type ErrorResponse from "../error/ErrorResponse";
-import { getBasePath } from "../../constants";
 
 /**
  * Base model, this the foundation for models that represent modular ui services, e.g. application, tab, caseview, etc
@@ -24,23 +23,22 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
   _childModels: Array<ModularUIModel>;
   _links: LinkCollection;
   _lastServerUpdate: number;
-  _origin: string = "";
-  _contextPath: string = getBasePath();
 
   /**
    * constructor
    */
   constructor(modularuiResponse: ModularUIResponse = new ModularUIResponse()) {
-    super(modularuiResponse.data, modularuiResponse.contributions);
+    super(
+      modularuiResponse.data,
+      modularuiResponse.contributions,
+      modularuiResponse.modelOptions,
+    );
 
     this._key = modularuiResponse.key;
     this._locale = modularuiResponse.locale;
     this._childModels = [];
 
     this._lastServerUpdate = Date.now();
-
-    this._origin = modularuiResponse.origin;
-    this._contextPath = modularuiResponse.contextPath;
   }
 
   /**
@@ -114,18 +112,6 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
     return this.getContribution("label", "");
   }
 
-  /**
-   */
-  get origin(): string {
-    return this._origin;
-  }
-
-  /**
-   */
-  get contextPath(): string {
-    return this._contextPath;
-  }
-
   /**
    * Getting the links of the resource
    */
@@ -145,8 +131,7 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
       this._links = new LinkCollection(
         linksData,
         linksContrubtions,
-        this.origin,
-        this.contextPath,
+        this.modelOptions,
       );
     }
     return this._links;
@@ -254,8 +239,6 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
       childModels: this._childModels.map<ModularUIModel>(
         (childModel: ModularUIModel) => childModel.dehydrate(),
       ),
-      origin: this._origin,
-      contextPath: this._contextPath,
     };
   }
 }

package/src/models/base/__tests__/BaseModel.spec.js

@@ -59,6 +59,10 @@ describe("baseModel", () => {
       data: { name: "value" },
       contributions: { name: "value" },
       connectKey: "ConnectKey",
+      options: {
+        contextPath: "/BeInformed",
+        origin: "",
+      },
     });
 
     const newModel = new BaseModel();