Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [DHIS2-17632][DHIS2-17633] restrict invalid category combo for orgUnit #3738

Merged

Conversation

eirikhaugstulen
Copy link
Contributor

Tech-summary:

  • Make sure that a user is not able to select an invalid combination of category option that is not assigned to an orgUnit

@eirikhaugstulen eirikhaugstulen marked this pull request as ready for review July 31, 2024 19:57
@eirikhaugstulen eirikhaugstulen requested a review from a team as a code owner July 31, 2024 19:57
Copy link
Contributor

@simonadomnisoru simonadomnisoru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @eirikhaugstulen
Looks really good overall 😄 ! I just added some suggestions for renaming some variables. Besides this, is it possible to add some cypress tests for this feature?
Thank you

Copy link

github-actions bot commented Aug 1, 2024

@karolinelien
Copy link
Contributor

karolinelien commented Aug 1, 2024

Looks good from a functional perspective! Couple of nitpicky comments:
Should we say "The category option is not valid for the selected organisation unit. Please select a valid option.
(Maybe we can check with Matthew/Peter on what wording makes sense here)
image

@eirikhaugstulen
Copy link
Contributor Author

Thanks for the review both of you! Should have fixed all namings and comments now 👍

Copy link

@geethaalwan geethaalwan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested successfully on 2.42,2.41.1.,2.40.5,2.39.7 versions

@eirikhaugstulen eirikhaugstulen merged commit bfffe06 into master Aug 9, 2024
44 checks passed
@eirikhaugstulen eirikhaugstulen deleted the eh/fix/DHIS2-17663-restrict-invalid-category-combo branch August 9, 2024 13:02
dhis2-bot added a commit that referenced this pull request Aug 9, 2024
## [100.76.1](v100.76.0...v100.76.1) (2024-08-09)

### Bug Fixes

* [DHIS2-17632][DHIS2-17633] restrict invalid category combo for orgUnit ([#3738](#3738)) ([bfffe06](bfffe06))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.76.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants