@beinformed/ui 1.65.0 → 1.65.1

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.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.65.0...v1.65.1) (2025-12-18)
+
+
+### Bug Fixes
+
+* **filters:** improve `formdata` construction and handle empty body fields ([ea14a24](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/ea14a24476b87c6fc8d4d5f141d87e23e2e26ecd))
+
 ## [1.65.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.14...v1.65.0) (2025-12-18)
 
 

package/esm/models/filters/FilterCollection.js

@@ -3,6 +3,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
+import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import BaseCollection from "../base/BaseCollection";
 import StringFilterModel from "../filters/StringFilterModel";
 import RangeFilterModel from "../filters/RangeFilterModel";
@@ -147,16 +148,13 @@ export default class FilterCollection extends BaseCollection {
    */
   get formdata() {
     var _context7;
-    let data = {};
-    _filterInstanceProperty(_context7 = this).call(_context7, f => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue()).forEach(f => {
-      // $FlowIgnore[cannot-spread-indexer]
-      // $FlowIgnore[exponential-spread]
-      data = {
-        ...data,
-        ...f.formdata
-      };
-    });
-    return data;
+    const bodyFields = _filterInstanceProperty(_context7 = this).call(_context7, f => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata);
+    if (bodyFields.length === 0) {
+      return null;
+    }
+    return bodyFields.reduce((data, f) => {
+      return _Object$assign(data, f.formdata);
+    }, {});
   }
 }
 //# sourceMappingURL=FilterCollection.js.map

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

