Fix #11930 Catalog Refactor and integration of Geonode api in the Catalog. by anup39 · Pull Request #12107 · geosolutions-it/MapStore2

anup39 · 2026-03-18T03:25:19Z

Description

This PR adds followings:

Refactored Catalog core in Mapstore
Integration of Geonode API in Catalog

Please check if the PR fulfills these requirements

The commit message follows our guidelines: https://github.com/geosolutions-it/MapStore2/blob/master/CONTRIBUTING.md
Tests for the changes have been added for Geonode integration , remaining for UI components
Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (check one with "x", remove the others)

Code style update (formatting, local variables)
Refactoring (no functional changes, no api changes)

Issue

What is the current behavior?

#11930

What is the new behavior?

Now Catalog plugin has been refactored with followings changes :

Added Catalog plugin to support both panel and dialog view
Refactored UI elements so that catalog can be reusable with new styles
For context, dashboard and geostory also same catalog component can be used instead of using CompactCatalog
Added necessary utils and api services to support integration of Geonode api in the catalog
Additional support for resource card to be used as layer card .
Multiple selection of layers to be added in the map.
New pagination component introduced for catalog.
Support of Filter and Orderby in the catalog.

Some of the screenshots :

Breaking change

Does this PR introduce a breaking change? (check one with "x", remove the other)

No

Other useful information

…into HEAD

Fix catalog mock refactor 1

…x_catalog_mock_refactor

…lated to catalog

…x_catalog_refactor_genode_int_11930

…atalog advance settings

dsuren1

@anup39
Could you kindly address these comments

Without a border shadow, it becomes difficult to distinguish the elements
Grid

