feat: enhance event edit permissions and streamline delete action handling

Author: henrikmv

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2026-08-14T17:05:09.479Z\n"
-"PO-Revision-Date: 2026-08-14T17:05:09.479Z\n"
+"POT-Creation-Date: 2026-08-14T19:00:38.850Z\n"
+"PO-Revision-Date: 2026-08-14T19:00:38.851Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -461,15 +461,6 @@ msgstr "Are you sure you want to delete this event?"
 msgid "Yes, delete event"
 msgstr "Yes, delete event"
 
-msgid "{{occurredAt}} belongs to an expired period. Event cannot be deleted"
-msgstr "{{occurredAt}} belongs to an expired period. Event cannot be deleted"
-
-msgid "This event has been completed"
-msgstr "This event has been completed"
-
-msgid "This event is outside the edit period"
-msgstr "This event is outside the edit period"
-
 msgid "Delete"
 msgstr "Delete"
 
@@ -1128,6 +1119,9 @@ msgstr "You only have view access to this program stage"
 msgid "This event is outside the editing period"
 msgstr "This event is outside the editing period"
 
+msgid "This event has been completed"
+msgstr "This event has been completed"
+
 msgid "This {{trackedEntityName}} is deactivated"
 msgstr "This {{trackedEntityName}} is deactivated"
 
@@ -1962,6 +1956,9 @@ msgstr "Program stage name"
 msgid "Working list could not be loaded"
 msgstr "Working list could not be loaded"
 
+msgid "{{occurredAt}} belongs to an expired period. Event cannot be deleted"
+msgstr "{{occurredAt}} belongs to an expired period. Event cannot be deleted"
+
 msgid "Download data..."
 msgstr "Download data..."
 

src/core_modules/capture-core/components/EventOverflowMenu/MenuItems/DeleteMenuItem.tsx

@@ -5,77 +5,25 @@ import {
     IconDelete16,
     MenuItem,
 } from '@dhis2/ui';
-import { ConditionalTooltip } from '../../Tooltips/ConditionalTooltip';
-import { convertClientToView, convertServerToClient } from '../../../converters';
-import { dataElementTypes, type ProgramStage } from '../../../metaData';
-import { useEventEditPermissions, useProgramExpiryForUser } from '../../../hooks';
-import { isValidPeriod } from '../../../utils/validation/validators/form';
 
 type Props = {
     setActionsOpen: (open: boolean) => void;
     setDeleteModalOpen: (open: boolean) => void;
-    occurredAt: string;
-    completedAt?: string;
-    eventStatus?: string;
-    programId: string;
-    programStage?: ProgramStage | null;
 };
 
 export const DeleteActionButton = ({
     setActionsOpen,
     setDeleteModalOpen,
-    occurredAt,
-    completedAt,
-    eventStatus,
-    programId,
-    programStage,
-}: Props) => {
-    const occurredAtClient = convertServerToClient(occurredAt, dataElementTypes.DATE) as string;
-    const occurredAtClientView = convertClientToView(occurredAtClient, dataElementTypes.DATE);
-    const expiryPeriod = useProgramExpiryForUser(programId);
-    const { isWithinValidPeriod: isEventWithinValidPeriod } = isValidPeriod(occurredAtClient, expiryPeriod ?? null);
-
-    const {
-        isFormBlockedByCompletion,
-        isEventReadOnly,
-    } = useEventEditPermissions({
-        programId,
-        stage: programStage,
-        eventStatus,
-        occurredAtClient,
-        completedAtClient: convertServerToClient(completedAt, dataElementTypes.DATE) as string,
-    });
-
-    const getDisabledMessage = (): string => {
-        if (!isEventWithinValidPeriod) {
-            return i18n.t('{{occurredAt}} belongs to an expired period. Event cannot be deleted', {
-                occurredAt: occurredAtClientView,
-                interpolation: { escapeValue: false },
-            });
-        }
-        if (isFormBlockedByCompletion) {
-            return i18n.t('This event has been completed');
-        }
-        return i18n.t('This event is outside the edit period');
-    };
-
-    return (
-        <ConditionalTooltip
-            content={getDisabledMessage()}
-            enabled={isEventReadOnly}
-        >
-            <MenuItem
-                dense
-                disabled={isEventReadOnly}
-                icon={<IconDelete16 color={colors.red600} />}
-                label={i18n.t('Delete')}
-                dataTest="stages-and-events-delete"
-                onClick={() => {
-                    setDeleteModalOpen(true);
-                    setActionsOpen(false);
-                }}
-                suffix=""
-            />
-        </ConditionalTooltip>
-    );
-};
+}: Props) => (
+    <MenuItem
+        dense
+        icon={<IconDelete16 color={colors.red600} />}
+        label={i18n.t('Delete')}
+        dataTest="stages-and-events-delete"
+        onClick={() => {
+            setDeleteModalOpen(true);
+            setActionsOpen(false);
+        }}
+        suffix=""
+    />
+);