@@ -194,17 +194,17 @@ export default class FilterCollection extends BaseCollection<FilterType> {
   /**
    */
   get formdata(): { [string]: any } | null {
-    let data = {};
-    this.filter(
-      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),
-    ).forEach((f) => {
-      // $FlowIgnore[cannot-spread-indexer]
-      // $FlowIgnore[exponential-spread]
-      data = {
-        ...data,
-        ...f.formdata,
-      };
-    });
-    return data;
+    const bodyFields = this.filter(
+      (f) =>
+        f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata,
+    );
+
+    if (bodyFields.length === 0) {
+      return null;
+    }
+
+    return bodyFields.reduce((data, f) => {
+      return Object.assign(data, f.formdata);
+    }, {});
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"FilterCollection.js","names":["BaseCollection","StringFilterModel","RangeFilterModel","AssignmentFilterModel","ConceptIndexFilterModel","CompositeAttributeModel","FilterModel","PARAMETER_TYPES","FilterCollection","constructor","data","contributions","modelOptions","Array","isArray","_filterInstanceProperty","_context","_context2","collection","_mapInstanceProperty","call","filterContribution","_Object$keys","filterKey","filterData","filterContributionByKey","filter","createFilter","dynamicschema","listkey","contexts","contextid","_context3","filterContext","_findInstanceProperty","context","id","type","_includesInstanceProperty","reset","_context4","checkRangeFilterByAttributeKey","key","rangeAttribute","attribute","start","end","checkAssignmentFilterByAttributeKey","user","assignmenttype","getFilterByAttributeKey","_context5","update","value","_context6","filterToUpdate","parentKey","Error","newFilter","clone","name","isValid","every","hasActiveFilters","some","isActive","formdata","_context7","f","parameterType","BODY","hasValue","forEach"],"sources":["../../../src/models/filters/FilterCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\n\nimport StringFilterModel from \"../filters/StringFilterModel\";\nimport RangeFilterModel from \"../filters/RangeFilterModel\";\nimport AssignmentFilterModel from \"../filters/AssignmentFilterModel\";\nimport ConceptIndexFilterModel from \"../filters/ConceptIndexFilterModel\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport FilterModel from \"../filters/FilterModel\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\nimport { PARAMETER_TYPES } from \"../../constants\";\n\n/**\n * Contains a collection of filters\n */\nexport default class FilterCollection extends BaseCollection<FilterType> {\n  /**\n   * Construct a collection of filters\n   */\n  constructor(\n    data: Object = {},\n    contributions: Object = {},\n    modelOptions?: ModelOptions,\n  ) {\n    super();\n\n    if (data && contributions && Array.isArray(contributions.filter)) {\n      this.collection = contributions.filter\n        .filter((filterContribution) => Object.keys(filterContribution)[0])\n        .map((filterContribution) => {\n          const [filterKey] = Object.keys(filterContribution);\n          const filterData = data[filterKey];\n          const filterContributionByKey = filterContribution[filterKey];\n\n          const filter = this.createFilter(\n            filterKey,\n            {\n              ...filterData,\n              dynamicschema: contributions.dynamicschema,\n            },\n            filterContributionByKey,\n            modelOptions,\n          );\n\n          if (contributions.listkey) {\n            filter.listkey = contributions.listkey;\n          }\n\n          if (contributions.contexts && filterContributionByKey.contextid) {\n            const filterContext = contributions.contexts.find(\n              (context) => context.id === filterContributionByKey.contextid,\n            );\n            if (filterContext) {\n              filter.context = filterContext;\n            }\n          }\n\n          return filter;\n        });\n    }\n  }\n\n  /**\n   */\n  createFilter(\n    filterKey: string,\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ): FilterType {\n    const type = contributions.type || \"stringfilter\";\n    if (type === \"choicefilter\" && filterKey === \"index\") {\n      return new ConceptIndexFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type.includes(\"rangefilter\")) {\n      return new RangeFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"assignmentfilter\") {\n      return new AssignmentFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"stringfilter\") {\n      return new StringFilterModel(data, contributions, modelOptions);\n    }\n\n    return new FilterModel(data, contributions, modelOptions);\n  }\n\n  /**\n   * Call the reset function on all filters\n   *\n   * @see {FilterType#reset()}\n   */\n  reset(): FilterCollection {\n    this.collection = this.collection.map((filter) => filter.reset());\n\n    return this;\n  }\n\n  /**\n   * Checks if range attribute key equals key\n   */\n  checkRangeFilterByAttributeKey(\n    filter: RangeFilterModel,\n    key: string,\n  ): boolean {\n    const rangeAttribute = filter.attribute;\n\n    if (rangeAttribute instanceof CompositeAttributeModel) {\n      return (\n        rangeAttribute.key === key ||\n        (rangeAttribute.start && rangeAttribute.start.key === key) ||\n        (rangeAttribute.end && rangeAttribute.end.key === key)\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   * Check if assignment filter attribute matches key\n   */\n  checkAssignmentFilterByAttributeKey(\n    filter: AssignmentFilterModel,\n    key: string,\n  ): boolean {\n    return (\n      filter.key === key ||\n      filter.user?.key === key ||\n      filter.assignmenttype?.key === key\n    );\n  }\n\n  /**\n   * Getting the filter by name\n   */\n  getFilterByAttributeKey(key: string): FilterType | null {\n    return (\n      this.find((filter) => {\n        if (filter instanceof RangeFilterModel) {\n          return this.checkRangeFilterByAttributeKey(filter, key);\n        }\n\n        if (filter instanceof AssignmentFilterModel) {\n          return this.checkAssignmentFilterByAttributeKey(filter, key);\n        }\n\n        return filter.attribute?.key === key;\n      }) || null\n    );\n  }\n\n  /**\n   * Update Filter by input name and value\n   */\n  update(attribute: AttributeType, value: string): void {\n    const filterToUpdate = attribute.parentKey\n      ? this.getFilterByAttributeKey(attribute.parentKey)\n      : this.getFilterByAttributeKey(attribute.key);\n\n    if (!filterToUpdate) {\n      throw new Error(`Can not find filter by attribute key: ${attribute.key}`);\n    }\n\n    const newFilter = filterToUpdate.clone();\n    newFilter.update(attribute, value);\n\n    this.collection = this.collection.map((filter) => {\n      if (filter.name === newFilter.name) {\n        return newFilter;\n      }\n\n      return filter;\n    });\n  }\n\n  /**\n   * Retrieve if all filters are valid\n   */\n  get isValid(): boolean {\n    return this.collection.every((filter) => filter.isValid);\n  }\n\n  /**\n   * Indicates if an active filter is present in the collection\n   */\n  hasActiveFilters(): boolean {\n    return this.collection.some((filter) => filter.isActive());\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    let data = {};\n    this.filter(\n      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),\n    ).forEach((f) => {\n      // $FlowIgnore[cannot-spread-indexer]\n      // $FlowIgnore[exponential-spread]\n      data = {\n        ...data,\n        ...f.formdata,\n      };\n    });\n    return data;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FilterCollection.js","names":["BaseCollection","StringFilterModel","RangeFilterModel","AssignmentFilterModel","ConceptIndexFilterModel","CompositeAttributeModel","FilterModel","PARAMETER_TYPES","FilterCollection","constructor","data","contributions","modelOptions","Array","isArray","_filterInstanceProperty","_context","_context2","collection","_mapInstanceProperty","call","filterContribution","_Object$keys","filterKey","filterData","filterContributionByKey","filter","createFilter","dynamicschema","listkey","contexts","contextid","_context3","filterContext","_findInstanceProperty","context","id","type","_includesInstanceProperty","reset","_context4","checkRangeFilterByAttributeKey","key","rangeAttribute","attribute","start","end","checkAssignmentFilterByAttributeKey","user","assignmenttype","getFilterByAttributeKey","_context5","update","value","_context6","filterToUpdate","parentKey","Error","newFilter","clone","name","isValid","every","hasActiveFilters","some","isActive","formdata","_context7","bodyFields","f","parameterType","BODY","hasValue","length","reduce","_Object$assign"],"sources":["../../../src/models/filters/FilterCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\n\nimport StringFilterModel from \"../filters/StringFilterModel\";\nimport RangeFilterModel from \"../filters/RangeFilterModel\";\nimport AssignmentFilterModel from \"../filters/AssignmentFilterModel\";\nimport ConceptIndexFilterModel from \"../filters/ConceptIndexFilterModel\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport FilterModel from \"../filters/FilterModel\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\nimport { PARAMETER_TYPES } from \"../../constants\";\n\n/**\n * Contains a collection of filters\n */\nexport default class FilterCollection extends BaseCollection<FilterType> {\n  /**\n   * Construct a collection of filters\n   */\n  constructor(\n    data: Object = {},\n    contributions: Object = {},\n    modelOptions?: ModelOptions,\n  ) {\n    super();\n\n    if (data && contributions && Array.isArray(contributions.filter)) {\n      this.collection = contributions.filter\n        .filter((filterContribution) => Object.keys(filterContribution)[0])\n        .map((filterContribution) => {\n          const [filterKey] = Object.keys(filterContribution);\n          const filterData = data[filterKey];\n          const filterContributionByKey = filterContribution[filterKey];\n\n          const filter = this.createFilter(\n            filterKey,\n            {\n              ...filterData,\n              dynamicschema: contributions.dynamicschema,\n            },\n            filterContributionByKey,\n            modelOptions,\n          );\n\n          if (contributions.listkey) {\n            filter.listkey = contributions.listkey;\n          }\n\n          if (contributions.contexts && filterContributionByKey.contextid) {\n            const filterContext = contributions.contexts.find(\n              (context) => context.id === filterContributionByKey.contextid,\n            );\n            if (filterContext) {\n              filter.context = filterContext;\n            }\n          }\n\n          return filter;\n        });\n    }\n  }\n\n  /**\n   */\n  createFilter(\n    filterKey: string,\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ): FilterType {\n    const type = contributions.type || \"stringfilter\";\n    if (type === \"choicefilter\" && filterKey === \"index\") {\n      return new ConceptIndexFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type.includes(\"rangefilter\")) {\n      return new RangeFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"assignmentfilter\") {\n      return new AssignmentFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"stringfilter\") {\n      return new StringFilterModel(data, contributions, modelOptions);\n    }\n\n    return new FilterModel(data, contributions, modelOptions);\n  }\n\n  /**\n   * Call the reset function on all filters\n   *\n   * @see {FilterType#reset()}\n   */\n  reset(): FilterCollection {\n    this.collection = this.collection.map((filter) => filter.reset());\n\n    return this;\n  }\n\n  /**\n   * Checks if range attribute key equals key\n   */\n  checkRangeFilterByAttributeKey(\n    filter: RangeFilterModel,\n    key: string,\n  ): boolean {\n    const rangeAttribute = filter.attribute;\n\n    if (rangeAttribute instanceof CompositeAttributeModel) {\n      return (\n        rangeAttribute.key === key ||\n        (rangeAttribute.start && rangeAttribute.start.key === key) ||\n        (rangeAttribute.end && rangeAttribute.end.key === key)\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   * Check if assignment filter attribute matches key\n   */\n  checkAssignmentFilterByAttributeKey(\n    filter: AssignmentFilterModel,\n    key: string,\n  ): boolean {\n    return (\n      filter.key === key ||\n      filter.user?.key === key ||\n      filter.assignmenttype?.key === key\n    );\n  }\n\n  /**\n   * Getting the filter by name\n   */\n  getFilterByAttributeKey(key: string): FilterType | null {\n    return (\n      this.find((filter) => {\n        if (filter instanceof RangeFilterModel) {\n          return this.checkRangeFilterByAttributeKey(filter, key);\n        }\n\n        if (filter instanceof AssignmentFilterModel) {\n          return this.checkAssignmentFilterByAttributeKey(filter, key);\n        }\n\n        return filter.attribute?.key === key;\n      }) || null\n    );\n  }\n\n  /**\n   * Update Filter by input name and value\n   */\n  update(attribute: AttributeType, value: string): void {\n    const filterToUpdate = attribute.parentKey\n      ? this.getFilterByAttributeKey(attribute.parentKey)\n      : this.getFilterByAttributeKey(attribute.key);\n\n    if (!filterToUpdate) {\n      throw new Error(`Can not find filter by attribute key: ${attribute.key}`);\n    }\n\n    const newFilter = filterToUpdate.clone();\n    newFilter.update(attribute, value);\n\n    this.collection = this.collection.map((filter) => {\n      if (filter.name === newFilter.name) {\n        return newFilter;\n      }\n\n      return filter;\n    });\n  }\n\n  /**\n   * Retrieve if all filters are valid\n   */\n  get isValid(): boolean {\n    return this.collection.every((filter) => filter.isValid);\n  }\n\n  /**\n   * Indicates if an active filter is present in the collection\n   */\n  hasActiveFilters(): boolean {\n    return this.collection.some((filter) => filter.isActive());\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    const bodyFields = this.filter(\n      (f) =>\n        f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata,\n    );\n\n    if (bodyFields.length === 0) {\n      return null;\n    }\n\n    return bodyFields.reduce((data, f) => {\n      return Object.assign(data, f.formdata);\n    }, {});\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/models/filters/FilterCollection.js

@@ -10,6 +10,7 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _BaseCollection = _interopRequireDefault(require("../base/BaseCollection"));
 var _StringFilterModel = _interopRequireDefault(require("../filters/StringFilterModel"));
 var _RangeFilterModel = _interopRequireDefault(require("../filters/RangeFilterModel"));
@@ -153,16 +154,13 @@ class FilterCollection extends _BaseCollection.default {
    */
   get formdata() {
     var _context7;
-    let data = {};
-    (0, _filter.default)(_context7 = this).call(_context7, f => f.parameterType === _constants.PARAMETER_TYPES.BODY && f.hasValue()).forEach(f => {
-      // $FlowIgnore[cannot-spread-indexer]
-      // $FlowIgnore[exponential-spread]
-      data = {
-        ...data,
-        ...f.formdata
-      };
-    });
-    return data;
+    const bodyFields = (0, _filter.default)(_context7 = this).call(_context7, f => f.parameterType === _constants.PARAMETER_TYPES.BODY && f.hasValue() && f.formdata);
+    if (bodyFields.length === 0) {
+      return null;
+    }
+    return bodyFields.reduce((data, f) => {
+      return (0, _assign.default)(data, f.formdata);
+    }, {});
   }
 }
 exports.default = FilterCollection;

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

@@ -1 +1 @@
-{"version":3,"file":"FilterCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_StringFilterModel","_RangeFilterModel","_AssignmentFilterModel","_ConceptIndexFilterModel","_CompositeAttributeModel","_FilterModel","_constants","FilterCollection","BaseCollection","constructor","data","contributions","modelOptions","Array","isArray","_filter","default","_context","_context2","collection","_map","call","filterContribution","_keys","filterKey","filterData","filterContributionByKey","filter","createFilter","dynamicschema","listkey","contexts","contextid","_context3","filterContext","_find","context","id","type","ConceptIndexFilterModel","_includes","RangeFilterModel","AssignmentFilterModel","StringFilterModel","FilterModel","reset","_context4","checkRangeFilterByAttributeKey","key","rangeAttribute","attribute","CompositeAttributeModel","start","end","checkAssignmentFilterByAttributeKey","user","assignmenttype","getFilterByAttributeKey","_context5","update","value","_context6","filterToUpdate","parentKey","Error","newFilter","clone","name","isValid","every","hasActiveFilters","some","isActive","formdata","_context7","f","parameterType","PARAMETER_TYPES","BODY","hasValue","forEach","exports"],"sources":["../../../src/models/filters/FilterCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\n\nimport StringFilterModel from \"../filters/StringFilterModel\";\nimport RangeFilterModel from \"../filters/RangeFilterModel\";\nimport AssignmentFilterModel from \"../filters/AssignmentFilterModel\";\nimport ConceptIndexFilterModel from \"../filters/ConceptIndexFilterModel\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport FilterModel from \"../filters/FilterModel\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\nimport { PARAMETER_TYPES } from \"../../constants\";\n\n/**\n * Contains a collection of filters\n */\nexport default class FilterCollection extends BaseCollection<FilterType> {\n  /**\n   * Construct a collection of filters\n   */\n  constructor(\n    data: Object = {},\n    contributions: Object = {},\n    modelOptions?: ModelOptions,\n  ) {\n    super();\n\n    if (data && contributions && Array.isArray(contributions.filter)) {\n      this.collection = contributions.filter\n        .filter((filterContribution) => Object.keys(filterContribution)[0])\n        .map((filterContribution) => {\n          const [filterKey] = Object.keys(filterContribution);\n          const filterData = data[filterKey];\n          const filterContributionByKey = filterContribution[filterKey];\n\n          const filter = this.createFilter(\n            filterKey,\n            {\n              ...filterData,\n              dynamicschema: contributions.dynamicschema,\n            },\n            filterContributionByKey,\n            modelOptions,\n          );\n\n          if (contributions.listkey) {\n            filter.listkey = contributions.listkey;\n          }\n\n          if (contributions.contexts && filterContributionByKey.contextid) {\n            const filterContext = contributions.contexts.find(\n              (context) => context.id === filterContributionByKey.contextid,\n            );\n            if (filterContext) {\n              filter.context = filterContext;\n            }\n          }\n\n          return filter;\n        });\n    }\n  }\n\n  /**\n   */\n  createFilter(\n    filterKey: string,\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ): FilterType {\n    const type = contributions.type || \"stringfilter\";\n    if (type === \"choicefilter\" && filterKey === \"index\") {\n      return new ConceptIndexFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type.includes(\"rangefilter\")) {\n      return new RangeFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"assignmentfilter\") {\n      return new AssignmentFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"stringfilter\") {\n      return new StringFilterModel(data, contributions, modelOptions);\n    }\n\n    return new FilterModel(data, contributions, modelOptions);\n  }\n\n  /**\n   * Call the reset function on all filters\n   *\n   * @see {FilterType#reset()}\n   */\n  reset(): FilterCollection {\n    this.collection = this.collection.map((filter) => filter.reset());\n\n    return this;\n  }\n\n  /**\n   * Checks if range attribute key equals key\n   */\n  checkRangeFilterByAttributeKey(\n    filter: RangeFilterModel,\n    key: string,\n  ): boolean {\n    const rangeAttribute = filter.attribute;\n\n    if (rangeAttribute instanceof CompositeAttributeModel) {\n      return (\n        rangeAttribute.key === key ||\n        (rangeAttribute.start && rangeAttribute.start.key === key) ||\n        (rangeAttribute.end && rangeAttribute.end.key === key)\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   * Check if assignment filter attribute matches key\n   */\n  checkAssignmentFilterByAttributeKey(\n    filter: AssignmentFilterModel,\n    key: string,\n  ): boolean {\n    return (\n      filter.key === key ||\n      filter.user?.key === key ||\n      filter.assignmenttype?.key === key\n    );\n  }\n\n  /**\n   * Getting the filter by name\n   */\n  getFilterByAttributeKey(key: string): FilterType | null {\n    return (\n      this.find((filter) => {\n        if (filter instanceof RangeFilterModel) {\n          return this.checkRangeFilterByAttributeKey(filter, key);\n        }\n\n        if (filter instanceof AssignmentFilterModel) {\n          return this.checkAssignmentFilterByAttributeKey(filter, key);\n        }\n\n        return filter.attribute?.key === key;\n      }) || null\n    );\n  }\n\n  /**\n   * Update Filter by input name and value\n   */\n  update(attribute: AttributeType, value: string): void {\n    const filterToUpdate = attribute.parentKey\n      ? this.getFilterByAttributeKey(attribute.parentKey)\n      : this.getFilterByAttributeKey(attribute.key);\n\n    if (!filterToUpdate) {\n      throw new Error(`Can not find filter by attribute key: ${attribute.key}`);\n    }\n\n    const newFilter = filterToUpdate.clone();\n    newFilter.update(attribute, value);\n\n    this.collection = this.collection.map((filter) => {\n      if (filter.name === newFilter.name) {\n        return newFilter;\n      }\n\n      return filter;\n    });\n  }\n\n  /**\n   * Retrieve if all filters are valid\n   */\n  get isValid(): boolean {\n    return this.collection.every((filter) => filter.isValid);\n  }\n\n  /**\n   * Indicates if an active filter is present in the collection\n   */\n  hasActiveFilters(): boolean {\n    return this.collection.some((filter) => filter.isActive());\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    let data = {};\n    this.filter(\n      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),\n    ).forEach((f) => {\n      // $FlowIgnore[cannot-spread-indexer]\n      // $FlowIgnore[exponential-spread]\n      data = {\n        ...data,\n        ...f.formdata,\n      };\n    });\n    return data;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FilterCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_StringFilterModel","_RangeFilterModel","_AssignmentFilterModel","_ConceptIndexFilterModel","_CompositeAttributeModel","_FilterModel","_constants","FilterCollection","BaseCollection","constructor","data","contributions","modelOptions","Array","isArray","_filter","default","_context","_context2","collection","_map","call","filterContribution","_keys","filterKey","filterData","filterContributionByKey","filter","createFilter","dynamicschema","listkey","contexts","contextid","_context3","filterContext","_find","context","id","type","ConceptIndexFilterModel","_includes","RangeFilterModel","AssignmentFilterModel","StringFilterModel","FilterModel","reset","_context4","checkRangeFilterByAttributeKey","key","rangeAttribute","attribute","CompositeAttributeModel","start","end","checkAssignmentFilterByAttributeKey","user","assignmenttype","getFilterByAttributeKey","_context5","update","value","_context6","filterToUpdate","parentKey","Error","newFilter","clone","name","isValid","every","hasActiveFilters","some","isActive","formdata","_context7","bodyFields","f","parameterType","PARAMETER_TYPES","BODY","hasValue","length","reduce","_assign","exports"],"sources":["../../../src/models/filters/FilterCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\n\nimport StringFilterModel from \"../filters/StringFilterModel\";\nimport RangeFilterModel from \"../filters/RangeFilterModel\";\nimport AssignmentFilterModel from \"../filters/AssignmentFilterModel\";\nimport ConceptIndexFilterModel from \"../filters/ConceptIndexFilterModel\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport FilterModel from \"../filters/FilterModel\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\nimport { PARAMETER_TYPES } from \"../../constants\";\n\n/**\n * Contains a collection of filters\n */\nexport default class FilterCollection extends BaseCollection<FilterType> {\n  /**\n   * Construct a collection of filters\n   */\n  constructor(\n    data: Object = {},\n    contributions: Object = {},\n    modelOptions?: ModelOptions,\n  ) {\n    super();\n\n    if (data && contributions && Array.isArray(contributions.filter)) {\n      this.collection = contributions.filter\n        .filter((filterContribution) => Object.keys(filterContribution)[0])\n        .map((filterContribution) => {\n          const [filterKey] = Object.keys(filterContribution);\n          const filterData = data[filterKey];\n          const filterContributionByKey = filterContribution[filterKey];\n\n          const filter = this.createFilter(\n            filterKey,\n            {\n              ...filterData,\n              dynamicschema: contributions.dynamicschema,\n            },\n            filterContributionByKey,\n            modelOptions,\n          );\n\n          if (contributions.listkey) {\n            filter.listkey = contributions.listkey;\n          }\n\n          if (contributions.contexts && filterContributionByKey.contextid) {\n            const filterContext = contributions.contexts.find(\n              (context) => context.id === filterContributionByKey.contextid,\n            );\n            if (filterContext) {\n              filter.context = filterContext;\n            }\n          }\n\n          return filter;\n        });\n    }\n  }\n\n  /**\n   */\n  createFilter(\n    filterKey: string,\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ): FilterType {\n    const type = contributions.type || \"stringfilter\";\n    if (type === \"choicefilter\" && filterKey === \"index\") {\n      return new ConceptIndexFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type.includes(\"rangefilter\")) {\n      return new RangeFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"assignmentfilter\") {\n      return new AssignmentFilterModel(data, contributions, modelOptions);\n    }\n\n    if (type === \"stringfilter\") {\n      return new StringFilterModel(data, contributions, modelOptions);\n    }\n\n    return new FilterModel(data, contributions, modelOptions);\n  }\n\n  /**\n   * Call the reset function on all filters\n   *\n   * @see {FilterType#reset()}\n   */\n  reset(): FilterCollection {\n    this.collection = this.collection.map((filter) => filter.reset());\n\n    return this;\n  }\n\n  /**\n   * Checks if range attribute key equals key\n   */\n  checkRangeFilterByAttributeKey(\n    filter: RangeFilterModel,\n    key: string,\n  ): boolean {\n    const rangeAttribute = filter.attribute;\n\n    if (rangeAttribute instanceof CompositeAttributeModel) {\n      return (\n        rangeAttribute.key === key ||\n        (rangeAttribute.start && rangeAttribute.start.key === key) ||\n        (rangeAttribute.end && rangeAttribute.end.key === key)\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   * Check if assignment filter attribute matches key\n   */\n  checkAssignmentFilterByAttributeKey(\n    filter: AssignmentFilterModel,\n    key: string,\n  ): boolean {\n    return (\n      filter.key === key ||\n      filter.user?.key === key ||\n      filter.assignmenttype?.key === key\n    );\n  }\n\n  /**\n   * Getting the filter by name\n   */\n  getFilterByAttributeKey(key: string): FilterType | null {\n    return (\n      this.find((filter) => {\n        if (filter instanceof RangeFilterModel) {\n          return this.checkRangeFilterByAttributeKey(filter, key);\n        }\n\n        if (filter instanceof AssignmentFilterModel) {\n          return this.checkAssignmentFilterByAttributeKey(filter, key);\n        }\n\n        return filter.attribute?.key === key;\n      }) || null\n    );\n  }\n\n  /**\n   * Update Filter by input name and value\n   */\n  update(attribute: AttributeType, value: string): void {\n    const filterToUpdate = attribute.parentKey\n      ? this.getFilterByAttributeKey(attribute.parentKey)\n      : this.getFilterByAttributeKey(attribute.key);\n\n    if (!filterToUpdate) {\n      throw new Error(`Can not find filter by attribute key: ${attribute.key}`);\n    }\n\n    const newFilter = filterToUpdate.clone();\n    newFilter.update(attribute, value);\n\n    this.collection = this.collection.map((filter) => {\n      if (filter.name === newFilter.name) {\n        return newFilter;\n      }\n\n      return filter;\n    });\n  }\n\n  /**\n   * Retrieve if all filters are valid\n   */\n  get isValid(): boolean {\n    return this.collection.every((filter) => filter.isValid);\n  }\n\n  /**\n   * Indicates if an active filter is present in the collection\n   */\n  hasActiveFilters(): boolean {\n    return this.collection.some((filter) => filter.isActive());\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    const bodyFields = this.filter(\n      (f) =>\n        f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata,\n    );\n\n    if (bodyFields.length === 0) {\n      return null;\n    }\n\n    return bodyFields.reduce((data, f) => {\n      return Object.assign(data, f.formdata);\n    }, {});\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/models/filters/FilterCollection.js

@@ -194,17 +194,17 @@ export default class FilterCollection extends BaseCollection<FilterType> {
   /**
    */
   get formdata(): { [string]: any } | null {
-    let data = {};
-    this.filter(
-      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),
-    ).forEach((f) => {
-      // $FlowIgnore[cannot-spread-indexer]
-      // $FlowIgnore[exponential-spread]
-      data = {
-        ...data,
-        ...f.formdata,
-      };
-    });
-    return data;
+    const bodyFields = this.filter(
+      (f) =>
+        f.parameterType === PARAMETER_TYPES.BODY && f.hasValue() && f.formdata,
+    );
+
+    if (bodyFields.length === 0) {
+      return null;
+    }
+
+    return bodyFields.reduce((data, f) => {
+      return Object.assign(data, f.formdata);
+    }, {});
   }
 }