fix: remove request NONE id schemes [DHIS2-18013] #98
+152
−11
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
tomzemp
commented
Sep 6, 2024
| 'dataElementIdScheme', | ||
| 'orgUnitIdScheme', | ||
| 'categoryOptionComboIdScheme', | ||
| 'outputDataElementIdScheme', |
There was a problem hiding this comment.
this was the source of the error before. I had the wrong names for the ID schemes relevant for requests.
tomzemp
commented
Sep 6, 2024
| @@ -32,20 +32,24 @@ jest.mock('@dhis2/analytics', () => ({ | |||
| DataDimension: ({ onSelect }) => ( | |||
| <input | |||
| data-test="fake-data-selector" | |||
| onInput={(e) => onSelect({ items: [e.target.value] })} | |||
| onInput={(e) => | |||
| onSelect({ items: [{ id: 'anIdDe', name: e.target.value }] }) | |||
There was a problem hiding this comment.
I've modified these, so that they produce a more realistic payload when saving.
|
🚀 Deployed on https://pr-98--dhis2-data-exchange.netlify.app |
tomzemp
commented
Sep 6, 2024
| } | ||
|
|
||
| expect(createExchangeMock).toHaveBeenCalled() | ||
| expect(createExchangeMock).toHaveBeenCalledWith(expectedPayload) |
There was a problem hiding this comment.
I've updated this test to check the payload being sent on save (which seems reasonable in general), and also has the benefit of confirming that the "NONE" ID Schemes that are selected by default get filtered out.
|
Thank you @tomzemp . Looks great and thanks for adding tests to it!!! |
flaminic
approved these changes
Sep 10, 2024
dhis2-bot
added a commit
that referenced
this pull request
Sep 11, 2024
## [100.9.4](v100.9.3...v100.9.4) (2024-09-11) ### Bug Fixes * remove request NONE id schemes [DHIS2-18013] ([#98](#98)) ([307d522](307d522))
|
🎉 This PR is included in version 100.9.4 🎉 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
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.
This fixes a bug whereby ID Schemes for requests were being sent to the backend with "NONE" values (https://dhis2.atlassian.net/jira/software/c/projects/DHIS2/issues/DHIS2-18013). The backend excepted these "NONE" types and then the exchange wouldn't run.
The app was supposed to be filtering out "NONE" values, but I had the wrong ID scheme names defined, so this failed.
The requests were also being posted to the backend with some additional properties (e.g. dxInfo that contains metadata about the dx selected). These extra properties were ignored, but it made interpreting the payload a bit difficult, so I've updated the logic to filter out properties that are only relevant for the app.
I've added some unit tests and modified an existing add-page test to partly cover this. I think it would be good to add some additional dedicated tests for add page, edit page around request ID schemes, but I've created a separate ticket for that (https://dhis2.atlassian.net/browse/DHIS2-18015) as I wanted to prioritize fixing the bug here.