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

feat: [DHIS2-18018][DHIS2-17853] show related stages widget in view event page #3916

Merged
merged 42 commits into from
Feb 12, 2025
Merged

feat: [DHIS2-18018][DHIS2-17853] show related stages widget in view event page #3916

merged 42 commits into from
Feb 12, 2025

Conversation

simonadomnisoru
Copy link
Contributor

@simonadomnisoru simonadomnisoru commented Dec 19, 2024 •
edited
Loading

DHIS2-18018

Tech summary:

  • Make the WidgetRelatedStages configurable in the enrollmentEventEditLayout page layout
  • Based on the user selected option show an action button in WidgetRelatedStages
  • use react-query to create the linked event and the relationship in useAddEventWithRelationship

@simonadomnisoru
feat: show related stages Widget on registration page
ba81d9c
@simonadomnisoru
feat: add enableLinkExistingEvent prop
293c359
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
0bd5fa9
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
d88b9c2
@simonadomnisoru
chore: improve wording
ddb3f0e
@simonadomnisoru
feat: show related stages widget when adding a new relationship
3eb3c93
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
c1a1edb
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
32c824f
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
9b2d205
@simonadomnisoru
chore: typo
2a27f57
@simonadomnisoru
chore: fix PR comments
9ecf999
@simonadomnisoru
chore: correct the variable name to match its format
28e26b8
@simonadomnisoru
chore: move helpers files to DataEntries/EnrollmentRegistrationEntry
d137e8e
@simonadomnisoru
chore: use action naming throughout the code
0dc2f01
@simonadomnisoru
chore: rename helper file to getRelationshipNewTeiName
6b97817
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
d643dd6
@simonadomnisoru
feat: simplify how we determine what event to redirect to
743bcbf
@simonadomnisoru
feat: show related stages widget in view event page
1e9b3f9
@simonadomnisoru
feat: show related stages widget in view event page
c619511
@simonadomnisoru
Merge branch 'master' into DHIS2-17192
8366d23
@simonadomnisoru
Merge branch 'DHIS2-17192' into DHIS2-18018
f8bcf40
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 8, 2025 •
edited
Loading

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

@simonadomnisoru simonadomnisoru marked this pull request as ready for review January 8, 2025 09:10
@simonadomnisoru simonadomnisoru requested a review from a team as a code owner January 8, 2025 09:10
henrikmv
henrikmv reviewed Feb 6, 2025
View reviewed changes
Copy link
Contributor

@henrikmv henrikmv left a comment

Choose a reason for hiding this comment

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

Well done Simona removing the 409 error!

Regarding the inconsistency in the disabled button behavior, removing the disabling function appears to introduce a bug. Since the user can click the button before all required values are set, the loading spinner spins indefinitely due to the missing values.

Skjermbilde 2025-02-06 kl 17 41 24

Would you like to take a look? Thanks!

henrikmv
henrikmv approved these changes Feb 8, 2025
View reviewed changes
Copy link
Contributor

@henrikmv henrikmv left a comment

Choose a reason for hiding this comment

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

Well done with this feature Simona! Looks very good now. Just some NIT comments from me.

henrikmv

This comment was marked as duplicate.

Sign in to view

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
5 New issues
5 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@karolinelien
Copy link
Contributor

Reviewed this from a functional/product perspective and it looks good to me. :)

geethaalwan
geethaalwan approved these changes Feb 11, 2025
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,2.41.4,2.40.8,2.39.9 versions

@simonadomnisoru simonadomnisoru merged commit b584a0c into master Feb 12, 2025
47 of 48 checks passed
@simonadomnisoru simonadomnisoru deleted the DHIS2-18018 branch February 12, 2025 17:41
dhis2-bot added a commit that referenced this pull request Feb 12, 2025
@dhis2-bot
chore(release): cut 101.26.0 [skip release]
5a3ae01 
# [101.26.0](v101.25.5...v101.26.0) (2025-02-12)

### Features

* [DHIS2-18018][DHIS2-17853] show related stages widget in view event page ([#3916](#3916)) ([b584a0c](b584a0c))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.26.0 🎉

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

@henrikmv henrikmv henrikmv approved these changes

@geethaalwan geethaalwan geethaalwan approved these changes

@eirikhaugstulen eirikhaugstulen Awaiting requested review from eirikhaugstulen

@karolinelien karolinelien Awaiting requested review from karolinelien

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

Successfully merging this pull request may close these issues.
6 participants
@simonadomnisoru @karolinelien @dhis2-bot @eirikhaugstulen @geethaalwan @henrikmv