fix: enable ou tree and levels/groups with user orgunits and display decent title (DHIS2-18066) #1702
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
| @@ -28,7 +28,9 @@ export const getOuLevelAndGroupText = (filter, metaData) => { | |||
|
|
|||
| const getLevelAndGroupText = (items, metaData, isLevel) => { | |||
| const getNameFromMetadata = (id) => | |||
| metaData.items[id] ? metaData.items[id].name : id | |||
| metaData.items[id] | |||
There was a problem hiding this comment.
Can you add a jest test that covers this code change?
jenniferarnesen
requested changes
Sep 25, 2024
janhenrikoverland
changed the title
1 task
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.
Implements DHIS2-18066
Description
The ability to combine the ou tree and levels/groups with user orgunits is a very powerful and useful feature for users. This was supported earlier, but it was enable due to problems with e.g. priting labels in a meaningful way.
We have decided to re-enable this feature as users really want need it. A fix has been included so that the filter title in pivot tables at least says e.g. "Facility level in User organisation unit" instead of "Facility level in USER_ORG_UNIT".
TODO
Screenshots
Before - Org unit selector - When User organisation unit is selected, the tree and levels/groups get disabled):
After - Org unit selector - All option enabled:
After - Org unit selector - All three user orgunit options selected and a level:
After - Pivot table - Filter title showing "User organisation unit" etc instead of "USER_ORG_UNIT":
