feat: [DHIS2-21655] Uncomplete events from view mode #4649
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| import React from 'react'; | ||
| import i18n from '@dhis2/d2-i18n'; | ||
| import log from 'loglevel'; | ||
| import { MenuItem, IconCheckmark16, IconUndo16 } from '@dhis2/ui'; | ||
| import { useMutation } from '@tanstack/react-query'; | ||
| import { useAlert, useDataEngine } from '@dhis2/app-runtime'; | ||
| import { errorCreator } from 'capture-core-utils'; | ||
| import { statusTypes as eventStatuses } from 'capture-core/events/statusTypes'; | ||
|
|
||
| type Props = { | ||
| eventId: string; | ||
| eventStatus?: string; | ||
| onMutate?: (newStatus: string) => void; | ||
| onSuccess?: (newStatus: string) => void; | ||
| onError?: () => void; | ||
| onClose: () => void; | ||
| }; | ||
|
|
||
| export const CompletionMenuItem = ({ | ||
| eventId, | ||
| eventStatus, | ||
| onMutate, | ||
| onSuccess, | ||
| onError, | ||
| onClose, | ||
| }: Props) => { | ||
| const dataEngine = useDataEngine(); | ||
| const { show: showError } = useAlert( | ||
| ({ message }) => message, | ||
| { critical: true }, | ||
| ); | ||
|
|
||
| const isCompleted = eventStatus === eventStatuses.COMPLETED; | ||
| const newStatus = isCompleted ? eventStatuses.ACTIVE : eventStatuses.COMPLETED; | ||
|
|
||
| const { mutate: updateCompletionStatus } = useMutation( | ||
| async () => { | ||
| const { event: apiEvent } = await dataEngine.query({ | ||
| event: { | ||
| resource: 'tracker/events', | ||
| id: eventId, | ||
| params: { | ||
| fields: 'event,status,program,programStage,orgUnit,occurredAt,scheduledAt,' + | ||
| 'enrollment,trackedEntity,attributeOptionCombo,notes,assignedUser,geometry,followUp', | ||
| }, | ||
| }, | ||
| }) as any; | ||
| return dataEngine.mutate({ | ||
| resource: 'tracker?async=false&importStrategy=UPDATE', | ||
| type: 'create', | ||
| data: { | ||
| events: [{ | ||
| ...apiEvent, | ||
| status: newStatus, | ||
| }], | ||
| }, | ||
| }); | ||
| }, | ||
| { | ||
| onMutate: () => { | ||
| onMutate?.(newStatus); | ||
| }, | ||
| onError: (error: unknown) => { | ||
| showError({ message: i18n.t('An error occurred when updating event status') }); | ||
|
henrikmv marked this conversation as resolved.
|
||
| log.error(errorCreator('An error occurred when updating event status')({ error, eventId, newStatus })); | ||
| onError?.(); | ||
| }, | ||
| onSuccess: () => { | ||
| onSuccess?.(newStatus); | ||
| }, | ||
| }, | ||
| ); | ||
|
|
||
| return ( | ||
| <MenuItem | ||
| dense | ||
| dataTest={isCompleted ? 'uncomplete-event-menu-item' : 'complete-event-menu-item'} | ||
| icon={isCompleted ? <IconUndo16 /> : <IconCheckmark16 />} | ||
| label={isCompleted ? i18n.t('Mark incomplete') : i18n.t('Mark complete')} | ||
| suffix={null} | ||
| onClick={() => { | ||
| onClose(); | ||
| updateCompletionStatus(); | ||
| }} | ||
| /> | ||
| ); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import React from 'react'; | ||
| import i18n from '@dhis2/d2-i18n'; | ||
| import { | ||
| colors, | ||
| IconDelete16, | ||
| MenuItem, | ||
| } from '@dhis2/ui'; | ||
|
|
||
| type Props = { | ||
| setActionsOpen: (open: boolean) => void; | ||
| setDeleteModalOpen: (open: boolean) => void; | ||
| }; | ||
|
|
||
| export const DeleteActionButton = ({ | ||
| setActionsOpen, | ||
| setDeleteModalOpen, | ||
| }: Props) => ( | ||
| <MenuItem | ||
| dense | ||
| icon={<IconDelete16 color={colors.red600} />} | ||
| label={i18n.t('Delete')} | ||
| dataTest="stages-and-events-delete" | ||
| onClick={() => { | ||
| setDeleteModalOpen(true); | ||
| setActionsOpen(false); | ||
| }} | ||
| suffix={null} | ||
| /> | ||
| ); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| export { DeleteActionButton } from './DeleteMenuItem'; | ||
| export { DeleteActionModal } from './DeleteEventModal'; | ||
| export { CompletionMenuItem } from './CompletionMenuItem'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { DeleteActionButton, DeleteActionModal, CompletionMenuItem } from './MenuItems'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔍 Single-event completion mutation omits dataValues from UPDATE payload
CompletionMenuItemfetches the event with a fixed field list that excludesdataValuesand then re-submits it viatracker?importStrategy=UPDATE. This mirrors the established bulk-complete pattern (useBulkCompleteEvents.ts, which was also narrowed in this PR to the same field set), so it is presumably safe with the server's merge behavior. However, if the tracker UPDATE strategy treats a missingdataValuesarray as an intent to clear them, toggling completion from view mode could drop event data values. Recommend confirming server behavior since this now runs for individual events triggered directly by users, not just the pre-existing bulk flow.Was this helpful? React with 👍 or 👎 to provide feedback.