Panel
When a GFI is triggered while the catalog panel is open, the GFI panel should take precedence
There seems to be a noticeable performance impact, with the component rendering indefinitely. This may need some investigation. Repro: keep the catalog open, add a layer, and perform another operation (e.g., GFI). (assigned to @dsuren1 )
Map layout panel dimension is not updated. Open catalog -> grid view -> close catalog panel -> Now open catalog panel from sidebar
The map zoom to extent of the latest layer when more than one is selected. Should we instead zoom to collective extent of the layers added? @allyoucanmap
When Sort By field value is added and then removed, if the value added is still persisted. In case of invalid value, the error restricts the service from being saved. (Sporadic)
Filtered result is incorrect (assigned to @dsuren1 ) (Not an issue, caused by not having request configuration rules resulting in filtered result from geoserver)
Select all -> Add to Map -> Impacts performance (Need to verify if it's due to point 3 mentioned above)
We need to disable Add To Map when adding the layer map process in progress

Updated (831f6d5)

Facet param updated with resource type dataset
Catalog plugin supports configuring fields for the filterFormFields via localConfig
Context now supports new Catalog plugin (config updated) and overriding of filter form fields. Included backward compatibility
api-preset configuration via exposed function from GeoNodeUtils and fallback mechanism using include & exclude params
Default preset updated to support keyword and category for tag support/display on Resource card
The Dashboard Editor uses serviceFilters to override Catalog staticTabs and filterFormFields, in line with other Catalog plugin props. Would it make sense to revisit the prop name for better clarity? @allyoucanmap
MapEditor configuration already support plugin override and it supports Catalog configs too (Verified). So both Dashboard and Geostory using MapEditor can support overriding

Note

Unit tests needs updating

dsuren1 · 2026-04-15T13:08:13Z

@@ -0,0 +1,266 @@
+
+.ms-catalog-wrapper {


Could we follow the existing styling pattern instead of adding new CSS? Perhaps this can be moved under the theme less

@dsuren1 this is fine like this, @anup39 please don't move this

@anup39 just convert this from .css to .less

dsuren1 · 2026-04-15T13:10:29Z

+const ButtonWithTooltip = tooltip(Button);
+
+
+const Catalog = ({


Kindly include an inline jsdoc comment explaining the plugin configurations support

dsuren1 · 2026-04-15T13:14:26Z

 import { defaultProps } from 'recompose';

-import CompactCatalog from '../../components/catalog/CompactCatalog';
+// import CompactCatalog from '../../components/catalog/CompactCatalog';


Suggested change

// import CompactCatalog from '../../components/catalog/CompactCatalog';

dsuren1 · 2026-04-15T13:17:20Z

+import API from '../../../../api/catalog';
+import { buildServiceUrl } from '../../../../utils/CatalogUtils';
+
+const catalogRequestsWorkflow = (Component) => {


Suggested change

const catalogRequestsWorkflow = (Component) => {

const withCatalogRequests = (Component) => {

Would it make sense to rename the HOC to follow the with convention?

dsuren1 · 2026-04-15T13:24:01Z

@@ -0,0 +1,267 @@
+/*
+ * Copyright 2025, GeoSolutions Sas.


Kindly ensure all newly added file to have the correct copyright year

Suggested change

* Copyright 2025, GeoSolutions Sas.

* Copyright 2026, GeoSolutions Sas.

…log_refactor_genode_int_11930 * commit 'de55770d13eb703b5b6cfe31ae55f38fea0b9fcf': Fix geosolutions-it#12146: ArcGIS support for FeatureService (geosolutions-it#12235) geosolutions-it#12094: Fix dropdown menu overflow when adding links to text widget in TextEditor (geosolutions-it#12260) geosolutions-it#12207: Fix - ScaleBox plugin - Custom scales not reported on map load (geosolutions-it#12212) fix a few danish translations (geosolutions-it#12230) geosolutions-it#12223: fix rule manager field filtering with checkbox is not working properly (geosolutions-it#12224) geosolutions-it#12218: fix pagination in rules manager layers autocomplete does not work (geosolutions-it#12219) Fix geosolutions-it#12213 - Fixed startup script for java new versions (geosolutions-it#12214) Update Changelog for version 2025.02.03 (geosolutions-it#12211) Fix pre-release gh action workflow for CLA (geosolutions-it#12205) Update Changelog for version 2026.01.00 (geosolutions-it#12202) fix geosolutions-it#12162 flatgeobuf params by getRequestConfigurationByUrl (geosolutions-it#12200) Fix geosolutions-it#12162 COG and FlatGeobuf layers support params for protected storage (geosolutions-it#12179) Fix doc of MapImport plugin (geosolutions-it#12197) Fix geosolutions-it#12044: fix wfs layer hidden in 3D + scale arrow not rendering (geosolutions-it#12155)

anup39 and others added 19 commits January 30, 2026 20:49

Initial mockup and refactor for catalog

307f8dc

deleted read me file

dd40f1b

New changes for filters

7c9ab03

Refactored and removed unused code

28e2c11

Added test cases for geonode related api

e143375

Refactored logic

b6a43d3

UI Changes

51f1dee

Migrated all the logics from Record Item to new Layer Card

c2fc9b5

Merge branch 'master' of https://github.com/geosolutions-it/MapStore2 …

ed2336c

…into HEAD

review catalog components

430a78e

Merge pull request #3 from allyoucanmap/fix_catalog_mock_refactor_1

87a331f

Fix catalog mock refactor 1

Merge branch 'master' of github.com:geosolutions-it/MapStore2 into fi…

4601cbc

…x_catalog_mock_refactor

Catalog in Dashboard initial refactor

1d25d35

Fix minor changes

58ef4a7

Added select functionality in dashboard

6b44933

Implemented single Select

d322220

Refactor logic for dashboard catalog

4d2cb06

Fix minor issues in styles

3ded9c2

Fix minor issues in styles , added translations and fix some logic re…

a4cb870

…lated to catalog

anup39 added this to the 2026.02.00 milestone Mar 18, 2026

anup39 assigned allyoucanmap Mar 18, 2026

anup39 added the Epic label Mar 18, 2026

cla-bot bot added the CLA Ready label Mar 18, 2026

anup39 linked an issue Mar 18, 2026 that may be closed by this pull request

MetadataExplorer refactor and GeoNode API service integration #11930

Open

5 tasks

anup39 added 2 commits March 18, 2026 09:17

Fix lint issues in translations

e63d13b

Fixed failing test cases

2245acd

anup39 requested a review from allyoucanmap March 18, 2026 04:13

anup39 added 3 commits March 30, 2026 08:35

Added Tag filter in the catalog card

a1407e4

geonode related utils and api sync with latest geonode client

3e3d78f

Merge branch 'master' of github.com:geosolutions-it/MapStore2 into fi…

41c356e

…x_catalog_refactor_genode_int_11930

anup39 added 17 commits March 31, 2026 09:15

Added enableImageryOverlay for the 3d tiles in geonode utils

9d2e037

Fixes in the filter logic

5d25b2f

Used API preset to reduce the size of the inital records for card

ec889c3

Moved the resources related to core catalog component

4e37dac

Fix genode api related test cases

d322ae3

Added test cases for new component

2447f67

Add config to for geonod integration and fixes testcases

7ee7fed

Fix : moved hoc, selectAll is only visible when total is more than zero

9d65695

Fixes and revised

c0291c6

Implemented options to select category or keyword filter in card in c…

b7c7bf0

…atalog advance settings

Test of padding a static values in the new tab of filter

909a007

Added a comment

8277380

Update docma config json

d69a1eb

added js doc

127abbf

Revert back to small c , case sensitive issue

899a376

change to small c also in relevant test cases

be6e8f0

Fix test cases and removed unwanted test cases

19acf3d

allyoucanmap requested review from dsuren1 and removed request for allyoucanmap April 10, 2026 08:10

allyoucanmap assigned dsuren1 and unassigned allyoucanmap Apr 10, 2026

code refactor and enhance configurability of Catalog

831f6d5

dsuren1 requested changes Apr 15, 2026

View reviewed changes

dsuren1 added 2 commits April 16, 2026 13:43

fix high frequency re-render and accordion style

406f4ff

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #11930 Catalog Refactor and integration of Geonode api in the Catalog.#12107

Fix #11930 Catalog Refactor and integration of Geonode api in the Catalog.#12107
anup39 wants to merge 44 commits intogeosolutions-it:masterfrom
anup39:fix_catalog_refactor_genode_int_11930

anup39 commented Mar 18, 2026

Uh oh!

dsuren1 left a comment •

edited

Loading

Uh oh!

dsuren1 Apr 15, 2026

Uh oh!

allyoucanmap Apr 16, 2026

Uh oh!

allyoucanmap Apr 16, 2026

Uh oh!

dsuren1 Apr 15, 2026

Uh oh!

dsuren1 Apr 15, 2026

Uh oh!

dsuren1 Apr 15, 2026

Uh oh!

dsuren1 Apr 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		const ButtonWithTooltip = tooltip(Button);


		const Catalog = ({

	const catalogRequestsWorkflow = (Component) => {
	const withCatalogRequests = (Component) => {

	* Copyright 2025, GeoSolutions Sas.
	* Copyright 2026, GeoSolutions Sas.

Conversation

anup39 commented Mar 18, 2026

Description

Issue

Breaking change

Other useful information

Uh oh!

dsuren1 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Updated (831f6d5)

Uh oh!

dsuren1 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

allyoucanmap Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

allyoucanmap Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

dsuren1 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

dsuren1 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

dsuren1 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

dsuren1 Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dsuren1 left a comment •

edited

Loading