@beinformed/ui 1.57.2 → 1.57.4

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();

package/src/models/caseview/CaseViewModel.js

@@ -160,8 +160,7 @@ export default class CaseViewModel extends DetailModel {
           taskgroup.name,
           taskgroup,
           taskgroupContributions,
-          this.origin,
-          this.contextPath,
+          this.modelOptions,
         );
       });
   }

package/src/models/concepts/ConceptDetailModel.js

@@ -34,6 +34,7 @@ export default class ConceptDetailModel extends ResourceModel {
     this._relations = new ConceptRelationCollection(
       this.data.relations,
       this.entryDate,
+      this.modelOptions,
     );
   }
 
@@ -273,8 +274,7 @@ export default class ConceptDetailModel extends ResourceModel {
       this._sourceReferences = new SourceReferenceCollection(
         this.getSourceReferencesForCurrentLanguage(availableLocales),
         this.entryDate,
-        this.origin,
-        this.contextPath,
+        this.modelOptions,
       );
     }
 

package/src/models/concepts/ConceptIndexModel.js

@@ -24,10 +24,14 @@ export default class ConceptIndexModel extends ResourceModel {
   constructor(modularuiResponse: ModularUIResponse) {
     super(modularuiResponse);
 
-    this._filterCollection = new FilterCollection(this.data.filter, {
-      filter: this.contributions.filter,
-      dynamicschema: this.data.dynamicschema,
-    });
+    this._filterCollection = new FilterCollection(
+      this.data.filter,
+      {
+        filter: this.contributions.filter,
+        dynamicschema: this.data.dynamicschema,
+      },
+      this.modelOptions,
+    );
 
     this._concepts = new ResourceCollection();
     this._concepts.collection = this.data._embedded
@@ -36,8 +40,7 @@ export default class ConceptIndexModel extends ResourceModel {
             new ConceptLinkModel(
               concept.concept,
               this.entryDate,
-              this.origin,
-              this.contextPath,
+              this.modelOptions,
             ),
         )
       : [];

package/src/models/concepts/ConceptLinkModel.js

@@ -5,9 +5,13 @@ import LinkCollection from "../links/LinkCollection";
 import ConceptTypeDetailModel from "./ConceptTypeDetailModel";
 import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 
-import type { IModelWithChildModels, ModularUIModel } from "../types";
+import type {
+  IModelWithChildModels,
+  ModelOptions,
+  ModularUIModel,
+} from "../types";
 import type Href from "../href/Href";
-import { getBasePath } from "../../constants";
+
 /**
  * Link to a concept
  */
@@ -18,8 +22,6 @@ export default class ConceptLinkModel
   _links: ?LinkCollection;
   _entryDate: ?ISO_DATE;
   _conceptType: ?ConceptTypeDetailModel;
-  _origin: string = "";
-  _contextPath: string = getBasePath();
 
   /**
    * Construct ConceptLinkModel
@@ -27,14 +29,11 @@ export default class ConceptLinkModel
   constructor(
     data: Object,
     entryDate: ?ISO_DATE = null,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
-    super(data, {});
+    super(data, {}, modelOptions);
 
     this._entryDate = entryDate;
-    this._origin = origin || "";
-    this._contextPath = contextPath || getBasePath();
   }
 
   /**
@@ -108,8 +107,7 @@ export default class ConceptLinkModel
           ? this.data._links[0]
           : this.data._links,
         null,
-        this._origin,
-        this._contextPath,
+        this.modelOptions,
       );
     }
 
@@ -169,7 +167,12 @@ export default class ConceptLinkModel
   /**
    */
   asLinkModel(): LinkModel {
-    const link = LinkModel.create(this.key, this.selfhref.href, this.label);
+    const link = LinkModel.create(
+      this.key,
+      this.selfhref.href,
+      this.label,
+      this.modelOptions,
+    );
     link.href = this.selfhref;
 
     return link;

package/src/models/concepts/ConceptRelationCollection.js

@@ -1,27 +1,38 @@
 // @flow
 import ResourceCollection from "../base/ResourceCollection";
 import ConceptRelationModel from "./ConceptRelationModel";
+import type { ModelOptions } from "../types";
+import { getBasePathModularUI } from "../../constants";
 
 /**
  * concept relation collection
  */
 export default class ConceptRelationCollection extends ResourceCollection<ConceptRelationModel> {
   _entryDate: ?ISO_DATE;
+  _modelOptions: ModelOptions;
 
   /**
    */
-  constructor(relations: Array<Object> = [], entryDate: ?ISO_DATE = null) {
+  constructor(
+    relations: Array<Object> = [],
+    entryDate: ?ISO_DATE = null,
+    modelOptions?: ModelOptions,
+  ) {
     super();
 
     this._entryDate = entryDate;
+    this._modelOptions = modelOptions || {
+      origin: "",
+      contextPath: getBasePathModularUI(),
+    };
 
     this.collection = Array.isArray(relations)
       ? relations.map((relation) =>
           relation instanceof ConceptRelationModel
             ? relation
-            : new ConceptRelationModel(relation, entryDate),
+            : new ConceptRelationModel(relation, entryDate, modelOptions),
         )
-      : [new ConceptRelationModel(relations, entryDate)];
+      : [new ConceptRelationModel(relations, entryDate, modelOptions)];
   }
 
   /**
@@ -46,6 +57,7 @@ export default class ConceptRelationCollection extends ResourceCollection<Concep
     return new ConceptRelationCollection(
       this.filter((relation) => relation.key === type),
       this._entryDate,
+      this._modelOptions,
     );
   }
 
@@ -67,6 +79,7 @@ export default class ConceptRelationCollection extends ResourceCollection<Concep
     return new ConceptRelationCollection(
       this.filter((relation) => relation.direction === "incoming"),
       this._entryDate,
+      this._modelOptions,
     );
   }
 
@@ -76,6 +89,7 @@ export default class ConceptRelationCollection extends ResourceCollection<Concep
     return new ConceptRelationCollection(
       this.filter((relation) => relation.direction === "outgoing"),
       this._entryDate,
+      this._modelOptions,
     );
   }
 }

package/src/models/concepts/ConceptRelationModel.js

@@ -2,11 +2,14 @@
 import ConceptLinkModel from "./ConceptLinkModel";
 import LinkModel from "../links/LinkModel";
 
+import { getBasePathModularUI } from "../../constants";
+
 import type {
   IModelWithChildModels,
   ModularUIModel,
   textfragmentJSON,
   propertyJSON,
+  ModelOptions,
 } from "../types";
 
 /**
@@ -14,15 +17,28 @@ import type {
  */
 export default class ConceptRelationModel implements IModelWithChildModels {
   _relation: Object;
+  _modelOptions: ModelOptions;
   _concept: ConceptLinkModel;
 
   /**
    */
-  constructor(relation: Object, entryDate: ?ISO_DATE = null) {
+  constructor(
+    relation: Object,
+    entryDate: ?ISO_DATE = null,
+    modelOptions?: ModelOptions,
+  ) {
     this._relation = relation;
+    this._modelOptions = modelOptions || {
+      origin: "",
+      contextPath: getBasePathModularUI(),
+    };
 
     if (relation && relation.concept) {
-      this._concept = new ConceptLinkModel(relation.concept, entryDate);
+      this._concept = new ConceptLinkModel(
+        relation.concept,
+        entryDate,
+        this._modelOptions,
+      );
     }
   }
 

package/src/models/concepts/SourceReferenceCollection.js

@@ -1,6 +1,7 @@
 // @flow
 import BaseCollection from "../base/BaseCollection";
 import SourceReferenceModel from "./SourceReferenceModel";
+import type { ModelOptions } from "../types";
 
 /**
  * Source reference collection
@@ -11,20 +12,14 @@ export default class SourceReferenceCollection extends BaseCollection<SourceRefe
   constructor(
     sourceReferences: Array<Object> = [],
     entryDate: ?ISO_DATE = null,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
     super();
 
     this.collection = sourceReferences
       ? sourceReferences.map(
           (sourceReference) =>
-            new SourceReferenceModel(
-              sourceReference,
-              entryDate,
-              origin,
-              contextPath,
-            ),
+            new SourceReferenceModel(sourceReference, entryDate, modelOptions),
         )
       : [];
   }

package/src/models/concepts/SourceReferenceModel.js

@@ -3,28 +3,29 @@ import { createHashFromHref } from "../../utils/helpers/createHash";
 
 import ContentLinkModel from "../content/ContentLinkModel";
 import Href from "../href/Href";
-import { getBasePath } from "../../constants";
+import { getBasePathModularUI } from "../../constants";
+import type { ModelOptions } from "../types";
 
 /**
  */
 class SourceReferenceModel {
   _sourceReference: Object;
   _entryDate: ?ISO_DATE;
-  _origin: string = "";
-  _contextPath: string = getBasePath();
+  _modelOptions: ModelOptions;
 
   /**
    */
   constructor(
     sourceReference: Object,
     entryDate: ?ISO_DATE = null,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
     this._sourceReference = sourceReference;
     this._entryDate = entryDate;
-    this._origin = origin || "";
-    this._contextPath = contextPath || getBasePath();
+    this._modelOptions = modelOptions || {
+      origin: "",
+      contextPath: getBasePathModularUI(),
+    };
   }
 
   /**
@@ -41,8 +42,7 @@ class SourceReferenceModel {
         section,
       },
       this._entryDate,
-      this._origin,
-      this._contextPath,
+      this._modelOptions,
     );
   }
 
@@ -52,8 +52,7 @@ class SourceReferenceModel {
     return new Href(
       this._sourceReference._links.self.href,
       "SourceReference",
-      this._origin,
-      this._contextPath,
+      this._modelOptions,
     );
   }
 

package/src/models/content/ContentIndexModel.js

@@ -23,15 +23,20 @@ export default class ContentIndexModel extends ResourceModel {
   constructor(modularuiResponse: ModularUIResponse) {
     super(modularuiResponse);
 
-    this._filterCollection = new FilterCollection(this.data.filter, {
-      filter: this.contributions.filter,
-      dynamicschema: this.data.dynamicschema,
-    });
+    this._filterCollection = new FilterCollection(
+      this.data.filter,
+      {
+        filter: this.contributions.filter,
+        dynamicschema: this.data.dynamicschema,
+      },
+      this.modelOptions,
+    );
 
     this._content = new ResourceCollection();
     this._content.collection = this.data._embedded
       ? this.data._embedded.results.map(
-          (content) => new ContentLinkModel(content.content),
+          (content) =>
+            new ContentLinkModel(content.content, null, this.modelOptions),
         )
       : [];
   }