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(dataset/workflow): Add catcombos to workflows and make workflows … #2894

Merged
merged 9 commits into from
Aug 21, 2024

Conversation

benguaraldi
Copy link
Contributor

@benguaraldi benguaraldi commented Jul 25, 2024

The full title was "fix(dataset/workflow): Add catcombos to workflows and make workflows only selectable when their catcombo matches the data set's" but it looks like that was too long.

This code implements all four requests from DHIS2-17576.

@benguaraldi benguaraldi requested a review from jimgrace July 25, 2024 17:41
Copy link
Member

@jimgrace jimgrace left a comment

Choose a reason for hiding this comment

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

I'm not a front-end dev, but this code looks right to me. I've watched Ben test it and it seems to cover all the cases presented in the Jira ticket.

@benguaraldi benguaraldi requested review from Birkbjo and tomzemp July 29, 2024 18:04
@benguaraldi
Copy link
Contributor Author

@Birkbjo and @tomzemp, I started with @jimgrace reviewing to make sure the functionality correct, but now we believe it works properly. Let me know what you both think of the code.

Thanks!

Copy link
Member

@Birkbjo Birkbjo left a comment

Choose a reason for hiding this comment

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

Thanks a lot for implementing this, and very impressive to get into this code!

Just a question though; it seems like the backend will "default" to the default-catcombo if null is sent for catcombo in workflows. I guess this is intended for 2.42?

@jimgrace
Copy link
Member

jimgrace commented Aug 8, 2024

@Birkbjo Thanks, good point!

Since approximately 2018, when workflows were created or edited, the backend assigned them the default cat combo. This change to the Maintenance app simply lets a user choose a different cat combo.

Once version 2.42 comes out, the flyway script I'm writing will change workflows with null or default cat combos to the correct cat combo based on their data sets.

As such, we believe that the way the workflow cat combo works in the Maintenance app is acceptable prior to version 2.42 and is the right approach for 2.42 and later.

@benguaraldi
Copy link
Contributor Author

@Birkbjo Thank you for reviewing! This app is definitely wild to work with.

I defer to @jimgrace on how the workflow cat combos work and should work.

@benguaraldi benguaraldi requested a review from Birkbjo August 12, 2024 19:13
@jimgrace
Copy link
Member

Yes, @benguaraldi, as I mentioned before, this code looks right to me.

@Birkbjo, it would be great to get this merged so I can then change some functionality in the backend that relies on this Maintenance app behavior. Thanks!

@Birkbjo Birkbjo force-pushed the DHIS2-17576/data-set-and-workflow-catcombo-match branch from c89ae2c to 834a4ac Compare August 21, 2024 12:22
@Birkbjo Birkbjo merged commit 1c1c2fc into master Aug 21, 2024
6 checks passed
@Birkbjo Birkbjo deleted the DHIS2-17576/data-set-and-workflow-catcombo-match branch August 21, 2024 12:34
dhis2-bot added a commit that referenced this pull request Aug 21, 2024
## [32.31.5](v32.31.4...v32.31.5) (2024-08-21)

### Bug Fixes

* **dataset/workflow:** Add catcombos to workflows and make workflows … ([#2894](#2894)) ([1c1c2fc](1c1c2fc))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 32.31.5 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@benguaraldi
Copy link
Contributor Author

Thanks, @Birkbjo!

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

Successfully merging this pull request may close these issues.

4 participants