WFNEWS-2419 route back to map page from full details #2167
Merged
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
Comment on lines
51
to
56
| if (this.params?.['source']) { | ||
| // use query params to determine the layer, coordinates and zoom level for routing back to the map | ||
| if ((this.params['source'] === 'map' || this.params['source']?.[0] === 'map') | ||
| && (this.params?.['type'] === 'area-restriction' || this.params?.['type'] === 'bans-prohibitions' | ||
| || this.params?.['type'].includes('evac')) | ||
| ) { |
There was a problem hiding this comment.
How would we summarize this logic into plain english?
There was a problem hiding this comment.
If the user accessed the full details page from the map, and if the full details page contains one of area restrictions, fire bans, evac orders or evac alerts, use the backToMap function to route back to the map using the same layer and zoom level along with the appropriate coordinates for that type.
I updated the comments in the code with this explanation
There was a problem hiding this comment.
Logic updated to make it more readable
| if ((this.params?.['source'] === 'map' || this.params?.['source']?.[0] === 'map') | ||
| && (this.params?.['type'] === 'area-restriction' || this.params?.['type'] === 'bans-prohibitions' | ||
| || this.params?.['type'].includes('evac')) | ||
| ) { |
There was a problem hiding this comment.
Logic updated to make it more readable
yzlucas
approved these changes
Dec 19, 2024
…n more gracefully
| // If the user accessed the full details page from the map, and if the full details page contains one of area restrictions, | ||
| // fire bans, evac orders or evac alerts, use the backToMap function to route back to the map using the same layer and zoom level, | ||
| // along with the appropriate coordinates for that type | ||
| if (this.navigatedfromMapPage() && this.isCurrentlyNavigatedOn()) { |
There was a problem hiding this comment.
Suggested change
| if (this.navigatedfromMapPage() && this.isCurrentlyNavigatedOn()) { | |
| if (this.navigatedfromMapPage() && this.isCurrentlyNavigatedOn(['area-restriction', 'bans-prohibitions', 'evac-orders', 'evac-alerts', 'danger-rating'])) { |
Comment on lines
113
to
115
| isCurrentlyNavigatedOn() { | ||
| const fullDetailPageTypes = ['area-restriction', 'bans-prohibitions', 'evac-orders', 'evac-alerts', 'danger-rating']; | ||
| if(fullDetailPageTypes.includes(this.params?.['type'])){ |
There was a problem hiding this comment.
Suggested change
| isCurrentlyNavigatedOn() { | |
| const fullDetailPageTypes = ['area-restriction', 'bans-prohibitions', 'evac-orders', 'evac-alerts', 'danger-rating']; | |
| if(fullDetailPageTypes.includes(this.params?.['type'])){ | |
| isCurrentlyNavigatedOn(pageList) { | |
| if(pageList.includes(this.params?.['type'])){ |
agordon-vivid
requested changes
Dec 19, 2024
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.
Add coordinates and zoom level to query params when routing to the full details page in order to return the user to where they were just at on the map.
Also updating desktop version to route back to previous zoom level on the map for bans, evacs, area restrictions, rather than use a hardcoded value.
Includes some formatting updates applied automatically in VSCode.