Fix #10990 Review resources catalog code to make it usable by GeoStore and GeoNode by allyoucanmap · Pull Request #10991 · geosolutions-it/MapStore2

allyoucanmap · 2025-04-07T08:29:35Z

Description

This PR introduces following changes:

move catalog and facets request to persistence api
fix error inside ajax interceptor when cancelling a request
move extras information to api response and remove the utils to retrieve status, id and info from ResourcesCatalog components
remove unused resources actions
allow to add additional tools to permissions component
add missing translations
include missing styles for facets filters
add missing theme variables

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 bug fixes / features)
Docs have been added / updated (for bug fixes / features)

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

Minor changes to existing features

Issue

What is the current behavior?

#10990

What is the new behavior?

Resources catalog component can be used in the GeoNode enviroment with the introduced changes

Breaking change

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

No

Other useful information

…into geonode-home

offtherailz

Found this bug (not happening on dev)

Video.del.2025-04-28.15-50-20.mp4

StandardRouter.jsx:88 TypeError: Cannot read properties of undefined (reading 'map')
    at eval (Permissions.jsx:277:193)
    at Array.map (<anonymous>)
    at Permissions (Permissions.jsx:271:89)

see comments inline

web/client/components/layout/ConfirmDialog.jsx

web/client/utils/ResourcesUtils.js

offtherailz · 2025-04-28T14:08:33Z

