Fix #10819 Manager menu is merged into Login/user menu and Manager menu is now deprecated by anup39 · Pull Request #10963 · geosolutions-it/MapStore2

anup39 · 2025-03-25T14:49:36Z

Description

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?

#10819

What is the new behavior?

Deprecated and removed ManagerMenu from localConfing.json and jsdoc
Merged the logic from ManagerMenu inside the Login plugin allowing the injection of menu items from containers
Evaluate a refactor of Login dropdown component from class to function removing also unused logic
Added migration guide section for changes needed inside localConfig.json related to the removal of ManagerMenu from configuration

Breaking change

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

No

Other useful information

fix failing tests

…r deprecation of managermenu

…ve_menu_10819

allyoucanmap

@anup39 implementation is fine, there are few changes in the doc and also there is a conflict with master branch

allyoucanmap · 2025-04-01T15:36:10Z

web/client/plugins/Login.jsx

+  * @class LoginPlugin
  * @memberof plugins
  * @static
+  * @name LoginPlugin


name should be the one used in localConfig.json

Suggested change

* @name LoginPlugin

* @name Login

allyoucanmap · 2025-04-01T15:36:34Z

web/client/plugins/Login.jsx

 * ```
 *
-  * @class Login
+  * @class LoginPlugin


class does not need value

Suggested change

* @class LoginPlugin

* @class

allyoucanmap · 2025-04-01T16:00:09Z

web/client/plugins/Login.jsx

+  * @prop {boolean} cfg.isUsingLDAP flag refers to if the user with type LDAP or not to manage show/hide change psasword, by default: false
+  * @prop {object} cfg.user the user object
+  * @prop {object[]} cfg.entries the entries of the menu
+  * @prop {boolean} cfg.enableRulesManager flag to enable/disable the rules manager
+  * @prop {boolean} cfg.enableImporter flag to enable/disable the importer
+  * @prop {function} cfg.onItemSelected function to call when an item is selected
+  * @prop {boolean} cfg.hidden flag to show/hide the menu
+  * @prop {object[]} cfg.items this property contains the items injected from the other plugins
+  * @prop {boolean} cfg.isAdmin flag to show/hide the admin menu
+  * @prop {string} cfg.displayName the name of the user to display
+  * @prop {boolean} cfg.showAccountInfo flag to show/hide the account info
+  * @prop {string} cfg.bsStyle the style of the button
+  * @prop {string} cfg.className the class name of the button
+  * @prop {object} context.loadedPlugins the plugins loaded in the application


My suggestion is to add only cfg properties and item exposed and configurable by the localConfig.json.

We should not add inside plugin documentation:

props connected to the state (e.g.: enableRulesManager, enableImporter, user, isAdmin)

props function connected to an action (e.g.: onItemSelected). In general functions cannot be easily used and configured in the localConfig.json file

context argument

For the moment let's keep only the already documented ones in ManagerMenu and Login so: cfg.id, cfg.isUsingLDAP and items

Also items should be placed before it's own description about containers usage

Suggested change

* @prop {boolean} cfg.isUsingLDAP flag refers to if the user with type LDAP or not to manage show/hide change psasword, by default: false

* @prop {object} cfg.user the user object

* @prop {object[]} cfg.entries the entries of the menu

* @prop {boolean} cfg.enableRulesManager flag to enable/disable the rules manager

* @prop {boolean} cfg.enableImporter flag to enable/disable the importer

* @prop {function} cfg.onItemSelected function to call when an item is selected

* @prop {boolean} cfg.hidden flag to show/hide the menu

* @prop {object[]} cfg.items this property contains the items injected from the other plugins

* @prop {boolean} cfg.isAdmin flag to show/hide the admin menu

* @prop {string} cfg.displayName the name of the user to display

* @prop {boolean} cfg.showAccountInfo flag to show/hide the account info

* @prop {string} cfg.bsStyle the style of the button

* @prop {string} cfg.className the class name of the button

* @prop {object} context.loadedPlugins the plugins loaded in the application

* @prop {boolean} cfg.isUsingLDAP flag refers to if the user with type LDAP or not to manage show/hide change psasword, by default: false

* @prop {object[]} items this property contains the items injected from the other plugins

allyoucanmap · 2025-04-02T10:11:56Z

@ElenaGallo please test these changes on dev, thanks

ElenaGallo · 2025-04-03T10:56:17Z

@anup39 If access rule management is enabled for the admin rule, the Manager button is still visible on the page..

manager.mp4

ElenaGallo · 2025-04-08T15:54:54Z

Test passed, @anup39 please backport to 2025.01.xx. Thanks

* 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>

anup39 and others added 11 commits March 14, 2025 22:25

feat : Merged manager menu into user menu

4cacb69

Added unsaved dialog logic and component

fbd1f2a

fixed default undefined value of renderUnsavedMapChangesDialog

04ee028

fix test case hide change password in case LDAP user [not admin]

3715375

added displayName prop

1d831fa

fix failing tests

7a97bd6

Merge pull request #1 from allyoucanmap/move_menu_10819

54b704c

fix failing tests

Moved Login Component in the LoginPlugin

130ce60

Added missing JSDoc in LoginPlugin, added mapstore migration guide fo…

f2c586a

…r deprecation of managermenu

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

d28cc88

…ve_menu_10819

removed test path for login only in test.webpack

099aaaf

anup39 added the enhancement label Mar 25, 2025

anup39 added this to the 2025.01.00 milestone Mar 25, 2025

anup39 self-assigned this Mar 25, 2025

anup39 mentioned this pull request Mar 25, 2025

Fix: #10819 Manager menu merged into User menu. #10945

Closed

8 tasks

fixes: eslint trailing space

432bfe6

anup39 linked an issue Mar 25, 2025 that may be closed by this pull request

Review User/Manage menus with the aim to merge them in one #10819

Closed

4 tasks

anup39 requested a review from allyoucanmap March 25, 2025 15:30

fixed empty space in the migration doc : lint error

adf4137

allyoucanmap requested changes Apr 1, 2025

View reviewed changes

anup39 added 3 commits April 2, 2025 11:01

fix : merged conflict migration guide

aa0e2e7

Changes in JSDOC of the Login Plugin

e9828d7

fix: lint error in migration doc

9855e68

anup39 requested a review from allyoucanmap April 2, 2025 09:12

allyoucanmap approved these changes Apr 2, 2025

View reviewed changes

allyoucanmap merged commit 646bb6e into geosolutions-it:master Apr 2, 2025
5 checks passed

ElenaGallo mentioned this pull request Apr 3, 2025

Review User/Manage menus with the aim to merge them in one #10819

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #10819 Manager menu is merged into Login/user menu and Manager menu is now deprecated #10963

Fix #10819 Manager menu is merged into Login/user menu and Manager menu is now deprecated #10963
allyoucanmap merged 16 commits intogeosolutions-it:masterfrom
anup39:move_menu_10819

anup39 commented Mar 25, 2025

Uh oh!

allyoucanmap left a comment

Uh oh!

allyoucanmap Apr 1, 2025

Uh oh!

anup39 Apr 2, 2025

Uh oh!

allyoucanmap Apr 1, 2025

Uh oh!

anup39 Apr 2, 2025

Uh oh!

allyoucanmap Apr 1, 2025

Uh oh!

anup39 Apr 2, 2025

Uh oh!

Uh oh!

allyoucanmap commented Apr 2, 2025

Uh oh!

ElenaGallo commented Apr 3, 2025

Uh oh!

ElenaGallo commented Apr 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

anup39 commented Mar 25, 2025

Description

Issue

Breaking change

Other useful information

Uh oh!

allyoucanmap left a comment

Choose a reason for hiding this comment

Uh oh!

allyoucanmap Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

anup39 Apr 2, 2025

Choose a reason for hiding this comment

Uh oh!

allyoucanmap Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

anup39 Apr 2, 2025

Choose a reason for hiding this comment

Uh oh!

allyoucanmap Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

anup39 Apr 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

allyoucanmap commented Apr 2, 2025

Uh oh!

ElenaGallo commented Apr 3, 2025

Uh oh!

ElenaGallo commented Apr 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants