fix: include event programs for export [DHIS2-17672] #2058
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
|
🚀 Deployed on https://pr-2058--dhis2-import-export.netlify.app |
Chisomchima
approved these changes
Jul 1, 2024
dhis2-bot
added a commit
that referenced
this pull request
Jul 1, 2024
## [101.1.7](v101.1.6...v101.1.7) (2024-07-01) ### Bug Fixes * include event programs for export [DHIS2-17672] ([#2058](#2058)) ([230b77e](230b77e))
|
🎉 This PR is included in version 101.1.7 🎉 The release is available on: Your semantic-release bot 📦🚀 |
tomzemp
added a commit
that referenced
this pull request
Jul 1, 2024
tomzemp
added a commit
that referenced
this pull request
Jul 1, 2024
This was referenced Jul 1, 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.
See https://dhis2.atlassian.net/jira/software/c/projects/DHIS2/issues/DHIS2-17672
This PR fixes an issue whereby the programs query had been amended to filter out WITHOUT_REGISTRATION (event) programs, which is relevant for the Tracked Entity Export page, but not for the Event export page.
Due to the structure of the existing code, I opted to just add an additional query (without filters) and look up the appropriate within based on a new
includeEventsparameter.Automated tests
I've added a test for to check that useDataQuery is called with the right query based on the
includeEventsparameter. There is little test coverage in this app, currently; I think the test for this change could be written better, but it requires a bunch more setup, like setting up a query provider.Manual tests
Event export page:
note:
Antenatal care visitwhich is an event program is shownTracked entity export page:
note:
Antenatal care visitwhich is an event program is NOT shown