feat: [DHIS2-18017] Ability to unlink event from edit/view event page #3846
Conversation
…/feat/DHIS2-18017_AbilityToUnlinkEvent
…/feat/DHIS2-18017_AbilityToUnlinkEvent
There was a problem hiding this comment.
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
| {i18n.t('Unlink relationship')} | ||
| </ModalTitle> | ||
| <ModalContent> | ||
| <p>{i18n.t('Are you sure you want to unlink this relationship?')}</p> |
There was a problem hiding this comment.
Do you think we should add some explaining texts to describe what we're doing here? If so, any suggestions. The user is removing the relationship between two linked events, but I'm afraid that Unlink this relationship can be a bit too technical?
There was a problem hiding this comment.
Could we say "Are you sure you want to delete the relationship (or link?) between these two events?" I might need to remind myself of the wording in the modal otherwise, I know we want to avoid DHIS2 terminology if we can but I think we have succumbed to needing to use "events" in this functionality? :D
And maybe we want to add a note about "This will only delete the relationship, not the other event"?
| <MenuItem | ||
| label={i18n.t('Unlink event')} | ||
| icon={<IconLink16 />} | ||
| dataTest={'event-overflow-unlink-event'} | ||
| onClick={() => { | ||
| setUnlinkModalIsOpen(true); | ||
| setActionsIsOpen(false); | ||
| }} | ||
| /> | ||
| <MenuItem | ||
| label={i18n.t('Unlink and delete event')} | ||
| icon={<IconDelete16 />} | ||
| dataTest={'event-overflow-unlink-and-delete-event'} | ||
| destructive | ||
| onClick={() => { | ||
| setUnlinkAndDeleteModalIsOpen(true); | ||
| setActionsIsOpen(false); | ||
| }} | ||
| /> |
There was a problem hiding this comment.
We have to do some validation here I think. The user has to have write access to the relationship type to do both actions. Additionally, the user has to have write access to the stage the event is in, and the organisation unit has to be within the user's capture scope
DHIS2-18017:
Removed export from
ScheduleInOrgUnitPlain.Added
UnlinkModalto handle unlinking relationships without deleting them.Added
UnlinkAndDeleteModalcomponent to handle the unlinking and deletion of events.Added
OverflowMenu.component.jswith flyout menu with options to view, unlink, and delete events.Added functionality to refresh data using the
setUpdateDatastate.