The default catalog changes after the catalog is opened from the background tool #10486#10586
Merged
offtherailz merged 3 commits intogeosolutions-it:masterfrom Oct 4, 2024
Conversation
1 task
offtherailz
requested changes
Oct 4, 2024
Member
offtherailz
left a comment
There was a problem hiding this comment.
The fix works, but the code have to be written to be more maintainable and readable.
Comment on lines
+130
to
+135
| export function addBackupBackground(background) { | ||
| return { | ||
| type: ADD_BACKUP_BACKGROUND, | ||
| background | ||
| }; | ||
| } |
Member
There was a problem hiding this comment.
This action stashes the selected catalog, not a backup of the background.
I'd also document to understand what is the parameter accepted (e.g. ID, object....).
So for this action I should use the following:
Suggested change
| export function addBackupBackground(background) { | |
| return { | |
| type: ADD_BACKUP_BACKGROUND, | |
| background | |
| }; | |
| } | |
| /** | |
| * stashes the current selected catalog to restore after catalog close, when opening | |
| * the catalog for background selection | |
| * @params ... <--- Insert here the parameter type and name | |
| */ | |
| export function stashSelectedCatalogService(service) { | |
| return { | |
| type: STASH_SELECTED_SERVICE, | |
| service | |
| }; | |
| } |
| .switchMap(() => Rx.Observable.of( | ||
| setControlProperty('metadataexplorer', 'enabled', true), | ||
| allowBackgroundsDeletion(false), | ||
| addBackupBackground(store.getState().catalog.selectedService), |
Member
There was a problem hiding this comment.
Use selectors when available in this case selectedServiceSelector in selectors/catalog.
This helps future refactors (e.g. internal restructuration of state) without having to find around the code all the x.y.z strings.
web/client/epics/catalog.js
Outdated
| resetCatalog() | ||
| ].concat(metadataSource === 'backgroundSelector' ? | ||
| [changeSelectedService(head(keys(services))), allowBackgroundsDeletion(true)] : []))); | ||
| [changeSelectedService(state.backgroundSelector.backupBackground), allowBackgroundsDeletion(true)] : []))); |
Member
There was a problem hiding this comment.
Also in this case, create a selector for that value and use it here.
| export const CONFIRM_DELETE_BACKGROUND_MODAL = 'BACKGROUND_SELECTOR:CONFIRM_DELETE_BACKGROUND_MODAL'; | ||
| export const ALLOW_BACKGROUNDS_DELETION = 'BACKGROUND_SELECTOR:ALLOW_BACKGROUNDS_DELETION'; | ||
| export const SYNC_CURRENT_BACKGROUND_LAYER = 'BACKGROUND_SELECTOR:SYNC_CURRENT_BACKGROUND_LAYER'; | ||
| export const ADD_BACKUP_BACKGROUND = 'BACKGROUND_SELECTOR:ADD_BACKUP_BACKGROUND'; |
Member
There was a problem hiding this comment.
Suggested change
| export const ADD_BACKUP_BACKGROUND = 'BACKGROUND_SELECTOR:ADD_BACKUP_BACKGROUND'; | |
| export const ADD_BACKUP_BACKGROUND = 'BACKGROUND_SELECTOR:STASH_SELECTED_SERVICE'; |
offtherailz
approved these changes
Oct 4, 2024
Member
|
@ElenaGallo, could you please test this on DEV ? Thank you |
Contributor
|
Test passed, @rowheat02 please backport to 2024.02.xx. Thanks |
rowheat02
added a commit
to rowheat02/MapStore2
that referenced
this pull request
Oct 8, 2024
tdipisa
pushed a commit
that referenced
this pull request
Oct 8, 2024
offtherailz
pushed a commit
that referenced
this pull request
Oct 18, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
While adding the background layer, a backup for the selected catalog service is stored in the backgroundselector store.
And same service is set while closing the Catalog Modal.
Please check if the PR fulfills these requirements
What kind of change does this PR introduce? (check one with "x", remove the others)
Issue
What is the current behavior?
#10486
The selected catalog service changes after trying to add a background layer
What is the new behavior?
Selected Catalog service remains same even after trying to add background layer
Breaking change
Does this PR introduce a breaking change? (check one with "x", remove the other)
Other useful information