Skip to content

#2437: Fix merging query in Filter form #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allyoucanmap merged 2 commits into from
Mar 25, 2026
+3 −2
Merged

#2437: Fix merging query in Filter form #2452

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b9030d
#2437: Fix merging query in Filter form
dsuren1 Mar 25, 2026
5a686af
Merge commit '5618f01485d5aac0cf9434d8de6e74ebbaa43fb7' into #2437_up…
dsuren1 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Open in desktop
Submodule MapStore2 updated 34 files
+1 −1 binary/bin-war/pom.xml
+1 −1 binary/pom.xml
+6 −2 docs/developer-guide/advanced-project-customization.md
+23 −1 docs/developer-guide/mapstore-migration-guide.md
+1 −1 package.json
+1 −1 pom.xml
+4 −0 product/pom.xml
+1 −1 project/standard/templates/pom.xml
+4 −0 project/standard/templates/web/pom.xml
+21 −0 utility/doc/jsDocBuild.js
+1 −0 utility/doc/jsDocUtils.js
+3 −1 web/client/components/styleeditor/__tests__/VisualStyleEditor-test.js
+14 −4 web/client/components/styleeditor/config/blocks.js
+0 −1 web/client/plugins/LayersSelection/index.js
+2 −1 web/client/plugins/ResourcesCatalog/ResourcesFiltersForm.jsx
+3 −23 web/client/plugins/ResourcesCatalog/hooks/useQueryResourcesByLocation.js
+18 −16 web/client/plugins/longitudinalProfile/Import.jsx
+3 −2 web/client/plugins/longitudinalProfile/SettingsPanel.jsx
+1 −0 web/client/themes/default/less/react-data-grid.less
+2 −0 web/client/translations/data.ca-ES.json
+2 −0 web/client/translations/data.da-DK.json
+2 −0 web/client/translations/data.de-DE.json
+2 −0 web/client/translations/data.en-US.json
+2 −0 web/client/translations/data.es-ES.json
+2 −0 web/client/translations/data.fr-FR.json
+2 −0 web/client/translations/data.it-IT.json
+2 −0 web/client/translations/data.nl-NL.json
+2 −0 web/client/translations/data.pt-BR.json
+2 −0 web/client/translations/data.sv-SE.json
+1 −1 web/client/utils/DOMUtil.js
+29 −0 web/client/utils/ResourcesFiltersUtils.js
+20 −1 web/client/utils/__tests__/ResourcesFiltersUtils-test.js
+231 −19 web/client/utils/styleparser/CesiumStyleParser.js
+319 −0 web/client/utils/styleparser/__tests__/CesiumStyleParser-test.js
3 changes: 2 additions & 1 deletion ...de_mapstore_client/client/js/plugins/DocumentsCatalog/containers/DocumentsFiltersForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading