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-18238] incorrect criteria when saving list with follow up false #3868

Merged

Conversation

eirikhaugstulen
Copy link
Contributor

@eirikhaugstulen eirikhaugstulen commented Oct 29, 2024

Summary:
When creating a list with followUp explicitly marked as false, this got filtered out before it was sent to the API.

I also took the opportunity to add some ButtonStrips when already editing these files. I think it makes the UI look a bit cleaner.

@eirikhaugstulen eirikhaugstulen marked this pull request as ready for review October 29, 2024 16:37
@eirikhaugstulen eirikhaugstulen requested a review from a team as a code owner October 29, 2024 16:37
@@ -55,7 +55,7 @@ export const addTEITemplateEpic = (action$: InputObservable, store: ReduxStore,
...(assignedUserMode && { assignedUserMode }),
...(assignedUsers?.length > 0 && { assignedUsers }),
...(programStatus && { enrollmentStatus: programStatus }),
...(!!followUp && { followUp }),
...(followUp !== undefined && { followUp: JSON.stringify(followUp) }),
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the same solution should be applied when updating a trackedEntity WL and when creating and updating a programStage WL. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm very glad you know this logic better than me! Good catch 😄

Copy link

github-actions bot commented Oct 30, 2024

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.2,2.40,6,2.39.8 versions

@eirikhaugstulen eirikhaugstulen merged commit 53c21f0 into master Nov 1, 2024
56 of 60 checks passed
@eirikhaugstulen eirikhaugstulen deleted the eh/fix/DHIS2-18238-incorrect-data-for-working-list branch November 1, 2024 14:54
dhis2-bot added a commit that referenced this pull request Nov 1, 2024
## [101.14.5](v101.14.4...v101.14.5) (2024-11-01)

### Bug Fixes

* [DHIS2-18238] incorrect criteria when saving list with follow up false ([#3868](#3868)) ([53c21f0](53c21f0))
* [DHIS2-18248] pass on createdAt to rules engine when editing ([#3848](#3848)) ([31cb56c](31cb56c))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.14.5 🎉

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.

4 participants