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-18017] Ability to unlink event from edit/view event page #3846

Merged
merged 27 commits into from
Dec 17, 2024
Merged

feat: [DHIS2-18017] Ability to unlink event from edit/view event page #3846

merged 27 commits into from
Dec 17, 2024

Conversation

henrikmv
Copy link
Contributor

@henrikmv henrikmv commented Oct 14, 2024 •
edited
Loading

DHIS2-18017:

  • AddedOverflowMenu.component.js with options to view, unlink, and unlink and delete events.

    • Added UnlinkModal to handle unlinking relationships without deleting them.
    • Added UnlinkAndDeleteModal to handle the unlinking and deletion of events.

  • Added validation

    • Can unlink with write access to relationship type
    • Can unlink and delete with access to relationship type and access to the stage of the linked event.

Other improvements

  • Removed duplicated export from ScheduleInOrgUnitPlain.
  • Updated the dhis2/ui to 10.1.1

@henrikmv henrikmv marked this pull request as ready for review October 21, 2024 07:26
@henrikmv henrikmv requested a review from a team as a code owner October 21, 2024 07:26
eirikhaugstulen
eirikhaugstulen reviewed Oct 27, 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 @henrikmv - this looks like a great start! As always, when we're doing quick actions on DHIS2 data, the complexity is always bigger that what we believe at first, but have a look at my comments and let's go through it if needed 🙌 Good work.

...s/capture-core/components/WidgetTwoEventWorkspace/OverflowMenu/Modal/UnlinkAndDeleteModal.js Outdated Show resolved Hide resolved
...re_modules/capture-core/components/WidgetTwoEventWorkspace/hooks/useLinkedEventByOriginId.js Outdated Show resolved Hide resolved
...re_modules/capture-core/components/WidgetTwoEventWorkspace/hooks/useLinkedEventByOriginId.js Outdated Show resolved Hide resolved
.../capture-core/components/WidgetTwoEventWorkspace/OverflowMenu/Modal/useDeleteRelationship.js Outdated Show resolved Hide resolved
...modules/capture-core/components/WidgetTwoEventWorkspace/WidgetTwoEventWorkspace.container.js Outdated Show resolved Hide resolved
...re_modules/capture-core/components/WidgetTwoEventWorkspace/OverflowMenu/Modal/UnlinkModal.js Outdated Show resolved Hide resolved
...dules/capture-core/components/WidgetTwoEventWorkspace/OverflowMenu/OverflowMenu.component.js Outdated Show resolved Hide resolved
simonadomnisoru
simonadomnisoru approved these changes Nov 6, 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.

Great job @henrikmv! 🥳

@github-actions GitHub Actions
Copy link

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

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

@henrikmv henrikmv requested a review from karolinelien November 6, 2024 15:07
@henrikmv henrikmv added e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud testing and removed testing labels Nov 7, 2024
geethaalwan
geethaalwan approved these changes Dec 11, 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, 2.41.3, 2.40.7,2.39.9 versions

@henrikmv henrikmv added testing and removed testing labels Dec 11, 2024
@henrikmv henrikmv added testing e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud e2e-tests and removed testing labels Dec 14, 2024
@henrikmv henrikmv added testing and removed testing e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud labels Dec 17, 2024
@henrikmv henrikmv added testing and removed testing labels Dec 17, 2024
@henrikmv henrikmv merged commit ad352f5 into master Dec 17, 2024
39 of 40 checks passed
@henrikmv henrikmv deleted the hv/feat/DHIS2-18017_AbilityToUnlinkEvent branch December 17, 2024 10:26
dhis2-bot added a commit that referenced this pull request Dec 17, 2024
@dhis2-bot
chore(release): cut 101.20.0 [skip release]
0e602f4 
# [101.20.0](v101.19.4...v101.20.0) (2024-12-17)

### Features

* [DHIS2-18017] Ability to unlink event from edit/view event page ([#3846](#3846)) ([ad352f5](ad352f5))
@dhis2-bot
Copy link
Contributor

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

@geethaalwan geethaalwan geethaalwan approved these changes

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

@eirikhaugstulen eirikhaugstulen Awaiting requested review from eirikhaugstulen

@JoakimSM JoakimSM Awaiting requested review from JoakimSM

@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
@henrikmv @dhis2-bot @simonadomnisoru @eirikhaugstulen @geethaalwan @karolinelien