@beinformed/ui 1.65.20 → 1.65.22

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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)
+
+
+### Bug Fixes
+
+* **hooks:** improve filter update logic in `useList` for better error handling and target resolution ([79efecc](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/79efeccf277b90e63c0f5dc703a2b96e1d79a810))
+
 ## [1.65.20](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.65.19...v1.65.20) (2026-01-16)
 
 

package/esm/hooks/useList.js

@@ -87,12 +87,22 @@ export const useListNavigation = ({
     update(list, true);
   }, [update]);
   const updateFilter = useCallback((list, filter, value, attribute) => {
-    if (attribute) {
-      filter.update(attribute, value);
-    } else if (filter instanceof AssignmentFilterModel) {
+    if (filter instanceof AssignmentFilterModel && !attribute) {
       throw new TypeError("AssignmentFilterModel needs the attribute argument to be able to update the filter");
+    }
+    let filterToUpdate = null;
+    let targetAttr = attribute;
+    if (attribute) {
+      filterToUpdate = list.filterCollection.getFilterByAttributeKey(attribute.key);
     } else if (filter instanceof FilterModel) {
-      filter.update(filter.attribute, value);
+      filterToUpdate = list.filterCollection.getFilterByName(filter.name);
+      targetAttr = filter.attribute;
+    }
+    if (filterToUpdate && targetAttr) {
+      filterToUpdate.update(targetAttr, value);
+    } else {
+      const searchKey = attribute ? `key: ${attribute.key}` : `name: ${filter.name}`;
+      console.error(`Can't find a filter to update by ${searchKey} on list: ${list.selfhref.toString()}`);
     }
     update(list, true);
   }, [update]);

package/esm/hooks/useList.js.flow

@@ -149,15 +149,35 @@ export const useListNavigation = ({
       value: string,
       attribute?: AttributeType,
     ) => {
-      if (attribute) {
-        filter.update(attribute, value);
-      } else if (filter instanceof AssignmentFilterModel) {
+      if (filter instanceof AssignmentFilterModel && !attribute) {
         throw new TypeError(
           "AssignmentFilterModel needs the attribute argument to be able to update the filter",
         );
+      }
+
+      let filterToUpdate = null;
+      let targetAttr = attribute;
+
+      if (attribute) {
+        filterToUpdate = list.filterCollection.getFilterByAttributeKey(
+          attribute.key,
+        );
       } else if (filter instanceof FilterModel) {
-        filter.update(filter.attribute, value);
+        filterToUpdate = list.filterCollection.getFilterByName(filter.name);
+        targetAttr = filter.attribute;
       }
+
+      if (filterToUpdate && targetAttr) {
+        filterToUpdate.update(targetAttr, value);
+      } else {
+        const searchKey = attribute
+          ? `key: ${attribute.key}`
+          : `name: ${filter.name}`;
+        console.error(
+          `Can't find a filter to update by ${searchKey} on list: ${list.selfhref.toString()}`,
+        );
+      }
+
       update(list, true);
     },
     [update],

package/esm/hooks/useList.js.map

@@ -1 +1 @@
-{"version":3,"file":"useList.js","names":["useDispatch","useModularUIBasic","HTTP_METHODS","loadModularUI","useNavigation","DetailModel","ListModel","CaseSearchModel","ListDetailModel","Href","FilterCollection","AssignmentFilterModel","FilterModel","useCallback","useMemo","useList","href","options","expectedModels","targetModel","useListOrDetail","useListDetail","forceTargetModel","useListNavigation","syncLocation","historyAction","push","replace","dispatch","navigate","update","list","resetPage","listHref","selfhref","page","requestMethod","POST","pathname","path","search","getQuerystring","state","formdata","connectKey","method","data","GET","updateFilters","filters","filterCollection","updateFilter","filter","value","attribute","TypeError","resetFilters","reset","removeFilter","getFilterByName","name","updateSort","sortOption","sorting","updatePage","paging","updatePageSize","pagesize"],"sources":["../../src/hooks/useList.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport { loadModularUI } from \"../redux\";\n\nimport { useNavigation } from \"./useRouter\";\n\nimport DetailModel from \"../models/detail/DetailModel\";\nimport ListModel from \"../models/list/ListModel\";\nimport CaseSearchModel from \"../models/search/CaseSearchModel\";\nimport ListDetailModel from \"../models/list/ListDetailModel\";\nimport Href from \"../models/href/Href\";\nimport FilterCollection from \"../models/filters/FilterCollection\";\nimport AssignmentFilterModel from \"../models/filters/AssignmentFilterModel\";\nimport FilterModel from \"../models/filters/FilterModel\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type { AttributeType, IFilter } from \"../models/types\";\nimport { useCallback, useMemo } from \"react\";\n\ntype ListNavigationHook = {\n  update: (list: ListModel, resetPage?: boolean) => void,\n  updateFilters: (\n    list: ListModel,\n    filters: FilterCollection | Array<IFilter>,\n  ) => void,\n  updateFilter: (\n    list: ListModel,\n    filter: IFilter,\n    value: string,\n    attribute?: AttributeType,\n  ) => void,\n  updateSort: (list: ListModel, sortOption: string) => void,\n  updatePage: (list: ListModel, page: number) => void,\n  updatePageSize: (list: ListModel, pagesize: number) => void,\n  resetFilters: (list: ListModel) => void,\n  removeFilter: (list: ListModel, filter: IFilter) => void,\n};\n\ntype ListNavigationOptions = {\n  syncLocation?: boolean,\n  historyAction?: \"push\" | \"replace\",\n};\n\n/**\n */\nexport const useList = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\"],\n    targetModel: [ListModel, CaseSearchModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListOrDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | DetailModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\", \"Detail\"],\n    targetModel: [ListModel, CaseSearchModel, DetailModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListDetailModel | null =>\n  useModularUIBasic(\"listdetail\", href, {\n    expectedModels: [\"ListDetail\"],\n    targetModel: ListDetailModel,\n    forceTargetModel: true,\n    ...options,\n  });\n\n/**\n */\nexport const useListNavigation = ({\n  syncLocation = true,\n  historyAction = \"push\",\n}: ListNavigationOptions = {}): ListNavigationHook => {\n  const { push, replace } = useNavigation();\n  const dispatch = useDispatch();\n\n  const navigate = historyAction === \"push\" ? push : replace;\n\n  const update = useCallback(\n    (list: ListModel, resetPage: boolean = false) => {\n      const listHref = list.selfhref;\n      if (resetPage) {\n        listHref.page = null;\n      }\n\n      if (list.requestMethod === HTTP_METHODS.POST) {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n            state: { formdata: list.formdata },\n          });\n        }\n\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.POST,\n            data: list.formdata,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      } else {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n          });\n        }\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.GET,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      }\n    },\n    [dispatch, navigate, syncLocation],\n  );\n\n  const updateFilters = useCallback(\n    (list: ListModel, filters: FilterCollection | Array<IFilter>) => {\n      list.filterCollection = filters;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateFilter = useCallback(\n    (\n      list: ListModel,\n      filter: IFilter,\n      value: string,\n      attribute?: AttributeType,\n    ) => {\n      if (attribute) {\n        filter.update(attribute, value);\n      } else if (filter instanceof AssignmentFilterModel) {\n        throw new TypeError(\n          \"AssignmentFilterModel needs the attribute argument to be able to update the filter\",\n        );\n      } else if (filter instanceof FilterModel) {\n        filter.update(filter.attribute, value);\n      }\n      update(list, true);\n    },\n    [update],\n  );\n\n  const resetFilters = useCallback(\n    (list: ListModel) => {\n      list.filterCollection.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const removeFilter = useCallback(\n    (list: ListModel, filter: IFilter) => {\n      list.filterCollection.getFilterByName(filter.name)?.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateSort = useCallback(\n    (list: ListModel, sortOption: string) => {\n      list.sorting.value = sortOption;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updatePage = useCallback(\n    (list: ListModel, page: number) => {\n      list.paging.page = page;\n      update(list);\n    },\n    [update],\n  );\n\n  const updatePageSize = useCallback(\n    (list: ListModel, pagesize: number) => {\n      list.paging.pagesize.value = pagesize;\n      update(list, true);\n    },\n    [update],\n  );\n\n  return useMemo(\n    () => ({\n      update,\n      updateFilters,\n      updateFilter,\n      updateSort,\n      updatePage,\n      updatePageSize,\n      resetFilters,\n      removeFilter,\n    }),\n    [\n      removeFilter,\n      resetFilters,\n      update,\n      updateFilter,\n      updateFilters,\n      updatePage,\n      updatePageSize,\n      updateSort,\n    ],\n  );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useList.js","names":["useDispatch","useModularUIBasic","HTTP_METHODS","loadModularUI","useNavigation","DetailModel","ListModel","CaseSearchModel","ListDetailModel","Href","FilterCollection","AssignmentFilterModel","FilterModel","useCallback","useMemo","useList","href","options","expectedModels","targetModel","useListOrDetail","useListDetail","forceTargetModel","useListNavigation","syncLocation","historyAction","push","replace","dispatch","navigate","update","list","resetPage","listHref","selfhref","page","requestMethod","POST","pathname","path","search","getQuerystring","state","formdata","connectKey","method","data","GET","updateFilters","filters","filterCollection","updateFilter","filter","value","attribute","TypeError","filterToUpdate","targetAttr","getFilterByAttributeKey","key","getFilterByName","name","searchKey","console","error","toString","resetFilters","reset","removeFilter","updateSort","sortOption","sorting","updatePage","paging","updatePageSize","pagesize"],"sources":["../../src/hooks/useList.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport { loadModularUI } from \"../redux\";\n\nimport { useNavigation } from \"./useRouter\";\n\nimport DetailModel from \"../models/detail/DetailModel\";\nimport ListModel from \"../models/list/ListModel\";\nimport CaseSearchModel from \"../models/search/CaseSearchModel\";\nimport ListDetailModel from \"../models/list/ListDetailModel\";\nimport Href from \"../models/href/Href\";\nimport FilterCollection from \"../models/filters/FilterCollection\";\nimport AssignmentFilterModel from \"../models/filters/AssignmentFilterModel\";\nimport FilterModel from \"../models/filters/FilterModel\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type { AttributeType, IFilter } from \"../models/types\";\nimport { useCallback, useMemo } from \"react\";\n\ntype ListNavigationHook = {\n  update: (list: ListModel, resetPage?: boolean) => void,\n  updateFilters: (\n    list: ListModel,\n    filters: FilterCollection | Array<IFilter>,\n  ) => void,\n  updateFilter: (\n    list: ListModel,\n    filter: IFilter,\n    value: string,\n    attribute?: AttributeType,\n  ) => void,\n  updateSort: (list: ListModel, sortOption: string) => void,\n  updatePage: (list: ListModel, page: number) => void,\n  updatePageSize: (list: ListModel, pagesize: number) => void,\n  resetFilters: (list: ListModel) => void,\n  removeFilter: (list: ListModel, filter: IFilter) => void,\n};\n\ntype ListNavigationOptions = {\n  syncLocation?: boolean,\n  historyAction?: \"push\" | \"replace\",\n};\n\n/**\n */\nexport const useList = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\"],\n    targetModel: [ListModel, CaseSearchModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListOrDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | DetailModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\", \"Detail\"],\n    targetModel: [ListModel, CaseSearchModel, DetailModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListDetailModel | null =>\n  useModularUIBasic(\"listdetail\", href, {\n    expectedModels: [\"ListDetail\"],\n    targetModel: ListDetailModel,\n    forceTargetModel: true,\n    ...options,\n  });\n\n/**\n */\nexport const useListNavigation = ({\n  syncLocation = true,\n  historyAction = \"push\",\n}: ListNavigationOptions = {}): ListNavigationHook => {\n  const { push, replace } = useNavigation();\n  const dispatch = useDispatch();\n\n  const navigate = historyAction === \"push\" ? push : replace;\n\n  const update = useCallback(\n    (list: ListModel, resetPage: boolean = false) => {\n      const listHref = list.selfhref;\n      if (resetPage) {\n        listHref.page = null;\n      }\n\n      if (list.requestMethod === HTTP_METHODS.POST) {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n            state: { formdata: list.formdata },\n          });\n        }\n\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.POST,\n            data: list.formdata,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      } else {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n          });\n        }\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.GET,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      }\n    },\n    [dispatch, navigate, syncLocation],\n  );\n\n  const updateFilters = useCallback(\n    (list: ListModel, filters: FilterCollection | Array<IFilter>) => {\n      list.filterCollection = filters;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateFilter = useCallback(\n    (\n      list: ListModel,\n      filter: IFilter,\n      value: string,\n      attribute?: AttributeType,\n    ) => {\n      if (filter instanceof AssignmentFilterModel && !attribute) {\n        throw new TypeError(\n          \"AssignmentFilterModel needs the attribute argument to be able to update the filter\",\n        );\n      }\n\n      let filterToUpdate = null;\n      let targetAttr = attribute;\n\n      if (attribute) {\n        filterToUpdate = list.filterCollection.getFilterByAttributeKey(\n          attribute.key,\n        );\n      } else if (filter instanceof FilterModel) {\n        filterToUpdate = list.filterCollection.getFilterByName(filter.name);\n        targetAttr = filter.attribute;\n      }\n\n      if (filterToUpdate && targetAttr) {\n        filterToUpdate.update(targetAttr, value);\n      } else {\n        const searchKey = attribute\n          ? `key: ${attribute.key}`\n          : `name: ${filter.name}`;\n        console.error(\n          `Can't find a filter to update by ${searchKey} on list: ${list.selfhref.toString()}`,\n        );\n      }\n\n      update(list, true);\n    },\n    [update],\n  );\n\n  const resetFilters = useCallback(\n    (list: ListModel) => {\n      list.filterCollection.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const removeFilter = useCallback(\n    (list: ListModel, filter: IFilter) => {\n      list.filterCollection.getFilterByName(filter.name)?.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateSort = useCallback(\n    (list: ListModel, sortOption: string) => {\n      list.sorting.value = sortOption;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updatePage = useCallback(\n    (list: ListModel, page: number) => {\n      list.paging.page = page;\n      update(list);\n    },\n    [update],\n  );\n\n  const updatePageSize = useCallback(\n    (list: ListModel, pagesize: number) => {\n      list.paging.pagesize.value = pagesize;\n      update(list, true);\n    },\n    [update],\n  );\n\n  return useMemo(\n    () => ({\n      update,\n      updateFilters,\n      updateFilter,\n      updateSort,\n      updatePage,\n      updatePageSize,\n      resetFilters,\n      removeFilter,\n    }),\n    [\n      removeFilter,\n      resetFilters,\n      update,\n      updateFilter,\n      updateFilters,\n      updatePage,\n      updatePageSize,\n      updateSort,\n    ],\n  );\n};\n"],"mappings":"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","ignoreList":[]}

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/hooks/useList.js

@@ -97,12 +97,22 @@ const useListNavigation = ({
     update(list, true);
   }, [update]);
   const updateFilter = (0, _react.useCallback)((list, filter, value, attribute) => {
-    if (attribute) {
-      filter.update(attribute, value);
-    } else if (filter instanceof _AssignmentFilterModel.default) {
+    if (filter instanceof _AssignmentFilterModel.default && !attribute) {
       throw new TypeError("AssignmentFilterModel needs the attribute argument to be able to update the filter");
+    }
+    let filterToUpdate = null;
+    let targetAttr = attribute;
+    if (attribute) {
+      filterToUpdate = list.filterCollection.getFilterByAttributeKey(attribute.key);
     } else if (filter instanceof _FilterModel.default) {
-      filter.update(filter.attribute, value);
+      filterToUpdate = list.filterCollection.getFilterByName(filter.name);
+      targetAttr = filter.attribute;
+    }
+    if (filterToUpdate && targetAttr) {
+      filterToUpdate.update(targetAttr, value);
+    } else {
+      const searchKey = attribute ? `key: ${attribute.key}` : `name: ${filter.name}`;
+      console.error(`Can't find a filter to update by ${searchKey} on list: ${list.selfhref.toString()}`);
     }
     update(list, true);
   }, [update]);

package/lib/hooks/useList.js.map

@@ -1 +1 @@
-{"version":3,"file":"useList.js","names":["_reactRedux","require","_useModularUIBasic","_Constants","_redux","_useRouter","_DetailModel","_interopRequireDefault","_ListModel","_CaseSearchModel","_ListDetailModel","_Href","_FilterCollection","_AssignmentFilterModel","_FilterModel","_react","useList","href","options","useModularUIBasic","expectedModels","targetModel","ListModel","CaseSearchModel","exports","useListOrDetail","DetailModel","useListDetail","ListDetailModel","forceTargetModel","useListNavigation","syncLocation","historyAction","push","replace","useNavigation","dispatch","useDispatch","navigate","update","useCallback","list","resetPage","listHref","selfhref","page","requestMethod","HTTP_METHODS","POST","pathname","path","search","getQuerystring","state","formdata","loadModularUI","connectKey","method","data","GET","updateFilters","filters","filterCollection","updateFilter","filter","value","attribute","AssignmentFilterModel","TypeError","FilterModel","resetFilters","reset","removeFilter","getFilterByName","name","updateSort","sortOption","sorting","updatePage","paging","updatePageSize","pagesize","useMemo"],"sources":["../../src/hooks/useList.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport { loadModularUI } from \"../redux\";\n\nimport { useNavigation } from \"./useRouter\";\n\nimport DetailModel from \"../models/detail/DetailModel\";\nimport ListModel from \"../models/list/ListModel\";\nimport CaseSearchModel from \"../models/search/CaseSearchModel\";\nimport ListDetailModel from \"../models/list/ListDetailModel\";\nimport Href from \"../models/href/Href\";\nimport FilterCollection from \"../models/filters/FilterCollection\";\nimport AssignmentFilterModel from \"../models/filters/AssignmentFilterModel\";\nimport FilterModel from \"../models/filters/FilterModel\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type { AttributeType, IFilter } from \"../models/types\";\nimport { useCallback, useMemo } from \"react\";\n\ntype ListNavigationHook = {\n  update: (list: ListModel, resetPage?: boolean) => void,\n  updateFilters: (\n    list: ListModel,\n    filters: FilterCollection | Array<IFilter>,\n  ) => void,\n  updateFilter: (\n    list: ListModel,\n    filter: IFilter,\n    value: string,\n    attribute?: AttributeType,\n  ) => void,\n  updateSort: (list: ListModel, sortOption: string) => void,\n  updatePage: (list: ListModel, page: number) => void,\n  updatePageSize: (list: ListModel, pagesize: number) => void,\n  resetFilters: (list: ListModel) => void,\n  removeFilter: (list: ListModel, filter: IFilter) => void,\n};\n\ntype ListNavigationOptions = {\n  syncLocation?: boolean,\n  historyAction?: \"push\" | \"replace\",\n};\n\n/**\n */\nexport const useList = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\"],\n    targetModel: [ListModel, CaseSearchModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListOrDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | DetailModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\", \"Detail\"],\n    targetModel: [ListModel, CaseSearchModel, DetailModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListDetailModel | null =>\n  useModularUIBasic(\"listdetail\", href, {\n    expectedModels: [\"ListDetail\"],\n    targetModel: ListDetailModel,\n    forceTargetModel: true,\n    ...options,\n  });\n\n/**\n */\nexport const useListNavigation = ({\n  syncLocation = true,\n  historyAction = \"push\",\n}: ListNavigationOptions = {}): ListNavigationHook => {\n  const { push, replace } = useNavigation();\n  const dispatch = useDispatch();\n\n  const navigate = historyAction === \"push\" ? push : replace;\n\n  const update = useCallback(\n    (list: ListModel, resetPage: boolean = false) => {\n      const listHref = list.selfhref;\n      if (resetPage) {\n        listHref.page = null;\n      }\n\n      if (list.requestMethod === HTTP_METHODS.POST) {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n            state: { formdata: list.formdata },\n          });\n        }\n\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.POST,\n            data: list.formdata,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      } else {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n          });\n        }\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.GET,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      }\n    },\n    [dispatch, navigate, syncLocation],\n  );\n\n  const updateFilters = useCallback(\n    (list: ListModel, filters: FilterCollection | Array<IFilter>) => {\n      list.filterCollection = filters;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateFilter = useCallback(\n    (\n      list: ListModel,\n      filter: IFilter,\n      value: string,\n      attribute?: AttributeType,\n    ) => {\n      if (attribute) {\n        filter.update(attribute, value);\n      } else if (filter instanceof AssignmentFilterModel) {\n        throw new TypeError(\n          \"AssignmentFilterModel needs the attribute argument to be able to update the filter\",\n        );\n      } else if (filter instanceof FilterModel) {\n        filter.update(filter.attribute, value);\n      }\n      update(list, true);\n    },\n    [update],\n  );\n\n  const resetFilters = useCallback(\n    (list: ListModel) => {\n      list.filterCollection.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const removeFilter = useCallback(\n    (list: ListModel, filter: IFilter) => {\n      list.filterCollection.getFilterByName(filter.name)?.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateSort = useCallback(\n    (list: ListModel, sortOption: string) => {\n      list.sorting.value = sortOption;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updatePage = useCallback(\n    (list: ListModel, page: number) => {\n      list.paging.page = page;\n      update(list);\n    },\n    [update],\n  );\n\n  const updatePageSize = useCallback(\n    (list: ListModel, pagesize: number) => {\n      list.paging.pagesize.value = pagesize;\n      update(list, true);\n    },\n    [update],\n  );\n\n  return useMemo(\n    () => ({\n      update,\n      updateFilters,\n      updateFilter,\n      updateSort,\n      updatePage,\n      updatePageSize,\n      resetFilters,\n      removeFilter,\n    }),\n    [\n      removeFilter,\n      resetFilters,\n      update,\n      updateFilter,\n      updateFilters,\n      updatePage,\n      updatePageSize,\n      updateSort,\n    ],\n  );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useList.js","names":["_reactRedux","require","_useModularUIBasic","_Constants","_redux","_useRouter","_DetailModel","_interopRequireDefault","_ListModel","_CaseSearchModel","_ListDetailModel","_Href","_FilterCollection","_AssignmentFilterModel","_FilterModel","_react","useList","href","options","useModularUIBasic","expectedModels","targetModel","ListModel","CaseSearchModel","exports","useListOrDetail","DetailModel","useListDetail","ListDetailModel","forceTargetModel","useListNavigation","syncLocation","historyAction","push","replace","useNavigation","dispatch","useDispatch","navigate","update","useCallback","list","resetPage","listHref","selfhref","page","requestMethod","HTTP_METHODS","POST","pathname","path","search","getQuerystring","state","formdata","loadModularUI","connectKey","method","data","GET","updateFilters","filters","filterCollection","updateFilter","filter","value","attribute","AssignmentFilterModel","TypeError","filterToUpdate","targetAttr","getFilterByAttributeKey","key","FilterModel","getFilterByName","name","searchKey","console","error","toString","resetFilters","reset","removeFilter","updateSort","sortOption","sorting","updatePage","paging","updatePageSize","pagesize","useMemo"],"sources":["../../src/hooks/useList.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport { loadModularUI } from \"../redux\";\n\nimport { useNavigation } from \"./useRouter\";\n\nimport DetailModel from \"../models/detail/DetailModel\";\nimport ListModel from \"../models/list/ListModel\";\nimport CaseSearchModel from \"../models/search/CaseSearchModel\";\nimport ListDetailModel from \"../models/list/ListDetailModel\";\nimport Href from \"../models/href/Href\";\nimport FilterCollection from \"../models/filters/FilterCollection\";\nimport AssignmentFilterModel from \"../models/filters/AssignmentFilterModel\";\nimport FilterModel from \"../models/filters/FilterModel\";\n\nimport type { HookOptions } from \"./useModularUIBasic\";\nimport type { AttributeType, IFilter } from \"../models/types\";\nimport { useCallback, useMemo } from \"react\";\n\ntype ListNavigationHook = {\n  update: (list: ListModel, resetPage?: boolean) => void,\n  updateFilters: (\n    list: ListModel,\n    filters: FilterCollection | Array<IFilter>,\n  ) => void,\n  updateFilter: (\n    list: ListModel,\n    filter: IFilter,\n    value: string,\n    attribute?: AttributeType,\n  ) => void,\n  updateSort: (list: ListModel, sortOption: string) => void,\n  updatePage: (list: ListModel, page: number) => void,\n  updatePageSize: (list: ListModel, pagesize: number) => void,\n  resetFilters: (list: ListModel) => void,\n  removeFilter: (list: ListModel, filter: IFilter) => void,\n};\n\ntype ListNavigationOptions = {\n  syncLocation?: boolean,\n  historyAction?: \"push\" | \"replace\",\n};\n\n/**\n */\nexport const useList = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\"],\n    targetModel: [ListModel, CaseSearchModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListOrDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListModel | DetailModel | null =>\n  useModularUIBasic(\"list\", href, {\n    expectedModels: [\"List\", \"CaseSearch\", \"Detail\"],\n    targetModel: [ListModel, CaseSearchModel, DetailModel],\n    ...options,\n  });\n\n/**\n */\nexport const useListDetail = (\n  href: string | Href,\n  options?: HookOptions,\n): ListDetailModel | null =>\n  useModularUIBasic(\"listdetail\", href, {\n    expectedModels: [\"ListDetail\"],\n    targetModel: ListDetailModel,\n    forceTargetModel: true,\n    ...options,\n  });\n\n/**\n */\nexport const useListNavigation = ({\n  syncLocation = true,\n  historyAction = \"push\",\n}: ListNavigationOptions = {}): ListNavigationHook => {\n  const { push, replace } = useNavigation();\n  const dispatch = useDispatch();\n\n  const navigate = historyAction === \"push\" ? push : replace;\n\n  const update = useCallback(\n    (list: ListModel, resetPage: boolean = false) => {\n      const listHref = list.selfhref;\n      if (resetPage) {\n        listHref.page = null;\n      }\n\n      if (list.requestMethod === HTTP_METHODS.POST) {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n            state: { formdata: list.formdata },\n          });\n        }\n\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.POST,\n            data: list.formdata,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      } else {\n        if (syncLocation) {\n          navigate({\n            pathname: listHref.path,\n            search: listHref.getQuerystring(true),\n          });\n        }\n        dispatch(\n          loadModularUI(list.connectKey, listHref, {\n            method: HTTP_METHODS.GET,\n            targetModel: [ListModel, CaseSearchModel],\n          }),\n        );\n      }\n    },\n    [dispatch, navigate, syncLocation],\n  );\n\n  const updateFilters = useCallback(\n    (list: ListModel, filters: FilterCollection | Array<IFilter>) => {\n      list.filterCollection = filters;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateFilter = useCallback(\n    (\n      list: ListModel,\n      filter: IFilter,\n      value: string,\n      attribute?: AttributeType,\n    ) => {\n      if (filter instanceof AssignmentFilterModel && !attribute) {\n        throw new TypeError(\n          \"AssignmentFilterModel needs the attribute argument to be able to update the filter\",\n        );\n      }\n\n      let filterToUpdate = null;\n      let targetAttr = attribute;\n\n      if (attribute) {\n        filterToUpdate = list.filterCollection.getFilterByAttributeKey(\n          attribute.key,\n        );\n      } else if (filter instanceof FilterModel) {\n        filterToUpdate = list.filterCollection.getFilterByName(filter.name);\n        targetAttr = filter.attribute;\n      }\n\n      if (filterToUpdate && targetAttr) {\n        filterToUpdate.update(targetAttr, value);\n      } else {\n        const searchKey = attribute\n          ? `key: ${attribute.key}`\n          : `name: ${filter.name}`;\n        console.error(\n          `Can't find a filter to update by ${searchKey} on list: ${list.selfhref.toString()}`,\n        );\n      }\n\n      update(list, true);\n    },\n    [update],\n  );\n\n  const resetFilters = useCallback(\n    (list: ListModel) => {\n      list.filterCollection.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const removeFilter = useCallback(\n    (list: ListModel, filter: IFilter) => {\n      list.filterCollection.getFilterByName(filter.name)?.reset();\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updateSort = useCallback(\n    (list: ListModel, sortOption: string) => {\n      list.sorting.value = sortOption;\n      update(list, true);\n    },\n    [update],\n  );\n\n  const updatePage = useCallback(\n    (list: ListModel, page: number) => {\n      list.paging.page = page;\n      update(list);\n    },\n    [update],\n  );\n\n  const updatePageSize = useCallback(\n    (list: ListModel, pagesize: number) => {\n      list.paging.pagesize.value = pagesize;\n      update(list, true);\n    },\n    [update],\n  );\n\n  return useMemo(\n    () => ({\n      update,\n      updateFilters,\n      updateFilter,\n      updateSort,\n      updatePage,\n      updatePageSize,\n      resetFilters,\n      removeFilter,\n    }),\n    [\n      removeFilter,\n      resetFilters,\n      update,\n      updateFilter,\n      updateFilters,\n      updatePage,\n      updatePageSize,\n      updateSort,\n    ],\n  );\n};\n"],"mappings":"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","ignoreList":[]}

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":";;;;;;;;AACA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,gBAAA,GAAAH,sBAAA,CAAAC,OAAA;AAEA;AACA;AACA;AACe,MAAMG,qBAAqB,SAChCC,wBAAe,CAEzB;EAKE;AACF;AACA;EACEC,WAAWA,CACTC,IAAY,EACZC,aAAqB,EACrBC,YAA2B,EAC3B;IACA,KAAK,CAACF,IAAI,EAAEC,aAAa,EAAEC,YAAY,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAEzC,IAAI,CAACC,eAAe,GAAG,IAAI,CAACC,yBAAyB,CAAC,CAAC;IACvD,IAAI,CAACC,KAAK,GAAG,IAAI,CAACC,eAAe,CAAC,CAAC;EACrC;;EAEA;AACF;AACA;EACEF,yBAAyBA,CAAA,EAAkB;IACzC,MAAMG,GAAG,GAAG,GAAG,IAAI,CAACC,SAAS,gBAAgB;IAC7C,MAAMC,kBAAkB,GAAG,IAAI,CAACX,IAAI,CAACS,GAAG,CAAC;IAEzC,IAAI,OAAOE,kBAAkB,KAAK,WAAW,EAAE;MAC7C,MAAM,IAAIC,iCAAqB,CAC7B,oCAAoCH,GAAG,EACzC,CAAC;IACH;IAEA,IAAI,IAAI,CAACT,IAAI,CAACa,aAAa,IAAI,IAAI,CAACb,IAAI,CAACa,aAAa,CAACJ,GAAG,CAAC,EAAE;MAC3DE,kBAAkB,CAACE,aAAa,GAAG;QACjC,CAACJ,GAAG,GAAG,IAAI,CAACT,IAAI,CAACa,aAAa,CAACJ,GAAG;MACpC,CAAC;IACH;IAEA,MAAMK,2BAA2B,GAAG;MAClC,GAAG,IAAI,CAACb,aAAa,CAACQ,GAAG,CAAC;MAC1BM,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE,IAAI;MAChBC,UAAU,EAAEN,kBAAkB,CAACO,MAAM,GAAG,QAAQ,GAAG;IACrD,CAAC;IAED,OAAO,IAAAC,wBAAe,EACpBR,kBAAkB,CAACS,IAAI,IAAIT,kBAAkB,CAACU,KAAK,EACnDV,kBAAkB,EAClBG,2BAA2B,EAC3B,IAAI,CAACZ,YACP,CAAC;EACH;;EAEA;AACF;AACA;EACEM,eAAeA,CAAA,EAAkB;IAC/B,MAAMC,GAAG,GAAG,GAAG,IAAI,CAACC,SAAS,SAAS;IACtC,MAAMY,QAAQ,GAAG,IAAI,CAACtB,IAAI,CAACS,GAAG,CAAC;IAE/B,IAAI,IAAI,CAACT,IAAI,CAACa,aAAa,IAAI,IAAI,CAACb,IAAI,CAACa,aAAa,CAACJ,GAAG,CAAC,EAAE;MAC3Da,QAAQ,CAACT,aAAa,GAAG;QACvB,CAACJ,GAAG,GAAG,IAAI,CAACT,IAAI,CAACa,aAAa,CAACJ,GAAG;MACpC,CAAC;IACH;IAEA,MAAMc,iBAAiB,GAAG;MACxB,GAAG,IAAI,CAACtB,aAAa,CAACQ,GAAG,CAAC;MAC1BM,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE,IAAI;MAChBC,UAAU,EAAEK,QAAQ,CAACJ,MAAM,GAAG,QAAQ,GAAG;IAC3C,CAAC;IAED,OAAO,IAAAC,wBAAe,EACpBG,QAAQ,CAACF,IAAI,IAAIE,QAAQ,CAACD,KAAK,EAC/BC,QAAQ,EACRC,iBAAiB,EACjB,IAAI,CAACrB,YACP,CAAC;EACH;;EAEA;AACF;AACA;EACE,IAAIsB,cAAcA,CAAA,EAAkB;IAClC,OAAO,IAAI,CAACnB,eAAe;EAC7B;;EAEA;AACF;AACA;EACE,IAAIoB,IAAIA,CAAA,EAAkB;IACxB,OAAO,IAAI,CAAClB,KAAK;EACnB;;EAEA;AACF;AACA;EACE,IAAImB,MAAMA,CAAA,EAA4C;IACpD,OAAO,CACL;MACEN,IAAI,EAAE,IAAI,CAACI,cAAc,CAACJ,IAAI;MAC9BO,KAAK,EAAE,IAAI,CAACH,cAAc,CAACG;IAC7B,CAAC,EACD;MACEP,IAAI,EAAE,IAAI,CAACK,IAAI,CAACL,IAAI;MACpBO,KAAK,EAAE,IAAI,CAACF,IAAI,CAACE;IACnB,CAAC,CACF;EACH;;EAEA;AACF;EACE,IAAIA,KAAKA,CAAA,EAAsB;IAC7B,OAAO;MACL,CAAC,IAAI,CAACH,cAAc,CAACJ,IAAI,GAAG,IAAI,CAACI,cAAc,CAACG,KAAK;MACrD,CAAC,IAAI,CAACF,IAAI,CAACL,IAAI,GAAG,IAAI,CAACK,IAAI,CAACE;IAC9B,CAAC;EACH;;EAEA;AACF;EACE,IAAIC,UAAUA,CAAA,EAAsB;IAClC,OAAO;MACL,CAAC,IAAI,CAACJ,cAAc,CAACJ,IAAI,GAAG,IAAI,CAACI,cAAc,CAACI,UAAU;MAC1D,CAAC,IAAI,CAACH,IAAI,CAACL,IAAI,GAAG,IAAI,CAACK,IAAI,CAACG;IAC9B,CAAC;EACH;;EAEA;AACF;AACA;EACEC,QAAQA,CAAA,EAAY;IAClB,OACG,IAAI,CAACL,cAAc,CAACG,KAAK,KAAK,IAAI,IACjC,IAAI,CAACH,cAAc,CAACG,KAAK,KAAK,EAAE,IACjC,IAAI,CAACF,IAAI,CAACE,KAAK,KAAK,IAAI,IAAI,IAAI,CAACF,IAAI,CAACE,KAAK,KAAK,EAAG;EAExD;;EAEA;AACF;AACA;EACEG,KAAKA,CAAA,EAA0B;IAC7B,IAAI,IAAI,CAACN,cAAc,EAAE;MACvB,IAAI,CAACA,cAAc,CAACM,KAAK,CAAC,CAAC;IAC7B;IACA,IAAI,IAAI,CAACL,IAAI,EAAE;MACb,IAAI,CAACA,IAAI,CAACK,KAAK,CAAC,CAAC;IACnB;IAEA,OAAO,IAAI;EACb;;EAEA;AACF;AACA;EACEC,MAAMA,CAACC,SAAwB,EAAEL,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACF,IAAI,IAAI,IAAI,IAAI,IAAI,CAACA,IAAI,CAAChB,GAAG,KAAKuB,SAAS,CAACvB,GAAG,EAAE;MACxD,IAAI,CAACgB,IAAI,CAACM,MAAM,CAACJ,KAAK,CAAC;IACzB,CAAC,MAAM,IACL,IAAI,CAACH,cAAc,IAAI,IAAI,IAC3B,IAAI,CAACA,cAAc,CAACf,GAAG,KAAKuB,SAAS,CAACvB,GAAG,EACzC;MACA,IAAI,CAACe,cAAc,CAACO,MAAM,CAACJ,KAAK,CAAC;IACnC;EACF;;EAEA;AACF;AACA;EACEM,QAAQA,CAAA,EAAY;IAClB,OACG,IAAI,CAACT,cAAc,IAAI,IAAI,IAAI,IAAI,CAACA,cAAc,CAACU,SAAS,KAAK,IAAI,IACrE,IAAI,CAACT,IAAI,IAAI,IAAI,IAAI,IAAI,CAACA,IAAI,CAACS,SAAS,KAAK,IAAK;EAEvD;;EAEA;AACF;AACA;EACE,IAAIC,OAAOA,CAAA,EAAY;IACrB,OACE,IAAI,CAACX,cAAc,IAAI,IAAI,IAC3B,IAAI,CAACA,cAAc,CAACW,OAAO,IAC3B,IAAI,CAACV,IAAI,IAAI,IAAI,IACjB,IAAI,CAACA,IAAI,CAACU,OAAO;EAErB;;EAEA;AACF;EACE,IAAIC,aAAaA,CAAA,EAAyB;IACxC,OAAO;MACL,CAAC,IAAI,CAACZ,cAAc,CAACJ,IAAI,GAAG,IAAI,CAACI,cAAc,CAACY,aAAa;MAC7D,CAAC,IAAI,CAACX,IAAI,CAACL,IAAI,GAAG,IAAI,CAACK,IAAI,CAACW;IAC9B,CAAC;EACH;;EAEA;AACF;EACE,IAAIC,QAAQA,CAAA,EAA6B;IACvC,OAAO,IAAI,CAACV,KAAK;EACnB;AACF;AAACW,OAAA,CAAAlC,OAAA,GAAAP,qBAAA","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.20",
+  "version": "1.65.22",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -101,7 +101,7 @@
     "@commitlint/cli": "^20.3.1",
     "@commitlint/config-conventional": "^20.3.1",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/react": "^16.3.1",
+    "@testing-library/react": "^16.3.2",
     "auditjs": "^4.0.47",
     "babel-jest": "^30.2.0",
     "babel-plugin-styled-components": "^2.1.4",