Applying necessary changes to cadastrapp to support MapStore layout changes #156
Conversation
This file contains 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
…ible to track if cadastrapp panel is open.
- Making menu item toggleable; - Alternative set of actions for cadastrapp when tool should be toggled without affecting drawing status - Close feature editor when cadastrapp is open. - Reset annotation editing session when cadastrapp selection tool is activated. - Toggle cadastrapp tool off when annotation triggers drawing.
offtherailz
requested changes
May 10, 2022
js/extension/epics/setup.js
Outdated
Comment on lines
139
to
184
| action$.ofType(SET_CONTROL_PROPERTIES) | ||
| action$.ofType(SET_CONTROL_PROPERTIES, SET_CONTROL_PROPERTY, TOGGLE_CONTROL) | ||
| .filter(() => isCadastrappOpen(store)) | ||
| .filter(({ control, properties }) => control === "metadataexplorer" && properties?.enabled) // open the catalog from TOC | ||
| .map( () => setControlProperty(CONTROL_NAME, "enabled", false)); | ||
| .filter(({control, property, properties = [], type}) => { | ||
| const state = store.getState(); | ||
| const controlState = state.controls[control].enabled; | ||
| switch (type) { | ||
| case SET_CONTROL_PROPERTY: | ||
| case TOGGLE_CONTROL: | ||
| return (property === 'enabled' || !property) && controlState && shutdownList.includes(control); | ||
| default: | ||
| return findIndex(keys(properties), prop => prop === 'enabled') > -1 && controlState && shutdownList.includes(control); | ||
| } | ||
| }) | ||
| .map( () => { | ||
| return setControlProperty(CONTROL_NAME, "enabled", false); | ||
| }); | ||
|
|
||
| export const closeCadastrappOnFeatureGridOpen = (action$) => | ||
| action$.ofType(OPEN_FEATURE_GRID) | ||
| .switchMap( () => { | ||
| let actions = [ | ||
| setControlProperty('cadastrapp', 'enabled', false) | ||
| ]; | ||
| return Rx.Observable.from(actions); |
There was a problem hiding this comment.
merge these two, and toggle only when cadastrapp it is open, to prevent unnecessary actions.
There was a problem hiding this comment.
Thanks, merged and added optional chaining for controlState variable because state branch may not exist in such subset of actions.
| * @param {boolean} isDock flag to use dock paddings instead of toolbar paddings | ||
| * @return {object} selected attributes of layout of the map | ||
| */ | ||
| export const mapLayoutValuesSelector = memoize((state, attributes = {}, isDock = false) => { |
There was a problem hiding this comment.
This basically is the copy of selector from upstream repo. isDock needed to apply offset from the right equal to sidebar width. If it's false - sidebar width + panel width offset is applied instead.
offtherailz
approved these changes
May 10, 2022
|
Good job |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
This PR applies several changes and improvements to the cadastrapp to make it compatible with the updated MapStore layout (geosolutions-it/MapStore2#8086)
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?
#150
What is the new behavior?
As per PR description
Breaking change
Does this PR introduce a breaking change? (check one with "x", remove the other)
Other useful information