src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/EventRow/EventRow.tsx

@@ -22,6 +22,7 @@ import {
     rollbackEnrollmentEvent,
 } from '../../../../../Pages/common/EnrollmentOverviewDomain';
 
+
 const styles: Readonly<any> = {
     row: {
         maxWidth: '100%',
@@ -34,6 +35,9 @@ const styles: Readonly<any> = {
     },
 };
 
+const isSkippableStatus = (status?: string) =>
+    status === eventStatuses.SCHEDULE || status === eventStatuses.SKIPPED;
+
 const EventRowPlain = ({
     id,
     pendingApiResponse,
@@ -51,7 +55,7 @@ const EventRowPlain = ({
     const [deleteModalOpen, setDeleteModalOpen] = useState(false);
     const dispatch = useDispatch();
 
-    const { canUncompleteEvent } = useEventEditPermissions({
+    const { canUncompleteEvent, isEventReadOnly } = useEventEditPermissions({
         programId,
         stage: programStage,
         eventStatus: eventDetails.status,
@@ -82,9 +86,9 @@ const EventRowPlain = ({
             <DataTableCell>
                 {stageWriteAccess && (
                     <>
-                        {pendingApiResponse ? (
-                            <CircularLoader small dataTest={'event-row-saving-loader'} />
-                        ) : (
+                        {pendingApiResponse && <CircularLoader small dataTest={'event-row-saving-loader'} />}
+
+                        {!pendingApiResponse && (!isEventReadOnly || canUncompleteEvent) && (
                             <OverflowButton
                                 open={actionsOpen}
                                 onClick={() => setActionsOpen(prev => !prev)}
@@ -97,8 +101,7 @@ const EventRowPlain = ({
                                         dense
                                         dataTest={'overflow-menu'}
                                     >
-                                        {(eventDetails.status === eventStatuses.SCHEDULE ||
-                                            eventDetails.status === eventStatuses.SKIPPED) && (
+                                        {isSkippableStatus(eventDetails.status) && (
                                             <SkipAction
                                                 eventId={id}
                                                 eventDetails={eventDetails}
@@ -122,11 +125,6 @@ const EventRowPlain = ({
                                         <DeleteActionButton
                                             setActionsOpen={setActionsOpen}
                                             setDeleteModalOpen={setDeleteModalOpen}
-                                            occurredAt={eventDetails.occurredAt}
-                                            completedAt={eventDetails.completedAt}
-                                            eventStatus={eventDetails.status}
-                                            programId={programId}
-                                            programStage={programStage}
                                         />
                                     </FlyoutMenu>
                                 )}

src/core_modules/capture-core/hooks/useEventEditPermissions.ts

@@ -40,7 +40,7 @@ export const useEventEditPermissions = ({
     const isWithinCompleteExpiry = isWithinCompleteEventsExpiry(completedAtClient, completeEventsExpiryDays);
     const isExpired = !isWithinValidPeriod || !isWithinCompleteExpiry;
 
-    const isFormBlockedByCompletion = !!(stage?.blockEntryForm && eventStatus === eventStatuses.COMPLETED);
+    const isCompletedAndBlockingForm = !!(stage?.blockEntryForm && eventStatus === eventStatuses.COMPLETED);
     const isEventBlockedByExpiry = isExpired && !hasEditExpiredAuthority;
 
     const canUncompleteEvent = computeCanChangeCompletionStatus({
@@ -51,9 +51,11 @@ export const useEventEditPermissions = ({
         hasEditExpiredAuthority,
     });
 
+    const isFormBlockedByCompletion = isCompletedAndBlockingForm;
+
     const isEventReadOnly = !eventAccess?.write
         || isEventBlockedByExpiry
-        || isFormBlockedByCompletion;
+        || isCompletedAndBlockingForm;
 
     return {
         isEventBlockedByExpiry,