@beinformed/ui 1.57.2 → 1.57.4

package/src/hooks/useModularUIModel.js

@@ -11,6 +11,8 @@ import UserProfileModel from "../models/user/UserProfileModel";
 
 import { useModularUIBasic } from "./useModularUIBasic";
 
+import type Href from "../models/href/Href";
+
 type HookOptions = {
   origin?: string,
   contextPath?: string,
@@ -31,7 +33,10 @@ export const useApplication = (
 /**
  * Load a tab by href
  */
-export const useTab = (href: string, options?: HookOptions): TabModel | null =>
+export const useTab = (
+  href: string | Href,
+  options?: HookOptions,
+): TabModel | null =>
   useModularUIBasic("tab", href, {
     expectedModels: ["Tab"],
     targetModel: TabModel,
@@ -42,7 +47,7 @@ export const useTab = (href: string, options?: HookOptions): TabModel | null =>
  * Load caseview by href
  */
 export const useCaseView = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): CaseViewModel | null =>
   useModularUIBasic("caseview", href, {
@@ -54,7 +59,7 @@ export const useCaseView = (
 /**
  */
 export const usePanel = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListModel | GroupingPanelModel | DetailModel | null =>
   useModularUIBasic("panel", href, {
@@ -65,7 +70,7 @@ export const usePanel = (
 /**
  */
 export const useList = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListModel | null =>
   useModularUIBasic("list", href, {
@@ -77,7 +82,7 @@ export const useList = (
 /**
  */
 export const useListOrDetail = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListModel | DetailModel | null =>
   useModularUIBasic("list", href, {
@@ -89,7 +94,7 @@ export const useListOrDetail = (
 /**
  */
 export const useListDetail = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListDetailModel | null =>
   useModularUIBasic("listdetail", href, {
@@ -102,7 +107,7 @@ export const useListDetail = (
 /**
  */
 export const useGroupingPanel = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): GroupingPanelModel | null =>
   useModularUIBasic("groupingpanel", href, {
@@ -114,7 +119,7 @@ export const useGroupingPanel = (
 /**
  */
 export const useDetailPanel = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): DetailModel | null =>
   useModularUIBasic("detailpanel", href, {
@@ -126,7 +131,7 @@ export const useDetailPanel = (
 /**
  */
 export const useQuicksearch = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): CaseSearchModel | null =>
   useModularUIBasic("quicksearch", href, {
@@ -138,7 +143,7 @@ export const useQuicksearch = (
 /**
  */
 export const useSearch = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): CaseSearchModel | null =>
   useModularUIBasic("search", href, {
@@ -150,7 +155,7 @@ export const useSearch = (
 /**
  */
 export const useUserProfile = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): UserProfileModel | null =>
   useModularUIBasic("userprofile", href, {

package/src/models/actions/ActionCollection.js

@@ -1,6 +1,7 @@
 // @flow
 import BaseCollection from "../base/BaseCollection";
 import ActionModel from "./ActionModel";
+import type { ModelOptions } from "../types";
 
 /**
  * Collection of actions
@@ -9,8 +10,7 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
   constructor(
     actions?: Object,
     actionsContributions?: Object,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
     super();
 
@@ -28,12 +28,7 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
 
         if (actionContribution) {
           actionModels.push(
-            new ActionModel(
-              actionData,
-              actionContribution,
-              origin,
-              contextPath,
-            ),
+            new ActionModel(actionData, actionContribution, modelOptions),
           );
         }
       }

package/src/models/actions/ActionModel.js

@@ -7,14 +7,13 @@ import BaseModel from "../base/BaseModel";
 import Href from "../href/Href";
 
 import {
-  getBasePath,
   HTTP_METHODS,
   CREATE_ACTION,
   UPDATE_ACTION,
   DELETE_ACTION,
 } from "../../constants";
 
-import type { AttributeType } from "../types";
+import type { AttributeType, ModelOptions } from "../types";
 
 /**
  * Defines an Action. For instance an action on the tab 'books', which leads to a form
@@ -23,23 +22,19 @@ export default class ActionModel extends BaseModel {
   _fieldCollection: AttributeCollection;
   _href: Href;
   _icon: string;
-  _origin: ?string;
-  _contextPath: ?string;
 
   constructor(
     data: Object,
     contributions: Object,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
-    super(data, contributions);
+    super(data, contributions, modelOptions);
 
     this._fieldCollection = new AttributeCollection(
       this.data.fields,
       this.contributions.fields,
+      { ...modelOptions, isReadonly: false },
     );
-    this._origin = origin;
-    this._contextPath = contextPath;
   }
 
   /**
@@ -54,7 +49,7 @@ export default class ActionModel extends BaseModel {
   ): ActionModel {
     const data = { name, href };
     const contributions = { name, label: label ?? name, type };
-    return new ActionModel(data, contributions, origin, contextPath);
+    return new ActionModel(data, contributions, { origin, contextPath });
   }
 
   /**
@@ -63,18 +58,6 @@ export default class ActionModel extends BaseModel {
     return this.data.href == null;
   }
 
-  /**
-   */
-  get origin(): string {
-    return this._origin ?? "";
-  }
-
-  /**
-   */
-  get contextPath(): string {
-    return this._contextPath ?? getBasePath();
-  }
-
   /**
    * retrieve href of action
    */
@@ -84,8 +67,7 @@ export default class ActionModel extends BaseModel {
       new Href(
         `${this.data.href}?${this.querystring}`,
         "Form",
-        this.origin,
-        this.contextPath,
+        this.modelOptions,
       )
     );
   }
@@ -204,6 +186,7 @@ export default class ActionModel extends BaseModel {
       return new ProcessStatusSettingsModel(
         this.getData("processStatus", {}),
         this.getContribution("processTask", {}),
+        this.modelOptions,
       );
     }
 

package/src/models/application/ApplicationModel.js

@@ -106,8 +106,7 @@ export default class ApplicationModel extends ResourceModel {
       "modelcatalog",
       "/modelcatalog",
       "Model catalog",
-      this.origin,
-      this.contextPath,
+      this.modelOptions,
     );
   }
 

package/src/models/attributes/AttributeCollection.js

@@ -11,7 +11,12 @@ import ContentConfiguration from "../contentconfiguration/ContentConfiguration";
 
 import { ConfigurationException } from "../../exceptions";
 
-import type { AttributeType, FormErrorAnchor } from "../types";
+import type { AttributeType, FormErrorAnchor, ModelOptions } from "../types";
+
+type AttributeCollectionOptions = {
+  ...ModelOptions,
+  isReadonly: boolean,
+};
 
 /**
  * Collection of attributes
@@ -20,7 +25,7 @@ class AttributeCollection extends ResourceCollection<AttributeType> {
   constructor(
     data: Object | Array<Object> = {},
     contributions: Array<Object> = [],
-    isReadonly: boolean = false,
+    modelOptions?: AttributeCollectionOptions,
   ) {
     super();
 
@@ -28,11 +33,14 @@ class AttributeCollection extends ResourceCollection<AttributeType> {
       contributions.forEach((contribution) => {
         const [key] = Object.keys(contribution);
 
-        const attribute = createAttribute(key, data, contribution[key]);
+        const attribute = createAttribute(key, data, contribution[key], {
+          origin: modelOptions?.origin,
+          contextPath: modelOptions?.contextPath,
+        });
 
         if (attribute !== null) {
           // when readonly is not explicitly set in the contributions, follow argument
-          if (isReadonly && !has(contribution[key], "readonly")) {
+          if (modelOptions?.isReadonly && !has(contribution[key], "readonly")) {
             attribute.readonly = true;
           }
 

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,
     );
   }