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.

Sign up for GitHub

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

Jump to bottom

fix: [DHIS2-15621] row view broken up in section #3457

Merged
merged 16 commits into from
Feb 26, 2024
Merged

fix: [DHIS2-15621] row view broken up in section #3457

merged 16 commits into from
Feb 26, 2024

Conversation

henrikmv
Copy link
Contributor

@henrikmv henrikmv commented Nov 3, 2023 •
edited
Loading

Updated:

  1. Changed the renderSection function for D2SectionFields.
  2. Used showContainer and formHorizontal to decide rendering method.
  3. Ensured consistent props for D2SectionFields.
  4. Reintegrated div with data-test and original className.
  5. Wrapped content in D2SectionFields.component with a div.
  6. Added data-test and applied conditional styling based on the formHorizontal prop.
  7. Changed tests to use the d2-section data-test prop.

@henrikmv henrikmv marked this pull request as ready for review November 23, 2023 10:43
@henrikmv henrikmv requested a review from a team as a code owner November 23, 2023 10:43
simonadomnisoru
simonadomnisoru reviewed Jan 31, 2024
View reviewed changes
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.

@henrikmv the code looks good now! 🎉
There are 5 failed tests in the NewPage.feature. Can you take a look at them before I approve? Thank you!

simonadomnisoru
simonadomnisoru approved these changes Feb 5, 2024
View reviewed changes
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.

Good job! 👍
PS: To get rid of Search using zip code failures, you can sync your branch with master after #3524 is merged

@henrikmv
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
b9fd675 
…/fix/DHIS2-15621_RowViewIsBrokenUpInSection
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 9, 2024 •
edited
Loading

🚀 Deployed on https://deploy-preview-3457--dhis2-capture.netlify.app

@henrikmv
Copy link
Contributor Author

henrikmv commented Feb 16, 2024 •
edited
Loading

@simonadomnisoru, I have had to make further changes. Will you please take another look?
What I have done:

  • Added an additional condition to display the container. Should be displayed only when showContainer is true and the formHorizontal property is false.
  • Adjusted the style to align elements appropriately.

Thank you!

@simonadomnisoru simonadomnisoru self-requested a review February 19, 2024 11:03
simonadomnisoru
simonadomnisoru approved these changes Feb 19, 2024
View reviewed changes
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.

LGTM!

@henrikmv henrikmv changed the title fix: [DHIS-15621] row view broken up in section fix: [DHIS2-15621] row view broken up in section Feb 23, 2024
geethaalwan
geethaalwan approved these changes Feb 26, 2024
View reviewed changes
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.41,2.40.4,2.39.5,2.38.7 versions

@henrikmv henrikmv merged commit ce7282c into master Feb 26, 2024
65 checks passed
@henrikmv henrikmv deleted the hv/fix/DHIS2-15621_RowViewIsBrokenUpInSection branch February 26, 2024 15:31
dhis2-bot added a commit that referenced this pull request Feb 26, 2024
@dhis2-bot
chore(release): cut 100.57.2 [skip release]
561b29d 
## [100.57.2](v100.57.1...v100.57.2) (2024-02-26)

### Bug Fixes

* [DHIS2-15621] row view broken up in section ([#3457](#3457)) ([ce7282c](ce7282c))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.57.2 🎉

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
Reviewers

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

@geethaalwan geethaalwan geethaalwan approved these changes

@JoakimSM JoakimSM Awaiting requested review from JoakimSM

Assignees
No one assigned
Labels
released testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@henrikmv @dhis2-bot @simonadomnisoru @JoakimSM @geethaalwan