web/client/utils/ResourcesUtils.js

 /**
 * parse all properties of a resource and it returns a valid resource
 * @param {object} resource resource properties
+ * @param {object} context associated context resource properties


If everything now relies on the structure of the object output of this function (placing everything in @extras, it makes sense to document the structure of the valid resource mentioned here, and it's @extras.

By removing all the abstract accessors to resourceId and resourceStatus, you have to guarantee the structure and document it

Personally I'd have:

preserve public accessors getResourceStatus(resource) that extract it from the resource, as for getResourceId, so you don't have to replace everywhere (that is also the objective of a public propertic accessor function). Even the @extras string makes getting the data very difficult, and hard to maintain.

create a private method getResourceItems (in fact it returns only them) that returns what you want to add to the valid resource.

@allyoucanmap As discussed, I’ve moved the GeoStore-specific resource handling functions to GeostoreUtils and updated the function names accordingly. All related references and JSDoc comments have been revised to reflect these changes and the corresponding unit tests have been updated as well

offtherailz · 2025-05-07T12:46:03Z

@ElenaGallo, could you please test this on DEV ? Thank you

tdipisa · 2025-05-07T12:53:13Z

@ElenaGallo I would say test scenarios covering the following from description should be performed at least

move catalog and facets request to persistence api

fix error inside ajax interceptor when cancelling a request

move extras information to api response and remove the utils to retrieve status, id and info from ResourcesCatalog components

remove unused resources actions

allow to add additional tools to permissions component

add missing translations

include missing styles for facets filters

add missing theme variables

Something else to include @allyoucanmap @dsuren1 to ensure all is still working as expected?

allyoucanmap · 2025-05-07T12:55:29Z

@tdipisa if possible to test all the catalog functionalities:

filters
details
user catalog
group catalog

ElenaGallo · 2025-05-12T16:21:24Z

All test passed, @allyoucanmap please backport to 2025.01.xx. Thanks

tdipisa · 2025-05-12T16:26:52Z

All test passed, @allyoucanmap please backport to 2025.01.xx. Thanks

@ElenaGallo there is anyway this issue connected #11085 that need to be fixed before.

…able by GeoStore and GeoNode (geosolutions-it#10991) (cherry picked from commit 157e28a)

…e it usable by GeoStore and GeoNode #10991 (#11089) --------- Co-authored-by: stefano bovio <stefano.bovio@geosolutionsgroup.com>

* Fix geosolutions-it#10819 Manager menu is merged into Login/user menu and Manager menu is now deprecated (geosolutions-it#10963) * Small update to LDAP doc (geosolutions-it#10972) * Fixing http-proxy version to 1.5.0 (geosolutions-it#10905) * Streetsmart openid master (geosolutions-it#10875) (geosolutions-it#10994) * geosolutions-it#10983: handle add new X twitter icon instead of old icon in Share-->Social (geosolutions-it#10988) (geosolutions-it#10995) Description: - add new x icon of x.com [twitter] in share panel * geosolutions-it#10986: Remove experimentalInteractiveLegend flag (geosolutions-it#10993) (geosolutions-it#11000) * Fix geosolutions-it#10898 Removed dependency BrandNavbar from both ResourceDetails and Language while creating map context (geosolutions-it#10978) (geosolutions-it#11001) * Fix geosolutions-it#10819 Changed migration guide and jsdoc for rules manager. (geosolutions-it#10984) (geosolutions-it#11002) * Fix geosolutions-it#10944 Remove primary color and shadow from panels headers (geosolutions-it#10956) (geosolutions-it#11006) --------- Co-authored-by: allyoucanmap <stefano.bovio@geosolutionsgroup.com> * geosolutions-it#10831: FIX- Improve how printing map preview is managed (geosolutions-it#10957) (geosolutions-it#11020) * geosolutions-it#10970: Add configuration support to open resource in target from homepage (geosolutions-it#10977) (geosolutions-it#11019) (cherry picked from commit b735d26) * [Backport 2025.01.xx] geosolutions-it#10820 Refactored Admin Ui section like HomePage using ResourceGrid Plugin (geosolutions-it#10973) (geosolutions-it#11023) * fix: merge conflict in index:ResourceCatalog * fix: conflict : removed ResourcesSearch * Fix:geosolutions-it#10820 double close icon in add new group dialog (geosolutions-it#11018) (geosolutions-it#11025) * [Backport 2025.01.xx] Fix geosolutions-it#10774 Review position of the filter button and search field in the homepage (geosolutions-it#11031) * Fix geosolutions-it#10774 Review position of the filter button and search field in the homepage (geosolutions-it#11005) * Fix geosolutions-it#10774 Clear all filters inside the resource search bar (geosolutions-it#11013) * Fix geosolutions-it#11010 Vertical scrollbar on map viewer (geosolutions-it#11015) (geosolutions-it#11032) * Fix geosolutions-it#11011 Map templates infinite scroll request all the pages (geosolutions-it#11014) (geosolutions-it#11033) * Fix geosolutions-it#10958 Clean up old packages and deps (geosolutions-it#10959) (geosolutions-it#11068) * geosolutions-it#11021: Implement an option to have static WMS legends (geosolutions-it#11034) (geosolutions-it#11074) (cherry picked from commit d28bf70) * [Backport to 2025.01.xx][FIXES geosolutions-it#11057] Latest MS binary of 2025.01 series does not start (geosolutions-it#11072) (geosolutions-it#11078) * Fix geosolutions-it#11064. Restored arguments for login event (geosolutions-it#11066) (geosolutions-it#11079) * Fix geosolutions-it#11058 .prettierignore improvements (geosolutions-it#11059) (geosolutions-it#11080) This changes include updates and documentation of `.prettierignore` file and json files in order to: - Prevent geosolutions-it#11058 error and any error due to target dirs - Include files that must be checked (fixing the missing ones) - Properly organize and document exclusion for future work * [Backport 2025.01.xx] Fix geosolutions-it#10990 Review resources catalog code to make it usable by GeoStore and GeoNode geosolutions-it#10991 (geosolutions-it#11089) --------- Co-authored-by: stefano bovio <stefano.bovio@geosolutionsgroup.com> * Fix prod config (geosolutions-it#11091) * Revert bump of mapstore-services to 1.9-SNAPSHOT (geosolutions-it#11094) * Fix prod config * Revert "Bump versions on master for release-branch (geosolutions-it#10904)" This reverts commit 3ceca0a. * update deps on stable branch 2025.01.xx for standard template web/pom.xml (geosolutions-it#11096) * Fix geosolutions-it#11086 IFC position controller no longer working (geosolutions-it#11090) (geosolutions-it#11101) * [Backport 2025.01.xx]: Fix geosolutions-it#11081 Minor home page issues to fix (geosolutions-it#11095) (geosolutions-it#11102) * Minor home page issues to fix geosolutions-it#11081 (geosolutions-it#11095) * fix: use update_resource and remove favouriteChanged action (geosolutions-it#11100) * Adding missing translation property geosolutions-it#11106 * Fix geosolutions-it#11099 Align the behavior of contexts management on the front end to the backend model (geosolutions-it#11108) (geosolutions-it#11122) * Fix geosolutions-it#10739 Changing correctly resolutions limits when switching map CRS (geosolutions-it#10746) (geosolutions-it#11123) * Fix geosolutions-it#10739 Changing correctly resolutions limits when switching map CRS * fix lint * Fix same visibility limit * Fix geosolutions-it#11097 Confirmation modal should not appear if no changes are made (geosolutions-it#11125) (geosolutions-it#11134) * Fix geosolutions-it#10947 Updated dockerfile to static files for standard templates (geosolutions-it#10950) (geosolutions-it#11135) * [Backport 2025.01.xx] upgrade spring framework to version 5.3.39 (geosolutions-it#11035) (geosolutions-it#11128) * upgrade spring framework to version 5.3.39 (geosolutions-it#11035) * Fixed geostore version * Update pom.xml Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * [2025.01.xx] upgrade spring framework to version 5.3.39 (geosolutions-it#11035) (geosolutions-it#11145) * Update pom.xml --------- Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * [Backport to 2025.01.xx] Keep commons-lang 2 for back compatibility with old catalina versions (geosolutions-it#11161) * [Backport 2025.01.xx] Fix geosolutions-it#10982 Side panels should be smaller (geosolutions-it#11172) * Fix geosolutions-it#10982 Side panels should be smaller (geosolutions-it#11009) * #geosolutions-it#10982 Side panels should be smaller * fix failing tests * requested changes * Fix geosolutions-it#10982 Review style of longitudinal profile chart (geosolutions-it#11151) * [Backport 2025.01.xx] Fix geosolutions-it#11147 Problems with save resource workflow (geosolutions-it#11170) * Fix geosolutions-it#11147 Problems with save resource workflow (geosolutions-it#11149) * Fix geosolutions-it#11147 Ensure thumbnail is persisted in UI while editing (geosolutions-it#11166) * Fix geosolutions-it#11146 Edit permission to everyone should not be set (geosolutions-it#11150) (geosolutions-it#11171) * Improve GeoServer user integration doc (geosolutions-it#11030) (geosolutions-it#11169) * Improve GeoServer user integration doc * Update docs/developer-guide/integrations/geoserver.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * backport 2025.01.xx - Fix geosolutions-it#11176 adding version template and updated pom versions (geosolutions-it#11178) (geosolutions-it#11180) * Fix geosolutions-it#11176 adding version template and updated pom versions (geosolutions-it#11178) * fix geostore-webapp.version * Update User Guide - User Session plugin (geosolutions-it#11115) (geosolutions-it#11185) * update_10934 * Update docs/user-guide/user-session.md * Update docs/user-guide/user-session.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * Update User Guide - Upload image on Text Widget (geosolutions-it#11024) (geosolutions-it#11186) * updateguide_10752 * Update docs/user-guide/widgets.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * 11073_update (geosolutions-it#11107) (geosolutions-it#11187) * Update User Guide - Configure the light on Cesium map (geosolutions-it#11126) (geosolutions-it#11184) * update_10844 * Update docs/user-guide/mapstore-toolbars.md * Update docs/user-guide/mapstore-toolbars.md * Update docs/user-guide/mapstore-toolbars.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * review_10929 (geosolutions-it#11188) * Update User Guide - Legend filtering for WMS layers (geosolutions-it#11026) (geosolutions-it#11189) * updateguide_10740 * review_10740 * Update docs/user-guide/toc.md --------- Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> * User Guide - Add User Session plugin section geosolutions-it#11190 (geosolutions-it#11191) * Set versions of main dependencies (geostore, mapfish, http-proxy) (geosolutions-it#11193) Co-authored-by: github-actions <github-actions@github.com> * Fix style parser import of font-awsome (geosolutions-it#11195) (geosolutions-it#11196) * Version Release 2025.01.00 * Restore java packages to 1.9-SNAPSHOT and update package.json * geosolutions-it#11153: Persist Swipe Layer state after map refresh (geosolutions-it#11158) (geosolutions-it#11202) * geosolutions-it#11153: Persist Swipe Layer state after map refresh - handle save swipe data into mapsave - handle setting the swipe saved data into swipe state after map config load - handle detect swipe change for save map - add unit tests * resolve review comments include: - use registerCustomSaveHandler instead of using basicMapOptionsToSaveSelector to save swipe state * Update web/client/selectors/swipe.js --------- Co-authored-by: Suren <dsuren1@gmail.com> * Revert "geosolutions-it#11153: Persist Swipe Layer state after map refresh (geosolutions-it#11158) (geosolutions-it#11202)" (geosolutions-it#11204) This reverts commit 644bb7b. * [Backport to 2025.01.xx][geosolutions-it#11205] MapStore war stand-alone not starting (geosolutions-it#11208) * [geosolutions-it#11205] MapStore war stand-alone not starting * Build fix (cherry picked from commit c2852fd) * Get rid of duplicate httpclient httpcore 4.4.15 deps * Fixing failing tests due to timeout (geosolutions-it#11216) (geosolutions-it#11217) * Removed changelog * Version Release 2025.01.00 * Submodule sync v2025.01.00 (#46) * Update db properties and backend port (#37) * Adding Vulnerability Fixes (#38) * Updated pom.xml files to fix vulnerabilities * Updated spring.security.version * Bump versions for tomcat and cxf-core (#39) * pom updates * removing duplicate ip * fixed port for embedded tomcat --------- Co-authored-by: Anup Dahal <adahal39@gmail.com> Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com> Co-authored-by: Lorenzo Natali <lorenzo.natali@geosolutionsgroup.com> Co-authored-by: mahmoud adel <58145645+mahmoudadel54@users.noreply.github.com> Co-authored-by: allyoucanmap <stefano.bovio@geosolutionsgroup.com> Co-authored-by: Suren <dsuren1@gmail.com> Co-authored-by: Matteo V. <matteo.velludini@geosolutionsgroup.com> Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com> Co-authored-by: RowHeat <40065760+rowheat02@users.noreply.github.com> Co-authored-by: ElenaGallo <56537133+ElenaGallo@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Raul Melara Beckman <101594967+rmelarab-ngs@users.noreply.github.com>

review resources catalog plugins configuration

3e21624

allyoucanmap added the enhancement label Apr 7, 2025

allyoucanmap added this to the 2025.01.00 milestone Apr 7, 2025

allyoucanmap added the BackportNeeded Commits provided for an issue need to be backported to the milestone's stable branch label Apr 7, 2025

allyoucanmap linked an issue Apr 7, 2025 that may be closed by this pull request

Review resources catalog code to make it usable by GeoStore and GeoNode #10990

Closed

1 task

allyoucanmap self-assigned this Apr 7, 2025

dsuren1 and others added 5 commits April 8, 2025 16:10

Menu divider border style (#10997)

7b759ae

Permission row style enhancement (#10996)

1d53b4c

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

07d3a37

…into geonode-home

fix failing test

ddd2958

Facet label component update (#10992)

c91ec71

allyoucanmap marked this pull request as ready for review April 17, 2025 08:34

allyoucanmap requested a review from offtherailz April 17, 2025 08:36

offtherailz requested changes Apr 28, 2025

View reviewed changes

tdipisa assigned dsuren1 May 5, 2025

Add unit test and code refactor

48761ba

dsuren1 requested a review from offtherailz May 6, 2025 11:30

offtherailz approved these changes May 7, 2025

View reviewed changes

offtherailz merged commit 157e28a into master May 7, 2025
6 checks passed

afabiani deleted the geonode-home branch May 7, 2025 12:56

dsuren1 restored the geonode-home branch May 8, 2025 06:56

dsuren1 deleted the geonode-home branch May 8, 2025 06:56

dsuren1 pushed a commit to dsuren1/MapStore2 that referenced this pull request May 13, 2025

Fix geosolutions-it#10990 Review resources catalog code to make it us…

2b374e8

…able by GeoStore and GeoNode (geosolutions-it#10991) (cherry picked from commit 157e28a)

allyoucanmap added a commit that referenced this pull request May 13, 2025

[Backport 2025.01.xx] Fix #10990 Review resources catalog code to mak…

72c7275

…e it usable by GeoStore and GeoNode #10991 (#11089) --------- Co-authored-by: stefano bovio <stefano.bovio@geosolutionsgroup.com>

tdipisa removed the BackportNeeded Commits provided for an issue need to be backported to the milestone's stable branch label May 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #10990 Review resources catalog code to make it usable by GeoStore and GeoNode#10991

Fix #10990 Review resources catalog code to make it usable by GeoStore and GeoNode#10991
offtherailz merged 7 commits intomasterfrom
geonode-home

allyoucanmap commented Apr 7, 2025 •

edited

Loading

Uh oh!

offtherailz left a comment •

edited by dsuren1

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

offtherailz Apr 28, 2025

Uh oh!

dsuren1 May 6, 2025

Uh oh!

Uh oh!

offtherailz commented May 7, 2025

Uh oh!

tdipisa commented May 7, 2025 •

edited

Loading

Uh oh!

allyoucanmap commented May 7, 2025

Uh oh!

ElenaGallo commented May 12, 2025

Uh oh!

tdipisa commented May 12, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

allyoucanmap commented Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issue

Breaking change

Other useful information

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

offtherailz Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

dsuren1 May 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

offtherailz commented May 7, 2025

Uh oh!

tdipisa commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

allyoucanmap commented May 7, 2025

Uh oh!

ElenaGallo commented May 12, 2025

Uh oh!

tdipisa commented May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

allyoucanmap commented Apr 7, 2025 •

edited

Loading

offtherailz left a comment •

edited by dsuren1

Loading

tdipisa commented May 7, 2025 •

edited

Loading

tdipisa commented May 12, 2025 •

edited

Loading