@beinformed/ui 1.65.21 → 1.65.22

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.65.22](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.65.21...v1.65.22) (2026-01-23)
+
+
+### Bug Fixes
+
+* **filters:** update `RangeFilterModel` param handling and add `formdata` support ([bad3d98](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/bad3d9825b98ae1e00f583568bdd8b77451508ad))
+
 ## [1.65.21](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.65.20...v1.65.21) (2026-01-19)
 
 

package/esm/models/filters/AssignmentFilterModel.js

@@ -12,7 +12,6 @@ export default class AssignmentFilterModel extends BaseFilterModel {
    */
   constructor(data, contributions, modelOptions) {
     super(data, contributions, modelOptions);
-    _defineProperty(this, "_listKey", void 0);
     _defineProperty(this, "_assignmenttype", void 0);
     _defineProperty(this, "_user", void 0);
     this._assignmenttype = this.createAssignmentTypeModel();

package/esm/models/filters/AssignmentFilterModel.js.flow

@@ -12,7 +12,6 @@ export default class AssignmentFilterModel
   extends BaseFilterModel
   implements IFilter
 {
-  _listKey: string;
   _assignmenttype: AttributeType;
   _user: AttributeType;
 

package/esm/models/filters/AssignmentFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssignmentFilterModel.js","names":["BaseFilterModel","IllegalStateException","createAttribute","AssignmentFilterModel","constructor","data","contributions","modelOptions","_defineProperty","_assignmenttype","createAssignmentTypeModel","_user","createUserModel","key","contextid","assignmentTypeData","dynamicschema","assignmentTypeContributions","type","enumerated","optionMode","_links","name","param","userData","userContributions","assignmenttype","user","params","value","inputvalue","hasValue","reset","update","attribute","isActive","initvalue","isValid","readonlyvalue","formdata"],"sources":["../../../src/models/filters/AssignmentFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport type { IFilter, AttributeType, ModelOptions } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\nimport createAttribute from \"../attributes/_createAttribute\";\n\n/**\n * Assignment filter consists of two filters: assignment type and user filter\n */\nexport default class AssignmentFilterModel\n  extends BaseFilterModel\n  implements IFilter\n{\n  _listKey: string;\n  _assignmenttype: AttributeType;\n  _user: AttributeType;\n\n  /**\n   * Construct an assignment filter\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._assignmenttype = this.createAssignmentTypeModel();\n    this._user = this.createUserModel();\n  }\n\n  /**\n   * Creates an assignmenttype model when assignmenttype json is present\n   */\n  createAssignmentTypeModel(): AttributeType {\n    const key = `${this.contextid}ASSIGNMENTTYPE`;\n    const assignmentTypeData = this.data[key];\n\n    if (typeof assignmentTypeData === \"undefined\") {\n      throw new IllegalStateException(\n        `Missing assignment type data for ${key}`,\n      );\n    }\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      assignmentTypeData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const assignmentTypeContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: assignmentTypeData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      assignmentTypeData.name || assignmentTypeData.param,\n      assignmentTypeData,\n      assignmentTypeContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Creates an assignmenttype model when userkey json is present\n   */\n  createUserModel(): AttributeType {\n    const key = `${this.contextid}USERKEY`;\n    const userData = this.data[key];\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      userData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const userContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: userData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      userData.name || userData.param,\n      userData,\n      userContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the assignment type attribute\n   */\n  get assignmenttype(): AttributeType {\n    return this._assignmenttype;\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the user identifier attribute\n   */\n  get user(): AttributeType {\n    return this._user;\n  }\n\n  /**\n   * Getting the parameters of this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    return [\n      {\n        name: this.assignmenttype.name,\n        value: this.assignmenttype.value,\n      },\n      {\n        name: this.user.name,\n        value: this.user.value,\n      },\n    ];\n  }\n\n  /**\n   */\n  get value(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.value,\n      [this.user.name]: this.user.value,\n    };\n  }\n\n  /**\n   */\n  get inputvalue(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.inputvalue,\n      [this.user.name]: this.user.inputvalue,\n    };\n  }\n\n  /**\n   * Indicates if the filter has a value.\n   */\n  hasValue(): boolean {\n    return (\n      (this.assignmenttype.value !== null &&\n        this.assignmenttype.value !== \"\") ||\n      (this.user.value !== null && this.user.value !== \"\")\n    );\n  }\n\n  /**\n   * Reset the values within the filter\n   */\n  reset(): AssignmentFilterModel {\n    if (this.assignmenttype) {\n      this.assignmenttype.reset();\n    }\n    if (this.user) {\n      this.user.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.user != null && this.user.key === attribute.key) {\n      this.user.update(value);\n    } else if (\n      this.assignmenttype != null &&\n      this.assignmenttype.key === attribute.key\n    ) {\n      this.assignmenttype.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return (\n      (this.assignmenttype != null && this.assignmenttype.initvalue !== null) ||\n      (this.user != null && this.user.initvalue !== null)\n    );\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return (\n      this.assignmenttype != null &&\n      this.assignmenttype.isValid &&\n      this.user != null &&\n      this.user.isValid\n    );\n  }\n\n  /**\n   */\n  get readonlyvalue(): { [string]: string } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,\n      [this.user.name]: this.user.readonlyvalue,\n    };\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    return this.value;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AssignmentFilterModel.js","names":["BaseFilterModel","IllegalStateException","createAttribute","AssignmentFilterModel","constructor","data","contributions","modelOptions","_defineProperty","_assignmenttype","createAssignmentTypeModel","_user","createUserModel","key","contextid","assignmentTypeData","dynamicschema","assignmentTypeContributions","type","enumerated","optionMode","_links","name","param","userData","userContributions","assignmenttype","user","params","value","inputvalue","hasValue","reset","update","attribute","isActive","initvalue","isValid","readonlyvalue","formdata"],"sources":["../../../src/models/filters/AssignmentFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport type { IFilter, AttributeType, ModelOptions } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\nimport createAttribute from \"../attributes/_createAttribute\";\n\n/**\n * Assignment filter consists of two filters: assignment type and user filter\n */\nexport default class AssignmentFilterModel\n  extends BaseFilterModel\n  implements IFilter\n{\n  _assignmenttype: AttributeType;\n  _user: AttributeType;\n\n  /**\n   * Construct an assignment filter\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._assignmenttype = this.createAssignmentTypeModel();\n    this._user = this.createUserModel();\n  }\n\n  /**\n   * Creates an assignmenttype model when assignmenttype json is present\n   */\n  createAssignmentTypeModel(): AttributeType {\n    const key = `${this.contextid}ASSIGNMENTTYPE`;\n    const assignmentTypeData = this.data[key];\n\n    if (typeof assignmentTypeData === \"undefined\") {\n      throw new IllegalStateException(\n        `Missing assignment type data for ${key}`,\n      );\n    }\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      assignmentTypeData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const assignmentTypeContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: assignmentTypeData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      assignmentTypeData.name || assignmentTypeData.param,\n      assignmentTypeData,\n      assignmentTypeContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Creates an assignmenttype model when userkey json is present\n   */\n  createUserModel(): AttributeType {\n    const key = `${this.contextid}USERKEY`;\n    const userData = this.data[key];\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      userData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const userContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: userData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      userData.name || userData.param,\n      userData,\n      userContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the assignment type attribute\n   */\n  get assignmenttype(): AttributeType {\n    return this._assignmenttype;\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the user identifier attribute\n   */\n  get user(): AttributeType {\n    return this._user;\n  }\n\n  /**\n   * Getting the parameters of this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    return [\n      {\n        name: this.assignmenttype.name,\n        value: this.assignmenttype.value,\n      },\n      {\n        name: this.user.name,\n        value: this.user.value,\n      },\n    ];\n  }\n\n  /**\n   */\n  get value(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.value,\n      [this.user.name]: this.user.value,\n    };\n  }\n\n  /**\n   */\n  get inputvalue(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.inputvalue,\n      [this.user.name]: this.user.inputvalue,\n    };\n  }\n\n  /**\n   * Indicates if the filter has a value.\n   */\n  hasValue(): boolean {\n    return (\n      (this.assignmenttype.value !== null &&\n        this.assignmenttype.value !== \"\") ||\n      (this.user.value !== null && this.user.value !== \"\")\n    );\n  }\n\n  /**\n   * Reset the values within the filter\n   */\n  reset(): AssignmentFilterModel {\n    if (this.assignmenttype) {\n      this.assignmenttype.reset();\n    }\n    if (this.user) {\n      this.user.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.user != null && this.user.key === attribute.key) {\n      this.user.update(value);\n    } else if (\n      this.assignmenttype != null &&\n      this.assignmenttype.key === attribute.key\n    ) {\n      this.assignmenttype.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return (\n      (this.assignmenttype != null && this.assignmenttype.initvalue !== null) ||\n      (this.user != null && this.user.initvalue !== null)\n    );\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return (\n      this.assignmenttype != null &&\n      this.assignmenttype.isValid &&\n      this.user != null &&\n      this.user.isValid\n    );\n  }\n\n  /**\n   */\n  get readonlyvalue(): { [string]: string } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,\n      [this.user.name]: this.user.readonlyvalue,\n    };\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    return this.value;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/esm/models/filters/RangeFilterModel.js

@@ -1,4 +1,5 @@
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import FilterModel from "../filters/FilterModel";
 import CompositeAttributeModel from "../attributes/CompositeAttributeModel";
 /**
@@ -32,5 +33,27 @@ export default class RangeFilterModel extends FilterModel {
     }
     return [];
   }
+
+  /**
+   */
+  get formdata() {
+    if (this.attribute instanceof CompositeAttributeModel) {
+      const formdata = {};
+      for (const child of this.attribute.children.all) {
+        const {
+          param
+        } = this.data[child.name];
+        if (child.value) {
+          formdata[param] = child.value;
+        }
+      }
+      if (_Object$keys(formdata).length > 0) {
+        return {
+          [this.param]: formdata
+        };
+      }
+    }
+    return null;
+  }
 }
 //# sourceMappingURL=RangeFilterModel.js.map

package/esm/models/filters/RangeFilterModel.js.flow

@@ -33,4 +33,22 @@ export default class RangeFilterModel extends FilterModel implements IFilter {
 
     return [];
   }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    if (this.attribute instanceof CompositeAttributeModel) {
+      const formdata = {};
+      for (const child of this.attribute.children.all) {
+        const { param } = this.data[child.name];
+        if (child.value) {
+          formdata[param] = child.value;
+        }
+      }
+      if (Object.keys(formdata).length > 0) {
+        return { [this.param]: formdata };
+      }
+    }
+    return null;
+  }
 }

package/esm/models/filters/RangeFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RangeFilterModel.js","names":["FilterModel","CompositeAttributeModel","RangeFilterModel","update","attribute","value","params","_context","_mapInstanceProperty","children","call","child","param","data","name"],"sources":["../../../src/models/filters/RangeFilterModel.js"],"sourcesContent":["// @flow\nimport FilterModel from \"../filters/FilterModel\";\n\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport type { AttributeType, IFilter } from \"../types\";\n\n/**\n * Range filter, for instance a date range filter or a number range filter\n */\nexport default class RangeFilterModel extends FilterModel implements IFilter {\n  /**\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      this.attribute.update(value, attribute);\n    } else if (this.attribute != null) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      return this.attribute.children.map((child) => {\n        const { param } = this.data[child.name];\n        return {\n          name: param,\n          value: child.value,\n        };\n      });\n    }\n\n    return [];\n  }\n}\n"],"mappings":";AACA,OAAOA,WAAW,MAAM,wBAAwB;AAEhD,OAAOC,uBAAuB,MAAM,uCAAuC;AAG3E;AACA;AACA;AACA,eAAe,MAAMC,gBAAgB,SAASF,WAAW,CAAoB;EAC3E;AACF;EACEG,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACD,SAAS,YAAYH,uBAAuB,EAAE;MACrD,IAAI,CAACG,SAAS,CAACD,MAAM,CAACE,KAAK,EAAED,SAAS,CAAC;IACzC,CAAC,MAAM,IAAI,IAAI,CAACA,SAAS,IAAI,IAAI,EAAE;MACjC,IAAI,CAACA,SAAS,CAACD,MAAM,CAACE,KAAK,CAAC;IAC9B;EACF;;EAEA;AACF;EACE,IAAIC,MAAMA,CAAA,EAA4C;IACpD,IAAI,IAAI,CAACF,SAAS,YAAYH,uBAAuB,EAAE;MAAA,IAAAM,QAAA;MACrD,OAAOC,oBAAA,CAAAD,QAAA,OAAI,CAACH,SAAS,CAACK,QAAQ,EAAAC,IAAA,CAAAH,QAAA,EAAMI,KAAK,IAAK;QAC5C,MAAM;UAAEC;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,OAAO;UACLA,IAAI,EAAEF,KAAK;UACXP,KAAK,EAAEM,KAAK,CAACN;QACf,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAO,EAAE;EACX;AACF","ignoreList":[]}
+{"version":3,"file":"RangeFilterModel.js","names":["FilterModel","CompositeAttributeModel","RangeFilterModel","update","attribute","value","params","_context","_mapInstanceProperty","children","call","child","param","data","name","formdata","all","_Object$keys","length"],"sources":["../../../src/models/filters/RangeFilterModel.js"],"sourcesContent":["// @flow\nimport FilterModel from \"../filters/FilterModel\";\n\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport type { AttributeType, IFilter } from \"../types\";\n\n/**\n * Range filter, for instance a date range filter or a number range filter\n */\nexport default class RangeFilterModel extends FilterModel implements IFilter {\n  /**\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      this.attribute.update(value, attribute);\n    } else if (this.attribute != null) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      return this.attribute.children.map((child) => {\n        const { param } = this.data[child.name];\n        return {\n          name: param,\n          value: child.value,\n        };\n      });\n    }\n\n    return [];\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      const formdata = {};\n      for (const child of this.attribute.children.all) {\n        const { param } = this.data[child.name];\n        if (child.value) {\n          formdata[param] = child.value;\n        }\n      }\n      if (Object.keys(formdata).length > 0) {\n        return { [this.param]: formdata };\n      }\n    }\n    return null;\n  }\n}\n"],"mappings":";;AACA,OAAOA,WAAW,MAAM,wBAAwB;AAEhD,OAAOC,uBAAuB,MAAM,uCAAuC;AAG3E;AACA;AACA;AACA,eAAe,MAAMC,gBAAgB,SAASF,WAAW,CAAoB;EAC3E;AACF;EACEG,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACD,SAAS,YAAYH,uBAAuB,EAAE;MACrD,IAAI,CAACG,SAAS,CAACD,MAAM,CAACE,KAAK,EAAED,SAAS,CAAC;IACzC,CAAC,MAAM,IAAI,IAAI,CAACA,SAAS,IAAI,IAAI,EAAE;MACjC,IAAI,CAACA,SAAS,CAACD,MAAM,CAACE,KAAK,CAAC;IAC9B;EACF;;EAEA;AACF;EACE,IAAIC,MAAMA,CAAA,EAA4C;IACpD,IAAI,IAAI,CAACF,SAAS,YAAYH,uBAAuB,EAAE;MAAA,IAAAM,QAAA;MACrD,OAAOC,oBAAA,CAAAD,QAAA,OAAI,CAACH,SAAS,CAACK,QAAQ,EAAAC,IAAA,CAAAH,QAAA,EAAMI,KAAK,IAAK;QAC5C,MAAM;UAAEC;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,OAAO;UACLA,IAAI,EAAEF,KAAK;UACXP,KAAK,EAAEM,KAAK,CAACN;QACf,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAO,EAAE;EACX;;EAEA;AACF;EACE,IAAIU,QAAQA,CAAA,EAA6B;IACvC,IAAI,IAAI,CAACX,SAAS,YAAYH,uBAAuB,EAAE;MACrD,MAAMc,QAAQ,GAAG,CAAC,CAAC;MACnB,KAAK,MAAMJ,KAAK,IAAI,IAAI,CAACP,SAAS,CAACK,QAAQ,CAACO,GAAG,EAAE;QAC/C,MAAM;UAAEJ;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,IAAIH,KAAK,CAACN,KAAK,EAAE;UACfU,QAAQ,CAACH,KAAK,CAAC,GAAGD,KAAK,CAACN,KAAK;QAC/B;MACF;MACA,IAAIY,YAAA,CAAYF,QAAQ,CAAC,CAACG,MAAM,GAAG,CAAC,EAAE;QACpC,OAAO;UAAE,CAAC,IAAI,CAACN,KAAK,GAAGG;QAAS,CAAC;MACnC;IACF;IACA,OAAO,IAAI;EACb;AACF","ignoreList":[]}

package/esm/models/filters/__tests__/RangeFilterModel.spec.js.flow

@@ -8,11 +8,11 @@ describe("rangeFilterModel", () => {
       {
         name: "NumberOfPages",
         startNumber: {
-          param: "NumberOfPages",
+          param: "start",
           value: "12",
         },
         endNumber: {
-          param: "endNumberOfPages",
+          param: "end",
         },
       },
       {
@@ -51,5 +51,16 @@ describe("rangeFilterModel", () => {
 
     expect(rangeFilter.attribute.start.value).toBe(12);
     expect(rangeFilter.attribute.end.value).toBeNull();
+
+    expect(rangeFilter.params).toEqual([
+      { name: "start", value: 12 },
+      { name: "end", value: null },
+    ]);
+
+    expect(rangeFilter.formdata).toEqual({
+      NumberOfPages: {
+        start: 12,
+      },
+    });
   });
 });

package/lib/models/filters/AssignmentFilterModel.js

@@ -18,7 +18,6 @@ class AssignmentFilterModel extends _BaseFilterModel.default {
    */
   constructor(data, contributions, modelOptions) {
     super(data, contributions, modelOptions);
-    (0, _defineProperty2.default)(this, "_listKey", void 0);
     (0, _defineProperty2.default)(this, "_assignmenttype", void 0);
     (0, _defineProperty2.default)(this, "_user", void 0);
     this._assignmenttype = this.createAssignmentTypeModel();

package/lib/models/filters/AssignmentFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssignmentFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","_exceptions","_createAttribute","AssignmentFilterModel","BaseFilterModel","constructor","data","contributions","modelOptions","_defineProperty2","default","_assignmenttype","createAssignmentTypeModel","_user","createUserModel","key","contextid","assignmentTypeData","IllegalStateException","dynamicschema","assignmentTypeContributions","type","enumerated","optionMode","_links","createAttribute","name","param","userData","userContributions","assignmenttype","user","params","value","inputvalue","hasValue","reset","update","attribute","isActive","initvalue","isValid","readonlyvalue","formdata","exports"],"sources":["../../../src/models/filters/AssignmentFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport type { IFilter, AttributeType, ModelOptions } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\nimport createAttribute from \"../attributes/_createAttribute\";\n\n/**\n * Assignment filter consists of two filters: assignment type and user filter\n */\nexport default class AssignmentFilterModel\n  extends BaseFilterModel\n  implements IFilter\n{\n  _listKey: string;\n  _assignmenttype: AttributeType;\n  _user: AttributeType;\n\n  /**\n   * Construct an assignment filter\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._assignmenttype = this.createAssignmentTypeModel();\n    this._user = this.createUserModel();\n  }\n\n  /**\n   * Creates an assignmenttype model when assignmenttype json is present\n   */\n  createAssignmentTypeModel(): AttributeType {\n    const key = `${this.contextid}ASSIGNMENTTYPE`;\n    const assignmentTypeData = this.data[key];\n\n    if (typeof assignmentTypeData === \"undefined\") {\n      throw new IllegalStateException(\n        `Missing assignment type data for ${key}`,\n      );\n    }\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      assignmentTypeData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const assignmentTypeContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: assignmentTypeData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      assignmentTypeData.name || assignmentTypeData.param,\n      assignmentTypeData,\n      assignmentTypeContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Creates an assignmenttype model when userkey json is present\n   */\n  createUserModel(): AttributeType {\n    const key = `${this.contextid}USERKEY`;\n    const userData = this.data[key];\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      userData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const userContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: userData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      userData.name || userData.param,\n      userData,\n      userContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the assignment type attribute\n   */\n  get assignmenttype(): AttributeType {\n    return this._assignmenttype;\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the user identifier attribute\n   */\n  get user(): AttributeType {\n    return this._user;\n  }\n\n  /**\n   * Getting the parameters of this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    return [\n      {\n        name: this.assignmenttype.name,\n        value: this.assignmenttype.value,\n      },\n      {\n        name: this.user.name,\n        value: this.user.value,\n      },\n    ];\n  }\n\n  /**\n   */\n  get value(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.value,\n      [this.user.name]: this.user.value,\n    };\n  }\n\n  /**\n   */\n  get inputvalue(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.inputvalue,\n      [this.user.name]: this.user.inputvalue,\n    };\n  }\n\n  /**\n   * Indicates if the filter has a value.\n   */\n  hasValue(): boolean {\n    return (\n      (this.assignmenttype.value !== null &&\n        this.assignmenttype.value !== \"\") ||\n      (this.user.value !== null && this.user.value !== \"\")\n    );\n  }\n\n  /**\n   * Reset the values within the filter\n   */\n  reset(): AssignmentFilterModel {\n    if (this.assignmenttype) {\n      this.assignmenttype.reset();\n    }\n    if (this.user) {\n      this.user.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.user != null && this.user.key === attribute.key) {\n      this.user.update(value);\n    } else if (\n      this.assignmenttype != null &&\n      this.assignmenttype.key === attribute.key\n    ) {\n      this.assignmenttype.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return (\n      (this.assignmenttype != null && this.assignmenttype.initvalue !== null) ||\n      (this.user != null && this.user.initvalue !== null)\n    );\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return (\n      this.assignmenttype != null &&\n      this.assignmenttype.isValid &&\n      this.user != null &&\n      this.user.isValid\n    );\n  }\n\n  /**\n   */\n  get readonlyvalue(): { [string]: string } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,\n      [this.user.name]: this.user.readonlyvalue,\n    };\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    return this.value;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AssignmentFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","_exceptions","_createAttribute","AssignmentFilterModel","BaseFilterModel","constructor","data","contributions","modelOptions","_defineProperty2","default","_assignmenttype","createAssignmentTypeModel","_user","createUserModel","key","contextid","assignmentTypeData","IllegalStateException","dynamicschema","assignmentTypeContributions","type","enumerated","optionMode","_links","createAttribute","name","param","userData","userContributions","assignmenttype","user","params","value","inputvalue","hasValue","reset","update","attribute","isActive","initvalue","isValid","readonlyvalue","formdata","exports"],"sources":["../../../src/models/filters/AssignmentFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport type { IFilter, AttributeType, ModelOptions } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\nimport createAttribute from \"../attributes/_createAttribute\";\n\n/**\n * Assignment filter consists of two filters: assignment type and user filter\n */\nexport default class AssignmentFilterModel\n  extends BaseFilterModel\n  implements IFilter\n{\n  _assignmenttype: AttributeType;\n  _user: AttributeType;\n\n  /**\n   * Construct an assignment filter\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._assignmenttype = this.createAssignmentTypeModel();\n    this._user = this.createUserModel();\n  }\n\n  /**\n   * Creates an assignmenttype model when assignmenttype json is present\n   */\n  createAssignmentTypeModel(): AttributeType {\n    const key = `${this.contextid}ASSIGNMENTTYPE`;\n    const assignmentTypeData = this.data[key];\n\n    if (typeof assignmentTypeData === \"undefined\") {\n      throw new IllegalStateException(\n        `Missing assignment type data for ${key}`,\n      );\n    }\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      assignmentTypeData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const assignmentTypeContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: assignmentTypeData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      assignmentTypeData.name || assignmentTypeData.param,\n      assignmentTypeData,\n      assignmentTypeContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Creates an assignmenttype model when userkey json is present\n   */\n  createUserModel(): AttributeType {\n    const key = `${this.contextid}USERKEY`;\n    const userData = this.data[key];\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      userData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const userContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: userData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      userData.name || userData.param,\n      userData,\n      userContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the assignment type attribute\n   */\n  get assignmenttype(): AttributeType {\n    return this._assignmenttype;\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the user identifier attribute\n   */\n  get user(): AttributeType {\n    return this._user;\n  }\n\n  /**\n   * Getting the parameters of this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    return [\n      {\n        name: this.assignmenttype.name,\n        value: this.assignmenttype.value,\n      },\n      {\n        name: this.user.name,\n        value: this.user.value,\n      },\n    ];\n  }\n\n  /**\n   */\n  get value(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.value,\n      [this.user.name]: this.user.value,\n    };\n  }\n\n  /**\n   */\n  get inputvalue(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.inputvalue,\n      [this.user.name]: this.user.inputvalue,\n    };\n  }\n\n  /**\n   * Indicates if the filter has a value.\n   */\n  hasValue(): boolean {\n    return (\n      (this.assignmenttype.value !== null &&\n        this.assignmenttype.value !== \"\") ||\n      (this.user.value !== null && this.user.value !== \"\")\n    );\n  }\n\n  /**\n   * Reset the values within the filter\n   */\n  reset(): AssignmentFilterModel {\n    if (this.assignmenttype) {\n      this.assignmenttype.reset();\n    }\n    if (this.user) {\n      this.user.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.user != null && this.user.key === attribute.key) {\n      this.user.update(value);\n    } else if (\n      this.assignmenttype != null &&\n      this.assignmenttype.key === attribute.key\n    ) {\n      this.assignmenttype.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return (\n      (this.assignmenttype != null && this.assignmenttype.initvalue !== null) ||\n      (this.user != null && this.user.initvalue !== null)\n    );\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return (\n      this.assignmenttype != null &&\n      this.assignmenttype.isValid &&\n      this.user != null &&\n      this.user.isValid\n    );\n  }\n\n  /**\n   */\n  get readonlyvalue(): { [string]: string } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,\n      [this.user.name]: this.user.readonlyvalue,\n    };\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    return this.value;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/models/filters/RangeFilterModel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _FilterModel = _interopRequireDefault(require("../filters/FilterModel"));
 var _CompositeAttributeModel = _interopRequireDefault(require("../attributes/CompositeAttributeModel"));
 /**
@@ -39,6 +40,28 @@ class RangeFilterModel extends _FilterModel.default {
     }
     return [];
   }
+
+  /**
+   */
+  get formdata() {
+    if (this.attribute instanceof _CompositeAttributeModel.default) {
+      const formdata = {};
+      for (const child of this.attribute.children.all) {
+        const {
+          param
+        } = this.data[child.name];
+        if (child.value) {
+          formdata[param] = child.value;
+        }
+      }
+      if ((0, _keys.default)(formdata).length > 0) {
+        return {
+          [this.param]: formdata
+        };
+      }
+    }
+    return null;
+  }
 }
 exports.default = RangeFilterModel;
 //# sourceMappingURL=RangeFilterModel.js.map

package/lib/models/filters/RangeFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RangeFilterModel.js","names":["_FilterModel","_interopRequireDefault","require","_CompositeAttributeModel","RangeFilterModel","FilterModel","update","attribute","value","CompositeAttributeModel","params","_context","_map","default","children","call","child","param","data","name","exports"],"sources":["../../../src/models/filters/RangeFilterModel.js"],"sourcesContent":["// @flow\nimport FilterModel from \"../filters/FilterModel\";\n\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport type { AttributeType, IFilter } from \"../types\";\n\n/**\n * Range filter, for instance a date range filter or a number range filter\n */\nexport default class RangeFilterModel extends FilterModel implements IFilter {\n  /**\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      this.attribute.update(value, attribute);\n    } else if (this.attribute != null) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      return this.attribute.children.map((child) => {\n        const { param } = this.data[child.name];\n        return {\n          name: param,\n          value: child.value,\n        };\n      });\n    }\n\n    return [];\n  }\n}\n"],"mappings":";;;;;;;;AACA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,wBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAGA;AACA;AACA;AACe,MAAME,gBAAgB,SAASC,oBAAW,CAAoB;EAC3E;AACF;EACEC,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACD,SAAS,YAAYE,gCAAuB,EAAE;MACrD,IAAI,CAACF,SAAS,CAACD,MAAM,CAACE,KAAK,EAAED,SAAS,CAAC;IACzC,CAAC,MAAM,IAAI,IAAI,CAACA,SAAS,IAAI,IAAI,EAAE;MACjC,IAAI,CAACA,SAAS,CAACD,MAAM,CAACE,KAAK,CAAC;IAC9B;EACF;;EAEA;AACF;EACE,IAAIE,MAAMA,CAAA,EAA4C;IACpD,IAAI,IAAI,CAACH,SAAS,YAAYE,gCAAuB,EAAE;MAAA,IAAAE,QAAA;MACrD,OAAO,IAAAC,IAAA,CAAAC,OAAA,EAAAF,QAAA,OAAI,CAACJ,SAAS,CAACO,QAAQ,EAAAC,IAAA,CAAAJ,QAAA,EAAMK,KAAK,IAAK;QAC5C,MAAM;UAAEC;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,OAAO;UACLA,IAAI,EAAEF,KAAK;UACXT,KAAK,EAAEQ,KAAK,CAACR;QACf,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAO,EAAE;EACX;AACF;AAACY,OAAA,CAAAP,OAAA,GAAAT,gBAAA","ignoreList":[]}
+{"version":3,"file":"RangeFilterModel.js","names":["_FilterModel","_interopRequireDefault","require","_CompositeAttributeModel","RangeFilterModel","FilterModel","update","attribute","value","CompositeAttributeModel","params","_context","_map","default","children","call","child","param","data","name","formdata","all","_keys","length","exports"],"sources":["../../../src/models/filters/RangeFilterModel.js"],"sourcesContent":["// @flow\nimport FilterModel from \"../filters/FilterModel\";\n\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport type { AttributeType, IFilter } from \"../types\";\n\n/**\n * Range filter, for instance a date range filter or a number range filter\n */\nexport default class RangeFilterModel extends FilterModel implements IFilter {\n  /**\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      this.attribute.update(value, attribute);\n    } else if (this.attribute != null) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      return this.attribute.children.map((child) => {\n        const { param } = this.data[child.name];\n        return {\n          name: param,\n          value: child.value,\n        };\n      });\n    }\n\n    return [];\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      const formdata = {};\n      for (const child of this.attribute.children.all) {\n        const { param } = this.data[child.name];\n        if (child.value) {\n          formdata[param] = child.value;\n        }\n      }\n      if (Object.keys(formdata).length > 0) {\n        return { [this.param]: formdata };\n      }\n    }\n    return null;\n  }\n}\n"],"mappings":";;;;;;;;;AACA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,wBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAGA;AACA;AACA;AACe,MAAME,gBAAgB,SAASC,oBAAW,CAAoB;EAC3E;AACF;EACEC,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACD,SAAS,YAAYE,gCAAuB,EAAE;MACrD,IAAI,CAACF,SAAS,CAACD,MAAM,CAACE,KAAK,EAAED,SAAS,CAAC;IACzC,CAAC,MAAM,IAAI,IAAI,CAACA,SAAS,IAAI,IAAI,EAAE;MACjC,IAAI,CAACA,SAAS,CAACD,MAAM,CAACE,KAAK,CAAC;IAC9B;EACF;;EAEA;AACF;EACE,IAAIE,MAAMA,CAAA,EAA4C;IACpD,IAAI,IAAI,CAACH,SAAS,YAAYE,gCAAuB,EAAE;MAAA,IAAAE,QAAA;MACrD,OAAO,IAAAC,IAAA,CAAAC,OAAA,EAAAF,QAAA,OAAI,CAACJ,SAAS,CAACO,QAAQ,EAAAC,IAAA,CAAAJ,QAAA,EAAMK,KAAK,IAAK;QAC5C,MAAM;UAAEC;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,OAAO;UACLA,IAAI,EAAEF,KAAK;UACXT,KAAK,EAAEQ,KAAK,CAACR;QACf,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAO,EAAE;EACX;;EAEA;AACF;EACE,IAAIY,QAAQA,CAAA,EAA6B;IACvC,IAAI,IAAI,CAACb,SAAS,YAAYE,gCAAuB,EAAE;MACrD,MAAMW,QAAQ,GAAG,CAAC,CAAC;MACnB,KAAK,MAAMJ,KAAK,IAAI,IAAI,CAACT,SAAS,CAACO,QAAQ,CAACO,GAAG,EAAE;QAC/C,MAAM;UAAEJ;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,IAAIH,KAAK,CAACR,KAAK,EAAE;UACfY,QAAQ,CAACH,KAAK,CAAC,GAAGD,KAAK,CAACR,KAAK;QAC/B;MACF;MACA,IAAI,IAAAc,KAAA,CAAAT,OAAA,EAAYO,QAAQ,CAAC,CAACG,MAAM,GAAG,CAAC,EAAE;QACpC,OAAO;UAAE,CAAC,IAAI,CAACN,KAAK,GAAGG;QAAS,CAAC;MACnC;IACF;IACA,OAAO,IAAI;EACb;AACF;AAACI,OAAA,CAAAX,OAAA,GAAAT,gBAAA","ignoreList":[]}

package/package.json

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