diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2 index b5b60a6696..c35d5cfcc7 160000 --- a/geonode_mapstore_client/client/MapStore2 +++ b/geonode_mapstore_client/client/MapStore2 @@ -1 +1 @@ -Subproject commit b5b60a669643a6d6e44f054e3891672d88191dde +Subproject commit c35d5cfcc76e899a709ca3fa46ca60e115865572 diff --git a/geonode_mapstore_client/client/js/plugins/DocumentsCatalog/containers/DocumentsFiltersForm.jsx b/geonode_mapstore_client/client/js/plugins/DocumentsCatalog/containers/DocumentsFiltersForm.jsx index f6b4270188..6a2d8383af 100644 --- a/geonode_mapstore_client/client/js/plugins/DocumentsCatalog/containers/DocumentsFiltersForm.jsx +++ b/geonode_mapstore_client/client/js/plugins/DocumentsCatalog/containers/DocumentsFiltersForm.jsx @@ -19,6 +19,7 @@ import { getMonitoredStateSelector } from '@mapstore/framework/plugins/Resources import { userSelector } from '@mapstore/framework/selectors/security'; import { getCatalogFacets } from '@mapstore/framework/api/persistence'; import { isMenuItemSupportedSupported } from '@mapstore/framework/utils/ResourcesUtils'; +import { mergeDefaultQuery } from '@mapstore/framework/utils/ResourcesFiltersUtils'; /** * This renders a configurable input filters for documents catalog @@ -80,7 +81,7 @@ function DocumentsFiltersForm({ filterFunc: item => isMenuItemSupportedSupported(item, availableResourceTypes, user) }); - const updatedQuery = defaultQuery ? { ...query, ...defaultQuery } : query; + const updatedQuery = defaultQuery ? mergeDefaultQuery(query, defaultQuery) : query; const { fields