@beinformed/ui 1.57.2 → 1.57.3

package/src/models/error/ErrorResponse.js

@@ -3,7 +3,8 @@ import Href from "../href/Href";
 
 import type { MessageParameters } from "../../i18n/types";
 import LayoutHintCollection from "../layouthint/LayoutHintCollection";
-import { getBasePath } from "../../constants";
+import { getBasePathModularUI } from "../../constants";
+import type { ModelOptions } from "../types";
 
 /**
  */
@@ -34,23 +35,16 @@ export default class ErrorResponse {
   _error: Object;
   _connectKey: ?string;
 
-  _origin: string = "";
-  _contextPath: string = getBasePath();
+  _modelOptions: ?ModelOptions;
 
   /**
    * Construct ErrorResponse
    */
-  constructor(
-    data: Object,
-    connectKey?: string,
-    origin?: string,
-    contextPath?: string,
-  ) {
+  constructor(data: Object, connectKey?: string, modelOptions?: ModelOptions) {
     this._error = data;
     this._connectKey = connectKey;
 
-    this._origin = origin || "";
-    this._contextPath = contextPath || getBasePath();
+    this._modelOptions = modelOptions;
   }
 
   /**
@@ -68,13 +62,13 @@ export default class ErrorResponse {
   /**
    */
   get origin(): string {
-    return this._origin;
+    return this._modelOptions?.origin || "";
   }
 
   /**
    */
   get contextPath(): string {
-    return this._contextPath;
+    return this._modelOptions?.contextPath || getBasePathModularUI();
   }
 
   /**
@@ -186,12 +180,7 @@ export default class ErrorResponse {
    */
   get redirectHref(): Href {
     if (this.response.redirect?.href) {
-      return new Href(
-        this.response.redirect?.href,
-        "",
-        this.origin,
-        this.contextPath,
-      );
+      return new Href(this.response.redirect?.href, "", this._modelOptions);
     }
     return new Href();
   }
@@ -320,7 +309,7 @@ export default class ErrorResponse {
    */
   get changePasswordHref(): ?Href {
     return this.properties.redirect
-      ? new Href(this.properties.redirect, "", this.origin, this.contextPath)
+      ? new Href(this.properties.redirect, "", this._modelOptions)
       : null;
   }
 

package/src/models/filters/AssignmentFilterModel.js

@@ -1,7 +1,7 @@
 // @flow
 import BaseFilterModel from "../filters/BaseFilterModel";
 
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 import { IllegalStateException } from "../../exceptions";
 /**
  * Assignment filter consists of two filters: assignment type and user filter
@@ -14,8 +14,12 @@ export default class AssignmentFilterModel extends BaseFilterModel {
   /**
    * Construct an assignment filter
    */
-  constructor(data: Object, contributions: Object) {
-    super(data, contributions);
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
 
     this._assignmenttype = this.createAssignmentTypeModel();
     this._user = this.createUserModel();

package/src/models/filters/BaseFilterModel.js

@@ -3,7 +3,7 @@ import BaseModel from "../base/BaseModel";
 import createAttribute from "../attributes/_createAttribute";
 import { PARAMETER_SEPARATOR } from "../../constants/Constants";
 
-import type { AttributeType, FilterType } from "../types";
+import type { AttributeType, FilterType, ModelOptions } from "../types";
 import { IllegalStateException } from "../../exceptions";
 
 /**
@@ -16,8 +16,12 @@ export default class BaseFilterModel extends BaseModel {
 
   /**
    */
-  constructor(data: Object, contributions: Object) {
-    super(data, contributions);
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
 
     this._attribute = this.createAttribute(
       this.type,
@@ -53,10 +57,15 @@ export default class BaseFilterModel extends BaseModel {
       return null;
     }
 
-    return createAttribute(param, data, {
-      ...contributions,
-      type: type,
-    });
+    return createAttribute(
+      param,
+      data,
+      {
+        ...contributions,
+        type: type,
+      },
+      this.modelOptions,
+    );
   }
 
   /**

package/src/models/filters/ConceptIndexFilterModel.js

@@ -2,6 +2,8 @@
 import BaseFilterModel from "../filters/BaseFilterModel";
 import ChoiceAttributeModel from "../attributes/ChoiceAttributeModel";
 
+import type { ModelOptions } from "../types";
+
 /**
  * The concept index model is a special filter used to index all first concept label letters in de modelcatalog.
  */
@@ -9,8 +11,12 @@ export default class ConceptIndexFilterModel extends BaseFilterModel {
   /**
    * Construct a filter
    */
-  constructor(data: Object, contributions: Object) {
-    super(data, contributions);
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
 
     if (data.options) {
       const selectedValues = data.options

package/src/models/filters/FilterCollection.js

@@ -8,7 +8,7 @@ import ConceptIndexFilterModel from "../filters/ConceptIndexFilterModel";
 import CompositeAttributeModel from "../attributes/CompositeAttributeModel";
 import FilterModel from "../filters/FilterModel";
 
-import type { AttributeType, FilterType } from "../types";
+import type { AttributeType, FilterType, ModelOptions } from "../types";
 
 /**
  * Contains a collection of filters
@@ -17,7 +17,11 @@ export default class FilterCollection extends BaseCollection<FilterType> {
   /**
    * Construct a collection of filters
    */
-  constructor(data: Object = {}, contributions: Object = {}) {
+  constructor(
+    data: Object = {},
+    contributions: Object = {},
+    modelOptions?: ModelOptions,
+  ) {
     super();
 
     if (data && contributions && Array.isArray(contributions.filter)) {
@@ -35,6 +39,7 @@ export default class FilterCollection extends BaseCollection<FilterType> {
               dynamicschema: contributions.dynamicschema,
             },
             filterContributionByKey,
+            modelOptions,
           );
 
           if (contributions.listkey) {
@@ -61,25 +66,26 @@ export default class FilterCollection extends BaseCollection<FilterType> {
     filterKey: string,
     data: Object,
     contributions: Object,
+    modelOptions?: ModelOptions,
   ): FilterType {
     const type = contributions.type || "stringfilter";
     if (type === "choicefilter" && filterKey === "index") {
-      return new ConceptIndexFilterModel(data, contributions);
+      return new ConceptIndexFilterModel(data, contributions, modelOptions);
     }
 
     if (type.includes("rangefilter")) {
-      return new RangeFilterModel(data, contributions);
+      return new RangeFilterModel(data, contributions, modelOptions);
     }
 
     if (type === "assignmentfilter") {
-      return new AssignmentFilterModel(data, contributions);
+      return new AssignmentFilterModel(data, contributions, modelOptions);
     }
 
     if (type === "stringfilter") {
-      return new StringFilterModel(data, contributions);
+      return new StringFilterModel(data, contributions, modelOptions);
     }
 
-    return new FilterModel(data, contributions);
+    return new FilterModel(data, contributions, modelOptions);
   }
 
   /**

package/src/models/filters/StringFilterModel.js

@@ -1,6 +1,6 @@
 // @flow
 
-import type { AttributeType, FilterType } from "../types";
+import type { AttributeType, FilterType, ModelOptions } from "../types";
 import FilterModel from "./FilterModel";
 
 /**
@@ -13,8 +13,12 @@ export default class StringFilterModel extends FilterModel {
 
   /**
    */
-  constructor(data: Object, contributions: Object) {
-    super(data, contributions);
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
 
     this.update(this.attribute, data.value ?? "");
 

package/src/models/form/FormModel.js

@@ -268,7 +268,11 @@ class FormModel extends ResourceModel {
       const objectId = missingAnchors?.[0]?.objectid ?? "";
       const contributions = this.contributions.objects?.[objectId];
       if (contributions) {
-        return new FormObjectModel(missingAnchors[0], contributions);
+        return new FormObjectModel(
+          missingAnchors[0],
+          contributions,
+          this.modelOptions,
+        );
       }
     }
 
@@ -410,6 +414,7 @@ class FormModel extends ResourceModel {
             new FormObjectModel(
               endResult,
               this.contributions.objects[endResult.objectid],
+              this.modelOptions,
             ),
         );
       }
@@ -605,7 +610,7 @@ class FormModel extends ResourceModel {
    */
   get successRedirect(): Href | null {
     return this.isFinished && this.success
-      ? new Href(this.success.redirect, "", this.origin, this.contextPath)
+      ? new Href(this.success.redirect, "", this.modelOptions)
       : null;
   }
 
@@ -640,6 +645,7 @@ class FormModel extends ResourceModel {
         resultDataKey,
         successData[resultDataKey],
         this.contributions.resultdata[resultDataKey],
+        this.modelOptions,
       );
     }
 

package/src/models/form/FormObjectModel.js

@@ -8,9 +8,16 @@ import ContentConfiguration from "../contentconfiguration/ContentConfiguration";
 import ErrorCollection from "../error/ErrorCollection";
 import { IllegalArgumentException } from "../../exceptions";
 
-import type { AttributeType, ModularUIModel, FormErrorAnchor } from "../types";
-import type LinkModel from "../links/LinkModel";
+import type {
+  AttributeType,
+  ModularUIModel,
+  FormErrorAnchor,
+  ModelOptions,
+} from "../types";
+
 import LayoutHintCollection from "../layouthint/LayoutHintCollection";
+
+import type LinkModel from "../links/LinkModel";
 import type { MessageParameters } from "../../i18n";
 import type ErrorResponse from "../error/ErrorResponse";
 
@@ -27,13 +34,18 @@ export default class FormObjectModel extends BaseModel {
   /**
    * Construct FormObjectModel
    */
-  constructor(object: Object, objectContributions: Object) {
-    super(object, objectContributions);
+  constructor(
+    object: Object,
+    objectContributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(object, objectContributions, modelOptions);
 
     if (object && this.getElements().length > 0) {
       this._attributeCollection = new AttributeCollection(
         this.getElements(),
         this.getApplicableAttributeContributions(),
+        { ...modelOptions, isReadonly: false },
       );
     } else {
       this._attributeCollection = new AttributeCollection();
@@ -65,6 +77,7 @@ export default class FormObjectModel extends BaseModel {
     return new FormObjectModel(
       formObjectModel.data,
       formObjectModel.contributions,
+      formObjectModel.modelOptions,
     );
   }
 

package/src/models/grouping/GroupingModel.js

@@ -1,6 +1,6 @@
 // @flow
 import AttributeCollection from "../attributes/AttributeCollection";
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 
 /**
  * Group information model
@@ -14,19 +14,26 @@ export class GroupModel {
 
   /**
    */
-  constructor(group: Object, context: Object, contributions: Array<Object>) {
+  constructor(
+    group: Object,
+    context: Object,
+    contributions: Array<Object>,
+    modelOptions?: ModelOptions,
+  ) {
     this._group = group;
     this._context = context;
 
     this._attributeCollection = new AttributeCollection(
       group,
       context.attributes,
+      { ...modelOptions, isReadonly: true },
     );
 
     if (group.grouping) {
       this._grouping = new GroupingModel(
         { ...group.grouping, dynamicschema: group.dynamicschema },
         contributions,
+        modelOptions,
       );
     }
   }
@@ -113,17 +120,25 @@ export default class GroupingModel {
 
   /**
    */
-  constructor(data: Object, contexts: Array<Context>) {
+  constructor(
+    data: Object,
+    contexts: Array<Context>,
+    modelOptions?: ModelOptions,
+  ) {
     this._prefix = data && data.prefix ? data.prefix : null;
 
     if (data?.group) {
-      this._groups = this.createGroup(data, contexts);
+      this._groups = this.createGroup(data, contexts, modelOptions);
     }
   }
 
   /**
    */
-  createGroup(data: Object, contributions: Array<Context>): Array<Object> {
+  createGroup(
+    data: Object,
+    contributions: Array<Context>,
+    modelOptions?: ModelOptions,
+  ): Array<Object> {
     const context = this.getContextFromContributionsByPrefix(
       contributions,
       this._prefix,
@@ -138,6 +153,7 @@ export default class GroupingModel {
         },
         context,
         contributions,
+        modelOptions,
       );
     });
   }

package/src/models/href/Href.js

@@ -1,10 +1,15 @@
 // @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 +35,7 @@ class Href {
   _state: any = null;
   _referenceHash: ?number;
   _origin: string = "";
-  _contextPath: string = getBasePath();
+  _contextPath: string = getBasePathModularUI();
 
   /**
    * Create a Href
@@ -38,8 +43,7 @@ class Href {
   constructor(
     href?: HrefInput,
     resourcetype?: string,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ?ModelOptions,
   ) {
     this.resourcetype = resourcetype ?? "";
 
@@ -51,12 +55,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 +482,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;
     }
@@ -516,7 +520,9 @@ class Href {
    * 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 +552,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", () => {
@@ -142,7 +142,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 +152,7 @@ describe("href spec", () => {
       pathname: "/BeInformed",
       search: "",
       state: {
+        origin: "",
         contextPath: "/BeInformed",
       },
     });
@@ -163,9 +164,7 @@ describe("href spec", () => {
       hash: "",
       pathname: "/BeInformed/list",
       search: "",
-      state: {
-        contextPath: "/BeInformed",
-      },
+      state: { origin: "", contextPath: "/BeInformed" },
     });
 
     const listHrefFromHref = new Href(listHref);
@@ -174,9 +173,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);
   }