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-18019] related stages UI tweaks #3872

Merged
merged 11 commits into from
Nov 20, 2024
Merged

fix: [DHIS2-18019] related stages UI tweaks #3872

merged 11 commits into from
Nov 20, 2024

Conversation

simonadomnisoru
Copy link
Contributor

@simonadomnisoru simonadomnisoru commented Nov 4, 2024 •
edited by jira bot
Loading

DHIS2-18019

Tech summary:

  • moved the back button and the widgets actions buttons
  • remove the WidgetTwoEventWorkspace from the default page layout and move it inside WidgetEditEvent
  • added type property to WidgetTwoEventWorkspace. If enabled via a custom page layout, the WidgetTwoEventWorkspace can still be used and moved around as a standalone widget.

@simonadomnisoru simonadomnisoru marked this pull request as ready for review November 4, 2024 15:23
@simonadomnisoru simonadomnisoru requested a review from a team as a code owner November 4, 2024 15:23
eirikhaugstulen
eirikhaugstulen reviewed Nov 4, 2024
View reviewed changes
Copy link
Contributor

@eirikhaugstulen eirikhaugstulen left a comment

Choose a reason for hiding this comment

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

Hey @simonadomnisoru! I think most of the code looks solid here, but I have some questions about the design. Let's either discuss this internally or take it up with the design team. Other than that; very good work! 🎉

...les/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js Show resolved Hide resolved
...les/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js Outdated Show resolved Hide resolved
...les/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js Outdated Show resolved Hide resolved
.../capture-core/components/Pages/EnrollmentEditEvent/PageLayout/DefaultPageLayout.constants.js Show resolved Hide resolved
@eirikhaugstulen
Copy link
Contributor

Also, now that we're no longer bound to allowing users to define where they want this widget to be themselves, should we implement the over/under functionality the design team wanted? Open for suggestions. @simonadomnisoru @JoakimSM

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 5, 2024 •
edited
Loading

🚀 Deployed on https://deploy-preview-3872.capture.netlify.dhis2.org

eirikhaugstulen
eirikhaugstulen approved these changes Nov 12, 2024
View reviewed changes
Copy link
Contributor

@eirikhaugstulen eirikhaugstulen left a comment

Choose a reason for hiding this comment

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

Looks like a great upgrade, @simonadomnisoru! Awaiting response from Joe, but it looks good from my perspective now! 🎉

cooper-joe
cooper-joe approved these changes Nov 19, 2024
View reviewed changes
Copy link
Member

@cooper-joe cooper-joe left a comment

Choose a reason for hiding this comment

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

LGTM, approved with minor changes.

...les/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js Outdated Show resolved Hide resolved
...les/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js Outdated
<div className={classes.referalResponse}>
<div className={classes.linkedEvent}>
<span className={classes.icon}>
<IconLink16 />
Copy link
Member

Choose a reason for hiding this comment

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

Icon color should be blue800.

@simonadomnisoru simonadomnisoru changed the title fix: [DHIS2-17019] related stages UI tweaks fix: [DHIS2-18019] related stages UI tweaks Nov 20, 2024
geethaalwan
geethaalwan approved these changes Nov 20, 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.42 version

@simonadomnisoru simonadomnisoru merged commit 7ea2240 into master Nov 20, 2024
34 of 39 checks passed
@simonadomnisoru simonadomnisoru deleted the DHIS2-18019 branch November 20, 2024 14:19
dhis2-bot added a commit that referenced this pull request Nov 20, 2024
@dhis2-bot
chore(release): cut 101.16.4 [skip release]
4043184 
## [101.16.4](v101.16.3...v101.16.4) (2024-11-20)

### Bug Fixes

* [DHIS2-18019] related stages UI tweaks ([#3872](#3872)) ([7ea2240](7ea2240))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.16.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
Reviewers

@cooper-joe cooper-joe cooper-joe approved these changes

@geethaalwan geethaalwan geethaalwan approved these changes

@eirikhaugstulen eirikhaugstulen eirikhaugstulen approved these changes

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
@simonadomnisoru @eirikhaugstulen @dhis2-bot @geethaalwan @cooper-joe