feat(tupaiaWeb): RN-1111: Disable map overlays for levels higher than current entity #5888
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
tcaiger
reviewed
Sep 11, 2024
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | ||
| */ | ||
|
|
||
| export const getFriendlyEntityType = entityType => { |
There was a problem hiding this comment.
Could you please add a comment here as it's hard to tell exactly why this needs to be done 🙏
tcaiger
reviewed
Sep 11, 2024
| @@ -219,6 +236,7 @@ export const MapOverlayList = ({ toggleOverlayLibrary }: { toggleOverlayLibrary? | |||
|
|
|||
| if (isLoadingMapOverlays) return null; | |||
|
|
|||
| const friendlyEntityType = getFriendlyEntityType(entity?.type); | |||
There was a problem hiding this comment.
Might be nice to just add this to useEntity?!
tcaiger
reviewed
Sep 11, 2024
| @@ -141,6 +156,11 @@ export class MapOverlaysRoute extends Route<MapOverlaysRequest> { | |||
| (relation: MapOverlayGroupRelation) => { | |||
| if (relation.child_type === MAP_OVERLAY_CHILD_TYPE) { | |||
| const overlay = overlaysById[relation.child_id]; | |||
|
|
|||
| // If the measure level is found in the ancestor types, that means the currently selected entity is a descendant of the measure level entity, so there will be no data to display. In this case, the overlay should be disabled. | |||
| const isDisabled = overlay.config.measureLevel | |||
There was a problem hiding this comment.
Nice - I think this is a great solution in the end. It took 2 years but we finally figured it out 😆
merge: update branch with latest dev
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.
Issue RN-1111: Disable map overlays for levels higher than current entity
Changes:
Screenshots: