@beinformed/ui 1.59.1 → 1.59.3

package/lib/utils/datetime/__tests__/DateTimeFormat.spec.js.flow

@@ -0,0 +1,141 @@
+import { TimestampUtil } from "../DateTimeUtil";
+import { INCLUDE_TIME_OFFSET, setSettings } from "../../../constants";
+
+const timestamp = "2023-06-07T07:04:01.010+02:00";
+
+describe("date time format conversion", () => {
+  beforeEach(() => {
+    TimestampUtil.setTimeZone("Europe/Amsterdam");
+    setSettings({ [INCLUDE_TIME_OFFSET]: true });
+  });
+
+  test("Year", () => {
+    expect(TimestampUtil.toFormat(timestamp, "yy")).toBe("23");
+    expect(TimestampUtil.toFormat(timestamp, "yyyy")).toBe("2023");
+  });
+
+  test("Month", () => {
+    expect(TimestampUtil.toFormat(timestamp, "M")).toBe("6");
+    expect(TimestampUtil.toFormat(timestamp, "MM")).toBe("06");
+    expect(TimestampUtil.toFormat(timestamp, "MMM")).toBe("Jun");
+    expect(TimestampUtil.toFormat(timestamp, "MMMM")).toBe("June");
+    expect(TimestampUtil.toFormat(timestamp, "MMMMM")).toBe("J");
+
+    expect(TimestampUtil.toFormat(timestamp, "L")).toBe("6");
+    expect(TimestampUtil.toFormat(timestamp, "LL")).toBe("06");
+    expect(TimestampUtil.toFormat(timestamp, "LLL")).toBe("Jun");
+    expect(TimestampUtil.toFormat(timestamp, "LLLL")).toBe("June");
+    expect(TimestampUtil.toFormat(timestamp, "LLLLL")).toBe("J");
+  });
+
+  test("Day", () => {
+    expect(TimestampUtil.toFormat(timestamp, "d")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "dd")).toBe("07");
+  });
+
+  test("Quarter", () => {
+    expect(TimestampUtil.toFormat(timestamp, "Q")).toBe("2");
+    expect(TimestampUtil.toFormat(timestamp, "QQ")).toBe("02");
+    expect(TimestampUtil.toFormat(timestamp, "QQQ")).toBe("Q2");
+    expect(TimestampUtil.toFormat(timestamp, "QQQQ")).toBe("2nd quarter");
+  });
+
+  test.skip("Day of Year", () => {
+    expect(TimestampUtil.toFormat(timestamp, "D")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "DD")).toBe("07");
+    expect(TimestampUtil.toFormat(timestamp, "DDD")).toBe("07");
+  });
+
+  test("Day of Week", () => {
+    expect(TimestampUtil.toFormat(timestamp, "E")).toBe("Wed");
+    expect(TimestampUtil.toFormat(timestamp, "EEEE")).toBe("Wednesday");
+    expect(TimestampUtil.toFormat(timestamp, "EEEEE")).toBe("W");
+
+    expect(TimestampUtil.toFormat(timestamp, "e")).toBe("3");
+    expect(TimestampUtil.toFormat(timestamp, "ee")).toBe("03");
+    expect(TimestampUtil.toFormat(timestamp, "eee")).toBe("Wed");
+    expect(TimestampUtil.toFormat(timestamp, "eeee")).toBe("Wednesday");
+    expect(TimestampUtil.toFormat(timestamp, "eeeee")).toBe("W");
+  });
+
+  test("Week", () => {
+    expect(TimestampUtil.toFormat(timestamp, "w")).toBe("23");
+    // expect(TimestampUtil.toFormat(timestamp, "W")).toBe("23");
+    // expect(TimestampUtil.toFormat(timestamp, "F")).toBe("W");
+  });
+
+  test("Hour", () => {
+    expect(TimestampUtil.toFormat(timestamp, "H")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "HH")).toBe("07");
+    expect(TimestampUtil.toFormat(timestamp, "h")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "hh")).toBe("07");
+
+    expect(TimestampUtil.toFormat(timestamp, "a")).toBe("AM");
+    expect(TimestampUtil.toFormat(timestamp, "aa")).toBe("AM");
+    expect(TimestampUtil.toFormat(timestamp, "aaa")).toBe("am");
+    expect(TimestampUtil.toFormat(timestamp, "aaaa")).toBe("a.m.");
+    expect(TimestampUtil.toFormat(timestamp, "aaaaa")).toBe("a");
+
+    expect(TimestampUtil.toFormat(timestamp, "K")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "k")).toBe("7");
+  });
+
+  test("Minute", () => {
+    expect(TimestampUtil.toFormat(timestamp, "s")).toBe("1");
+    expect(TimestampUtil.toFormat(timestamp, "ss")).toBe("01");
+  });
+
+  test("Milliseconds", () => {
+    expect(TimestampUtil.toFormat(timestamp, "SSS")).toBe("010");
+  });
+
+  test("Zone / offset", () => {
+    expect(TimestampUtil.toFormat(timestamp, "z")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "zz")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "zzz")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "zzzz")).toBe("GMT+02:00");
+    expect(TimestampUtil.toFormat(timestamp, "zzzzz")).toBe("GMT+02:00");
+
+    expect(TimestampUtil.toFormat(timestamp, "X")).toBe("+02");
+    expect(TimestampUtil.toFormat(timestamp, "XX")).toBe("+0200");
+    expect(TimestampUtil.toFormat(timestamp, "XXX")).toBe("+02:00");
+
+    expect(TimestampUtil.toFormat(timestamp, "x")).toBe("+02");
+    expect(TimestampUtil.toFormat(timestamp, "xx")).toBe("+0200");
+    expect(TimestampUtil.toFormat(timestamp, "xxx")).toBe("+02:00");
+
+    expect(TimestampUtil.toFormat(timestamp, "O")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "OOOO")).toBe("GMT+02:00");
+
+    // expect(TimestampUtil.toFormat(timestamp, "VV")).toBe("GMT+02:00");
+    // expect(TimestampUtil.toFormat(timestamp, "V")).toBe("Europe/Amsterdam");
+    // expect(TimestampUtil.toFormat(timestamp, "Z")).toBe("+02:00");
+    // expect(TimestampUtil.toFormat(timestamp, "ZZZZ")).toBe("+02:00");
+  });
+
+  test("Era and Chronology", () => {
+    expect(TimestampUtil.toFormat(timestamp, "G")).toBe("AD");
+    expect(TimestampUtil.toFormat(timestamp, "GGGG")).toBe("Anno Domini");
+    expect(TimestampUtil.toFormat(timestamp, "GGGGG")).toBe("A");
+
+    expect(TimestampUtil.toFormat(timestamp, "u")).toBe("2023");
+  });
+
+  test("Converted", () => {
+    const ZZZ = TimestampUtil.convertFormat("ZZZ");
+    expect(TimestampUtil.toFormat(timestamp, ZZZ)).toBe("+02:00");
+
+    const ZZ = TimestampUtil.convertFormat("ZZ");
+    expect(TimestampUtil.toFormat(timestamp, ZZ)).toBe("+0200");
+
+    const Z = TimestampUtil.convertFormat("Z");
+    expect(TimestampUtil.toFormat(timestamp, Z)).toBe("+02");
+
+    const fullDateTime = TimestampUtil.convertFormat(
+      "EEE MMM dd, yyyy h:mma ZZ",
+    );
+    expect(TimestampUtil.toFormat(timestamp, fullDateTime)).toBe(
+      "Wed Jun 07, 2023 7:04AM +0200",
+    );
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.59.1",
+  "version": "1.59.3",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/models/attributes/DatetimeAttributeModel.js

@@ -385,15 +385,6 @@ class DatetimeAttributeModel extends StringAttributeModel {
       return DateUtil.toFormat(value, this.dateReadonlyFormat);
     }
 
-    if (this.hasDate && this.hasTime) {
-      const dateTimeReadonlyFormat = `${this.dateReadonlyFormat} ${this.timeReadonlyFormat}`;
-      return this.formatUtil.toFormat(value, dateTimeReadonlyFormat);
-    }
-
-    if (this.type === "date") {
-      return this.formatUtil.toFormat(value, this.dateReadonlyFormat);
-    }
-
     return this.formatUtil.toFormat(value, this.format);
   }
 

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

@@ -153,6 +153,35 @@ describe("datetimeAttributeModel", () => {
     expect(attribute.readonlyvalue).toBe("21-12-2031 17:41");
   });
 
+  it("can handle custom format", () => {
+    const attribute = new DatetimeAttributeModel(
+      { value: "2031-12-21T17:41:21" },
+      {
+        type: "datetime",
+        format: "dd-MM-yyyy HH:mm xxx",
+      },
+    );
+    expect(attribute.readonlyvalue).toBe("21-12-2031 17:41 +01:00");
+
+    const attribute2 = new DatetimeAttributeModel(
+      { value: "2031-12-21T17:41:21" },
+      {
+        type: "datetime",
+        format: "dd-MM-yyyy HH:mm Z",
+      },
+    );
+    expect(attribute2.readonlyvalue).toBe("21-12-2031 17:41 +01");
+
+    const attribute3 = new DatetimeAttributeModel(
+      { value: "2031-12-21T17:41:21" },
+      {
+        type: "datetime",
+        format: "EEE MMM dd, yyyy h:mma ZZ",
+      },
+    );
+    expect(attribute3.readonlyvalue).toBe("Sun Dec 21, 2031 5:41PM +0100");
+  });
+
   it("returns date part of formatlabel as placeholder if attribute has date and time", () => {
     const attribute = new DatetimeAttributeModel(
       {},

package/src/models/attributes/input-constraints/DateBoundaryConstraint.js

@@ -11,6 +11,7 @@ import {
   IllegalArgumentException,
   IllegalStateException,
 } from "../../../exceptions";
+import { DATETIME_OFFSET_FORMAT } from "../../../constants";
 
 const INEXACT_DATE_ID = "Constraint.Date.InexactDate";
 const OUT_OF_RANGE_ID = "Constraint.Date.OutOfRange";
@@ -22,6 +23,7 @@ const ABOVE_MAXIMUM_ID = "Constraint.Date.AboveMaximum";
 class DateBoundaryConstraint implements IConstraintModel {
   _type: string;
   _format: string;
+  _formatNoOffset: string;
   _minDate: ?string;
   _maxDate: ?string;
 
@@ -35,6 +37,7 @@ class DateBoundaryConstraint implements IConstraintModel {
   ) {
     this._type = type;
     this._format = format;
+    this._formatNoOffset = format.replace(DATETIME_OFFSET_FORMAT, "").trim();
     this._minDate = minDate;
     this._maxDate = maxDate;
   }
@@ -105,10 +108,10 @@ class DateBoundaryConstraint implements IConstraintModel {
   get parameters(): { "max-date": string | null, "min-date": string | null } {
     return {
       "min-date": this.minDate
-        ? this.formatUtil.toFormat(this.minDate, this.format)
+        ? this.formatUtil.toFormat(this.minDate, this._formatNoOffset)
         : null,
       "max-date": this.maxDate
-        ? this.formatUtil.toFormat(this.maxDate, this.format)
+        ? this.formatUtil.toFormat(this.maxDate, this._formatNoOffset)
         : null,
     };
   }

package/src/utils/datetime/DateTimeUtil.js

@@ -99,8 +99,32 @@ class BaseDateTimeUtil {
 
   /**
    */
-  convertFormat(sourceFormat: string): string {
-    return sourceFormat ? sourceFormat : this.getIsoFormat();
+  convertFormat(javaFormat: string): string {
+    if (!javaFormat) {
+      return this.getIsoFormat();
+    }
+
+    const javaToUTS35Map = {
+      ZZZ: "xxx",
+      ZZ: "xx",
+      Z: "x",
+    };
+
+    // Replace Java pattern tokens with UTS #35 tokens
+    let uts35Format = javaFormat;
+
+    // Sort keys by length (descending) to handle multi-character tokens first
+    const sortedKeys = Object.keys(javaToUTS35Map).sort(
+      (a, b) => b.length - a.length,
+    );
+
+    for (const javaToken of sortedKeys) {
+      const uts35Token = javaToUTS35Map[javaToken];
+      const regex = new RegExp(javaToken, "g"); // Match all occurrences
+      uts35Format = uts35Format.replace(regex, uts35Token);
+    }
+
+    return uts35Format;
   }
 
   /**

package/src/utils/datetime/__tests__/DateTime.spec.js

@@ -613,6 +613,13 @@ describe("asserts for date/time utilities", () => {
       expect(TimestampUtil.convertFormat("yyyy-MM-dd HH:mm:ss.SSS")).toBe(
         "yyyy-MM-dd HH:mm:ss.SSS",
       );
+      expect(TimestampUtil.convertFormat("dd-MM-yyyy HH:mm Z")).toBe(
+        "dd-MM-yyyy HH:mm x",
+      );
+
+      expect(TimestampUtil.convertFormat("dd-MM-yyyy HH:mm zzzz")).toBe(
+        "dd-MM-yyyy HH:mm zzzz",
+      );
     });
 
     it("should render iso timestamp to specified format", () => {

package/src/utils/datetime/__tests__/DateTimeFormat.spec.js

@@ -0,0 +1,141 @@
+import { TimestampUtil } from "../DateTimeUtil";
+import { INCLUDE_TIME_OFFSET, setSettings } from "../../../constants";
+
+const timestamp = "2023-06-07T07:04:01.010+02:00";
+
+describe("date time format conversion", () => {
+  beforeEach(() => {
+    TimestampUtil.setTimeZone("Europe/Amsterdam");
+    setSettings({ [INCLUDE_TIME_OFFSET]: true });
+  });
+
+  test("Year", () => {
+    expect(TimestampUtil.toFormat(timestamp, "yy")).toBe("23");
+    expect(TimestampUtil.toFormat(timestamp, "yyyy")).toBe("2023");
+  });
+
+  test("Month", () => {
+    expect(TimestampUtil.toFormat(timestamp, "M")).toBe("6");
+    expect(TimestampUtil.toFormat(timestamp, "MM")).toBe("06");
+    expect(TimestampUtil.toFormat(timestamp, "MMM")).toBe("Jun");
+    expect(TimestampUtil.toFormat(timestamp, "MMMM")).toBe("June");
+    expect(TimestampUtil.toFormat(timestamp, "MMMMM")).toBe("J");
+
+    expect(TimestampUtil.toFormat(timestamp, "L")).toBe("6");
+    expect(TimestampUtil.toFormat(timestamp, "LL")).toBe("06");
+    expect(TimestampUtil.toFormat(timestamp, "LLL")).toBe("Jun");
+    expect(TimestampUtil.toFormat(timestamp, "LLLL")).toBe("June");
+    expect(TimestampUtil.toFormat(timestamp, "LLLLL")).toBe("J");
+  });
+
+  test("Day", () => {
+    expect(TimestampUtil.toFormat(timestamp, "d")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "dd")).toBe("07");
+  });
+
+  test("Quarter", () => {
+    expect(TimestampUtil.toFormat(timestamp, "Q")).toBe("2");
+    expect(TimestampUtil.toFormat(timestamp, "QQ")).toBe("02");
+    expect(TimestampUtil.toFormat(timestamp, "QQQ")).toBe("Q2");
+    expect(TimestampUtil.toFormat(timestamp, "QQQQ")).toBe("2nd quarter");
+  });
+
+  test.skip("Day of Year", () => {
+    expect(TimestampUtil.toFormat(timestamp, "D")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "DD")).toBe("07");
+    expect(TimestampUtil.toFormat(timestamp, "DDD")).toBe("07");
+  });
+
+  test("Day of Week", () => {
+    expect(TimestampUtil.toFormat(timestamp, "E")).toBe("Wed");
+    expect(TimestampUtil.toFormat(timestamp, "EEEE")).toBe("Wednesday");
+    expect(TimestampUtil.toFormat(timestamp, "EEEEE")).toBe("W");
+
+    expect(TimestampUtil.toFormat(timestamp, "e")).toBe("3");
+    expect(TimestampUtil.toFormat(timestamp, "ee")).toBe("03");
+    expect(TimestampUtil.toFormat(timestamp, "eee")).toBe("Wed");
+    expect(TimestampUtil.toFormat(timestamp, "eeee")).toBe("Wednesday");
+    expect(TimestampUtil.toFormat(timestamp, "eeeee")).toBe("W");
+  });
+
+  test("Week", () => {
+    expect(TimestampUtil.toFormat(timestamp, "w")).toBe("23");
+    // expect(TimestampUtil.toFormat(timestamp, "W")).toBe("23");
+    // expect(TimestampUtil.toFormat(timestamp, "F")).toBe("W");
+  });
+
+  test("Hour", () => {
+    expect(TimestampUtil.toFormat(timestamp, "H")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "HH")).toBe("07");
+    expect(TimestampUtil.toFormat(timestamp, "h")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "hh")).toBe("07");
+
+    expect(TimestampUtil.toFormat(timestamp, "a")).toBe("AM");
+    expect(TimestampUtil.toFormat(timestamp, "aa")).toBe("AM");
+    expect(TimestampUtil.toFormat(timestamp, "aaa")).toBe("am");
+    expect(TimestampUtil.toFormat(timestamp, "aaaa")).toBe("a.m.");
+    expect(TimestampUtil.toFormat(timestamp, "aaaaa")).toBe("a");
+
+    expect(TimestampUtil.toFormat(timestamp, "K")).toBe("7");
+    expect(TimestampUtil.toFormat(timestamp, "k")).toBe("7");
+  });
+
+  test("Minute", () => {
+    expect(TimestampUtil.toFormat(timestamp, "s")).toBe("1");
+    expect(TimestampUtil.toFormat(timestamp, "ss")).toBe("01");
+  });
+
+  test("Milliseconds", () => {
+    expect(TimestampUtil.toFormat(timestamp, "SSS")).toBe("010");
+  });
+
+  test("Zone / offset", () => {
+    expect(TimestampUtil.toFormat(timestamp, "z")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "zz")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "zzz")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "zzzz")).toBe("GMT+02:00");
+    expect(TimestampUtil.toFormat(timestamp, "zzzzz")).toBe("GMT+02:00");
+
+    expect(TimestampUtil.toFormat(timestamp, "X")).toBe("+02");
+    expect(TimestampUtil.toFormat(timestamp, "XX")).toBe("+0200");
+    expect(TimestampUtil.toFormat(timestamp, "XXX")).toBe("+02:00");
+
+    expect(TimestampUtil.toFormat(timestamp, "x")).toBe("+02");
+    expect(TimestampUtil.toFormat(timestamp, "xx")).toBe("+0200");
+    expect(TimestampUtil.toFormat(timestamp, "xxx")).toBe("+02:00");
+
+    expect(TimestampUtil.toFormat(timestamp, "O")).toBe("GMT+2");
+    expect(TimestampUtil.toFormat(timestamp, "OOOO")).toBe("GMT+02:00");
+
+    // expect(TimestampUtil.toFormat(timestamp, "VV")).toBe("GMT+02:00");
+    // expect(TimestampUtil.toFormat(timestamp, "V")).toBe("Europe/Amsterdam");
+    // expect(TimestampUtil.toFormat(timestamp, "Z")).toBe("+02:00");
+    // expect(TimestampUtil.toFormat(timestamp, "ZZZZ")).toBe("+02:00");
+  });
+
+  test("Era and Chronology", () => {
+    expect(TimestampUtil.toFormat(timestamp, "G")).toBe("AD");
+    expect(TimestampUtil.toFormat(timestamp, "GGGG")).toBe("Anno Domini");
+    expect(TimestampUtil.toFormat(timestamp, "GGGGG")).toBe("A");
+
+    expect(TimestampUtil.toFormat(timestamp, "u")).toBe("2023");
+  });
+
+  test("Converted", () => {
+    const ZZZ = TimestampUtil.convertFormat("ZZZ");
+    expect(TimestampUtil.toFormat(timestamp, ZZZ)).toBe("+02:00");
+
+    const ZZ = TimestampUtil.convertFormat("ZZ");
+    expect(TimestampUtil.toFormat(timestamp, ZZ)).toBe("+0200");
+
+    const Z = TimestampUtil.convertFormat("Z");
+    expect(TimestampUtil.toFormat(timestamp, Z)).toBe("+02");
+
+    const fullDateTime = TimestampUtil.convertFormat(
+      "EEE MMM dd, yyyy h:mma ZZ",
+    );
+    expect(TimestampUtil.toFormat(timestamp, fullDateTime)).toBe(
+      "Wed Jun 07, 2023 7:04AM +0200",
+    );
+  });
+});

package/types/constants/Constants.d.ts

@@ -50,6 +50,10 @@ export const ISO_TIME_FORMAT: "HH:mm:ss";
 /**
  */
 export const ISO_TIMESTAMP_FORMAT: "yyyy-MM-dd'T'HH:mm:ss.SSS";
+/**
+ * Offset format is appended to iso datetime and timestamp when isIncludeTimeOffsetInDateTimes = true
+ */
+export const DATETIME_OFFSET_FORMAT: "xxx";
 /**
  * week starts on monday by default
  */
@@ -82,6 +86,10 @@ export const IS_SYNC: boolean;
  * @type {boolean}
  */
 export const IS_SERVER: boolean;
+/**
+ * @type {boolean}
+ */
+export const IS_GRAALJS: boolean;
 /**
  * @type {{SUCCESS: string, ERROR: string, INFO: string, WARNING: string}}
  */
@@ -132,6 +140,7 @@ export namespace ATTRIBUTE_WIDTH {
     let EXTRA_LARGE: string;
 }
 export const ALL_CONTENT_IN_DATA_SETTING: "hasAllContentInData";
+export const INCLUDE_TIME_OFFSET: "isIncludeTimeOffsetInDateTimes";
 export namespace INTERNAL_LOGIN_TYPE {
     let JAAS: string;
     let PAC4J_FORM: string;

package/types/constants/Settings.d.ts

@@ -6,11 +6,14 @@ export function allSettings(): {
 };
 export function cacheContributions(): boolean;
 export function getBasePath(): string;
-export function getUploadPath(): string;
-export function getCaptchaPath(): string;
+export function getBasePathModularUI(): string;
+export function getBasePathServer(): string;
+export function getUploadPath(contextPath?: string, origin?: string): string;
+export function getCaptchaPath(contextPath?: string, origin?: string): string;
 export function hasAllContentInData(): boolean;
+export function isIncludeTimeOffsetInDateTimes(): boolean;
 export function loginType(): string;
-export function loginPath(): string;
+export function loginPath(clientName?: string): string;
 export function loginUsernameField(): string;
 export function loginPasswordField(): string;
 export function logoutPath(): string;

package/types/models/actions/ActionCollection.d.ts

@@ -2,7 +2,7 @@
  * Collection of actions
  */
 export default class ActionCollection extends BaseCollection<ActionModel> {
-    constructor(actions?: Object, actionsContributions?: Object);
+    constructor(actions?: Object, actionsContributions?: Object, modelOptions?: ModelOptions);
     collection: any[];
     /**
      * Retrieve action by key
@@ -27,3 +27,4 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
 }
 import ActionModel from "./ActionModel";
 import BaseCollection from "../base/BaseCollection";
+import { ModelOptions } from "../types";

package/types/models/actions/ActionModel.d.ts

@@ -4,7 +4,7 @@
 export default class ActionModel extends BaseModel {
     /**
      */
-    static createFromHref(name: string, href: string, label: string, type?: string): ActionModel;
+    static createFromHref(name: string, href: string, label: string, type?: string, origin?: string, contextPath?: string): ActionModel;
     _fieldCollection: AttributeCollection;
     _href: Href;
     _icon: string;

package/types/models/attributes/AttributeCollection.d.ts

@@ -3,7 +3,7 @@ export default AttributeCollection;
  * Collection of attributes
  */
 declare class AttributeCollection extends ResourceCollection<AttributeType, any> {
-    constructor(data?: Object | Array<Object>, contributions?: Array<Object>, isReadonly?: boolean);
+    constructor(data?: Object | Array<Object>, contributions?: Array<Object>, modelOptions?: AttributeCollectionOptions);
     /**
      * Replace attributes with a new array of attributes
      */
@@ -94,3 +94,7 @@ import ResourceCollection from "../base/ResourceCollection";
 import ChoiceAttributeModel from "./ChoiceAttributeModel";
 import { FormErrorAnchor } from "../types";
 import ContentConfiguration from "../contentconfiguration/ContentConfiguration";
+type AttributeCollectionOptions = {
+    ModelOptions: any;
+    isReadonly: boolean;
+};

package/types/models/attributes/AttributeSetModel.d.ts

@@ -3,7 +3,7 @@
 export default class AttributeSetModel extends BaseModel {
     /**
      */
-    constructor(key?: string, data?: Object, contributions?: Object);
+    constructor(key?: string, data?: Object, contributions?: Object, modelOptions?: ModelOptions);
     _key: string;
     _attributeCollection: AttributeCollection;
     /**
@@ -33,3 +33,4 @@ export default class AttributeSetModel extends BaseModel {
 }
 import BaseModel from "../base/BaseModel";
 import AttributeCollection from "./AttributeCollection";
+import { ModelOptions } from "../types";

package/types/models/attributes/ChoiceAttributeOptionCollection.d.ts

@@ -4,8 +4,9 @@ export default ChoiceAttributeOptionCollection;
 declare class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel, any> {
     /**
      */
-    static create(data?: Object, contributions?: Object, referenceDate?: ISO_DATE): ChoiceAttributeOptionCollection;
-    constructor(initCollection?: ChoiceAttributeOptionModel[]);
+    static create(data?: Object, contributions?: Object, modelOptions?: ChoiceAttributeOptionModelOptions): ChoiceAttributeOptionCollection;
+    constructor(modelOptions?: ChoiceAttributeOptionModelOptions);
+    _modelOptions: ChoiceAttributeOptionModelOptions;
     _headers: Array<ListHeaderModel>;
     _sortOptions: boolean;
     /**
@@ -22,11 +23,11 @@ declare class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceA
     getOptionCount(code: string, options: Array<Object>): number | null;
     /**
      */
-    addOptions(data: Object, contributions: Object, referenceDate?: ISO_DATE): ChoiceAttributeOptionCollection;
+    addOptions(data: Object, contributions: Object): ChoiceAttributeOptionCollection;
     /**
      * Create options based on data and dynamischema
      */
-    addDynamicSchema(data: Object, contributions: Object, referenceDate?: ISO_DATE): ChoiceAttributeOptionCollection;
+    addDynamicSchema(data: Object, contributions: Object): ChoiceAttributeOptionCollection;
     /**
      */
     addBooleanOption(code: "true" | "false", defaultLabel: string, data: string | Array<string>, options?: Array<Object>): void;
@@ -37,7 +38,7 @@ declare class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceA
     addBooleanOptions(value: any, contributions: Object): ChoiceAttributeOptionCollection;
     /**
      */
-    addOption(data: string | Array<string>, contributions: Object, referenceDate?: ISO_DATE): ChoiceAttributeOptionCollection;
+    addOption(data: string | Array<string>, contributions: Object): ChoiceAttributeOptionCollection;
     /**
      * Get all options that have selected property true
      */
@@ -76,4 +77,5 @@ declare class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceA
 }
 import ChoiceAttributeOptionModel from "./ChoiceAttributeOptionModel";
 import ResourceCollection from "../base/ResourceCollection";
+import { ChoiceAttributeOptionModelOptions } from "./ChoiceAttributeOptionModel";
 import ListHeaderModel from "../list/ListHeaderModel";

package/types/models/attributes/ChoiceAttributeOptionModel.d.ts

@@ -1,3 +1,7 @@
+type ChoiceAttributeOptionModelOptions = {
+    ModelOptions: any;
+    referenceDate: ISO_DATE;
+};
 export default ChoiceAttributeOptionModel;
 /**
  */
@@ -7,7 +11,7 @@ declare class ChoiceAttributeOptionModel extends BaseModel {
     static createFromListItemModel(listitem: ListItemModel): ChoiceAttributeOptionModel;
     /**
      */
-    constructor(selectedValues?: Array<string>, option?: Object, referenceDate?: ISO_DATE);
+    constructor(selectedValues?: Array<string>, option?: Object, modelOptions?: ChoiceAttributeOptionModelOptions);
     _code: string;
     _isSelected: boolean;
     _referenceDate: ISO_DATE;
@@ -56,7 +60,7 @@ declare class ChoiceAttributeOptionModel extends BaseModel {
     get attributeCollection(): AttributeCollection;
     /**
      */
-    createAttributeCollection(): AttributeCollection;
+    createAttributeCollection(modelOptions?: ChoiceAttributeOptionModelOptions): AttributeCollection;
     /**
      * Get label of option for simple codemaps (e.g. static codemap)
      */
@@ -80,7 +84,7 @@ declare class ChoiceAttributeOptionModel extends BaseModel {
     get count(): number;
     /**
      */
-    addChildren(selectedValues?: Array<string>, option?: Object, referenceDate?: ISO_DATE): ChoiceAttributeOptionCollection;
+    addChildren(selectedValues?: Array<string>, option?: Object, modelOptions?: ChoiceAttributeOptionModelOptions): ChoiceAttributeOptionCollection;
     /**
      * get children of option
      */

package/types/models/attributes/CompositeAttributeChildCollection.d.ts

@@ -5,13 +5,13 @@ export default CompositeAttributeChildCollection;
 declare class CompositeAttributeChildCollection extends ResourceCollection<AttributeType, any> {
     /**
      */
-    static create(data: Object, contributions: Object): CompositeAttributeChildCollection;
+    static create(data: Object, contributions: Object, modelOptions?: ModelOptions): CompositeAttributeChildCollection;
     /**
      */
-    static createStandard(data: Object, contributions: Object): CompositeAttributeChildCollection;
+    static createStandard(data: Object, contributions: Object, modelOptions?: ModelOptions): CompositeAttributeChildCollection;
     /**
      */
-    static createMultiData(data: Object, contributions: Object): CompositeAttributeChildCollection;
+    static createMultiData(data: Object, contributions: Object, modelOptions?: ModelOptions): CompositeAttributeChildCollection;
     constructor(initCollection?: AttributeType[]);
     /**
      * Get input value of contributions
@@ -54,3 +54,4 @@ declare class CompositeAttributeChildCollection extends ResourceCollection<Attri
 import { AttributeType } from "../types";
 import ResourceCollection from "../base/ResourceCollection";
 import ErrorCollection from "../error/ErrorCollection";
+import { ModelOptions } from "../types";