From 43a436b2405aa0d33ceaad19306388c724bc9837 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Sat, 25 Jul 2026 11:20:19 +0000
Subject: [PATCH 01/12] feat: add uid to error

---
 i18n/en.pot                                   |  4 +-
 .../Actions/CompleteAction/CompleteAction.tsx | 41 ++++++++++++++--
 .../Actions/CompleteAction/CompleteAction.tsx | 43 ++++++++++++++--
 .../hooks/useCompleteBulkEnrollments.ts       | 14 ++++++
 .../utils/getRecordUrlFromErrorReport.ts      | 49 +++++++++++++++++++
 .../BulkActionBar/utils/index.ts              |  1 +
 6 files changed, 140 insertions(+), 12 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index d04cbca43f..bb4c1d9ae3 100644
--- a/i18n/en.pot
+++ b/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-07-21T13:35:51.419Z\n"
-"PO-Revision-Date: 2026-07-21T13:35:51.419Z\n"
+"POT-Creation-Date: 2026-07-25T11:20:21.107Z\n"
+"PO-Revision-Date: 2026-07-25T11:20:21.107Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 35de3c8129..0cfaccbbfa 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -5,6 +5,8 @@ import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTi
 import { useBulkCompleteEvents } from './hooks/useBulkCompleteEvents';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
 import { Widget } from '../../../../../Widget';
+import { getRecordUrlFromErrorReport } from '../../../../WorkingListsCommon/BulkActionBar/utils';
+import { useLocationQuery } from '../../../../../../utils/routing';
 import type { Props } from './CompleteAction.types';
 
 const styles: Readonly<any> = {
@@ -19,6 +21,13 @@ const styles: Readonly<any> = {
     errorContainer: {
         padding: '0px 20px',
     },
+    errorItem: {
+        marginBottom: '8px',
+    },
+    errorUidHeader: {
+        fontWeight: 'bold',
+        fontFamily: 'monospace',
+    },
 };
 
 const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive?: boolean) => {
@@ -42,6 +51,7 @@ const CompleteActionPlain = ({
 }: Props & WithStyles<typeof styles>) => {
     const [isCompleteDialogOpen, setIsCompleteDialogOpen] = useState(false);
     const [openAccordion, setOpenAccordion] = useState(false);
+    const { orgUnitId } = useLocationQuery();
     const tooltipContent = getTooltipContent(stageDataWriteAccess, bulkDataEntryIsActive);
     const disabled = Boolean(!stageDataWriteAccess || bulkDataEntryIsActive);
     const {
@@ -141,11 +151,32 @@ const CompleteActionPlain = ({
                                 <span className={classes.errorContainer}>
                                     <ul>
                                         {validationError?.validationReport?.errorReports ?
-                                            validationError.validationReport.errorReports.map(errorReport => (
-                                                <li key={`${errorReport.uid}-${errorReport.errorCode}`}>
-                                                    {errorReport?.message}
-                                                </li>
-                                            )) : (
+                                            validationError.validationReport.errorReports.map((errorReport) => {
+                                                const recordUrl = getRecordUrlFromErrorReport({
+                                                    errorReport,
+                                                    programId,
+                                                    orgUnitId,
+                                                });
+                                                return (
+                                                    <li
+                                                        key={`${errorReport.uid}-${errorReport.errorCode}`}
+                                                        className={classes.errorItem}
+                                                    >
+                                                        <div className={classes.errorUidHeader}>
+                                                            {recordUrl ? (
+                                                                <a
+                                                                    href={recordUrl}
+                                                                    target="_blank"
+                                                                    rel="noopener noreferrer"
+                                                                >
+                                                                    {errorReport.uid}
+                                                                </a>
+                                                            ) : errorReport.uid}
+                                                        </div>
+                                                        <div>{errorReport?.message}</div>
+                                                    </li>
+                                                );
+                                            }) : (
                                                 <li>
                                                     {i18n.t('An unknown error occurred.')}
                                                 </li>
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
index be75d43236..79aa282a6e 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -15,6 +15,8 @@ import {
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
 import { useCompleteBulkEnrollments } from './hooks/useCompleteBulkEnrollments';
 import { Widget } from '../../../../../Widget';
+import { getRecordUrlFromErrorReport } from '../../../../WorkingListsCommon/BulkActionBar/utils';
+import { useLocationQuery } from '../../../../../../utils/routing';
 import type { PlainProps } from './CompleteAction.types';
 
 const styles: Readonly<any> = {
@@ -34,6 +36,13 @@ const styles: Readonly<any> = {
     errorContainer: {
         padding: '0px 20px',
     },
+    errorItem: {
+        marginBottom: '8px',
+    },
+    errorUidHeader: {
+        fontWeight: 'bold',
+        fontFamily: 'monospace',
+    },
 };
 
 const getTooltipContent = (programDataWriteAccess: boolean, bulkDataEntryIsActive: boolean) => {
@@ -59,9 +68,11 @@ const CompleteActionPlain = ({
     const [modalIsOpen, setModalIsOpen] = useState(false);
     const [completeEvents, setCompleteEvents] = useState(true);
     const [openAccordion, setOpenAccordion] = useState(false);
+    const { orgUnitId } = useLocationQuery();
     const {
         completeEnrollments,
         enrollmentCounts,
+        enrollmentIdToTeiId,
         isLoading,
         validationError,
         isCompleting,
@@ -110,11 +121,33 @@ const CompleteActionPlain = ({
                     >
                         <span className={classes.errorContainer}>
                             <ul>
-                                {errors ? errors.map(errorReport => (
-                                    <li key={`${errorReport.uid}-${errorReport.errorCode}`}>
-                                        {errorReport?.message}
-                                    </li>
-                                )) : (
+                                {errors ? errors.map((errorReport) => {
+                                    const recordUrl = getRecordUrlFromErrorReport({
+                                        errorReport,
+                                        programId,
+                                        orgUnitId,
+                                        enrollmentIdToTeiId,
+                                    });
+                                    return (
+                                        <li
+                                            key={`${errorReport.uid}-${errorReport.errorCode}`}
+                                            className={classes.errorItem}
+                                        >
+                                            <div className={classes.errorUidHeader}>
+                                                {recordUrl ? (
+                                                    <a
+                                                        href={recordUrl}
+                                                        target="_blank"
+                                                        rel="noopener noreferrer"
+                                                    >
+                                                        {errorReport.uid}
+                                                    </a>
+                                                ) : errorReport.uid}
+                                            </div>
+                                            <div>{errorReport?.message}</div>
+                                        </li>
+                                    );
+                                }) : (
                                     <li>
                                         {i18n.t('An unknown error occurred.')}
                                     </li>
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index 30441f31c0..66a8e6ac2c 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -243,6 +243,19 @@ export const useCompleteBulkEnrollments = ({
         completed: trackedEntities?.completedEnrollments?.length ?? 0,
     }), [trackedEntities]);
 
+    const enrollmentIdToTeiId = useMemo(() => {
+        const allEnrollments = [
+            ...(trackedEntities?.activeEnrollments ?? []),
+            ...(trackedEntities?.completedEnrollments ?? []),
+        ];
+        return allEnrollments.reduce<Record<string, string>>((acc, enrollment) => {
+            if (enrollment?.enrollment && enrollment?.trackedEntity) {
+                acc[enrollment.enrollment] = enrollment.trackedEntity;
+            }
+            return acc;
+        }, {});
+    }, [trackedEntities]);
+
     useEffect(() => {
         if (!modalIsOpen) {
             resetCompleteEnrollments();
@@ -257,6 +270,7 @@ export const useCompleteBulkEnrollments = ({
     return {
         completeEnrollments: onStartCompleteEnrollments,
         enrollmentCounts,
+        enrollmentIdToTeiId,
         isLoading: isInitialLoadingTrackedEntities,
         isError: isTrackedEntitiesError,
         validationError,
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
new file mode 100644
index 0000000000..44d58cb5f9
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
@@ -0,0 +1,49 @@
+import log from 'loglevel';
+import { errorCreator } from 'capture-core-utils';
+import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../../../metaData';
+import { buildUrlQueryString } from '../../../../../utils/routing';
+
+type ErrorReport = {
+    uid?: string;
+    trackerType?: 'ENROLLMENT' | 'EVENT' | string;
+};
+
+export const getRecordUrlFromErrorReport = ({
+    errorReport,
+    programId,
+    orgUnitId,
+    enrollmentIdToTeiId,
+}: {
+    errorReport: ErrorReport;
+    programId?: string;
+    orgUnitId?: string;
+    enrollmentIdToTeiId?: Record<string, string>;
+}): string | null => {
+    if (!errorReport.uid || !programId || !orgUnitId) {
+        return null;
+    }
+
+    if (errorReport.trackerType === 'ENROLLMENT') {
+        const teiId = enrollmentIdToTeiId?.[errorReport.uid];
+        if (!teiId) {
+            return null;
+        }
+        return `#/enrollment?${buildUrlQueryString({
+            teiId,
+            programId,
+            orgUnitId,
+            enrollmentId: errorReport.uid,
+        })}`;
+    }
+
+    try {
+        const program = getProgramFromProgramIdThrowIfNotFound(programId);
+        if (program instanceof EventProgram) {
+            return `#/viewEvent?${buildUrlQueryString({ viewEventId: errorReport.uid, orgUnitId })}`;
+        }
+        return `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: errorReport.uid, orgUnitId })}`;
+    } catch (error) {
+        log.error(errorCreator('Could not build record URL for error report')({ error, programId }));
+        return null;
+    }
+};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
new file mode 100644
index 0000000000..79d643b552
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
@@ -0,0 +1 @@
+export { getRecordUrlFromErrorReport } from './getRecordUrlFromErrorReport';

From 43392d0ab1bdcd5fde75838e9ff93e85348dee3b Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Sat, 25 Jul 2026 12:02:46 +0000
Subject: [PATCH 02/12] feat: integrate BulkActionErrorReports component for
 error handling in bulk actions

---
 i18n/en.pot                                   |  26 ++++-
 .../Actions/CompleteAction/CompleteAction.tsx |  53 +--------
 .../hooks/useBulkCompleteEvents.ts            |  22 +++-
 .../Actions/DeleteAction/DeleteAction.tsx     | 107 ++++++++++++++++--
 .../DeleteAction/DeleteAction.types.ts        |   1 +
 .../EventBulkActions/EventBulkActions.tsx     |   1 +
 .../Actions/CompleteAction/CompleteAction.tsx |  53 ++-------
 .../hooks/useCompleteBulkEnrollments.ts       |   7 +-
 .../EnrollmentDeleteModal.tsx                 |  57 +++++++++-
 .../hooks/useDeleteEnrollments.ts             |  42 +++++--
 .../BulkActionErrorReports.component.tsx      |  77 +++++++++++++
 .../BulkActionErrorReports/index.ts           |   1 +
 12 files changed, 324 insertions(+), 123 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index bb4c1d9ae3..cd5d20608b 100644
--- a/i18n/en.pot
+++ b/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-07-25T11:20:21.107Z\n"
-"PO-Revision-Date: 2026-07-25T11:20:21.107Z\n"
+"POT-Creation-Date: 2026-07-25T12:02:47.298Z\n"
+"PO-Revision-Date: 2026-07-25T12:02:47.298Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -1983,9 +1983,6 @@ msgstr "There was an error completing the events."
 msgid "Details (Advanced)"
 msgstr "Details (Advanced)"
 
-msgid "An unknown error occurred."
-msgstr "An unknown error occurred."
-
 msgid "An error occurred while completing events"
 msgstr "An error occurred while completing events"
 
@@ -2004,6 +2001,12 @@ msgstr "This cannot be undone."
 msgid "Are you sure you want to delete the selected events?"
 msgstr "Are you sure you want to delete the selected events?"
 
+msgid "Error deleting events"
+msgstr "Error deleting events"
+
+msgid "There was an error while deleting the events. Please see the details below."
+msgstr "There was an error while deleting the events. Please see the details below."
+
 msgid "Owner organisation unit"
 msgstr "Owner organisation unit"
 
@@ -2094,6 +2097,16 @@ msgstr "Delete selected enrollments"
 msgid "An error occurred while loading the selected enrollments. Please try again."
 msgstr "An error occurred while loading the selected enrollments. Please try again."
 
+msgid "Error deleting enrollments"
+msgstr "Error deleting enrollments"
+
+msgid ""
+"There was an error while deleting the enrollments. Please see the details "
+"below."
+msgstr ""
+"There was an error while deleting the enrollments. Please see the details "
+"below."
+
 msgid ""
 "This action will permanently delete the selected enrollments, including all "
 "associated data and events."
@@ -2203,6 +2216,9 @@ msgstr[1] "{{count}} selected"
 msgid "Deselect all"
 msgstr "Deselect all"
 
+msgid "An unknown error occurred."
+msgstr "An unknown error occurred."
+
 msgid "Download as JSON"
 msgstr "Download as JSON"
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 0cfaccbbfa..ece87e8ffd 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -5,7 +5,7 @@ import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTi
 import { useBulkCompleteEvents } from './hooks/useBulkCompleteEvents';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
 import { Widget } from '../../../../../Widget';
-import { getRecordUrlFromErrorReport } from '../../../../WorkingListsCommon/BulkActionBar/utils';
+import { BulkActionErrorReports } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { Props } from './CompleteAction.types';
 
@@ -18,16 +18,6 @@ const styles: Readonly<any> = {
         flexDirection: 'column',
         gap: '8px',
     },
-    errorContainer: {
-        padding: '0px 20px',
-    },
-    errorItem: {
-        marginBottom: '8px',
-    },
-    errorUidHeader: {
-        fontWeight: 'bold',
-        fontFamily: 'monospace',
-    },
 };
 
 const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive?: boolean) => {
@@ -148,42 +138,11 @@ const CompleteActionPlain = ({
                                 borderless
                                 header={i18n.t('Details (Advanced)')}
                             >
-                                <span className={classes.errorContainer}>
-                                    <ul>
-                                        {validationError?.validationReport?.errorReports ?
-                                            validationError.validationReport.errorReports.map((errorReport) => {
-                                                const recordUrl = getRecordUrlFromErrorReport({
-                                                    errorReport,
-                                                    programId,
-                                                    orgUnitId,
-                                                });
-                                                return (
-                                                    <li
-                                                        key={`${errorReport.uid}-${errorReport.errorCode}`}
-                                                        className={classes.errorItem}
-                                                    >
-                                                        <div className={classes.errorUidHeader}>
-                                                            {recordUrl ? (
-                                                                <a
-                                                                    href={recordUrl}
-                                                                    target="_blank"
-                                                                    rel="noopener noreferrer"
-                                                                >
-                                                                    {errorReport.uid}
-                                                                </a>
-                                                            ) : errorReport.uid}
-                                                        </div>
-                                                        <div>{errorReport?.message}</div>
-                                                    </li>
-                                                );
-                                            }) : (
-                                                <li>
-                                                    {i18n.t('An unknown error occurred.')}
-                                                </li>
-                                            )
-                                        }
-                                    </ul>
-                                </span>
+                                <BulkActionErrorReports
+                                    errorReports={validationError?.validationReport?.errorReports}
+                                    programId={programId}
+                                    orgUnitId={orgUnitId}
+                                />
                             </Widget>
                         </span>
                     </ModalContent>
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
index e46c3e8460..31f26cad10 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
@@ -68,10 +68,10 @@ export const useBulkCompleteEvents = ({
     const {
         mutate: completeEvents,
         isLoading: isCompletingEvents,
-        data: validationError,
+        data,
         error,
         reset: resetCompleteEvents,
-    } = useMutation<any, unknown, { payload: any }>(
+    } = useMutation<any, any, { payload: any }>(
         ({ payload }: { payload: any }) => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=UPDATE&atomicMode=OBJECT',
             type: 'create',
@@ -80,8 +80,10 @@ export const useBulkCompleteEvents = ({
             },
         }),
         {
-            onError: () => {
-                showAlert({ message: i18n.t('An error occurred while completing events') });
+            onError: (serverResponse) => {
+                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
+                    showAlert({ message: i18n.t('An error occurred while completing events') });
+                }
             },
             onSuccess: (response, { payload }: any) => {
                 const errorReports = response?.validationReport?.errorReports;
@@ -102,6 +104,16 @@ export const useBulkCompleteEvents = ({
         },
     );
 
+    const validationError = useMemo(() => {
+        if (data?.validationReport?.errorReports?.length) {
+            return data;
+        }
+        if (error?.details?.validationReport?.errorReports?.length) {
+            return error.details;
+        }
+        return null;
+    }, [data, error]);
+
     const onCompleteEvents = useCallback(() => {
         if (!events) {
             return;
@@ -111,6 +123,8 @@ export const useBulkCompleteEvents = ({
             ...event,
             status: 'COMPLETED',
             program: event.program || programId || event.programId,
+            // TEMP SABOTAGE: replace with a valid-format but nonexistent UID so tracker returns per-event errorReports
+            event: 'zzzzzzzzzzz',
         }));
 
         completeEvents({ payload: serverPayload });
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index 5eaf520b57..a5d4ebe735 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -1,13 +1,28 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import log from 'loglevel';
 import i18n from '@dhis2/d2-i18n';
-import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
+import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import { useMutation } from '@tanstack/react-query';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { errorCreator } from 'capture-core-utils';
+import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
+import { Widget } from '../../../../../Widget';
+import { BulkActionErrorReports } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
+import { useLocationQuery } from '../../../../../../utils/routing';
 import type { Props } from './DeleteAction.types';
 
+const styles: Readonly<any> = {
+    container: {
+        fontSize: '14px',
+        lineHeight: '19px',
+        color: colors.grey900,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '8px',
+    },
+};
+
 const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive?: boolean) => {
     if (!stageDataWriteAccess) {
         return i18n.t('You do not have access to delete events');
@@ -18,14 +33,18 @@ const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive
     return '';
 };
 
-export const DeleteAction = ({
+const DeleteActionPlain = ({
     selectedRows,
     stageDataWriteAccess,
     bulkDataEntryIsActive,
     onUpdateList,
-}: Props) => {
+    programId,
+    classes,
+}: Props & WithStyles<typeof styles>) => {
     const [isModalOpen, setIsModalOpen] = useState(false);
+    const [openAccordion, setOpenAccordion] = useState(false);
     const dataEngine = useDataEngine();
+    const { orgUnitId } = useLocationQuery();
     const { show: showAlert } = useAlert(
         ({ message }) => message,
         { critical: true },
@@ -34,20 +53,28 @@ export const DeleteAction = ({
     const tooltipContent = getTooltipContent(stageDataWriteAccess, bulkDataEntryIsActive);
     const disabled = Boolean(!stageDataWriteAccess || !!bulkDataEntryIsActive);
 
-    const { mutate: deleteEvents, isLoading }: { mutate: any, isLoading: boolean } = useMutation(
+    const {
+        mutate: deleteEvents,
+        isLoading,
+        error: deleteError,
+        reset: resetDeleteEvents,
+    }: { mutate: any, isLoading: boolean, error: any, reset: () => void } = useMutation(
         () => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
+                // TEMP SABOTAGE: replace each event with a valid-format but nonexistent UID so tracker returns per-event errorReports
                 events: Object
                     .keys(selectedRows)
-                    .map(id => ({ event: id })),
+                    .map(() => ({ event: 'zzzzzzzzzzz' })),
             },
         }),
         {
-            onError: (error) => {
-                log.error(errorCreator('An error occurred while deleting the events')({ error }));
-                showAlert({ message: i18n.t('An error occurred while deleting the events') });
+            onError: (serverResponse: any) => {
+                log.error(errorCreator('An error occurred while deleting the events')({ serverResponse }));
+                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
+                    showAlert({ message: i18n.t('An error occurred while deleting the events') });
+                }
             },
             onSuccess: () => {
                 onUpdateList();
@@ -56,6 +83,17 @@ export const DeleteAction = ({
         },
     );
 
+    const validationError = useMemo(() => (
+        deleteError?.details?.validationReport?.errorReports?.length
+            ? deleteError.details
+            : null
+    ), [deleteError]);
+
+    const closeModal = () => {
+        setIsModalOpen(false);
+        resetDeleteEvents();
+    };
+
     return (
         <>
             <ConditionalTooltip
@@ -71,10 +109,10 @@ export const DeleteAction = ({
                 </Button>
             </ConditionalTooltip>
 
-            {isModalOpen && (
+            {isModalOpen && !validationError && (
                 <Modal
                     small
-                    onClose={() => setIsModalOpen(false)}
+                    onClose={closeModal}
                     dataTest={'bulk-delete-events-dialog'}
                 >
                     <ModalTitle>
@@ -91,7 +129,7 @@ export const DeleteAction = ({
                         <ButtonStrip>
                             <Button
                                 secondary
-                                onClick={() => setIsModalOpen(false)}
+                                onClick={closeModal}
                             >
                                 {i18n.t('Cancel')}
                             </Button>
@@ -106,6 +144,51 @@ export const DeleteAction = ({
                     </ModalActions>
                 </Modal>
             )}
+
+            {isModalOpen && validationError && (
+                <Modal
+                    small
+                    onClose={closeModal}
+                    dataTest={'bulk-delete-events-dialog'}
+                >
+                    <ModalTitle>
+                        {i18n.t('Error deleting events')}
+                    </ModalTitle>
+
+                    <ModalContent>
+                        <span className={classes.container}>
+                            {i18n.t('There was an error while deleting the events. Please see the details below.')}
+
+                            <Widget
+                                open={openAccordion}
+                                onOpen={() => setOpenAccordion(true)}
+                                onClose={() => setOpenAccordion(false)}
+                                borderless
+                                header={i18n.t('Details (Advanced)')}
+                            >
+                                <BulkActionErrorReports
+                                    errorReports={validationError?.validationReport?.errorReports}
+                                    programId={programId}
+                                    orgUnitId={orgUnitId}
+                                />
+                            </Widget>
+                        </span>
+                    </ModalContent>
+
+                    <ModalActions>
+                        <ButtonStrip>
+                            <Button
+                                secondary
+                                onClick={closeModal}
+                            >
+                                {i18n.t('Close')}
+                            </Button>
+                        </ButtonStrip>
+                    </ModalActions>
+                </Modal>
+            )}
         </>
     );
 };
+
+export const DeleteAction = withStyles(styles)(DeleteActionPlain);
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts
index d7038527b1..656f4b4c77 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts
@@ -3,4 +3,5 @@ export type Props = {
     stageDataWriteAccess?: boolean;
     onUpdateList: () => void;
     bulkDataEntryIsActive?: boolean;
+    programId?: string;
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx
index c48eddb0f9..4744eb5501 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx
@@ -45,6 +45,7 @@ export const EventBulkActions = ({
                 stageDataWriteAccess={stage.access.data.write}
                 bulkDataEntryIsActive={bulkDataEntryIsActive}
                 onUpdateList={onUpdateList}
+                programId={programId}
             />
         </BulkActionBar>
     );
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 79aa282a6e..1a3c18aa62 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -15,7 +15,7 @@ import {
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
 import { useCompleteBulkEnrollments } from './hooks/useCompleteBulkEnrollments';
 import { Widget } from '../../../../../Widget';
-import { getRecordUrlFromErrorReport } from '../../../../WorkingListsCommon/BulkActionBar/utils';
+import { BulkActionErrorReports } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { PlainProps } from './CompleteAction.types';
 
@@ -33,16 +33,6 @@ const styles: Readonly<any> = {
         justifyContent: 'center',
         margin: '20px 0',
     },
-    errorContainer: {
-        padding: '0px 20px',
-    },
-    errorItem: {
-        marginBottom: '8px',
-    },
-    errorUidHeader: {
-        fontWeight: 'bold',
-        fontFamily: 'monospace',
-    },
 };
 
 const getTooltipContent = (programDataWriteAccess: boolean, bulkDataEntryIsActive: boolean) => {
@@ -119,41 +109,12 @@ const CompleteActionPlain = ({
                         borderless
                         header={i18n.t('Details (Advanced)')}
                     >
-                        <span className={classes.errorContainer}>
-                            <ul>
-                                {errors ? errors.map((errorReport) => {
-                                    const recordUrl = getRecordUrlFromErrorReport({
-                                        errorReport,
-                                        programId,
-                                        orgUnitId,
-                                        enrollmentIdToTeiId,
-                                    });
-                                    return (
-                                        <li
-                                            key={`${errorReport.uid}-${errorReport.errorCode}`}
-                                            className={classes.errorItem}
-                                        >
-                                            <div className={classes.errorUidHeader}>
-                                                {recordUrl ? (
-                                                    <a
-                                                        href={recordUrl}
-                                                        target="_blank"
-                                                        rel="noopener noreferrer"
-                                                    >
-                                                        {errorReport.uid}
-                                                    </a>
-                                                ) : errorReport.uid}
-                                            </div>
-                                            <div>{errorReport?.message}</div>
-                                        </li>
-                                    );
-                                }) : (
-                                    <li>
-                                        {i18n.t('An unknown error occurred.')}
-                                    </li>
-                                )}
-                            </ul>
-                        </span>
+                        <BulkActionErrorReports
+                            errorReports={errors}
+                            programId={programId}
+                            orgUnitId={orgUnitId}
+                            enrollmentIdToTeiId={enrollmentIdToTeiId}
+                        />
                     </Widget>
                 </div>
             );
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index 66a8e6ac2c..04d48ce48e 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -264,7 +264,12 @@ export const useCompleteBulkEnrollments = ({
 
     const onStartCompleteEnrollments = ({ completeEvents }: { completeEvents: boolean }) => {
         const enrollments = formatServerPayload(trackedEntities, completeEvents, stages);
-        onValidateEnrollments({ completeEvents, enrollments } as any);
+        // TEMP SABOTAGE: point program at a valid-format but nonexistent UID so validation returns per-enrollment errorReports
+        const sabotagedEnrollments = enrollments.map(enrollment => ({
+            ...enrollment,
+            program: 'zzzzzzzzzzz',
+        }));
+        onValidateEnrollments({ completeEvents, enrollments: sabotagedEnrollments } as any);
     };
 
     return {
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
index 67b3b227f1..1c674ee4e1 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
@@ -1,9 +1,12 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { Button, ButtonStrip, CircularLoader, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
 import { useDeleteEnrollments } from '../hooks/useDeleteEnrollments';
 import { CustomCheckbox } from './CustomCheckbox';
+import { Widget } from '../../../../../../Widget';
+import { BulkActionErrorReports } from '../../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
+import { useLocationQuery } from '../../../../../../../utils/routing';
 import type { PlainProps } from './EnrollmentDeleteModal.types';
 
 const styles: Readonly<any> = {
@@ -35,12 +38,16 @@ const EnrollmentDeleteModalPlain = ({
         updateStatusToDelete,
         numberOfEnrollmentsToDelete,
         isEnrollmentsError,
+        validationError,
+        enrollmentIdToTeiId,
     } = useDeleteEnrollments({
         selectedRows,
         programId,
         onUpdateList,
         setIsDeleteDialogOpen,
     });
+    const [openAccordion, setOpenAccordion] = useState(false);
+    const { orgUnitId } = useLocationQuery();
 
     if (isEnrollmentsError) {
         return (
@@ -72,6 +79,54 @@ const EnrollmentDeleteModalPlain = ({
         );
     }
 
+    if (validationError) {
+        const errors = validationError?.validationReport?.errorReports;
+        return (
+            <Modal
+                onClose={() => setIsDeleteDialogOpen(false)}
+                dataTest={'bulk-delete-enrollments-dialog'}
+            >
+                <ModalTitle>
+                    {i18n.t('Error deleting enrollments')}
+                </ModalTitle>
+
+                <ModalContent>
+                    <div className={classes.modalContent}>
+                        <span>
+                            {i18n.t('There was an error while deleting the enrollments. Please see the details below.')}
+                        </span>
+
+                        <Widget
+                            open={openAccordion}
+                            onOpen={() => setOpenAccordion(true)}
+                            onClose={() => setOpenAccordion(false)}
+                            borderless
+                            header={i18n.t('Details (Advanced)')}
+                        >
+                            <BulkActionErrorReports
+                                errorReports={errors}
+                                programId={programId}
+                                orgUnitId={orgUnitId}
+                                enrollmentIdToTeiId={enrollmentIdToTeiId}
+                            />
+                        </Widget>
+                    </div>
+                </ModalContent>
+
+                <ModalActions>
+                    <ButtonStrip>
+                        <Button
+                            secondary
+                            onClick={() => setIsDeleteDialogOpen(false)}
+                        >
+                            {i18n.t('Close')}
+                        </Button>
+                    </ButtonStrip>
+                </ModalActions>
+            </Modal>
+        );
+    }
+
     if (isLoadingEnrollments || !enrollmentCounts) {
         return (
             <Modal
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index 91321a3fab..f9aec020d1 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -54,7 +54,7 @@ export const useDeleteEnrollments = ({
                 const filterQueryParam = supportForFeature ? 'trackedEntities' : 'trackedEntity';
 
                 return ({
-                    fields: 'trackedEntity,enrollments[enrollment,program,status]',
+                    fields: 'trackedEntity,enrollments[enrollment,program,status,trackedEntity]',
                     [filterQueryParam]: Object.keys(selectedRows).join(supportForFeature ? ',' : ';'),
                     pageSize: 100,
                     program: programId,
@@ -68,25 +68,35 @@ export const useDeleteEnrollments = ({
                 if (!apiTrackedEntities) return [];
 
                 return apiTrackedEntities
-                    .flatMap(apiTrackedEntity => apiTrackedEntity.enrollments);
+                    .flatMap(apiTrackedEntity => (apiTrackedEntity.enrollments ?? []).map((enrollment: any) => ({
+                        ...enrollment,
+                        trackedEntity: enrollment.trackedEntity ?? apiTrackedEntity.trackedEntity,
+                    })));
             },
         },
     );
 
-    const { mutate: deleteEnrollments, isLoading: isDeletingEnrollments } = useMutation<any>(
+    const {
+        mutate: deleteEnrollments,
+        isLoading: isDeletingEnrollments,
+        error: deleteError,
+    } = useMutation<any, any>(
         () => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
+                // TEMP SABOTAGE: replace each enrollment with a valid-format but nonexistent UID so tracker returns per-enrollment errorReports
                 enrollments: enrollments
                     .filter(({ status }) => status && statusToDelete[status.toLowerCase()])
-                    .map(({ enrollment }) => ({ enrollment })),
+                    .map(() => ({ enrollment: 'zzzzzzzzzzz' })),
             },
         }),
         {
-            onError: (error) => {
-                log.error(errorCreator('An error occurred when deleting enrollments')({ error }));
-                showAlert({ message: i18n.t('An error occurred when deleting enrollments') });
+            onError: (serverResponse) => {
+                log.error(errorCreator('An error occurred when deleting enrollments')({ serverResponse }));
+                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
+                    showAlert({ message: i18n.t('An error occurred when deleting enrollments') });
+                }
             },
             onSuccess: () => {
                 queryClient.removeQueries([ReactQueryAppNamespace, ...QueryKey]);
@@ -96,6 +106,22 @@ export const useDeleteEnrollments = ({
         },
     );
 
+    const validationError = useMemo(() => (
+        deleteError?.details?.validationReport?.errorReports?.length
+            ? deleteError.details
+            : null
+    ), [deleteError]);
+
+    const enrollmentIdToTeiId = useMemo(() => {
+        const map: Record<string, string> = {};
+        (enrollments ?? []).forEach((enrollment: any) => {
+            if (enrollment?.enrollment && enrollment?.trackedEntity) {
+                map[enrollment.enrollment] = enrollment.trackedEntity;
+            }
+        });
+        return map;
+    }, [enrollments]);
+
     const enrollmentCounts = useMemo(() => {
         if (!enrollments) {
             return null;
@@ -153,5 +179,7 @@ export const useDeleteEnrollments = ({
         statusToDelete,
         updateStatusToDelete,
         numberOfEnrollmentsToDelete,
+        validationError,
+        enrollmentIdToTeiId,
     };
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx
new file mode 100644
index 0000000000..3b17fcfec9
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { withStyles, type WithStyles } from 'capture-core-utils/styles';
+import { getRecordUrlFromErrorReport } from '../utils';
+
+type ErrorReport = {
+    uid?: string;
+    errorCode?: string;
+    message?: string;
+    trackerType?: 'ENROLLMENT' | 'EVENT' | string;
+};
+
+type Props = {
+    errorReports?: Array<ErrorReport>;
+    programId?: string;
+    orgUnitId?: string;
+    enrollmentIdToTeiId?: Record<string, string>;
+};
+
+const styles: Readonly<any> = {
+    errorContainer: {
+        padding: '0px 20px',
+    },
+    errorItem: {
+        marginBottom: '8px',
+    },
+    errorUidHeader: {
+        fontWeight: 'bold',
+        fontFamily: 'monospace',
+    },
+};
+
+const BulkActionErrorReportsPlain = ({
+    errorReports,
+    programId,
+    orgUnitId,
+    enrollmentIdToTeiId,
+    classes,
+}: Props & WithStyles<typeof styles>) => (
+    <span className={classes.errorContainer}>
+        <ul>
+            {errorReports && errorReports.length ? errorReports.map((errorReport) => {
+                const recordUrl = getRecordUrlFromErrorReport({
+                    errorReport,
+                    programId,
+                    orgUnitId,
+                    enrollmentIdToTeiId,
+                });
+                return (
+                    <li
+                        key={`${errorReport.uid}-${errorReport.errorCode}`}
+                        className={classes.errorItem}
+                    >
+                        <div className={classes.errorUidHeader}>
+                            {recordUrl ? (
+                                <a
+                                    href={recordUrl}
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    {errorReport.uid}
+                                </a>
+                            ) : errorReport.uid}
+                        </div>
+                        <div>{errorReport?.message}</div>
+                    </li>
+                );
+            }) : (
+                <li>
+                    {i18n.t('An unknown error occurred.')}
+                </li>
+            )}
+        </ul>
+    </span>
+);
+
+export const BulkActionErrorReports = withStyles(styles)(BulkActionErrorReportsPlain);
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts
new file mode 100644
index 0000000000..a1b422f7d0
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts
@@ -0,0 +1 @@
+export { BulkActionErrorReports } from './BulkActionErrorReports.component';

From 9b7b5606d3277016f1ee43d7291005152300fdb0 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Sat, 25 Jul 2026 12:11:10 +0000
Subject: [PATCH 03/12] feat: add generic  error handling

---
 i18n/en.pot                                   |  10 +-
 .../Actions/CompleteAction/CompleteAction.tsx |  27 ++---
 .../hooks/useBulkCompleteEvents.ts            |  14 +--
 .../Actions/DeleteAction/DeleteAction.tsx     |  57 +++-------
 .../Actions/CompleteAction/CompleteAction.tsx |  39 ++-----
 .../EnrollmentDeleteModal.tsx                 |  35 ++----
 .../hooks/useDeleteEnrollments.ts             |  10 +-
 .../BulkActionErrorDetails.component.tsx      | 105 ++++++++++++++++++
 .../BulkActionErrorDetails/index.ts           |   1 +
 .../BulkActionErrorReports.component.tsx      |  77 -------------
 .../BulkActionErrorReports/index.ts           |   1 -
 .../utils/extractValidationReport.ts          |  13 +++
 .../BulkActionBar/utils/index.ts              |   1 +
 13 files changed, 180 insertions(+), 210 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/index.ts
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index cd5d20608b..685c553fe9 100644
--- a/i18n/en.pot
+++ b/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-07-25T12:02:47.298Z\n"
-"PO-Revision-Date: 2026-07-25T12:02:47.298Z\n"
+"POT-Creation-Date: 2026-07-25T12:11:11.156Z\n"
+"PO-Revision-Date: 2026-07-25T12:11:11.156Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -1980,9 +1980,6 @@ msgstr "Error completing events"
 msgid "There was an error completing the events."
 msgstr "There was an error completing the events."
 
-msgid "Details (Advanced)"
-msgstr "Details (Advanced)"
-
 msgid "An error occurred while completing events"
 msgstr "An error occurred while completing events"
 
@@ -2216,6 +2213,9 @@ msgstr[1] "{{count}} selected"
 msgid "Deselect all"
 msgstr "Deselect all"
 
+msgid "Details (Advanced)"
+msgstr "Details (Advanced)"
+
 msgid "An unknown error occurred."
 msgstr "An unknown error occurred."
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
index ece87e8ffd..9adabb14a8 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -4,8 +4,7 @@ import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import { useBulkCompleteEvents } from './hooks/useBulkCompleteEvents';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
-import { Widget } from '../../../../../Widget';
-import { BulkActionErrorReports } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
+import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { Props } from './CompleteAction.types';
 
@@ -40,7 +39,6 @@ const CompleteActionPlain = ({
     classes,
 }: Props & WithStyles<typeof styles>) => {
     const [isCompleteDialogOpen, setIsCompleteDialogOpen] = useState(false);
-    const [openAccordion, setOpenAccordion] = useState(false);
     const { orgUnitId } = useLocationQuery();
     const tooltipContent = getTooltipContent(stageDataWriteAccess, bulkDataEntryIsActive);
     const disabled = Boolean(!stageDataWriteAccess || bulkDataEntryIsActive);
@@ -128,23 +126,12 @@ const CompleteActionPlain = ({
                     </ModalTitle>
 
                     <ModalContent>
-                        <span className={classes.container}>
-                            {i18n.t('There was an error completing the events.')}
-
-                            <Widget
-                                open={openAccordion}
-                                onOpen={() => setOpenAccordion(true)}
-                                onClose={() => setOpenAccordion(false)}
-                                borderless
-                                header={i18n.t('Details (Advanced)')}
-                            >
-                                <BulkActionErrorReports
-                                    errorReports={validationError?.validationReport?.errorReports}
-                                    programId={programId}
-                                    orgUnitId={orgUnitId}
-                                />
-                            </Widget>
-                        </span>
+                        <BulkActionErrorDetails
+                            introText={i18n.t('There was an error completing the events.')}
+                            errorReports={validationError?.validationReport?.errorReports}
+                            programId={programId}
+                            orgUnitId={orgUnitId}
+                        />
                     </ModalContent>
 
                     <ModalActions>
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
index 31f26cad10..eeffd72973 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
@@ -5,6 +5,7 @@ import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { FEATURES, featureAvailable } from 'capture-core-utils';
 import { useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
+import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
 
 type Props = {
     selectedRows: { [key: string]: boolean };
@@ -104,15 +105,10 @@ export const useBulkCompleteEvents = ({
         },
     );
 
-    const validationError = useMemo(() => {
-        if (data?.validationReport?.errorReports?.length) {
-            return data;
-        }
-        if (error?.details?.validationReport?.errorReports?.length) {
-            return error.details;
-        }
-        return null;
-    }, [data, error]);
+    const validationError = useMemo(
+        () => extractValidationReport({ data, error }),
+        [data, error],
+    );
 
     const onCompleteEvents = useCallback(() => {
         if (!events) {
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index a5d4ebe735..833cb161ee 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -1,28 +1,16 @@
 import React, { useMemo, useState } from 'react';
 import log from 'loglevel';
 import i18n from '@dhis2/d2-i18n';
-import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
+import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import { useMutation } from '@tanstack/react-query';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { errorCreator } from 'capture-core-utils';
-import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
-import { Widget } from '../../../../../Widget';
-import { BulkActionErrorReports } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
+import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
+import { extractValidationReport } from '../../../../WorkingListsCommon/BulkActionBar/utils';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { Props } from './DeleteAction.types';
 
-const styles: Readonly<any> = {
-    container: {
-        fontSize: '14px',
-        lineHeight: '19px',
-        color: colors.grey900,
-        display: 'flex',
-        flexDirection: 'column',
-        gap: '8px',
-    },
-};
-
 const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive?: boolean) => {
     if (!stageDataWriteAccess) {
         return i18n.t('You do not have access to delete events');
@@ -33,16 +21,14 @@ const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive
     return '';
 };
 
-const DeleteActionPlain = ({
+export const DeleteAction = ({
     selectedRows,
     stageDataWriteAccess,
     bulkDataEntryIsActive,
     onUpdateList,
     programId,
-    classes,
-}: Props & WithStyles<typeof styles>) => {
+}: Props) => {
     const [isModalOpen, setIsModalOpen] = useState(false);
-    const [openAccordion, setOpenAccordion] = useState(false);
     const dataEngine = useDataEngine();
     const { orgUnitId } = useLocationQuery();
     const { show: showAlert } = useAlert(
@@ -83,11 +69,10 @@ const DeleteActionPlain = ({
         },
     );
 
-    const validationError = useMemo(() => (
-        deleteError?.details?.validationReport?.errorReports?.length
-            ? deleteError.details
-            : null
-    ), [deleteError]);
+    const validationError = useMemo(
+        () => extractValidationReport({ error: deleteError }),
+        [deleteError],
+    );
 
     const closeModal = () => {
         setIsModalOpen(false);
@@ -156,23 +141,12 @@ const DeleteActionPlain = ({
                     </ModalTitle>
 
                     <ModalContent>
-                        <span className={classes.container}>
-                            {i18n.t('There was an error while deleting the events. Please see the details below.')}
-
-                            <Widget
-                                open={openAccordion}
-                                onOpen={() => setOpenAccordion(true)}
-                                onClose={() => setOpenAccordion(false)}
-                                borderless
-                                header={i18n.t('Details (Advanced)')}
-                            >
-                                <BulkActionErrorReports
-                                    errorReports={validationError?.validationReport?.errorReports}
-                                    programId={programId}
-                                    orgUnitId={orgUnitId}
-                                />
-                            </Widget>
-                        </span>
+                        <BulkActionErrorDetails
+                            introText={i18n.t('There was an error while deleting the events. Please see the details below.')}
+                            errorReports={validationError?.validationReport?.errorReports}
+                            programId={programId}
+                            orgUnitId={orgUnitId}
+                        />
                     </ModalContent>
 
                     <ModalActions>
@@ -191,4 +165,3 @@ const DeleteActionPlain = ({
     );
 };
 
-export const DeleteAction = withStyles(styles)(DeleteActionPlain);
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 1a3c18aa62..a08b906df2 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -14,8 +14,7 @@ import {
 } from '@dhis2/ui';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
 import { useCompleteBulkEnrollments } from './hooks/useCompleteBulkEnrollments';
-import { Widget } from '../../../../../Widget';
-import { BulkActionErrorReports } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
+import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { PlainProps } from './CompleteAction.types';
 
@@ -57,7 +56,6 @@ const CompleteActionPlain = ({
 }: PlainProps & WithStyles<typeof styles>) => {
     const [modalIsOpen, setModalIsOpen] = useState(false);
     const [completeEvents, setCompleteEvents] = useState(true);
-    const [openAccordion, setOpenAccordion] = useState(false);
     const { orgUnitId } = useLocationQuery();
     const {
         completeEnrollments,
@@ -92,31 +90,18 @@ const CompleteActionPlain = ({
         // If there was an error importing the data, show an error message
         if (validationError) {
             const errors = (validationError as any)?.details?.validationReport?.errorReports;
+            const introText = hasPartiallyUploadedEnrollments
+                // eslint-disable-next-line max-len
+                ? i18n.t('Some enrollments were completed successfully, but there was an error while completing the rest. Please see the details below.')
+                : i18n.t('There was an error while completing the enrollments. Please see the details below.');
             return (
-                <div className={classes.container}>
-                    <span>
-                        {hasPartiallyUploadedEnrollments ?
-                            // eslint-disable-next-line max-len
-                            i18n.t('Some enrollments were completed successfully, but there was an error while completing the rest. Please see the details below.') :
-                            i18n.t('There was an error while completing the enrollments. Please see the details below.')
-                        }
-                    </span>
-
-                    <Widget
-                        open={openAccordion}
-                        onOpen={() => setOpenAccordion(true)}
-                        onClose={() => setOpenAccordion(false)}
-                        borderless
-                        header={i18n.t('Details (Advanced)')}
-                    >
-                        <BulkActionErrorReports
-                            errorReports={errors}
-                            programId={programId}
-                            orgUnitId={orgUnitId}
-                            enrollmentIdToTeiId={enrollmentIdToTeiId}
-                        />
-                    </Widget>
-                </div>
+                <BulkActionErrorDetails
+                    introText={introText}
+                    errorReports={errors}
+                    programId={programId}
+                    orgUnitId={orgUnitId}
+                    enrollmentIdToTeiId={enrollmentIdToTeiId}
+                />
             );
         }
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
index 1c674ee4e1..e2ef0d2add 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
@@ -1,11 +1,10 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { Button, ButtonStrip, CircularLoader, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
 import { useDeleteEnrollments } from '../hooks/useDeleteEnrollments';
 import { CustomCheckbox } from './CustomCheckbox';
-import { Widget } from '../../../../../../Widget';
-import { BulkActionErrorReports } from '../../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorReports';
+import { BulkActionErrorDetails } from '../../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
 import { useLocationQuery } from '../../../../../../../utils/routing';
 import type { PlainProps } from './EnrollmentDeleteModal.types';
 
@@ -46,7 +45,6 @@ const EnrollmentDeleteModalPlain = ({
         onUpdateList,
         setIsDeleteDialogOpen,
     });
-    const [openAccordion, setOpenAccordion] = useState(false);
     const { orgUnitId } = useLocationQuery();
 
     if (isEnrollmentsError) {
@@ -91,26 +89,15 @@ const EnrollmentDeleteModalPlain = ({
                 </ModalTitle>
 
                 <ModalContent>
-                    <div className={classes.modalContent}>
-                        <span>
-                            {i18n.t('There was an error while deleting the enrollments. Please see the details below.')}
-                        </span>
-
-                        <Widget
-                            open={openAccordion}
-                            onOpen={() => setOpenAccordion(true)}
-                            onClose={() => setOpenAccordion(false)}
-                            borderless
-                            header={i18n.t('Details (Advanced)')}
-                        >
-                            <BulkActionErrorReports
-                                errorReports={errors}
-                                programId={programId}
-                                orgUnitId={orgUnitId}
-                                enrollmentIdToTeiId={enrollmentIdToTeiId}
-                            />
-                        </Widget>
-                    </div>
+                    <BulkActionErrorDetails
+                        introText={i18n.t(
+                            'There was an error while deleting the enrollments. Please see the details below.',
+                        )}
+                        errorReports={errors}
+                        programId={programId}
+                        orgUnitId={orgUnitId}
+                        enrollmentIdToTeiId={enrollmentIdToTeiId}
+                    />
                 </ModalContent>
 
                 <ModalActions>
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index f9aec020d1..f7de0bab7f 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -6,6 +6,7 @@ import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { errorCreator, FEATURES, featureAvailable } from 'capture-core-utils';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
 import { ReactQueryAppNamespace, useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
+import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
 
 type Props = {
     selectedRows: Record<string, boolean>;
@@ -106,11 +107,10 @@ export const useDeleteEnrollments = ({
         },
     );
 
-    const validationError = useMemo(() => (
-        deleteError?.details?.validationReport?.errorReports?.length
-            ? deleteError.details
-            : null
-    ), [deleteError]);
+    const validationError = useMemo(
+        () => extractValidationReport({ error: deleteError }),
+        [deleteError],
+    );
 
     const enrollmentIdToTeiId = useMemo(() => {
         const map: Record<string, string> = {};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
new file mode 100644
index 0000000000..b0ef152601
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
@@ -0,0 +1,105 @@
+import React, { useState, type ReactNode } from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { withStyles, type WithStyles } from 'capture-core-utils/styles';
+import { colors } from '@dhis2/ui';
+import { Widget } from '../../../../Widget';
+import { getRecordUrlFromErrorReport } from '../utils';
+
+type ErrorReport = {
+    uid?: string;
+    errorCode?: string;
+    message?: string;
+    trackerType?: 'ENROLLMENT' | 'EVENT' | string;
+};
+
+type Props = {
+    introText: ReactNode;
+    errorReports?: Array<ErrorReport>;
+    programId?: string;
+    orgUnitId?: string;
+    enrollmentIdToTeiId?: Record<string, string>;
+};
+
+const styles: Readonly<any> = {
+    container: {
+        fontSize: '14px',
+        lineHeight: '19px',
+        color: colors.grey900,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '8px',
+    },
+    errorContainer: {
+        padding: '0px 20px',
+    },
+    errorItem: {
+        marginBottom: '8px',
+    },
+    errorUidHeader: {
+        fontWeight: 'bold',
+        fontFamily: 'monospace',
+    },
+};
+
+const BulkActionErrorDetailsPlain = ({
+    introText,
+    errorReports,
+    programId,
+    orgUnitId,
+    enrollmentIdToTeiId,
+    classes,
+}: Props & WithStyles<typeof styles>) => {
+    const [openAccordion, setOpenAccordion] = useState(false);
+
+    return (
+        <div className={classes.container}>
+            <span>{introText}</span>
+
+            <Widget
+                open={openAccordion}
+                onOpen={() => setOpenAccordion(true)}
+                onClose={() => setOpenAccordion(false)}
+                borderless
+                header={i18n.t('Details (Advanced)')}
+            >
+                <span className={classes.errorContainer}>
+                    <ul>
+                        {errorReports && errorReports.length ? errorReports.map((errorReport) => {
+                            const recordUrl = getRecordUrlFromErrorReport({
+                                errorReport,
+                                programId,
+                                orgUnitId,
+                                enrollmentIdToTeiId,
+                            });
+                            return (
+                                <li
+                                    key={`${errorReport.uid}-${errorReport.errorCode}`}
+                                    className={classes.errorItem}
+                                >
+                                    <div className={classes.errorUidHeader}>
+                                        {recordUrl ? (
+                                            <a
+                                                href={recordUrl}
+                                                target="_blank"
+                                                rel="noopener noreferrer"
+                                            >
+                                                {errorReport.uid}
+                                            </a>
+                                        ) : errorReport.uid}
+                                    </div>
+                                    <div>{errorReport?.message}</div>
+                                </li>
+                            );
+                        }) : (
+                            <li>
+                                {i18n.t('An unknown error occurred.')}
+                            </li>
+                        )}
+                    </ul>
+                </span>
+            </Widget>
+        </div>
+    );
+};
+
+export const BulkActionErrorDetails = withStyles(styles)(BulkActionErrorDetailsPlain);
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/index.ts
new file mode 100644
index 0000000000..86cff1a7c2
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/index.ts
@@ -0,0 +1 @@
+export { BulkActionErrorDetails } from './BulkActionErrorDetails.component';
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx
deleted file mode 100644
index 3b17fcfec9..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/BulkActionErrorReports.component.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React from 'react';
-import i18n from '@dhis2/d2-i18n';
-import { withStyles, type WithStyles } from 'capture-core-utils/styles';
-import { getRecordUrlFromErrorReport } from '../utils';
-
-type ErrorReport = {
-    uid?: string;
-    errorCode?: string;
-    message?: string;
-    trackerType?: 'ENROLLMENT' | 'EVENT' | string;
-};
-
-type Props = {
-    errorReports?: Array<ErrorReport>;
-    programId?: string;
-    orgUnitId?: string;
-    enrollmentIdToTeiId?: Record<string, string>;
-};
-
-const styles: Readonly<any> = {
-    errorContainer: {
-        padding: '0px 20px',
-    },
-    errorItem: {
-        marginBottom: '8px',
-    },
-    errorUidHeader: {
-        fontWeight: 'bold',
-        fontFamily: 'monospace',
-    },
-};
-
-const BulkActionErrorReportsPlain = ({
-    errorReports,
-    programId,
-    orgUnitId,
-    enrollmentIdToTeiId,
-    classes,
-}: Props & WithStyles<typeof styles>) => (
-    <span className={classes.errorContainer}>
-        <ul>
-            {errorReports && errorReports.length ? errorReports.map((errorReport) => {
-                const recordUrl = getRecordUrlFromErrorReport({
-                    errorReport,
-                    programId,
-                    orgUnitId,
-                    enrollmentIdToTeiId,
-                });
-                return (
-                    <li
-                        key={`${errorReport.uid}-${errorReport.errorCode}`}
-                        className={classes.errorItem}
-                    >
-                        <div className={classes.errorUidHeader}>
-                            {recordUrl ? (
-                                <a
-                                    href={recordUrl}
-                                    target="_blank"
-                                    rel="noopener noreferrer"
-                                >
-                                    {errorReport.uid}
-                                </a>
-                            ) : errorReport.uid}
-                        </div>
-                        <div>{errorReport?.message}</div>
-                    </li>
-                );
-            }) : (
-                <li>
-                    {i18n.t('An unknown error occurred.')}
-                </li>
-            )}
-        </ul>
-    </span>
-);
-
-export const BulkActionErrorReports = withStyles(styles)(BulkActionErrorReportsPlain);
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts
deleted file mode 100644
index a1b422f7d0..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorReports/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { BulkActionErrorReports } from './BulkActionErrorReports.component';
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
new file mode 100644
index 0000000000..9b3ae69310
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
@@ -0,0 +1,13 @@
+// A tracker validation report can arrive on either the success `data` payload
+// (e.g. atomicMode=OBJECT partial success) or on the error response's `details`
+// (HTTP-error case). Callers only care about the container that holds
+// `validationReport.errorReports` — use this to normalize both paths.
+export const extractValidationReport = ({ data, error }: { data?: any; error?: any }): any | null => {
+    if (data?.validationReport?.errorReports?.length) {
+        return data;
+    }
+    if (error?.details?.validationReport?.errorReports?.length) {
+        return error.details;
+    }
+    return null;
+};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
index 79d643b552..483e52bab6 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
@@ -1 +1,2 @@
 export { getRecordUrlFromErrorReport } from './getRecordUrlFromErrorReport';
+export { extractValidationReport } from './extractValidationReport';

From dac99bd72aedca919c0f796d6328c65b4d0a5776 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Sat, 25 Jul 2026 13:09:24 +0000
Subject: [PATCH 04/12] feat: enhance error handling by adding knownEventUids
 for bulk actions

---
 i18n/en.pot                                   |  4 ++--
 .../Actions/CompleteAction/CompleteAction.tsx |  4 +++-
 .../hooks/useBulkCompleteEvents.ts            |  5 +++--
 .../Actions/DeleteAction/DeleteAction.tsx     | 11 ++++++++---
 .../Actions/CompleteAction/CompleteAction.tsx |  2 ++
 .../hooks/useCompleteBulkEnrollments.ts       | 19 +++++++++++++++++--
 .../hooks/useDeleteEnrollments.ts             |  5 +++--
 .../BulkActionErrorDetails.component.tsx      |  3 +++
 .../utils/getRecordUrlFromErrorReport.ts      |  8 ++++++++
 9 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 685c553fe9..233b2b5961 100644
--- a/i18n/en.pot
+++ b/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-07-25T12:11:11.156Z\n"
-"PO-Revision-Date: 2026-07-25T12:11:11.156Z\n"
+"POT-Creation-Date: 2026-07-25T13:09:25.459Z\n"
+"PO-Revision-Date: 2026-07-25T13:09:25.459Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 9adabb14a8..abdb7f5616 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -1,4 +1,4 @@
-import React, { type ComponentType, useState } from 'react';
+import React, { type ComponentType, useMemo, useState } from 'react';
 import i18n from '@dhis2/d2-i18n';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
@@ -40,6 +40,7 @@ const CompleteActionPlain = ({
 }: Props & WithStyles<typeof styles>) => {
     const [isCompleteDialogOpen, setIsCompleteDialogOpen] = useState(false);
     const { orgUnitId } = useLocationQuery();
+    const knownEventUids = useMemo(() => new Set(Object.keys(selectedRows)), [selectedRows]);
     const tooltipContent = getTooltipContent(stageDataWriteAccess, bulkDataEntryIsActive);
     const disabled = Boolean(!stageDataWriteAccess || bulkDataEntryIsActive);
     const {
@@ -131,6 +132,7 @@ const CompleteActionPlain = ({
                             errorReports={validationError?.validationReport?.errorReports}
                             programId={programId}
                             orgUnitId={orgUnitId}
+                            knownEventUids={knownEventUids}
                         />
                     </ModalContent>
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
index eeffd72973..603ceb460a 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
@@ -119,8 +119,9 @@ export const useBulkCompleteEvents = ({
             ...event,
             status: 'COMPLETED',
             program: event.program || programId || event.programId,
-            // TEMP SABOTAGE: replace with a valid-format but nonexistent UID so tracker returns per-event errorReports
-            event: 'zzzzzzzzzzz',
+            // TEMP SABOTAGE: point orgUnit at a nonexistent UID so each event fails individually
+            // while keeping the real event UID in the errorReport (linkable in the modal).
+            orgUnit: 'zzzzzzzzzzz',
         }));
 
         completeEvents({ payload: serverPayload });
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index 833cb161ee..4e74d42b9a 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -31,6 +31,7 @@ export const DeleteAction = ({
     const [isModalOpen, setIsModalOpen] = useState(false);
     const dataEngine = useDataEngine();
     const { orgUnitId } = useLocationQuery();
+    const knownEventUids = useMemo(() => new Set(Object.keys(selectedRows)), [selectedRows]);
     const { show: showAlert } = useAlert(
         ({ message }) => message,
         { critical: true },
@@ -49,10 +50,11 @@ export const DeleteAction = ({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
-                // TEMP SABOTAGE: replace each event with a valid-format but nonexistent UID so tracker returns per-event errorReports
+                // TEMP SABOTAGE: assign each event a unique nonexistent UID so tracker returns
+                // a distinct errorReport per row (no link, since these UIDs aren't in knownEventUids).
                 events: Object
                     .keys(selectedRows)
-                    .map(() => ({ event: 'zzzzzzzzzzz' })),
+                    .map((_, i) => ({ event: `zzzzzzzzzz${(i % 36).toString(36)}` })),
             },
         }),
         {
@@ -142,10 +144,13 @@ export const DeleteAction = ({
 
                     <ModalContent>
                         <BulkActionErrorDetails
-                            introText={i18n.t('There was an error while deleting the events. Please see the details below.')}
+                            introText={i18n.t(
+                                'There was an error while deleting the events. Please see the details below.',
+                            )}
                             errorReports={validationError?.validationReport?.errorReports}
                             programId={programId}
                             orgUnitId={orgUnitId}
+                            knownEventUids={knownEventUids}
                         />
                     </ModalContent>
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
index a08b906df2..9ceefe2552 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -61,6 +61,7 @@ const CompleteActionPlain = ({
         completeEnrollments,
         enrollmentCounts,
         enrollmentIdToTeiId,
+        knownEventUids,
         isLoading,
         validationError,
         isCompleting,
@@ -101,6 +102,7 @@ const CompleteActionPlain = ({
                     programId={programId}
                     orgUnitId={orgUnitId}
                     enrollmentIdToTeiId={enrollmentIdToTeiId}
+                    knownEventUids={knownEventUids}
                 />
             );
         }
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index 04d48ce48e..7de801f151 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -256,6 +256,19 @@ export const useCompleteBulkEnrollments = ({
         }, {});
     }, [trackedEntities]);
 
+    const knownEventUids = useMemo(() => {
+        const set = new Set<string>();
+        [
+            ...(trackedEntities?.activeEnrollments ?? []),
+            ...(trackedEntities?.completedEnrollments ?? []),
+        ].forEach((enrollment: any) => {
+            (enrollment?.events ?? []).forEach((event: any) => {
+                if (event?.event) set.add(event.event);
+            });
+        });
+        return set;
+    }, [trackedEntities]);
+
     useEffect(() => {
         if (!modalIsOpen) {
             resetCompleteEnrollments();
@@ -264,10 +277,11 @@ export const useCompleteBulkEnrollments = ({
 
     const onStartCompleteEnrollments = ({ completeEvents }: { completeEvents: boolean }) => {
         const enrollments = formatServerPayload(trackedEntities, completeEvents, stages);
-        // TEMP SABOTAGE: point program at a valid-format but nonexistent UID so validation returns per-enrollment errorReports
+        // TEMP SABOTAGE: point orgUnit at a nonexistent UID so each enrollment fails individually
+        // while keeping the real enrollment UID in the errorReport (linkable in the modal).
         const sabotagedEnrollments = enrollments.map(enrollment => ({
             ...enrollment,
-            program: 'zzzzzzzzzzz',
+            orgUnit: 'zzzzzzzzzzz',
         }));
         onValidateEnrollments({ completeEvents, enrollments: sabotagedEnrollments } as any);
     };
@@ -276,6 +290,7 @@ export const useCompleteBulkEnrollments = ({
         completeEnrollments: onStartCompleteEnrollments,
         enrollmentCounts,
         enrollmentIdToTeiId,
+        knownEventUids,
         isLoading: isInitialLoadingTrackedEntities,
         isError: isTrackedEntitiesError,
         validationError,
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index f7de0bab7f..42c756c0e5 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -86,10 +86,11 @@ export const useDeleteEnrollments = ({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
-                // TEMP SABOTAGE: replace each enrollment with a valid-format but nonexistent UID so tracker returns per-enrollment errorReports
+                // TEMP SABOTAGE: assign each enrollment a unique nonexistent UID so tracker returns
+                // a distinct errorReport per row (no link, since these aren't in enrollmentIdToTeiId).
                 enrollments: enrollments
                     .filter(({ status }) => status && statusToDelete[status.toLowerCase()])
-                    .map(() => ({ enrollment: 'zzzzzzzzzzz' })),
+                    .map((_, i) => ({ enrollment: `zzzzzzzzzz${(i % 36).toString(36)}` })),
             },
         }),
         {
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
index b0ef152601..8c9879403e 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
@@ -18,6 +18,7 @@ type Props = {
     programId?: string;
     orgUnitId?: string;
     enrollmentIdToTeiId?: Record<string, string>;
+    knownEventUids?: Set<string>;
 };
 
 const styles: Readonly<any> = {
@@ -47,6 +48,7 @@ const BulkActionErrorDetailsPlain = ({
     programId,
     orgUnitId,
     enrollmentIdToTeiId,
+    knownEventUids,
     classes,
 }: Props & WithStyles<typeof styles>) => {
     const [openAccordion, setOpenAccordion] = useState(false);
@@ -70,6 +72,7 @@ const BulkActionErrorDetailsPlain = ({
                                 programId,
                                 orgUnitId,
                                 enrollmentIdToTeiId,
+                                knownEventUids,
                             });
                             return (
                                 <li
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
index 44d58cb5f9..efea66dd0b 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
@@ -13,11 +13,13 @@ export const getRecordUrlFromErrorReport = ({
     programId,
     orgUnitId,
     enrollmentIdToTeiId,
+    knownEventUids,
 }: {
     errorReport: ErrorReport;
     programId?: string;
     orgUnitId?: string;
     enrollmentIdToTeiId?: Record<string, string>;
+    knownEventUids?: Set<string>;
 }): string | null => {
     if (!errorReport.uid || !programId || !orgUnitId) {
         return null;
@@ -36,6 +38,12 @@ export const getRecordUrlFromErrorReport = ({
         })}`;
     }
 
+    // Only link an event UID we can vouch for — the error may reference a UID
+    // the server rejected as nonexistent, and linking there is a dead end.
+    if (!knownEventUids?.has(errorReport.uid)) {
+        return null;
+    }
+
     try {
         const program = getProgramFromProgramIdThrowIfNotFound(programId);
         if (program instanceof EventProgram) {

From c9345a4ac4c7297202708d719cb9dac53729a42f Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Sat, 25 Jul 2026 13:12:06 +0000
Subject: [PATCH 05/12] feat: remove temporary sabotage for error trigger

---
 i18n/en.pot                                               | 4 ++--
 .../Actions/CompleteAction/hooks/useBulkCompleteEvents.ts | 3 ---
 .../Actions/DeleteAction/DeleteAction.tsx                 | 4 +---
 .../CompleteAction/hooks/useCompleteBulkEnrollments.ts    | 8 +-------
 .../DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts | 4 +---
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 233b2b5961..7ba69b9cb3 100644
--- a/i18n/en.pot
+++ b/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-07-25T13:09:25.459Z\n"
-"PO-Revision-Date: 2026-07-25T13:09:25.459Z\n"
+"POT-Creation-Date: 2026-07-25T13:12:08.089Z\n"
+"PO-Revision-Date: 2026-07-25T13:12:08.089Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
index 603ceb460a..9aec8cf955 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
@@ -119,9 +119,6 @@ export const useBulkCompleteEvents = ({
             ...event,
             status: 'COMPLETED',
             program: event.program || programId || event.programId,
-            // TEMP SABOTAGE: point orgUnit at a nonexistent UID so each event fails individually
-            // while keeping the real event UID in the errorReport (linkable in the modal).
-            orgUnit: 'zzzzzzzzzzz',
         }));
 
         completeEvents({ payload: serverPayload });
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index 4e74d42b9a..abd36339f4 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -50,11 +50,9 @@ export const DeleteAction = ({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
-                // TEMP SABOTAGE: assign each event a unique nonexistent UID so tracker returns
-                // a distinct errorReport per row (no link, since these UIDs aren't in knownEventUids).
                 events: Object
                     .keys(selectedRows)
-                    .map((_, i) => ({ event: `zzzzzzzzzz${(i % 36).toString(36)}` })),
+                    .map(id => ({ event: id })),
             },
         }),
         {
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index 7de801f151..37b696bc78 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -277,13 +277,7 @@ export const useCompleteBulkEnrollments = ({
 
     const onStartCompleteEnrollments = ({ completeEvents }: { completeEvents: boolean }) => {
         const enrollments = formatServerPayload(trackedEntities, completeEvents, stages);
-        // TEMP SABOTAGE: point orgUnit at a nonexistent UID so each enrollment fails individually
-        // while keeping the real enrollment UID in the errorReport (linkable in the modal).
-        const sabotagedEnrollments = enrollments.map(enrollment => ({
-            ...enrollment,
-            orgUnit: 'zzzzzzzzzzz',
-        }));
-        onValidateEnrollments({ completeEvents, enrollments: sabotagedEnrollments } as any);
+        onValidateEnrollments({ completeEvents, enrollments } as any);
     };
 
     return {
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index 42c756c0e5..3f655915db 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -86,11 +86,9 @@ export const useDeleteEnrollments = ({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
-                // TEMP SABOTAGE: assign each enrollment a unique nonexistent UID so tracker returns
-                // a distinct errorReport per row (no link, since these aren't in enrollmentIdToTeiId).
                 enrollments: enrollments
                     .filter(({ status }) => status && statusToDelete[status.toLowerCase()])
-                    .map((_, i) => ({ enrollment: `zzzzzzzzzz${(i % 36).toString(36)}` })),
+                    .map(({ enrollment }) => ({ enrollment })),
             },
         }),
         {

From 5b5d516f7ad5be7ab9404ae1e43a9e38ecf0ec33 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Sat, 25 Jul 2026 18:07:19 +0000
Subject: [PATCH 06/12] feat: refactor error handling and update loading states
 in bulk actions

---
 i18n/en.pot                                   | 10 +-
 .../hooks/useBulkCompleteEvents.ts            |  2 +-
 .../Actions/DeleteAction/DeleteAction.tsx     | 22 +++--
 .../Actions/CompleteAction/CompleteAction.tsx |  2 +-
 .../hooks/useCompleteBulkEnrollments.ts       | 21 +++--
 .../hooks/useDeleteEnrollments.ts             | 12 ++-
 .../DeleteTeiAction/DeleteTeiAction.tsx       | 59 +++++++++++-
 .../DeleteTeiAction/DeleteTeiAction.types.ts  |  1 +
 .../hooks/useCascadeDeleteTei.ts              | 32 +++++--
 .../BulkActionErrorDetails.component.tsx      | 11 ++-
 .../utils/getRecordPathFromErrorReport.ts     | 91 +++++++++++++++++++
 .../utils/getRecordUrlFromErrorReport.ts      | 57 ------------
 .../BulkActionBar/utils/index.ts              |  2 +-
 13 files changed, 227 insertions(+), 95 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index 7ba69b9cb3..d3eacc3e1b 100644
--- a/i18n/en.pot
+++ b/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-07-25T13:12:08.089Z\n"
-"PO-Revision-Date: 2026-07-25T13:12:08.089Z\n"
+"POT-Creation-Date: 2026-07-25T18:07:21.949Z\n"
+"PO-Revision-Date: 2026-07-25T18:07:21.950Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -2148,6 +2148,12 @@ msgstr "Deleting records will also delete any associated enrollments and events.
 msgid "Are you sure you want to delete?"
 msgstr "Are you sure you want to delete?"
 
+msgid "Error deleting {{ trackedEntityName }}"
+msgstr "Error deleting {{ trackedEntityName }}"
+
+msgid "There was an error while deleting the records. Please see the details below."
+msgstr "There was an error while deleting the records. Please see the details below."
+
 msgid "An error occurred while deleting the records"
 msgstr "An error occurred while deleting the records"
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
index 9aec8cf955..efb71a057d 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
@@ -68,7 +68,7 @@ export const useBulkCompleteEvents = ({
 
     const {
         mutate: completeEvents,
-        isLoading: isCompletingEvents,
+        isPending: isCompletingEvents,
         data,
         error,
         reset: resetCompleteEvents,
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index abd36339f4..d758504b80 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -42,10 +42,17 @@ export const DeleteAction = ({
 
     const {
         mutate: deleteEvents,
-        isLoading,
+        isPending,
+        data: deleteData,
         error: deleteError,
         reset: resetDeleteEvents,
-    }: { mutate: any, isLoading: boolean, error: any, reset: () => void } = useMutation(
+    }: {
+        mutate: any,
+        isPending: boolean,
+        data: any,
+        error: any,
+        reset: () => void,
+    } = useMutation(
         () => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
@@ -62,7 +69,10 @@ export const DeleteAction = ({
                     showAlert({ message: i18n.t('An error occurred while deleting the events') });
                 }
             },
-            onSuccess: () => {
+            // Defensive against a future switch to atomicMode=OBJECT, where partial-failure
+            // reports would arrive on `data` (HTTP 200) rather than as an HTTP error.
+            onSuccess: (response: any) => {
+                if (response?.validationReport?.errorReports?.length) return;
                 onUpdateList();
                 setIsModalOpen(false);
             },
@@ -70,8 +80,8 @@ export const DeleteAction = ({
     );
 
     const validationError = useMemo(
-        () => extractValidationReport({ error: deleteError }),
-        [deleteError],
+        () => extractValidationReport({ data: deleteData, error: deleteError }),
+        [deleteData, deleteError],
     );
 
     const closeModal = () => {
@@ -121,7 +131,7 @@ export const DeleteAction = ({
                             <Button
                                 destructive
                                 onClick={deleteEvents}
-                                loading={isLoading}
+                                loading={isPending}
                             >
                                 {i18n.t('Delete')}
                             </Button>
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 9ceefe2552..4a19ba8f3f 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -90,7 +90,7 @@ const CompleteActionPlain = ({
 
         // If there was an error importing the data, show an error message
         if (validationError) {
-            const errors = (validationError as any)?.details?.validationReport?.errorReports;
+            const errors = validationError?.validationReport?.errorReports;
             const introText = hasPartiallyUploadedEnrollments
                 // eslint-disable-next-line max-len
                 ? i18n.t('Some enrollments were completed successfully, but there was an error while completing the rest. Please see the details below.')
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index 37b696bc78..94bc479f53 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -6,6 +6,7 @@ import log from 'loglevel';
 import { errorCreator, FEATURES, featureAvailable } from 'capture-core-utils';
 import { ReactQueryAppNamespace, useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
+import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
 import type { ProgramStage } from '../../../../../../../metaData';
 
 type Props = {
@@ -155,7 +156,7 @@ export const useCompleteBulkEnrollments = ({
 
     const {
         mutate: importEnrollments,
-        isLoading: isImportingEnrollments,
+        isPending: isImportingEnrollments,
     } = useMutation<any>(
         ({ enrollments }: any) => importValidEnrollments({ dataEngine, enrollments }),
         {
@@ -178,7 +179,7 @@ export const useCompleteBulkEnrollments = ({
 
     const {
         mutate: importPartialEnrollments,
-        isLoading: isImportingPartialEnrollments,
+        isPending: isImportingPartialEnrollments,
         isSuccess: hasPartiallyUploadedEnrollments,
     } = useMutation(
         ({ enrollments }: any) => importValidEnrollments({ dataEngine, enrollments }),
@@ -203,8 +204,8 @@ export const useCompleteBulkEnrollments = ({
 
     const {
         mutate: onValidateEnrollments,
-        isLoading: isCompletingEnrollments,
-        error: validationError,
+        isPending: isCompletingEnrollments,
+        error: validateError,
         reset: resetCompleteEnrollments,
     } = useMutation<any>(
         ({ enrollments }: any) => validateEnrollments({
@@ -243,6 +244,11 @@ export const useCompleteBulkEnrollments = ({
         completed: trackedEntities?.completedEnrollments?.length ?? 0,
     }), [trackedEntities]);
 
+    const validationError = useMemo(
+        () => extractValidationReport({ error: validateError }),
+        [validateError],
+    );
+
     const enrollmentIdToTeiId = useMemo(() => {
         const allEnrollments = [
             ...(trackedEntities?.activeEnrollments ?? []),
@@ -256,12 +262,11 @@ export const useCompleteBulkEnrollments = ({
         }, {});
     }, [trackedEntities]);
 
+    // Only events from active enrollments are submitted (see formatServerPayload),
+    // so limit the vouched-UID set to that same scope.
     const knownEventUids = useMemo(() => {
         const set = new Set<string>();
-        [
-            ...(trackedEntities?.activeEnrollments ?? []),
-            ...(trackedEntities?.completedEnrollments ?? []),
-        ].forEach((enrollment: any) => {
+        (trackedEntities?.activeEnrollments ?? []).forEach((enrollment: any) => {
             (enrollment?.events ?? []).forEach((event: any) => {
                 if (event?.event) set.add(event.event);
             });
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index 3f655915db..3e2e612462 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -79,7 +79,8 @@ export const useDeleteEnrollments = ({
 
     const {
         mutate: deleteEnrollments,
-        isLoading: isDeletingEnrollments,
+        isPending: isDeletingEnrollments,
+        data: deleteData,
         error: deleteError,
     } = useMutation<any, any>(
         () => dataEngine.mutate({
@@ -98,7 +99,10 @@ export const useDeleteEnrollments = ({
                     showAlert({ message: i18n.t('An error occurred when deleting enrollments') });
                 }
             },
-            onSuccess: () => {
+            // Defensive against a future switch to atomicMode=OBJECT, where partial-failure
+            // reports would arrive on `data` (HTTP 200) rather than as an HTTP error.
+            onSuccess: (response: any) => {
+                if (response?.validationReport?.errorReports?.length) return;
                 queryClient.removeQueries([ReactQueryAppNamespace, ...QueryKey]);
                 onUpdateList();
                 setIsDeleteDialogOpen(false);
@@ -107,8 +111,8 @@ export const useDeleteEnrollments = ({
     );
 
     const validationError = useMemo(
-        () => extractValidationReport({ error: deleteError }),
-        [deleteError],
+        () => extractValidationReport({ data: deleteData, error: deleteError }),
+        [deleteData, deleteError],
     );
 
     const enrollmentIdToTeiId = useMemo(() => {
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
index 44daa45d42..7e31dd85b6 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
@@ -1,8 +1,10 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import i18n from '@dhis2/d2-i18n';
 import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import { useAuthority } from '../../../../../../utils/userInfo/useAuthority';
+import { useLocationQuery } from '../../../../../../utils/routing';
 import { useCascadeDeleteTei } from './hooks/useCascadeDeleteTei';
+import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
 import type { PlainProps } from './DeleteTeiAction.types';
 
 const CASCADE_DELETE_TEI_AUTHORITY = 'F_TEI_CASCADE_DELETE';
@@ -14,14 +16,27 @@ export const DeleteTeiAction = ({
     selectedRowsCount,
     trackedEntityName,
     onUpdateList,
+    programId,
 }: PlainProps) => {
     const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
     const { hasAuthority } = useAuthority({ authority: CASCADE_DELETE_TEI_AUTHORITY });
-    const { deleteTeis, isLoading } = useCascadeDeleteTei({
+    const { orgUnitId } = useLocationQuery();
+    const {
+        deleteTeis,
+        isLoading,
+        validationError,
+        resetDeleteTeis,
+    } = useCascadeDeleteTei({
         selectedRows,
         setIsDeleteDialogOpen,
         onUpdateList,
     });
+    const knownTeiUids = useMemo(() => new Set(Object.keys(selectedRows)), [selectedRows]);
+
+    const closeModal = () => {
+        setIsDeleteDialogOpen(false);
+        resetDeleteTeis();
+    };
 
     if (!hasAuthority) {
         return null;
@@ -38,10 +53,10 @@ export const DeleteTeiAction = ({
                 })}
             </Button>
 
-            {isDeleteDialogOpen && (
+            {isDeleteDialogOpen && !validationError && (
                 <Modal
                     small
-                    onClose={() => setIsDeleteDialogOpen(false)}
+                    onClose={closeModal}
                 >
                     <ModalTitle>
                         {i18n.t('Delete {{count}} {{ trackedEntityName }}', {
@@ -64,7 +79,7 @@ export const DeleteTeiAction = ({
                         <ButtonStrip>
                             <Button
                                 secondary
-                                onClick={() => setIsDeleteDialogOpen(false)}
+                                onClick={closeModal}
                             >
                                 {i18n.t('Cancel')}
                             </Button>
@@ -80,6 +95,40 @@ export const DeleteTeiAction = ({
                     </ModalActions>
                 </Modal>
             )}
+
+            {isDeleteDialogOpen && validationError && (
+                <Modal
+                    small
+                    onClose={closeModal}
+                >
+                    <ModalTitle>
+                        {i18n.t('Error deleting {{ trackedEntityName }}', {
+                            trackedEntityName: trackedEntityName.toLowerCase(),
+                        })}
+                    </ModalTitle>
+                    <ModalContent>
+                        <BulkActionErrorDetails
+                            introText={i18n.t(
+                                'There was an error while deleting the records. Please see the details below.',
+                            )}
+                            errorReports={validationError?.validationReport?.errorReports}
+                            programId={programId}
+                            orgUnitId={orgUnitId}
+                            knownTeiUids={knownTeiUids}
+                        />
+                    </ModalContent>
+                    <ModalActions>
+                        <ButtonStrip>
+                            <Button
+                                secondary
+                                onClick={closeModal}
+                            >
+                                {i18n.t('Close')}
+                            </Button>
+                        </ButtonStrip>
+                    </ModalActions>
+                </Modal>
+            )}
         </>
     );
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts
index e0c2b52851..5f202f963a 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts
@@ -3,4 +3,5 @@ export type PlainProps = {
     selectedRowsCount: number;
     trackedEntityName: string;
     onUpdateList: () => void;
+    programId?: string;
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
index 6340957271..3d93e4f6ab 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
@@ -1,8 +1,10 @@
+import { useMemo } from 'react';
 import log from 'loglevel';
 import i18n from '@dhis2/d2-i18n';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { useMutation } from '@tanstack/react-query';
 import { errorCreator } from 'capture-core-utils';
+import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
 
 type Props = {
     selectedRows: Record<string, boolean>;
@@ -21,7 +23,13 @@ export const useCascadeDeleteTei = ({
         { critical: true },
     );
 
-    const { mutate: deleteTeis, isLoading } = useMutation<any>(
+    const {
+        mutate: deleteTeis,
+        isPending,
+        data: deleteData,
+        error: deleteError,
+        reset: resetDeleteTeis,
+    } = useMutation<any, any>(
         () => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
@@ -32,19 +40,31 @@ export const useCascadeDeleteTei = ({
             },
         }),
         {
-            onError: (error) => {
-                log.error(errorCreator('An error occurred while deleting the tracked entities')({ error }));
-                showAlert({ message: i18n.t('An error occurred while deleting the records') });
+            onError: (serverResponse) => {
+                log.error(errorCreator('An error occurred while deleting the tracked entities')({ serverResponse }));
+                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
+                    showAlert({ message: i18n.t('An error occurred while deleting the records') });
+                }
             },
-            onSuccess: () => {
+            // Defensive against a future switch to atomicMode=OBJECT, where partial-failure
+            // reports would arrive on `data` (HTTP 200) rather than as an HTTP error.
+            onSuccess: (response: any) => {
+                if (response?.validationReport?.errorReports?.length) return;
                 onUpdateList();
                 setIsDeleteDialogOpen(false);
             },
         },
     );
 
+    const validationError = useMemo(
+        () => extractValidationReport({ data: deleteData, error: deleteError }),
+        [deleteData, deleteError],
+    );
+
     return {
         deleteTeis,
-        isLoading,
+        isLoading: isPending,
+        validationError,
+        resetDeleteTeis,
     };
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
index 8c9879403e..a19d041be6 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
@@ -3,7 +3,7 @@ import i18n from '@dhis2/d2-i18n';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { colors } from '@dhis2/ui';
 import { Widget } from '../../../../Widget';
-import { getRecordUrlFromErrorReport } from '../utils';
+import { getRecordPathFromErrorReport } from '../utils';
 
 type ErrorReport = {
     uid?: string;
@@ -19,6 +19,7 @@ type Props = {
     orgUnitId?: string;
     enrollmentIdToTeiId?: Record<string, string>;
     knownEventUids?: Set<string>;
+    knownTeiUids?: Set<string>;
 };
 
 const styles: Readonly<any> = {
@@ -49,6 +50,7 @@ const BulkActionErrorDetailsPlain = ({
     orgUnitId,
     enrollmentIdToTeiId,
     knownEventUids,
+    knownTeiUids,
     classes,
 }: Props & WithStyles<typeof styles>) => {
     const [openAccordion, setOpenAccordion] = useState(false);
@@ -67,12 +69,13 @@ const BulkActionErrorDetailsPlain = ({
                 <span className={classes.errorContainer}>
                     <ul>
                         {errorReports && errorReports.length ? errorReports.map((errorReport) => {
-                            const recordUrl = getRecordUrlFromErrorReport({
+                            const recordPath = getRecordPathFromErrorReport({
                                 errorReport,
                                 programId,
                                 orgUnitId,
                                 enrollmentIdToTeiId,
                                 knownEventUids,
+                                knownTeiUids,
                             });
                             return (
                                 <li
@@ -80,9 +83,9 @@ const BulkActionErrorDetailsPlain = ({
                                     className={classes.errorItem}
                                 >
                                     <div className={classes.errorUidHeader}>
-                                        {recordUrl ? (
+                                        {recordPath ? (
                                             <a
-                                                href={recordUrl}
+                                                href={`#${recordPath}`}
                                                 target="_blank"
                                                 rel="noopener noreferrer"
                                             >
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts
new file mode 100644
index 0000000000..80b3238776
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts
@@ -0,0 +1,91 @@
+import log from 'loglevel';
+import { errorCreator } from 'capture-core-utils';
+import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../../../metaData';
+import { buildUrlQueryString } from '../../../../../utils/routing';
+
+type ErrorReport = {
+    uid?: string;
+    trackerType?: 'ENROLLMENT' | 'EVENT' | 'TRACKED_ENTITY' | string;
+};
+
+type BuildArgs = {
+    uid: string;
+    programId: string;
+    orgUnitId: string;
+    enrollmentIdToTeiId?: Record<string, string>;
+    knownEventUids?: Set<string>;
+    knownTeiUids?: Set<string>;
+};
+
+const buildEnrollmentPath = ({ uid, programId, orgUnitId, enrollmentIdToTeiId }: BuildArgs): string | null => {
+    const teiId = enrollmentIdToTeiId?.[uid];
+    if (!teiId) return null;
+    return `/enrollment?${buildUrlQueryString({
+        teiId,
+        programId,
+        orgUnitId,
+        enrollmentId: uid,
+    })}`;
+};
+
+const buildTeiPath = ({ uid, programId, orgUnitId, knownTeiUids }: BuildArgs): string | null => {
+    if (!knownTeiUids?.has(uid)) return null;
+    return `/enrollment?${buildUrlQueryString({
+        teiId: uid,
+        programId,
+        orgUnitId,
+        enrollmentId: 'AUTO',
+    })}`;
+};
+
+const buildEventPath = ({ uid, programId, orgUnitId, knownEventUids }: BuildArgs): string | null => {
+    // Only link an event UID we can vouch for — the error may reference a UID
+    // the server rejected as nonexistent, and linking there is a dead end.
+    if (!knownEventUids?.has(uid)) return null;
+    try {
+        const program = getProgramFromProgramIdThrowIfNotFound(programId);
+        if (program instanceof EventProgram) {
+            return `/viewEvent?${buildUrlQueryString({ viewEventId: uid, orgUnitId })}`;
+        }
+        return `/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
+    } catch (error) {
+        log.error(errorCreator('Could not build record path for error report')({ error, programId }));
+        return null;
+    }
+};
+
+// Returns a router-style path (e.g. `/viewEvent?...`) matching the convention in
+// `useLinkedRecordClick.ts`. Callers wanting an anchor `href` are responsible for
+// prepending the HashRouter fragment marker (`#`).
+export const getRecordPathFromErrorReport = ({
+    errorReport,
+    programId,
+    orgUnitId,
+    enrollmentIdToTeiId,
+    knownEventUids,
+    knownTeiUids,
+}: {
+    errorReport: ErrorReport;
+    programId?: string;
+    orgUnitId?: string;
+    enrollmentIdToTeiId?: Record<string, string>;
+    knownEventUids?: Set<string>;
+    knownTeiUids?: Set<string>;
+}): string | null => {
+    if (!errorReport.uid || !programId || !orgUnitId) {
+        return null;
+    }
+
+    const args: BuildArgs = {
+        uid: errorReport.uid,
+        programId,
+        orgUnitId,
+        enrollmentIdToTeiId,
+        knownEventUids,
+        knownTeiUids,
+    };
+
+    if (errorReport.trackerType === 'ENROLLMENT') return buildEnrollmentPath(args);
+    if (errorReport.trackerType === 'TRACKED_ENTITY') return buildTeiPath(args);
+    return buildEventPath(args);
+};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
deleted file mode 100644
index efea66dd0b..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordUrlFromErrorReport.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import log from 'loglevel';
-import { errorCreator } from 'capture-core-utils';
-import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../../../metaData';
-import { buildUrlQueryString } from '../../../../../utils/routing';
-
-type ErrorReport = {
-    uid?: string;
-    trackerType?: 'ENROLLMENT' | 'EVENT' | string;
-};
-
-export const getRecordUrlFromErrorReport = ({
-    errorReport,
-    programId,
-    orgUnitId,
-    enrollmentIdToTeiId,
-    knownEventUids,
-}: {
-    errorReport: ErrorReport;
-    programId?: string;
-    orgUnitId?: string;
-    enrollmentIdToTeiId?: Record<string, string>;
-    knownEventUids?: Set<string>;
-}): string | null => {
-    if (!errorReport.uid || !programId || !orgUnitId) {
-        return null;
-    }
-
-    if (errorReport.trackerType === 'ENROLLMENT') {
-        const teiId = enrollmentIdToTeiId?.[errorReport.uid];
-        if (!teiId) {
-            return null;
-        }
-        return `#/enrollment?${buildUrlQueryString({
-            teiId,
-            programId,
-            orgUnitId,
-            enrollmentId: errorReport.uid,
-        })}`;
-    }
-
-    // Only link an event UID we can vouch for — the error may reference a UID
-    // the server rejected as nonexistent, and linking there is a dead end.
-    if (!knownEventUids?.has(errorReport.uid)) {
-        return null;
-    }
-
-    try {
-        const program = getProgramFromProgramIdThrowIfNotFound(programId);
-        if (program instanceof EventProgram) {
-            return `#/viewEvent?${buildUrlQueryString({ viewEventId: errorReport.uid, orgUnitId })}`;
-        }
-        return `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: errorReport.uid, orgUnitId })}`;
-    } catch (error) {
-        log.error(errorCreator('Could not build record URL for error report')({ error, programId }));
-        return null;
-    }
-};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
index 483e52bab6..a1265ab833 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
@@ -1,2 +1,2 @@
-export { getRecordUrlFromErrorReport } from './getRecordUrlFromErrorReport';
+export { getRecordPathFromErrorReport } from './getRecordPathFromErrorReport';
 export { extractValidationReport } from './extractValidationReport';

From 34cbd202163513243de7138b270b28a301728b68 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Thu, 6 Aug 2026 09:57:07 +0000
Subject: [PATCH 07/12] feat: refactor temp

---
 i18n/en.pot                                   |  10 +-
 .../Actions/CompleteAction/CompleteAction.tsx |  83 +++----
 .../hooks/useBulkCompleteEvents.ts            |  96 +++-----
 .../Actions/DeleteAction/DeleteAction.tsx     | 164 ++++---------
 .../DeleteAction/hooks/useBulkDeleteEvents.ts |  50 ++++
 .../Actions/CompleteAction/CompleteAction.tsx |  20 +-
 .../hooks/useCompleteBulkEnrollments.ts       | 227 ++++++++----------
 .../EnrollmentDeleteModal.tsx                 | 112 ++++-----
 .../hooks/useDeleteEnrollments.ts             | 134 +++++------
 .../DeleteTeiAction/DeleteTeiAction.tsx       | 127 ++++------
 .../hooks/useCascadeDeleteTei.ts              |  58 ++---
 .../BulkActionConfirmModal.tsx                |  52 ++++
 .../BulkActionConfirmModal/index.ts           |   1 +
 .../BulkActionErrorDetails.component.tsx      |  40 +--
 .../BulkActionErrorModal.tsx                  |  48 ++++
 .../BulkActionErrorModal/index.ts             |   1 +
 .../BulkActionBar/hooks/index.ts              |   1 +
 .../hooks/useBulkMutationWithValidation.ts    |  72 ++++++
 .../WorkingListsCommon/BulkActionBar/types.ts |  19 ++
 .../utils/errorReportHrefResolvers.ts         |  93 +++++++
 .../utils/extractValidationReport.ts          |  17 +-
 .../utils/getRecordPathFromErrorReport.ts     |  91 -------
 .../BulkActionBar/utils/index.ts              |   6 +-
 23 files changed, 767 insertions(+), 755 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/BulkActionConfirmModal.tsx
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/index.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/BulkActionErrorModal.tsx
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/index.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts
 create mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index 1e0eba8e23..a81ffed0eb 100644
--- a/i18n/en.pot
+++ b/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-06T09:19:30.694Z\n"
-"PO-Revision-Date: 2026-08-06T09:19:30.694Z\n"
+"POT-Creation-Date: 2026-08-06T09:57:09.241Z\n"
+"PO-Revision-Date: 2026-08-06T09:57:09.241Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -1995,9 +1995,6 @@ msgstr "An error occurred while completing events"
 msgid "You do not have access to delete events"
 msgstr "You do not have access to delete events"
 
-msgid "An error occurred while deleting the events"
-msgstr "An error occurred while deleting the events"
-
 msgid "Delete events"
 msgstr "Delete events"
 
@@ -2013,6 +2010,9 @@ msgstr "Error deleting events"
 msgid "There was an error while deleting the events. Please see the details below."
 msgstr "There was an error while deleting the events. Please see the details below."
 
+msgid "An error occurred while deleting the events"
+msgstr "An error occurred while deleting the events"
+
 msgid "Owner organisation unit"
 msgstr "Owner organisation unit"
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
index abdb7f5616..587d02b8ab 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -1,10 +1,13 @@
 import React, { type ComponentType, useMemo, useState } from 'react';
 import i18n from '@dhis2/d2-i18n';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
-import { Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
+import {
+    Button, ButtonStrip, colors, Modal, ModalActions, ModalContent, ModalTitle,
+} from '@dhis2/ui';
 import { useBulkCompleteEvents } from './hooks/useBulkCompleteEvents';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
-import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
+import { BulkActionErrorModal } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorModal';
+import { createEventErrorHrefResolver } from '../../../../WorkingListsCommon/BulkActionBar/utils';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { Props } from './CompleteAction.types';
 
@@ -40,9 +43,9 @@ const CompleteActionPlain = ({
 }: Props & WithStyles<typeof styles>) => {
     const [isCompleteDialogOpen, setIsCompleteDialogOpen] = useState(false);
     const { orgUnitId } = useLocationQuery();
-    const knownEventUids = useMemo(() => new Set(Object.keys(selectedRows)), [selectedRows]);
+    const disabled = !stageDataWriteAccess || Boolean(bulkDataEntryIsActive);
     const tooltipContent = getTooltipContent(stageDataWriteAccess, bulkDataEntryIsActive);
-    const disabled = Boolean(!stageDataWriteAccess || bulkDataEntryIsActive);
+
     const {
         eventCounts,
         isLoading,
@@ -58,6 +61,17 @@ const CompleteActionPlain = ({
         programId,
     });
 
+    const getRecordHref = useMemo(
+        () => createEventErrorHrefResolver({
+            programId,
+            orgUnitId,
+            knownEventUids: new Set(Object.keys(selectedRows)),
+        }),
+        [programId, orgUnitId, selectedRows],
+    );
+
+    const closeDialog = () => setIsCompleteDialogOpen(false);
+
     return (
         <>
             <ConditionalTooltip
@@ -76,77 +90,48 @@ const CompleteActionPlain = ({
             {isCompleteDialogOpen && eventCounts && !validationError && (
                 <Modal
                     small
-                    onClose={() => setIsCompleteDialogOpen(false)}
-                    dataTest={'bulk-complete-events-dialog'}
+                    onClose={closeDialog}
+                    dataTest="bulk-complete-events-dialog"
                 >
-                    <ModalTitle>
-                        {i18n.t('Complete events')}
-                    </ModalTitle>
-
+                    <ModalTitle>{i18n.t('Complete events')}</ModalTitle>
                     <ModalContent>
                         <span className={classes.container}>
-                            {eventCounts.active > 0 ?
-                                i18n.t('Are you sure you want to complete all active events in selection?')
-                                :
-                                i18n.t('There are no active events to complete in the current selection.')
+                            {eventCounts.active > 0
+                                ? i18n.t('Are you sure you want to complete all active events in selection?')
+                                : i18n.t('There are no active events to complete in the current selection.')
                             }
                         </span>
                     </ModalContent>
-
                     <ModalActions>
                         <ButtonStrip>
                             <Button
                                 secondary
-                                onClick={() => setIsCompleteDialogOpen(false)}
+                                onClick={closeDialog}
                             >
                                 {i18n.t('Cancel')}
                             </Button>
-
                             <Button
                                 primary
                                 onClick={onCompleteEvents}
-                                disabled={isLoading || eventCounts?.active === 0}
+                                disabled={isLoading || eventCounts.active === 0}
                                 loading={isCompletingEvents}
                             >
                                 {i18n.t('Complete')}
                             </Button>
                         </ButtonStrip>
                     </ModalActions>
-
                 </Modal>
             )}
 
             {isCompleteDialogOpen && validationError && (
-                <Modal
-                    small
-                    onClose={() => setIsCompleteDialogOpen(false)}
-                    dataTest={'bulk-complete-events-dialog'}
-                >
-                    <ModalTitle>
-                        {i18n.t('Error completing events')}
-                    </ModalTitle>
-
-                    <ModalContent>
-                        <BulkActionErrorDetails
-                            introText={i18n.t('There was an error completing the events.')}
-                            errorReports={validationError?.validationReport?.errorReports}
-                            programId={programId}
-                            orgUnitId={orgUnitId}
-                            knownEventUids={knownEventUids}
-                        />
-                    </ModalContent>
-
-                    <ModalActions>
-                        <ButtonStrip>
-                            <Button
-                                secondary
-                                onClick={() => setIsCompleteDialogOpen(false)}
-                            >
-                                {i18n.t('Close')}
-                            </Button>
-                        </ButtonStrip>
-                    </ModalActions>
-                </Modal>
+                <BulkActionErrorModal
+                    title={i18n.t('Error completing events')}
+                    introText={i18n.t('There was an error completing the events.')}
+                    errorReports={validationError.validationReport.errorReports}
+                    getRecordHref={getRecordHref}
+                    onClose={closeDialog}
+                    dataTest="bulk-complete-events-dialog"
+                />
             )}
         </>
     );
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
index efb71a057d..9d40765855 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.ts
@@ -1,14 +1,13 @@
-import { useCallback, useEffect, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import i18n from '@dhis2/d2-i18n';
-import { useMutation } from '@tanstack/react-query';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { FEATURES, featureAvailable } from 'capture-core-utils';
 import { useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
-import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
+import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
 
 type Props = {
-    selectedRows: { [key: string]: boolean };
+    selectedRows: Record<string, boolean>;
     isCompleteDialogOpen: boolean;
     setIsCompleteDialogOpen: (isCompleteDialogOpen: boolean) => void;
     onUpdateList: (disableClearSelection?: boolean) => void;
@@ -16,6 +15,8 @@ type Props = {
     programId?: string;
 };
 
+type Payload = Array<{ event: string; [key: string]: any }>;
+
 export const useBulkCompleteEvents = ({
     selectedRows,
     isCompleteDialogOpen,
@@ -59,63 +60,50 @@ export const useBulkCompleteEvents = ({
                     } else {
                         acc.completedEvents.push(event);
                     }
-
                     return acc;
                 }, { activeEvents: [], completedEvents: [] });
             },
         },
     );
 
-    const {
-        mutate: completeEvents,
-        isPending: isCompletingEvents,
-        data,
-        error,
-        reset: resetCompleteEvents,
-    } = useMutation<any, any, { payload: any }>(
-        ({ payload }: { payload: any }) => dataEngine.mutate({
+    const mutationFn = useCallback(
+        ({ payload }: { payload: Payload }) => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=UPDATE&atomicMode=OBJECT',
             type: 'create',
-            data: {
-                events: payload,
-            },
-        }),
-        {
-            onError: (serverResponse) => {
-                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
-                    showAlert({ message: i18n.t('An error occurred while completing events') });
-                }
-            },
-            onSuccess: (response, { payload }: any) => {
-                const errorReports = response?.validationReport?.errorReports;
-                if (errorReports && errorReports.length) {
-                    const eventIds = payload.map(event => event.event);
-                    const validEventIds = eventIds
-                        .filter(eventId => !errorReports
-                            .find(errorReport => errorReport.uid === eventId),
-                        );
-
-                    removeRowsFromSelection(validEventIds);
-                    onUpdateList(true);
-                } else {
-                    onUpdateList();
-                    setIsCompleteDialogOpen(false);
-                }
-            },
-        },
+            data: { events: payload },
+        }) as Promise<any>,
+        [dataEngine],
     );
 
-    const validationError = useMemo(
-        () => extractValidationReport({ data, error }),
-        [data, error],
-    );
+    const {
+        mutate: completeEvents,
+        isPending: isCompletingEvents,
+        validationError,
+    } = useBulkMutationWithValidation<any, { payload: Payload }>({
+        mutationFn,
+        active: isCompleteDialogOpen,
+        onSuccess: () => {
+            onUpdateList();
+            setIsCompleteDialogOpen(false);
+        },
+        onPartialSuccess: (report, { payload }) => {
+            const errorReports = report.validationReport.errorReports;
+            const erroredUids = new Set(errorReports.map(e => e.uid).filter(Boolean));
+            const validEventIds = payload
+                .map(event => event.event)
+                .filter(id => !erroredUids.has(id));
+            removeRowsFromSelection(validEventIds);
+            onUpdateList(true);
+        },
+        onFatalError: () => {
+            showAlert({ message: i18n.t('An error occurred while completing events') });
+        },
+    });
 
     const onCompleteEvents = useCallback(() => {
-        if (!events) {
-            return;
-        }
+        if (!events) return;
 
-        const serverPayload = events.activeEvents.map(event => ({
+        const serverPayload: Payload = events.activeEvents.map((event: any) => ({
             ...event,
             status: 'COMPLETED',
             program: event.program || programId || event.programId,
@@ -125,25 +113,15 @@ export const useBulkCompleteEvents = ({
     }, [completeEvents, events, programId]);
 
     const eventCounts = useMemo(() => {
-        if (!events) {
-            return null;
-        }
-
+        if (!events) return null;
         return {
             active: events.activeEvents.length,
             completed: events.completedEvents.length,
         };
     }, [events]);
 
-    useEffect(() => {
-        if (!isCompleteDialogOpen) {
-            resetCompleteEvents();
-        }
-    }, [isCompleteDialogOpen, resetCompleteEvents]);
-
     return {
         eventCounts,
-        error,
         validationError,
         onCompleteEvents,
         isCompletingEvents,
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index d758504b80..f3827ead29 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -1,14 +1,16 @@
 import React, { useMemo, useState } from 'react';
-import log from 'loglevel';
 import i18n from '@dhis2/d2-i18n';
-import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
-import { useMutation } from '@tanstack/react-query';
-import { useAlert, useDataEngine } from '@dhis2/app-runtime';
-import { errorCreator } from 'capture-core-utils';
+import { Button } from '@dhis2/ui';
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
-import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
-import { extractValidationReport } from '../../../../WorkingListsCommon/BulkActionBar/utils';
+import {
+    BulkActionConfirmModal,
+} from '../../../../WorkingListsCommon/BulkActionBar/BulkActionConfirmModal';
+import {
+    BulkActionErrorModal,
+} from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorModal';
+import { createEventErrorHrefResolver } from '../../../../WorkingListsCommon/BulkActionBar/utils';
 import { useLocationQuery } from '../../../../../../utils/routing';
+import { useBulkDeleteEvents } from './hooks/useBulkDeleteEvents';
 import type { Props } from './DeleteAction.types';
 
 const getTooltipContent = (stageDataWriteAccess?: boolean, bulkDataEntryIsActive?: boolean) => {
@@ -29,64 +31,34 @@ export const DeleteAction = ({
     programId,
 }: Props) => {
     const [isModalOpen, setIsModalOpen] = useState(false);
-    const dataEngine = useDataEngine();
     const { orgUnitId } = useLocationQuery();
-    const knownEventUids = useMemo(() => new Set(Object.keys(selectedRows)), [selectedRows]);
-    const { show: showAlert } = useAlert(
-        ({ message }) => message,
-        { critical: true },
-    );
-
     const tooltipContent = getTooltipContent(stageDataWriteAccess, bulkDataEntryIsActive);
-    const disabled = Boolean(!stageDataWriteAccess || !!bulkDataEntryIsActive);
+    const disabled = !stageDataWriteAccess || Boolean(bulkDataEntryIsActive);
 
     const {
         mutate: deleteEvents,
         isPending,
-        data: deleteData,
-        error: deleteError,
-        reset: resetDeleteEvents,
-    }: {
-        mutate: any,
-        isPending: boolean,
-        data: any,
-        error: any,
-        reset: () => void,
-    } = useMutation(
-        () => dataEngine.mutate({
-            resource: 'tracker?async=false&importStrategy=DELETE',
-            type: 'create',
-            data: {
-                events: Object
-                    .keys(selectedRows)
-                    .map(id => ({ event: id })),
-            },
-        }),
-        {
-            onError: (serverResponse: any) => {
-                log.error(errorCreator('An error occurred while deleting the events')({ serverResponse }));
-                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
-                    showAlert({ message: i18n.t('An error occurred while deleting the events') });
-                }
-            },
-            // Defensive against a future switch to atomicMode=OBJECT, where partial-failure
-            // reports would arrive on `data` (HTTP 200) rather than as an HTTP error.
-            onSuccess: (response: any) => {
-                if (response?.validationReport?.errorReports?.length) return;
-                onUpdateList();
-                setIsModalOpen(false);
-            },
-        },
-    );
+        validationError,
+        reset,
+    } = useBulkDeleteEvents({
+        selectedRows,
+        active: isModalOpen,
+        onUpdateList,
+        setIsModalOpen,
+    });
 
-    const validationError = useMemo(
-        () => extractValidationReport({ data: deleteData, error: deleteError }),
-        [deleteData, deleteError],
+    const getRecordHref = useMemo(
+        () => createEventErrorHrefResolver({
+            programId,
+            orgUnitId,
+            knownEventUids: new Set(Object.keys(selectedRows)),
+        }),
+        [programId, orgUnitId, selectedRows],
     );
 
     const closeModal = () => {
         setIsModalOpen(false);
-        resetDeleteEvents();
+        reset();
     };
 
     return (
@@ -105,76 +77,32 @@ export const DeleteAction = ({
             </ConditionalTooltip>
 
             {isModalOpen && !validationError && (
-                <Modal
-                    small
-                    onClose={closeModal}
-                    dataTest={'bulk-delete-events-dialog'}
+                <BulkActionConfirmModal
+                    title={i18n.t('Delete events')}
+                    confirmLabel={i18n.t('Delete')}
+                    onConfirm={() => deleteEvents()}
+                    onCancel={closeModal}
+                    isPending={isPending}
+                    dataTest="bulk-delete-events-dialog"
                 >
-                    <ModalTitle>
-                        {i18n.t('Delete events')}
-                    </ModalTitle>
-
-                    <ModalContent>
-                        {i18n.t('This cannot be undone.')}
-                        {' '}
-                        {i18n.t('Are you sure you want to delete the selected events?')}
-                    </ModalContent>
-
-                    <ModalActions>
-                        <ButtonStrip>
-                            <Button
-                                secondary
-                                onClick={closeModal}
-                            >
-                                {i18n.t('Cancel')}
-                            </Button>
-                            <Button
-                                destructive
-                                onClick={deleteEvents}
-                                loading={isPending}
-                            >
-                                {i18n.t('Delete')}
-                            </Button>
-                        </ButtonStrip>
-                    </ModalActions>
-                </Modal>
+                    {i18n.t('This cannot be undone.')}
+                    {' '}
+                    {i18n.t('Are you sure you want to delete the selected events?')}
+                </BulkActionConfirmModal>
             )}
 
             {isModalOpen && validationError && (
-                <Modal
-                    small
+                <BulkActionErrorModal
+                    title={i18n.t('Error deleting events')}
+                    introText={i18n.t(
+                        'There was an error while deleting the events. Please see the details below.',
+                    )}
+                    errorReports={validationError.validationReport.errorReports}
+                    getRecordHref={getRecordHref}
                     onClose={closeModal}
-                    dataTest={'bulk-delete-events-dialog'}
-                >
-                    <ModalTitle>
-                        {i18n.t('Error deleting events')}
-                    </ModalTitle>
-
-                    <ModalContent>
-                        <BulkActionErrorDetails
-                            introText={i18n.t(
-                                'There was an error while deleting the events. Please see the details below.',
-                            )}
-                            errorReports={validationError?.validationReport?.errorReports}
-                            programId={programId}
-                            orgUnitId={orgUnitId}
-                            knownEventUids={knownEventUids}
-                        />
-                    </ModalContent>
-
-                    <ModalActions>
-                        <ButtonStrip>
-                            <Button
-                                secondary
-                                onClick={closeModal}
-                            >
-                                {i18n.t('Close')}
-                            </Button>
-                        </ButtonStrip>
-                    </ModalActions>
-                </Modal>
+                    dataTest="bulk-delete-events-dialog"
+                />
             )}
         </>
     );
 };
-
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts
new file mode 100644
index 0000000000..54da082e1e
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts
@@ -0,0 +1,50 @@
+import { useCallback } from 'react';
+import log from 'loglevel';
+import i18n from '@dhis2/d2-i18n';
+import { useAlert, useDataEngine } from '@dhis2/app-runtime';
+import { errorCreator } from 'capture-core-utils';
+import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
+
+type Props = {
+    selectedRows: Record<string, boolean>;
+    active: boolean;
+    onUpdateList: () => void;
+    setIsModalOpen: (open: boolean) => void;
+};
+
+export const useBulkDeleteEvents = ({
+    selectedRows,
+    active,
+    onUpdateList,
+    setIsModalOpen,
+}: Props) => {
+    const dataEngine = useDataEngine();
+    const { show: showAlert } = useAlert(
+        ({ message }) => message,
+        { critical: true },
+    );
+
+    const mutationFn = useCallback(
+        () => dataEngine.mutate({
+            resource: 'tracker?async=false&importStrategy=DELETE',
+            type: 'create',
+            data: {
+                events: Object.keys(selectedRows).map(id => ({ event: id })),
+            },
+        }),
+        [dataEngine, selectedRows],
+    );
+
+    return useBulkMutationWithValidation<any, void>({
+        mutationFn,
+        active,
+        onSuccess: () => {
+            onUpdateList();
+            setIsModalOpen(false);
+        },
+        onFatalError: (serverResponse) => {
+            log.error(errorCreator('An error occurred while deleting the events')({ serverResponse }));
+            showAlert({ message: i18n.t('An error occurred while deleting the events') });
+        },
+    });
+};
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
index 4a19ba8f3f..02ad7316a0 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/CompleteAction.tsx
@@ -1,6 +1,6 @@
 import i18n from '@dhis2/d2-i18n';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import {
     Button,
     ButtonStrip,
@@ -15,6 +15,7 @@ import {
 import { ConditionalTooltip } from '../../../../../Tooltips/ConditionalTooltip';
 import { useCompleteBulkEnrollments } from './hooks/useCompleteBulkEnrollments';
 import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
+import { createEnrollmentErrorHrefResolver } from '../../../../WorkingListsCommon/BulkActionBar/utils';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import type { PlainProps } from './CompleteAction.types';
 
@@ -78,6 +79,16 @@ const CompleteActionPlain = ({
     const tooltipContent = getTooltipContent(programDataWriteAccess, bulkDataEntryIsActive);
     const disabled = !programDataWriteAccess || bulkDataEntryIsActive;
 
+    const getRecordHref = useMemo(
+        () => createEnrollmentErrorHrefResolver({
+            programId,
+            orgUnitId,
+            enrollmentIdToTeiId,
+            knownEventUids,
+        }),
+        [programId, orgUnitId, enrollmentIdToTeiId, knownEventUids],
+    );
+
     const ModalTextContent = () => {
         // If the data is still loading, show a spinner
         if (!enrollmentCounts || isLoading) {
@@ -90,7 +101,7 @@ const CompleteActionPlain = ({
 
         // If there was an error importing the data, show an error message
         if (validationError) {
-            const errors = validationError?.validationReport?.errorReports;
+            const errors = validationError.validationReport.errorReports;
             const introText = hasPartiallyUploadedEnrollments
                 // eslint-disable-next-line max-len
                 ? i18n.t('Some enrollments were completed successfully, but there was an error while completing the rest. Please see the details below.')
@@ -99,10 +110,7 @@ const CompleteActionPlain = ({
                 <BulkActionErrorDetails
                     introText={introText}
                     errorReports={errors}
-                    programId={programId}
-                    orgUnitId={orgUnitId}
-                    enrollmentIdToTeiId={enrollmentIdToTeiId}
-                    knownEventUids={knownEventUids}
+                    getRecordHref={getRecordHref}
                 />
             );
         }
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index 94bc479f53..d85189f93a 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import i18n from '@dhis2/d2-i18n';
@@ -6,11 +6,20 @@ import log from 'loglevel';
 import { errorCreator, FEATURES, featureAvailable } from 'capture-core-utils';
 import { ReactQueryAppNamespace, useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
-import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
+import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
+import type { ErrorReport } from '../../../../../WorkingListsCommon/BulkActionBar/types';
 import type { ProgramStage } from '../../../../../../../metaData';
 
+type Enrollment = {
+    enrollment: string;
+    trackedEntity: string;
+    status?: string;
+    events?: Array<{ event: string; programStage: string; status?: string; [key: string]: any }>;
+    [key: string]: any;
+};
+
 type Props = {
-    selectedRows: Record<string, any>;
+    selectedRows: Record<string, boolean>;
     programId: string;
     stages: Map<string, ProgramStage>;
     modalIsOpen: boolean;
@@ -18,27 +27,32 @@ type Props = {
     removeRowsFromSelection: (rows: Array<string>) => void;
 };
 
-const validateEnrollments = async ({ dataEngine, enrollments }) => dataEngine.mutate({
-    resource: 'tracker?async=false&importStrategy=UPDATE&importMode=VALIDATE',
-    type: 'create',
-    data: () => ({ enrollments }),
-});
+const validateEnrollments = async ({ dataEngine, enrollments }: { dataEngine: any; enrollments: Enrollment[] }) =>
+    dataEngine.mutate({
+        resource: 'tracker?async=false&importStrategy=UPDATE&importMode=VALIDATE',
+        type: 'create',
+        data: () => ({ enrollments }),
+    });
 
-const importValidEnrollments = async ({ dataEngine, enrollments }) => dataEngine.mutate({
-    resource: 'tracker?async=false&importStrategy=UPDATE&importMode=COMMIT',
-    type: 'create',
-    data: () => ({ enrollments }),
-});
+const importValidEnrollments = async ({ dataEngine, enrollments }: { dataEngine: any; enrollments: Enrollment[] }) =>
+    dataEngine.mutate({
+        resource: 'tracker?async=false&importStrategy=UPDATE&importMode=COMMIT',
+        type: 'create',
+        data: () => ({ enrollments }),
+    });
 
-const formatServerPayload = (trackedEntities, completeEvents, stages) => {
-    const enrollments = trackedEntities?.activeEnrollments ?? [];
-    let updatedEnrollments;
+const formatServerPayload = (
+    trackedEntities: any,
+    completeEvents: boolean,
+    stages: Map<string, ProgramStage>,
+): Enrollment[] => {
+    const enrollments: Enrollment[] = trackedEntities?.activeEnrollments ?? [];
 
     if (completeEvents) {
-        updatedEnrollments = enrollments.map(enrollment => ({
+        return enrollments.map(enrollment => ({
             ...enrollment,
             status: 'COMPLETED',
-            events: enrollment.events
+            events: (enrollment.events ?? [])
                 .filter((event) => {
                     const access = stages.get(event.programStage)?.access?.data?.write;
                     const isEventActive = event.status === 'ACTIVE';
@@ -46,37 +60,32 @@ const formatServerPayload = (trackedEntities, completeEvents, stages) => {
                 })
                 .map(event => ({ ...event, status: 'COMPLETED' })),
         }));
-    } else {
-        updatedEnrollments = enrollments.map(enrollment => ({
-            ...enrollment,
-            status: 'COMPLETED',
-            events: [],
-        }));
     }
 
-    return updatedEnrollments;
+    return enrollments.map(enrollment => ({
+        ...enrollment,
+        status: 'COMPLETED',
+        events: [],
+    }));
 };
 
-const filterValidEnrollments = (enrollments, errors) => {
-    const invalidEnrollments = new Set();
+const filterValidEnrollments = (enrollments: Enrollment[], errors: ErrorReport[]): Enrollment[] => {
+    const invalidEnrollments = new Set<string>();
 
-    errors.forEach((apiErrorMessage) => {
-        if (apiErrorMessage.trackerType === 'ENROLLMENT') {
-            invalidEnrollments.add(apiErrorMessage.uid);
-        } else if (apiErrorMessage.trackerType === 'EVENT') {
+    errors.forEach((errorReport) => {
+        if (errorReport.trackerType === 'ENROLLMENT' && errorReport.uid) {
+            invalidEnrollments.add(errorReport.uid);
+        } else if (errorReport.trackerType === 'EVENT' && errorReport.uid) {
             const invalidEnrollment = enrollments.find(enrollment =>
-                enrollment.events.some(event => event.event === apiErrorMessage.uid),
+                enrollment.events?.some(event => event.event === errorReport.uid),
             );
-
             if (invalidEnrollment) {
                 invalidEnrollments.add(invalidEnrollment.enrollment);
             }
         }
     });
 
-    return enrollments.filter(
-        enrollment => !invalidEnrollments.has(enrollment.enrollment),
-    );
+    return enrollments.filter(enrollment => !invalidEnrollments.has(enrollment.enrollment));
 };
 
 
@@ -95,17 +104,12 @@ export const useCompleteBulkEnrollments = ({
         { critical: true },
     );
 
-    const removeQueries = () => {
-        queryClient.removeQueries(
-            [
-                ReactQueryAppNamespace,
-                'WorkingLists',
-                'BulkActionBar',
-                'CompleteAction',
-                'trackedEntities',
-            ],
-        );
-    };
+    const removeQueries = useCallback(() => {
+        queryClient.removeQueries([
+            ReactQueryAppNamespace,
+            'WorkingLists', 'BulkActionBar', 'CompleteAction', 'trackedEntities',
+        ]);
+    }, [queryClient]);
 
     const {
         data: trackedEntities,
@@ -134,22 +138,17 @@ export const useCompleteBulkEnrollments = ({
                 const apiTrackedEntities = handleAPIResponse(REQUESTED_ENTITIES.trackedEntities, data);
                 if (!apiTrackedEntities) return null;
 
-                const { activeEnrollments, completedEnrollments } = apiTrackedEntities
-                    .flatMap(trackedEntity => trackedEntity.enrollments)
-                    .reduce((acc, enrollment) => {
+                return apiTrackedEntities
+                    .flatMap((trackedEntity: any) => trackedEntity.enrollments)
+                    .reduce((acc: { activeEnrollments: Enrollment[]; completedEnrollments: Enrollment[] },
+                        enrollment: Enrollment) => {
                         if (enrollment.status === 'ACTIVE') {
                             acc.activeEnrollments.push(enrollment);
                         } else {
                             acc.completedEnrollments.push(enrollment);
                         }
-
                         return acc;
                     }, { activeEnrollments: [], completedEnrollments: [] });
-
-                return {
-                    activeEnrollments,
-                    completedEnrollments,
-                };
             },
         },
     );
@@ -157,8 +156,8 @@ export const useCompleteBulkEnrollments = ({
     const {
         mutate: importEnrollments,
         isPending: isImportingEnrollments,
-    } = useMutation<any>(
-        ({ enrollments }: any) => importValidEnrollments({ dataEngine, enrollments }),
+    } = useMutation(
+        ({ enrollments }: { enrollments: Enrollment[] }) => importValidEnrollments({ dataEngine, enrollments }),
         {
             onSuccess: () => {
                 onUpdateList();
@@ -167,12 +166,9 @@ export const useCompleteBulkEnrollments = ({
             onError: (serverResponse, variables) => {
                 removeQueries();
                 showAlert({ message: i18n.t('An error occurred when completing the enrollments') });
-                log.error(
-                    errorCreator('An error occurred when completing enrollments')({
-                        serverResponse,
-                        variables,
-                    }),
-                );
+                log.error(errorCreator('An error occurred when completing enrollments')({
+                    serverResponse, variables,
+                }));
             },
         },
     );
@@ -182,9 +178,9 @@ export const useCompleteBulkEnrollments = ({
         isPending: isImportingPartialEnrollments,
         isSuccess: hasPartiallyUploadedEnrollments,
     } = useMutation(
-        ({ enrollments }: any) => importValidEnrollments({ dataEngine, enrollments }),
+        ({ enrollments }: { enrollments: Enrollment[] }) => importValidEnrollments({ dataEngine, enrollments }),
         {
-            onSuccess: (serverResponse, { enrollments }) => {
+            onSuccess: (_response, { enrollments }) => {
                 const enrollmentIds = enrollments.map(enrollment => enrollment.trackedEntity);
                 removeRowsFromSelection(enrollmentIds);
                 removeQueries();
@@ -192,65 +188,52 @@ export const useCompleteBulkEnrollments = ({
             },
             onError: (serverResponse, variables) => {
                 showAlert({ message: i18n.t('An error occurred when completing the enrollments') });
-                log.error(
-                    errorCreator('An error occurred when completing enrollments')({
-                        serverResponse,
-                        variables,
-                    }),
-                );
+                log.error(errorCreator('An error occurred when completing enrollments')({
+                    serverResponse, variables,
+                }));
             },
         },
     );
 
-    const {
-        mutate: onValidateEnrollments,
-        isPending: isCompletingEnrollments,
-        error: validateError,
-        reset: resetCompleteEnrollments,
-    } = useMutation<any>(
-        ({ enrollments }: any) => validateEnrollments({
-            dataEngine,
-            enrollments,
-        }),
-        {
-            onSuccess: (serverResponse: any, { enrollments }: any) => {
-                importEnrollments({ enrollments } as any);
-            },
-            onError: (serverResponse: any, { enrollments }: any) => {
-                const errors = serverResponse?.details?.validationReport?.errorReports;
-                if (!errors) {
-                    log.error(
-                        errorCreator('An unknown error occurred when completing enrollments',
-                        )({
-                            serverResponse,
-                            enrollments,
-                        }));
-                    showAlert({ message: i18n.t('An unknown error occurred when completing enrollments') });
-                    return;
-                }
-                const validEnrollments = filterValidEnrollments(enrollments, errors);
-
-                if (validEnrollments.length === 0) {
-                    return;
-                }
+    const validateMutationFn = useCallback(
+        ({ enrollments }: { enrollments: Enrollment[] }) =>
+            validateEnrollments({ dataEngine, enrollments }) as Promise<any>,
+        [dataEngine],
+    );
 
-                importPartialEnrollments({ enrollments: validEnrollments });
-            },
+    const {
+        mutate: validateAndImportEnrollments,
+        isPending: isValidatingEnrollments,
+        validationError,
+    } = useBulkMutationWithValidation<any, { enrollments: Enrollment[] }>({
+        mutationFn: validateMutationFn,
+        active: modalIsOpen,
+        onSuccess: (_response, { enrollments }) => {
+            importEnrollments({ enrollments });
         },
-    );
+        onValidationError: (report, { enrollments }) => {
+            const validEnrollments = filterValidEnrollments(
+                enrollments,
+                report.validationReport.errorReports,
+            );
+            if (validEnrollments.length === 0) return;
+            importPartialEnrollments({ enrollments: validEnrollments });
+        },
+        onFatalError: (error, { enrollments }) => {
+            log.error(errorCreator('An unknown error occurred when completing enrollments')({
+                error, enrollments,
+            }));
+            showAlert({ message: i18n.t('An unknown error occurred when completing enrollments') });
+        },
+    });
 
     const enrollmentCounts = useMemo(() => ({
         active: trackedEntities?.activeEnrollments?.length ?? 0,
         completed: trackedEntities?.completedEnrollments?.length ?? 0,
     }), [trackedEntities]);
 
-    const validationError = useMemo(
-        () => extractValidationReport({ error: validateError }),
-        [validateError],
-    );
-
     const enrollmentIdToTeiId = useMemo(() => {
-        const allEnrollments = [
+        const allEnrollments: Enrollment[] = [
             ...(trackedEntities?.activeEnrollments ?? []),
             ...(trackedEntities?.completedEnrollments ?? []),
         ];
@@ -266,24 +249,18 @@ export const useCompleteBulkEnrollments = ({
     // so limit the vouched-UID set to that same scope.
     const knownEventUids = useMemo(() => {
         const set = new Set<string>();
-        (trackedEntities?.activeEnrollments ?? []).forEach((enrollment: any) => {
-            (enrollment?.events ?? []).forEach((event: any) => {
-                if (event?.event) set.add(event.event);
+        (trackedEntities?.activeEnrollments ?? []).forEach((enrollment: Enrollment) => {
+            (enrollment.events ?? []).forEach((event) => {
+                if (event.event) set.add(event.event);
             });
         });
         return set;
     }, [trackedEntities]);
 
-    useEffect(() => {
-        if (!modalIsOpen) {
-            resetCompleteEnrollments();
-        }
-    }, [modalIsOpen, resetCompleteEnrollments]);
-
-    const onStartCompleteEnrollments = ({ completeEvents }: { completeEvents: boolean }) => {
+    const onStartCompleteEnrollments = useCallback(({ completeEvents }: { completeEvents: boolean }) => {
         const enrollments = formatServerPayload(trackedEntities, completeEvents, stages);
-        onValidateEnrollments({ completeEvents, enrollments } as any);
-    };
+        validateAndImportEnrollments({ enrollments });
+    }, [trackedEntities, stages, validateAndImportEnrollments]);
 
     return {
         completeEnrollments: onStartCompleteEnrollments,
@@ -293,7 +270,7 @@ export const useCompleteBulkEnrollments = ({
         isLoading: isInitialLoadingTrackedEntities,
         isError: isTrackedEntitiesError,
         validationError,
-        isCompleting: isImportingEnrollments || isImportingPartialEnrollments || isCompletingEnrollments,
+        isCompleting: isImportingEnrollments || isImportingPartialEnrollments || isValidatingEnrollments,
         hasPartiallyUploadedEnrollments,
     };
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
index e2ef0d2add..7055d35934 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
@@ -1,10 +1,13 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { Button, ButtonStrip, CircularLoader, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
 import { useDeleteEnrollments } from '../hooks/useDeleteEnrollments';
 import { CustomCheckbox } from './CustomCheckbox';
-import { BulkActionErrorDetails } from '../../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
+import {
+    BulkActionErrorModal,
+} from '../../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorModal';
+import { createEnrollmentErrorHrefResolver } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
 import { useLocationQuery } from '../../../../../../../utils/routing';
 import type { PlainProps } from './EnrollmentDeleteModal.types';
 
@@ -28,6 +31,7 @@ const EnrollmentDeleteModalPlain = ({
     setIsDeleteDialogOpen,
     classes,
 }: PlainProps & WithStyles<typeof styles>) => {
+    const { orgUnitId } = useLocationQuery();
     const {
         deleteEnrollments,
         isDeletingEnrollments,
@@ -42,32 +46,39 @@ const EnrollmentDeleteModalPlain = ({
     } = useDeleteEnrollments({
         selectedRows,
         programId,
+        active: true,
         onUpdateList,
         setIsDeleteDialogOpen,
     });
-    const { orgUnitId } = useLocationQuery();
+
+    const getRecordHref = useMemo(
+        () => createEnrollmentErrorHrefResolver({
+            programId,
+            orgUnitId,
+            enrollmentIdToTeiId,
+        }),
+        [programId, orgUnitId, enrollmentIdToTeiId],
+    );
+
+    const closeDialog = () => setIsDeleteDialogOpen(false);
 
     if (isEnrollmentsError) {
         return (
             <Modal
-                onClose={() => setIsDeleteDialogOpen(false)}
+                onClose={closeDialog}
                 small
             >
-                <ModalTitle>
-                    {i18n.t('Delete selected enrollments')}
-                </ModalTitle>
-
+                <ModalTitle>{i18n.t('Delete selected enrollments')}</ModalTitle>
                 <ModalContent>
                     <div className={classes.modalContent}>
                         {i18n.t('An error occurred while loading the selected enrollments. Please try again.')}
                     </div>
                 </ModalContent>
-
                 <ModalActions>
                     <ButtonStrip>
                         <Button
                             secondary
-                            onClick={() => setIsDeleteDialogOpen(false)}
+                            onClick={closeDialog}
                         >
                             {i18n.t('Cancel')}
                         </Button>
@@ -78,62 +89,34 @@ const EnrollmentDeleteModalPlain = ({
     }
 
     if (validationError) {
-        const errors = validationError?.validationReport?.errorReports;
         return (
-            <Modal
-                onClose={() => setIsDeleteDialogOpen(false)}
-                dataTest={'bulk-delete-enrollments-dialog'}
-            >
-                <ModalTitle>
-                    {i18n.t('Error deleting enrollments')}
-                </ModalTitle>
-
-                <ModalContent>
-                    <BulkActionErrorDetails
-                        introText={i18n.t(
-                            'There was an error while deleting the enrollments. Please see the details below.',
-                        )}
-                        errorReports={errors}
-                        programId={programId}
-                        orgUnitId={orgUnitId}
-                        enrollmentIdToTeiId={enrollmentIdToTeiId}
-                    />
-                </ModalContent>
-
-                <ModalActions>
-                    <ButtonStrip>
-                        <Button
-                            secondary
-                            onClick={() => setIsDeleteDialogOpen(false)}
-                        >
-                            {i18n.t('Close')}
-                        </Button>
-                    </ButtonStrip>
-                </ModalActions>
-            </Modal>
+            <BulkActionErrorModal
+                title={i18n.t('Error deleting enrollments')}
+                introText={i18n.t(
+                    'There was an error while deleting the enrollments. Please see the details below.',
+                )}
+                errorReports={validationError.validationReport.errorReports}
+                getRecordHref={getRecordHref}
+                onClose={closeDialog}
+                dataTest="bulk-delete-enrollments-dialog"
+            />
         );
     }
 
     if (isLoadingEnrollments || !enrollmentCounts) {
         return (
-            <Modal
-                onClose={() => setIsDeleteDialogOpen(false)}
-            >
-                <ModalTitle>
-                    {i18n.t('Delete selected enrollments')}
-                </ModalTitle>
-
+            <Modal onClose={closeDialog}>
+                <ModalTitle>{i18n.t('Delete selected enrollments')}</ModalTitle>
                 <ModalContent>
                     <span className={classes.loadingContainer}>
                         <CircularLoader />
                     </span>
                 </ModalContent>
-
                 <ModalActions>
                     <ButtonStrip>
                         <Button
                             secondary
-                            onClick={() => setIsDeleteDialogOpen(false)}
+                            onClick={closeDialog}
                         >
                             {i18n.t('Cancel')}
                         </Button>
@@ -145,24 +128,17 @@ const EnrollmentDeleteModalPlain = ({
 
     return (
         <Modal
-            onClose={() => setIsDeleteDialogOpen(false)}
-            dataTest={'bulk-delete-enrollments-dialog'}
+            onClose={closeDialog}
+            dataTest="bulk-delete-enrollments-dialog"
         >
-            <ModalTitle>
-                {i18n.t('Delete selected enrollments')}
-            </ModalTitle>
-
+            <ModalTitle>{i18n.t('Delete selected enrollments')}</ModalTitle>
             <ModalContent>
                 <div className={classes.modalContent}>
                     <div>
                         {/* eslint-disable-next-line max-len */}
                         {i18n.t('This action will permanently delete the selected enrollments, including all associated data and events.')}
                     </div>
-
-                    <div>
-                        {i18n.t('Please select which enrollment statuses you want to delete:')}
-                    </div>
-
+                    <div>{i18n.t('Please select which enrollment statuses you want to delete:')}</div>
                     <div>
                         <CustomCheckbox
                             disabled={enrollmentCounts.active === 0}
@@ -170,39 +146,35 @@ const EnrollmentDeleteModalPlain = ({
                             id="active"
                             checked={enrollmentCounts.active === 0 ? false : statusToDelete.active}
                             onChange={updateStatusToDelete}
-                            dataTest={'bulk-delete-enrollments-active-checkbox'}
+                            dataTest="bulk-delete-enrollments-active-checkbox"
                         />
-
                         <CustomCheckbox
                             disabled={enrollmentCounts.completed === 0}
                             label={i18n.t('Completed enrollments ({{count}})', { count: enrollmentCounts.completed })}
                             id="completed"
                             checked={enrollmentCounts.completed === 0 ? false : statusToDelete.completed}
                             onChange={updateStatusToDelete}
-                            dataTest={'bulk-delete-enrollments-completed-checkbox'}
+                            dataTest="bulk-delete-enrollments-completed-checkbox"
                         />
-
                         <CustomCheckbox
                             disabled={enrollmentCounts.cancelled === 0}
                             label={i18n.t('Cancelled enrollments ({{count}})', { count: enrollmentCounts.cancelled })}
                             id="cancelled"
                             onChange={updateStatusToDelete}
                             checked={enrollmentCounts.cancelled === 0 ? false : statusToDelete.cancelled}
-                            dataTest={'bulk-delete-enrollments-cancelled-checkbox'}
+                            dataTest="bulk-delete-enrollments-cancelled-checkbox"
                         />
                     </div>
                 </div>
             </ModalContent>
-
             <ModalActions>
                 <ButtonStrip>
                     <Button
                         secondary
-                        onClick={() => setIsDeleteDialogOpen(false)}
+                        onClick={closeDialog}
                     >
                         {i18n.t('Cancel')}
                     </Button>
-
                     <Button
                         destructive
                         // @ts-expect-error - keeping original functionality as before ts rewrite
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index 3e2e612462..84cbf9d4c0 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -1,16 +1,26 @@
 import { useCallback, useMemo, useState } from 'react';
 import log from 'loglevel';
 import i18n from '@dhis2/d2-i18n';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useQueryClient } from '@tanstack/react-query';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
 import { errorCreator, FEATURES, featureAvailable } from 'capture-core-utils';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
 import { ReactQueryAppNamespace, useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
-import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
+import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
+
+type Enrollment = {
+    enrollment: string;
+    program?: string;
+    status?: string;
+    trackedEntity: string;
+};
+
+type StatusToDelete = { active: boolean; completed: boolean; cancelled: boolean };
 
 type Props = {
     selectedRows: Record<string, boolean>;
     programId: string;
+    active: boolean;
     onUpdateList: () => void;
     setIsDeleteDialogOpen: (open: boolean) => void;
 };
@@ -20,11 +30,12 @@ const QueryKey = ['WorkingLists', 'BulkActionBar', 'DeleteEnrollmentsAction', 't
 export const useDeleteEnrollments = ({
     selectedRows,
     programId,
+    active,
     onUpdateList,
     setIsDeleteDialogOpen,
 }: Props) => {
     const queryClient = useQueryClient();
-    const [statusToDelete, setStatusToDelete] = useState({
+    const [statusToDelete, setStatusToDelete] = useState<StatusToDelete>({
         active: true,
         completed: true,
         cancelled: true,
@@ -38,7 +49,7 @@ export const useDeleteEnrollments = ({
     const updateStatusToDelete = useCallback((status: string) => {
         setStatusToDelete(prevStatus => ({
             ...prevStatus,
-            [status]: !prevStatus[status],
+            [status]: !prevStatus[status as keyof StatusToDelete],
         }));
     }, []);
 
@@ -64,12 +75,12 @@ export const useDeleteEnrollments = ({
         },
         {
             enabled: Object.keys(selectedRows).length > 0,
-            select: (data: any) => {
+            select: (data: any): Enrollment[] => {
                 const apiTrackedEntities = handleAPIResponse(REQUESTED_ENTITIES.trackedEntities, data);
                 if (!apiTrackedEntities) return [];
 
-                return apiTrackedEntities
-                    .flatMap(apiTrackedEntity => (apiTrackedEntity.enrollments ?? []).map((enrollment: any) => ({
+                return apiTrackedEntities.flatMap((apiTrackedEntity: any) =>
+                    (apiTrackedEntity.enrollments ?? []).map((enrollment: Enrollment) => ({
                         ...enrollment,
                         trackedEntity: enrollment.trackedEntity ?? apiTrackedEntity.trackedEntity,
                     })));
@@ -77,48 +88,41 @@ export const useDeleteEnrollments = ({
         },
     );
 
-    const {
-        mutate: deleteEnrollments,
-        isPending: isDeletingEnrollments,
-        data: deleteData,
-        error: deleteError,
-    } = useMutation<any, any>(
+    const mutationFn = useCallback(
         () => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
-                enrollments: enrollments
-                    .filter(({ status }) => status && statusToDelete[status.toLowerCase()])
+                enrollments: (enrollments ?? [])
+                    .filter(({ status }) => status && statusToDelete[status.toLowerCase() as keyof StatusToDelete])
                     .map(({ enrollment }) => ({ enrollment })),
             },
-        }),
-        {
-            onError: (serverResponse) => {
-                log.error(errorCreator('An error occurred when deleting enrollments')({ serverResponse }));
-                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
-                    showAlert({ message: i18n.t('An error occurred when deleting enrollments') });
-                }
-            },
-            // Defensive against a future switch to atomicMode=OBJECT, where partial-failure
-            // reports would arrive on `data` (HTTP 200) rather than as an HTTP error.
-            onSuccess: (response: any) => {
-                if (response?.validationReport?.errorReports?.length) return;
-                queryClient.removeQueries([ReactQueryAppNamespace, ...QueryKey]);
-                onUpdateList();
-                setIsDeleteDialogOpen(false);
-            },
-        },
+        }) as Promise<any>,
+        [dataEngine, enrollments, statusToDelete],
     );
 
-    const validationError = useMemo(
-        () => extractValidationReport({ data: deleteData, error: deleteError }),
-        [deleteData, deleteError],
-    );
+    const {
+        mutate: deleteEnrollments,
+        isPending: isDeletingEnrollments,
+        validationError,
+    } = useBulkMutationWithValidation<any, void>({
+        mutationFn,
+        active,
+        onSuccess: () => {
+            queryClient.removeQueries([ReactQueryAppNamespace, ...QueryKey]);
+            onUpdateList();
+            setIsDeleteDialogOpen(false);
+        },
+        onFatalError: (serverResponse) => {
+            log.error(errorCreator('An error occurred when deleting enrollments')({ serverResponse }));
+            showAlert({ message: i18n.t('An error occurred when deleting enrollments') });
+        },
+    });
 
     const enrollmentIdToTeiId = useMemo(() => {
         const map: Record<string, string> = {};
-        (enrollments ?? []).forEach((enrollment: any) => {
-            if (enrollment?.enrollment && enrollment?.trackedEntity) {
+        (enrollments ?? []).forEach((enrollment) => {
+            if (enrollment.enrollment && enrollment.trackedEntity) {
                 map[enrollment.enrollment] = enrollment.trackedEntity;
             }
         });
@@ -126,52 +130,24 @@ export const useDeleteEnrollments = ({
     }, [enrollments]);
 
     const enrollmentCounts = useMemo(() => {
-        if (!enrollments) {
-            return null;
-        }
-
-        const {
-            activeEnrollments,
-            completedEnrollments,
-            cancelledEnrollments,
-        } = enrollments.reduce((acc, enrollment) => {
-            if (enrollment.status === 'ACTIVE') {
-                acc.activeEnrollments += 1;
-            } else if (enrollment.status === 'CANCELLED') {
-                acc.cancelledEnrollments += 1;
-            } else {
-                acc.completedEnrollments += 1;
-            }
+        if (!enrollments) return null;
 
+        const counts = enrollments.reduce((acc, enrollment) => {
+            if (enrollment.status === 'ACTIVE') acc.active += 1;
+            else if (enrollment.status === 'CANCELLED') acc.cancelled += 1;
+            else acc.completed += 1;
             return acc;
-        }, { activeEnrollments: 0, completedEnrollments: 0, cancelledEnrollments: 0 });
-
-        return {
-            active: activeEnrollments,
-            completed: completedEnrollments,
-            cancelled: cancelledEnrollments,
-            total: enrollments.length,
-        };
+        }, { active: 0, completed: 0, cancelled: 0 });
+
+        return { ...counts, total: enrollments.length };
     }, [enrollments]);
 
     const numberOfEnrollmentsToDelete = useMemo(() => {
-        if (!enrollments || !enrollmentCounts) {
-            return 0;
-        }
-
-        let total = 0;
-        if (statusToDelete.active) {
-            total += enrollmentCounts.active;
-        }
-        if (statusToDelete.completed) {
-            total += enrollmentCounts.completed;
-        }
-        if (statusToDelete.cancelled) {
-            total += enrollmentCounts.cancelled;
-        }
-
-        return total;
-    }, [enrollments, enrollmentCounts, statusToDelete]);
+        if (!enrollmentCounts) return 0;
+        return (['active', 'completed', 'cancelled'] as const)
+            .filter(status => statusToDelete[status])
+            .reduce((total, status) => total + enrollmentCounts[status], 0);
+    }, [enrollmentCounts, statusToDelete]);
 
     return {
         deleteEnrollments,
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
index 7e31dd85b6..03f9df1f6a 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
@@ -1,15 +1,20 @@
 import React, { useMemo, useState } from 'react';
 import i18n from '@dhis2/d2-i18n';
-import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
+import { Button } from '@dhis2/ui';
 import { useAuthority } from '../../../../../../utils/userInfo/useAuthority';
 import { useLocationQuery } from '../../../../../../utils/routing';
 import { useCascadeDeleteTei } from './hooks/useCascadeDeleteTei';
-import { BulkActionErrorDetails } from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorDetails';
+import {
+    BulkActionConfirmModal,
+} from '../../../../WorkingListsCommon/BulkActionBar/BulkActionConfirmModal';
+import {
+    BulkActionErrorModal,
+} from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorModal';
+import { createTeiErrorHrefResolver } from '../../../../WorkingListsCommon/BulkActionBar/utils';
 import type { PlainProps } from './DeleteTeiAction.types';
 
 const CASCADE_DELETE_TEI_AUTHORITY = 'F_TEI_CASCADE_DELETE';
 
-
 // TODO - Add program and TEType access checks before adding action to prod
 export const DeleteTeiAction = ({
     selectedRows,
@@ -21,21 +26,31 @@ export const DeleteTeiAction = ({
     const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
     const { hasAuthority } = useAuthority({ authority: CASCADE_DELETE_TEI_AUTHORITY });
     const { orgUnitId } = useLocationQuery();
+
     const {
-        deleteTeis,
-        isLoading,
+        mutate: deleteTeis,
+        isPending,
         validationError,
-        resetDeleteTeis,
+        reset,
     } = useCascadeDeleteTei({
         selectedRows,
+        active: isDeleteDialogOpen,
         setIsDeleteDialogOpen,
         onUpdateList,
     });
-    const knownTeiUids = useMemo(() => new Set(Object.keys(selectedRows)), [selectedRows]);
+
+    const getRecordHref = useMemo(
+        () => createTeiErrorHrefResolver({
+            programId,
+            orgUnitId,
+            knownTeiUids: new Set(Object.keys(selectedRows)),
+        }),
+        [programId, orgUnitId, selectedRows],
+    );
 
     const closeModal = () => {
         setIsDeleteDialogOpen(false);
-        resetDeleteTeis();
+        reset();
     };
 
     if (!hasAuthority) {
@@ -54,80 +69,38 @@ export const DeleteTeiAction = ({
             </Button>
 
             {isDeleteDialogOpen && !validationError && (
-                <Modal
-                    small
-                    onClose={closeModal}
+                <BulkActionConfirmModal
+                    title={i18n.t('Delete {{count}} {{ trackedEntityName }}', {
+                        count: selectedRowsCount,
+                        trackedEntityName: trackedEntityName.toLowerCase(),
+                        defaultValue: 'Delete {{count}} {{ trackedEntityName }}',
+                        defaultValue_plural: 'Delete {{count}} {{ trackedEntityName }}',
+                    })}
+                    confirmLabel={i18n.t('Delete')}
+                    onConfirm={() => deleteTeis()}
+                    onCancel={closeModal}
+                    isPending={isPending}
                 >
-                    <ModalTitle>
-                        {i18n.t('Delete {{count}} {{ trackedEntityName }}', {
-                            count: selectedRowsCount,
-                            trackedEntityName: trackedEntityName.toLowerCase(),
-                            defaultValue: 'Delete {{count}} {{ trackedEntityName }}',
-                            defaultValue_plural: 'Delete {{count}} {{ trackedEntityName }}',
-                        })}
-                    </ModalTitle>
-                    <ModalContent>
-                        <span>
-                            {i18n.t('Deleting records will also delete any associated enrollments and events.')}
-                            {' '}
-                            {i18n.t('This cannot be undone.')}
-                            {' '}
-                            {i18n.t('Are you sure you want to delete?')}
-                        </span>
-                    </ModalContent>
-                    <ModalActions>
-                        <ButtonStrip>
-                            <Button
-                                secondary
-                                onClick={closeModal}
-                            >
-                                {i18n.t('Cancel')}
-                            </Button>
-                            <Button
-                                destructive
-                                // @ts-expect-error - keeping original functionality as before ts rewrite
-                                onClick={deleteTeis}
-                                loading={isLoading}
-                            >
-                                {i18n.t('Delete')}
-                            </Button>
-                        </ButtonStrip>
-                    </ModalActions>
-                </Modal>
+                    {i18n.t('Deleting records will also delete any associated enrollments and events.')}
+                    {' '}
+                    {i18n.t('This cannot be undone.')}
+                    {' '}
+                    {i18n.t('Are you sure you want to delete?')}
+                </BulkActionConfirmModal>
             )}
 
             {isDeleteDialogOpen && validationError && (
-                <Modal
-                    small
+                <BulkActionErrorModal
+                    title={i18n.t('Error deleting {{ trackedEntityName }}', {
+                        trackedEntityName: trackedEntityName.toLowerCase(),
+                    })}
+                    introText={i18n.t(
+                        'There was an error while deleting the records. Please see the details below.',
+                    )}
+                    errorReports={validationError.validationReport.errorReports}
+                    getRecordHref={getRecordHref}
                     onClose={closeModal}
-                >
-                    <ModalTitle>
-                        {i18n.t('Error deleting {{ trackedEntityName }}', {
-                            trackedEntityName: trackedEntityName.toLowerCase(),
-                        })}
-                    </ModalTitle>
-                    <ModalContent>
-                        <BulkActionErrorDetails
-                            introText={i18n.t(
-                                'There was an error while deleting the records. Please see the details below.',
-                            )}
-                            errorReports={validationError?.validationReport?.errorReports}
-                            programId={programId}
-                            orgUnitId={orgUnitId}
-                            knownTeiUids={knownTeiUids}
-                        />
-                    </ModalContent>
-                    <ModalActions>
-                        <ButtonStrip>
-                            <Button
-                                secondary
-                                onClick={closeModal}
-                            >
-                                {i18n.t('Close')}
-                            </Button>
-                        </ButtonStrip>
-                    </ModalActions>
-                </Modal>
+                />
             )}
         </>
     );
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
index 3d93e4f6ab..9c7150d35d 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
@@ -1,19 +1,20 @@
-import { useMemo } from 'react';
+import { useCallback } from 'react';
 import log from 'loglevel';
 import i18n from '@dhis2/d2-i18n';
 import { useAlert, useDataEngine } from '@dhis2/app-runtime';
-import { useMutation } from '@tanstack/react-query';
 import { errorCreator } from 'capture-core-utils';
-import { extractValidationReport } from '../../../../../WorkingListsCommon/BulkActionBar/utils';
+import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
 
 type Props = {
     selectedRows: Record<string, boolean>;
+    active: boolean;
     setIsDeleteDialogOpen: (open: boolean) => void;
     onUpdateList: () => void;
 };
 
 export const useCascadeDeleteTei = ({
     selectedRows,
+    active,
     setIsDeleteDialogOpen,
     onUpdateList,
 }: Props) => {
@@ -23,48 +24,27 @@ export const useCascadeDeleteTei = ({
         { critical: true },
     );
 
-    const {
-        mutate: deleteTeis,
-        isPending,
-        data: deleteData,
-        error: deleteError,
-        reset: resetDeleteTeis,
-    } = useMutation<any, any>(
+    const mutationFn = useCallback(
         () => dataEngine.mutate({
             resource: 'tracker?async=false&importStrategy=DELETE',
             type: 'create',
             data: {
-                trackedEntities: Object
-                    .keys(selectedRows)
-                    .map(id => ({ trackedEntity: id })),
+                trackedEntities: Object.keys(selectedRows).map(id => ({ trackedEntity: id })),
             },
         }),
-        {
-            onError: (serverResponse) => {
-                log.error(errorCreator('An error occurred while deleting the tracked entities')({ serverResponse }));
-                if (!serverResponse?.details?.validationReport?.errorReports?.length) {
-                    showAlert({ message: i18n.t('An error occurred while deleting the records') });
-                }
-            },
-            // Defensive against a future switch to atomicMode=OBJECT, where partial-failure
-            // reports would arrive on `data` (HTTP 200) rather than as an HTTP error.
-            onSuccess: (response: any) => {
-                if (response?.validationReport?.errorReports?.length) return;
-                onUpdateList();
-                setIsDeleteDialogOpen(false);
-            },
-        },
+        [dataEngine, selectedRows],
     );
 
-    const validationError = useMemo(
-        () => extractValidationReport({ data: deleteData, error: deleteError }),
-        [deleteData, deleteError],
-    );
-
-    return {
-        deleteTeis,
-        isLoading: isPending,
-        validationError,
-        resetDeleteTeis,
-    };
+    return useBulkMutationWithValidation<any, void>({
+        mutationFn,
+        active,
+        onSuccess: () => {
+            onUpdateList();
+            setIsDeleteDialogOpen(false);
+        },
+        onFatalError: (serverResponse) => {
+            log.error(errorCreator('An error occurred while deleting the tracked entities')({ serverResponse }));
+            showAlert({ message: i18n.t('An error occurred while deleting the records') });
+        },
+    });
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/BulkActionConfirmModal.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/BulkActionConfirmModal.tsx
new file mode 100644
index 0000000000..a35c6d853a
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/BulkActionConfirmModal.tsx
@@ -0,0 +1,52 @@
+import React, { type ReactNode } from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
+
+type Props = {
+    title: ReactNode;
+    children: ReactNode;
+    confirmLabel: ReactNode;
+    onConfirm: () => void;
+    onCancel: () => void;
+    isPending?: boolean;
+    confirmDisabled?: boolean;
+    dataTest?: string;
+};
+
+export const BulkActionConfirmModal = ({
+    title,
+    children,
+    confirmLabel,
+    onConfirm,
+    onCancel,
+    isPending = false,
+    confirmDisabled = false,
+    dataTest,
+}: Props) => (
+    <Modal
+        small
+        onClose={onCancel}
+        dataTest={dataTest}
+    >
+        <ModalTitle>{title}</ModalTitle>
+        <ModalContent>{children}</ModalContent>
+        <ModalActions>
+            <ButtonStrip>
+                <Button
+                    secondary
+                    onClick={onCancel}
+                >
+                    {i18n.t('Cancel')}
+                </Button>
+                <Button
+                    destructive
+                    onClick={onConfirm}
+                    loading={isPending}
+                    disabled={confirmDisabled}
+                >
+                    {confirmLabel}
+                </Button>
+            </ButtonStrip>
+        </ModalActions>
+    </Modal>
+);
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/index.ts
new file mode 100644
index 0000000000..ae5c4ebf53
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionConfirmModal/index.ts
@@ -0,0 +1 @@
+export { BulkActionConfirmModal } from './BulkActionConfirmModal';
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
index a19d041be6..d5148a1a41 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
@@ -3,23 +3,12 @@ import i18n from '@dhis2/d2-i18n';
 import { withStyles, type WithStyles } from 'capture-core-utils/styles';
 import { colors } from '@dhis2/ui';
 import { Widget } from '../../../../Widget';
-import { getRecordPathFromErrorReport } from '../utils';
-
-type ErrorReport = {
-    uid?: string;
-    errorCode?: string;
-    message?: string;
-    trackerType?: 'ENROLLMENT' | 'EVENT' | string;
-};
+import type { ErrorReport, ErrorReportHrefResolver } from '../types';
 
 type Props = {
     introText: ReactNode;
-    errorReports?: Array<ErrorReport>;
-    programId?: string;
-    orgUnitId?: string;
-    enrollmentIdToTeiId?: Record<string, string>;
-    knownEventUids?: Set<string>;
-    knownTeiUids?: Set<string>;
+    errorReports?: ErrorReport[];
+    getRecordHref?: ErrorReportHrefResolver;
 };
 
 const styles: Readonly<any> = {
@@ -46,11 +35,7 @@ const styles: Readonly<any> = {
 const BulkActionErrorDetailsPlain = ({
     introText,
     errorReports,
-    programId,
-    orgUnitId,
-    enrollmentIdToTeiId,
-    knownEventUids,
-    knownTeiUids,
+    getRecordHref,
     classes,
 }: Props & WithStyles<typeof styles>) => {
     const [openAccordion, setOpenAccordion] = useState(false);
@@ -69,23 +54,16 @@ const BulkActionErrorDetailsPlain = ({
                 <span className={classes.errorContainer}>
                     <ul>
                         {errorReports && errorReports.length ? errorReports.map((errorReport) => {
-                            const recordPath = getRecordPathFromErrorReport({
-                                errorReport,
-                                programId,
-                                orgUnitId,
-                                enrollmentIdToTeiId,
-                                knownEventUids,
-                                knownTeiUids,
-                            });
+                            const href = getRecordHref?.(errorReport) ?? null;
                             return (
                                 <li
-                                    key={`${errorReport.uid}-${errorReport.errorCode}`}
+                                    key={`${errorReport.uid}-${errorReport.errorCode}-${errorReport.message}`}
                                     className={classes.errorItem}
                                 >
                                     <div className={classes.errorUidHeader}>
-                                        {recordPath ? (
+                                        {href ? (
                                             <a
-                                                href={`#${recordPath}`}
+                                                href={href}
                                                 target="_blank"
                                                 rel="noopener noreferrer"
                                             >
@@ -93,7 +71,7 @@ const BulkActionErrorDetailsPlain = ({
                                             </a>
                                         ) : errorReport.uid}
                                     </div>
-                                    <div>{errorReport?.message}</div>
+                                    <div>{errorReport.message}</div>
                                 </li>
                             );
                         }) : (
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/BulkActionErrorModal.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/BulkActionErrorModal.tsx
new file mode 100644
index 0000000000..7556ff2f26
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/BulkActionErrorModal.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { Button, ButtonStrip, Modal, ModalActions, ModalContent, ModalTitle } from '@dhis2/ui';
+import { BulkActionErrorDetails } from '../BulkActionErrorDetails';
+import type { ErrorReport, ErrorReportHrefResolver } from '../types';
+
+type Props = {
+    title: string;
+    introText: string;
+    errorReports?: ErrorReport[];
+    getRecordHref?: ErrorReportHrefResolver;
+    onClose: () => void;
+    dataTest?: string;
+};
+
+export const BulkActionErrorModal = ({
+    title,
+    introText,
+    errorReports,
+    getRecordHref,
+    onClose,
+    dataTest,
+}: Props) => (
+    <Modal
+        small
+        onClose={onClose}
+        dataTest={dataTest}
+    >
+        <ModalTitle>{title}</ModalTitle>
+        <ModalContent>
+            <BulkActionErrorDetails
+                introText={introText}
+                errorReports={errorReports}
+                getRecordHref={getRecordHref}
+            />
+        </ModalContent>
+        <ModalActions>
+            <ButtonStrip>
+                <Button
+                    secondary
+                    onClick={onClose}
+                >
+                    {i18n.t('Close')}
+                </Button>
+            </ButtonStrip>
+        </ModalActions>
+    </Modal>
+);
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/index.ts
new file mode 100644
index 0000000000..b82fae978c
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorModal/index.ts
@@ -0,0 +1 @@
+export { BulkActionErrorModal } from './BulkActionErrorModal';
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/index.ts
index aeafa2cb53..d0e92956a7 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/index.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/index.ts
@@ -1 +1,2 @@
 export { useSelectedRowsController } from './useSelectedRowsController';
+export { useBulkMutationWithValidation } from './useBulkMutationWithValidation';
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
new file mode 100644
index 0000000000..c40766ed37
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
@@ -0,0 +1,72 @@
+import { useEffect, useMemo } from 'react';
+import { useMutation } from '@tanstack/react-query';
+import { extractValidationReport } from '../utils';
+import type { ValidationReportContainer } from '../types';
+
+type Options<TData, TVariables> = {
+    mutationFn: (variables: TVariables) => Promise<TData>;
+    // Clean success — HTTP 200 with no error reports. Do UI cleanup here
+    // (close modal, refetch list, clear selection).
+    onSuccess?: (response: TData, variables: TVariables) => void;
+    // Partial success — HTTP 200 that still carries error reports (atomicMode=OBJECT).
+    // Caller should remove valid rows from selection and refresh the list; the
+    // hook keeps `validationError` set so the caller can render the error modal.
+    onPartialSuccess?: (report: ValidationReportContainer, variables: TVariables) => void;
+    // HTTP error WITH a validation report — server rejected the request but
+    // told us which rows are the problem. Useful for "recover by retrying the
+    // valid subset" flows. `validationError` is set regardless of whether this
+    // callback is provided.
+    onValidationError?: (report: ValidationReportContainer, variables: TVariables) => void;
+    // HTTP error WITHOUT a validation report (network failure, 500, etc). Show a
+    // toast here. Errors that carry a validation report are surfaced through
+    // `validationError` (and `onValidationError`) and skip this callback.
+    onFatalError?: (error: any, variables: TVariables) => void;
+    // Modal-open flag (or similar). When it goes false, the mutation state resets
+    // so the next open starts fresh.
+    active: boolean;
+};
+
+export const useBulkMutationWithValidation = <TData, TVariables>({
+    mutationFn,
+    onSuccess,
+    onPartialSuccess,
+    onValidationError,
+    onFatalError,
+    active,
+}: Options<TData, TVariables>) => {
+    const {
+        mutate,
+        isPending,
+        data,
+        error,
+        reset,
+    } = useMutation<TData, any, TVariables>(mutationFn, {
+        onSuccess: (response, variables) => {
+            const container = response as unknown as ValidationReportContainer | undefined;
+            if (container?.validationReport?.errorReports?.length) {
+                onPartialSuccess?.(container, variables);
+                return;
+            }
+            onSuccess?.(response, variables);
+        },
+        onError: (err, variables) => {
+            const details = err?.details as ValidationReportContainer | undefined;
+            if (details?.validationReport?.errorReports?.length) {
+                onValidationError?.(details, variables);
+                return;
+            }
+            onFatalError?.(err, variables);
+        },
+    });
+
+    const validationError = useMemo(
+        () => extractValidationReport({ data, error }),
+        [data, error],
+    );
+
+    useEffect(() => {
+        if (!active) reset();
+    }, [active, reset]);
+
+    return { mutate, isPending, validationError, reset };
+};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts
new file mode 100644
index 0000000000..6818a16b79
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts
@@ -0,0 +1,19 @@
+export type TrackerType = 'ENROLLMENT' | 'EVENT' | 'TRACKED_ENTITY' | 'RELATIONSHIP';
+
+export type ErrorReport = {
+    uid?: string;
+    errorCode?: string;
+    message?: string;
+    trackerType?: TrackerType;
+};
+
+export type ValidationReport = {
+    errorReports: ErrorReport[];
+};
+
+export type ValidationReportContainer = {
+    validationReport: ValidationReport;
+};
+
+// Already-anchor-ready (`#/...` for HashRouter). Null means render the UID as plain text.
+export type ErrorReportHrefResolver = (errorReport: ErrorReport) => string | null;
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
new file mode 100644
index 0000000000..9b435d47ee
--- /dev/null
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
@@ -0,0 +1,93 @@
+import log from 'loglevel';
+import { errorCreator } from 'capture-core-utils';
+import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../../../metaData';
+import { buildUrlQueryString } from '../../../../../utils/routing';
+import type { ErrorReport, ErrorReportHrefResolver } from '../types';
+
+// Resolvers return an anchor-ready href (`#/...`) or null when we can't (or shouldn't)
+// link to the record. Each resolver only links a UID it can vouch for — the server may
+// reference a UID it rejected as nonexistent, and following that is a dead end.
+
+type EventFlavorDeps = {
+    programId?: string;
+    orgUnitId?: string;
+    knownEventUids: Set<string>;
+};
+
+export const createEventErrorHrefResolver = ({
+    programId, orgUnitId, knownEventUids,
+}: EventFlavorDeps): ErrorReportHrefResolver => {
+    // Resolve the program flavor once; programId doesn't vary across reports.
+    let isEventProgram = false;
+    let programResolvable = false;
+    if (programId) {
+        try {
+            isEventProgram = getProgramFromProgramIdThrowIfNotFound(programId) instanceof EventProgram;
+            programResolvable = true;
+        } catch (error) {
+            log.error(errorCreator('Could not resolve program for error link')({ error, programId }));
+        }
+    }
+
+    return (errorReport: ErrorReport) => {
+        const uid = errorReport.uid;
+        if (!uid || !programId || !orgUnitId || !programResolvable) return null;
+        if (!knownEventUids.has(uid)) return null;
+        if (isEventProgram) {
+            return `#/viewEvent?${buildUrlQueryString({ viewEventId: uid, orgUnitId })}`;
+        }
+        return `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
+    };
+};
+
+type TeiFlavorDeps = {
+    programId?: string;
+    orgUnitId?: string;
+    knownTeiUids: Set<string>;
+};
+
+export const createTeiErrorHrefResolver = ({
+    programId, orgUnitId, knownTeiUids,
+}: TeiFlavorDeps): ErrorReportHrefResolver =>
+    (errorReport: ErrorReport) => {
+        const uid = errorReport.uid;
+        if (!uid || !programId || !orgUnitId) return null;
+        if (!knownTeiUids.has(uid)) return null;
+        return `#/enrollment?${buildUrlQueryString({
+            teiId: uid,
+            programId,
+            orgUnitId,
+            enrollmentId: 'AUTO',
+        })}`;
+    };
+
+type EnrollmentFlavorDeps = {
+    programId?: string;
+    orgUnitId?: string;
+    enrollmentIdToTeiId: Record<string, string>;
+    // Optional — enrollment Complete has these because it submits events too.
+    knownEventUids?: Set<string>;
+};
+
+export const createEnrollmentErrorHrefResolver = ({
+    programId, orgUnitId, enrollmentIdToTeiId, knownEventUids,
+}: EnrollmentFlavorDeps): ErrorReportHrefResolver =>
+    (errorReport: ErrorReport) => {
+        const uid = errorReport.uid;
+        if (!uid || !programId || !orgUnitId) return null;
+
+        if (errorReport.trackerType === 'ENROLLMENT') {
+            const teiId = enrollmentIdToTeiId[uid];
+            if (!teiId) return null;
+            return `#/enrollment?${buildUrlQueryString({
+                teiId, programId, orgUnitId, enrollmentId: uid,
+            })}`;
+        }
+
+        if (errorReport.trackerType === 'EVENT') {
+            if (!knownEventUids?.has(uid)) return null;
+            return `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
+        }
+
+        return null;
+    };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
index 9b3ae69310..1cd095a754 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
@@ -1,13 +1,20 @@
+import type { ValidationReportContainer } from '../types';
+
 // A tracker validation report can arrive on either the success `data` payload
 // (e.g. atomicMode=OBJECT partial success) or on the error response's `details`
 // (HTTP-error case). Callers only care about the container that holds
 // `validationReport.errorReports` — use this to normalize both paths.
-export const extractValidationReport = ({ data, error }: { data?: any; error?: any }): any | null => {
-    if (data?.validationReport?.errorReports?.length) {
-        return data;
+export const extractValidationReport = ({ data, error }: {
+    data?: unknown;
+    error?: { details?: unknown } | null;
+}): ValidationReportContainer | null => {
+    const fromData = data as ValidationReportContainer | undefined;
+    if (fromData?.validationReport?.errorReports?.length) {
+        return fromData;
     }
-    if (error?.details?.validationReport?.errorReports?.length) {
-        return error.details;
+    const fromError = error?.details as ValidationReportContainer | undefined;
+    if (fromError?.validationReport?.errorReports?.length) {
+        return fromError;
     }
     return null;
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts
deleted file mode 100644
index 80b3238776..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/getRecordPathFromErrorReport.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import log from 'loglevel';
-import { errorCreator } from 'capture-core-utils';
-import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../../../metaData';
-import { buildUrlQueryString } from '../../../../../utils/routing';
-
-type ErrorReport = {
-    uid?: string;
-    trackerType?: 'ENROLLMENT' | 'EVENT' | 'TRACKED_ENTITY' | string;
-};
-
-type BuildArgs = {
-    uid: string;
-    programId: string;
-    orgUnitId: string;
-    enrollmentIdToTeiId?: Record<string, string>;
-    knownEventUids?: Set<string>;
-    knownTeiUids?: Set<string>;
-};
-
-const buildEnrollmentPath = ({ uid, programId, orgUnitId, enrollmentIdToTeiId }: BuildArgs): string | null => {
-    const teiId = enrollmentIdToTeiId?.[uid];
-    if (!teiId) return null;
-    return `/enrollment?${buildUrlQueryString({
-        teiId,
-        programId,
-        orgUnitId,
-        enrollmentId: uid,
-    })}`;
-};
-
-const buildTeiPath = ({ uid, programId, orgUnitId, knownTeiUids }: BuildArgs): string | null => {
-    if (!knownTeiUids?.has(uid)) return null;
-    return `/enrollment?${buildUrlQueryString({
-        teiId: uid,
-        programId,
-        orgUnitId,
-        enrollmentId: 'AUTO',
-    })}`;
-};
-
-const buildEventPath = ({ uid, programId, orgUnitId, knownEventUids }: BuildArgs): string | null => {
-    // Only link an event UID we can vouch for — the error may reference a UID
-    // the server rejected as nonexistent, and linking there is a dead end.
-    if (!knownEventUids?.has(uid)) return null;
-    try {
-        const program = getProgramFromProgramIdThrowIfNotFound(programId);
-        if (program instanceof EventProgram) {
-            return `/viewEvent?${buildUrlQueryString({ viewEventId: uid, orgUnitId })}`;
-        }
-        return `/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
-    } catch (error) {
-        log.error(errorCreator('Could not build record path for error report')({ error, programId }));
-        return null;
-    }
-};
-
-// Returns a router-style path (e.g. `/viewEvent?...`) matching the convention in
-// `useLinkedRecordClick.ts`. Callers wanting an anchor `href` are responsible for
-// prepending the HashRouter fragment marker (`#`).
-export const getRecordPathFromErrorReport = ({
-    errorReport,
-    programId,
-    orgUnitId,
-    enrollmentIdToTeiId,
-    knownEventUids,
-    knownTeiUids,
-}: {
-    errorReport: ErrorReport;
-    programId?: string;
-    orgUnitId?: string;
-    enrollmentIdToTeiId?: Record<string, string>;
-    knownEventUids?: Set<string>;
-    knownTeiUids?: Set<string>;
-}): string | null => {
-    if (!errorReport.uid || !programId || !orgUnitId) {
-        return null;
-    }
-
-    const args: BuildArgs = {
-        uid: errorReport.uid,
-        programId,
-        orgUnitId,
-        enrollmentIdToTeiId,
-        knownEventUids,
-        knownTeiUids,
-    };
-
-    if (errorReport.trackerType === 'ENROLLMENT') return buildEnrollmentPath(args);
-    if (errorReport.trackerType === 'TRACKED_ENTITY') return buildTeiPath(args);
-    return buildEventPath(args);
-};
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
index a1265ab833..48bdfc6090 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
@@ -1,2 +1,6 @@
-export { getRecordPathFromErrorReport } from './getRecordPathFromErrorReport';
 export { extractValidationReport } from './extractValidationReport';
+export {
+    createEventErrorHrefResolver,
+    createTeiErrorHrefResolver,
+    createEnrollmentErrorHrefResolver,
+} from './errorReportHrefResolvers';

From 7291b63458e7c5c07c735877c45026e798caf048 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Thu, 6 Aug 2026 10:04:23 +0000
Subject: [PATCH 08/12] fix: remove comments

---
 i18n/en.pot                                        |  4 ++--
 .../hooks/useCompleteBulkEnrollments.ts            |  2 --
 .../hooks/useBulkMutationWithValidation.ts         | 14 --------------
 .../WorkingListsCommon/BulkActionBar/types.ts      |  1 -
 .../utils/errorReportHrefResolvers.ts              |  6 ------
 .../BulkActionBar/utils/extractValidationReport.ts |  4 ----
 6 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index a81ffed0eb..64f6297672 100644
--- a/i18n/en.pot
+++ b/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-06T09:57:09.241Z\n"
-"PO-Revision-Date: 2026-08-06T09:57:09.241Z\n"
+"POT-Creation-Date: 2026-08-06T10:04:24.691Z\n"
+"PO-Revision-Date: 2026-08-06T10:04:24.691Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index d85189f93a..b8d25eff12 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -245,8 +245,6 @@ export const useCompleteBulkEnrollments = ({
         }, {});
     }, [trackedEntities]);
 
-    // Only events from active enrollments are submitted (see formatServerPayload),
-    // so limit the vouched-UID set to that same scope.
     const knownEventUids = useMemo(() => {
         const set = new Set<string>();
         (trackedEntities?.activeEnrollments ?? []).forEach((enrollment: Enrollment) => {
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
index c40766ed37..56c1e008da 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
@@ -5,24 +5,10 @@ import type { ValidationReportContainer } from '../types';
 
 type Options<TData, TVariables> = {
     mutationFn: (variables: TVariables) => Promise<TData>;
-    // Clean success — HTTP 200 with no error reports. Do UI cleanup here
-    // (close modal, refetch list, clear selection).
     onSuccess?: (response: TData, variables: TVariables) => void;
-    // Partial success — HTTP 200 that still carries error reports (atomicMode=OBJECT).
-    // Caller should remove valid rows from selection and refresh the list; the
-    // hook keeps `validationError` set so the caller can render the error modal.
     onPartialSuccess?: (report: ValidationReportContainer, variables: TVariables) => void;
-    // HTTP error WITH a validation report — server rejected the request but
-    // told us which rows are the problem. Useful for "recover by retrying the
-    // valid subset" flows. `validationError` is set regardless of whether this
-    // callback is provided.
     onValidationError?: (report: ValidationReportContainer, variables: TVariables) => void;
-    // HTTP error WITHOUT a validation report (network failure, 500, etc). Show a
-    // toast here. Errors that carry a validation report are surfaced through
-    // `validationError` (and `onValidationError`) and skip this callback.
     onFatalError?: (error: any, variables: TVariables) => void;
-    // Modal-open flag (or similar). When it goes false, the mutation state resets
-    // so the next open starts fresh.
     active: boolean;
 };
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts
index 6818a16b79..cdce5971a3 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/types.ts
@@ -15,5 +15,4 @@ export type ValidationReportContainer = {
     validationReport: ValidationReport;
 };
 
-// Already-anchor-ready (`#/...` for HashRouter). Null means render the UID as plain text.
 export type ErrorReportHrefResolver = (errorReport: ErrorReport) => string | null;
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
index 9b435d47ee..b5f08d7c01 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
@@ -4,10 +4,6 @@ import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../.
 import { buildUrlQueryString } from '../../../../../utils/routing';
 import type { ErrorReport, ErrorReportHrefResolver } from '../types';
 
-// Resolvers return an anchor-ready href (`#/...`) or null when we can't (or shouldn't)
-// link to the record. Each resolver only links a UID it can vouch for — the server may
-// reference a UID it rejected as nonexistent, and following that is a dead end.
-
 type EventFlavorDeps = {
     programId?: string;
     orgUnitId?: string;
@@ -17,7 +13,6 @@ type EventFlavorDeps = {
 export const createEventErrorHrefResolver = ({
     programId, orgUnitId, knownEventUids,
 }: EventFlavorDeps): ErrorReportHrefResolver => {
-    // Resolve the program flavor once; programId doesn't vary across reports.
     let isEventProgram = false;
     let programResolvable = false;
     if (programId) {
@@ -65,7 +60,6 @@ type EnrollmentFlavorDeps = {
     programId?: string;
     orgUnitId?: string;
     enrollmentIdToTeiId: Record<string, string>;
-    // Optional — enrollment Complete has these because it submits events too.
     knownEventUids?: Set<string>;
 };
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
index 1cd095a754..1ab9d827b8 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/extractValidationReport.ts
@@ -1,9 +1,5 @@
 import type { ValidationReportContainer } from '../types';
 
-// A tracker validation report can arrive on either the success `data` payload
-// (e.g. atomicMode=OBJECT partial success) or on the error response's `details`
-// (HTTP-error case). Callers only care about the container that holds
-// `validationReport.errorReports` — use this to normalize both paths.
 export const extractValidationReport = ({ data, error }: {
     data?: unknown;
     error?: { details?: unknown } | null;

From 432da64135aa5ff44f6e51f25c10e66c7d617245 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Thu, 6 Aug 2026 12:15:47 +0000
Subject: [PATCH 09/12] fix: remove fully deleted records from list when bulk
 partial success

---
 i18n/en.pot                                   |  27 +----
 .../Actions/DeleteAction/DeleteAction.tsx     |   2 +
 .../DeleteAction/DeleteAction.types.ts        |   5 +-
 .../DeleteAction/hooks/useBulkDeleteEvents.ts |  12 +-
 .../EventBulkActions/EventBulkActions.tsx     |   1 +
 .../DeleteEnrollmentsAction.tsx               |   2 +
 .../DeleteEnrollmentsAction.types.ts          |   3 +-
 .../EnrollmentDeleteModal.tsx                 |   2 +
 .../EnrollmentDeleteModal.types.ts            |   3 +-
 .../hooks/useDeleteEnrollments.ts             |  34 +++++-
 .../DeleteTeiAction/DeleteTeiAction.tsx       | 107 ------------------
 .../DeleteTeiAction/DeleteTeiAction.types.ts  |   7 --
 .../hooks/useCascadeDeleteTei.ts              |  50 --------
 .../Actions/DeleteTeiAction/index.ts          |   1 -
 .../TrackedEntityBulkActions/Actions/index.ts |   1 -
 .../TrackedEntityBulkActions.component.tsx    |   7 +-
 .../utils/errorReportHrefResolvers.ts         |  55 +++------
 .../BulkActionBar/utils/index.ts              |   1 -
 18 files changed, 79 insertions(+), 241 deletions(-)
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
 delete mode 100644 src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/index.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index 64f6297672..6a4ae2ef65 100644
--- a/i18n/en.pot
+++ b/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-06T10:04:24.691Z\n"
-"PO-Revision-Date: 2026-08-06T10:04:24.691Z\n"
+"POT-Creation-Date: 2026-08-06T12:15:48.962Z\n"
+"PO-Revision-Date: 2026-08-06T12:15:48.962Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -2143,29 +2143,6 @@ msgstr[1] "Delete {{count}} enrollments"
 msgid "An error occurred when deleting enrollments"
 msgstr "An error occurred when deleting enrollments"
 
-msgid "Delete {{ trackedEntityName }} with all enrollments"
-msgstr "Delete {{ trackedEntityName }} with all enrollments"
-
-msgid "Delete {{count}} {{ trackedEntityName }}"
-msgid_plural "Delete {{count}} {{ trackedEntityName }}"
-msgstr[0] "Delete {{count}} {{ trackedEntityName }}"
-msgstr[1] "Delete {{count}} {{ trackedEntityName }}"
-
-msgid "Deleting records will also delete any associated enrollments and events."
-msgstr "Deleting records will also delete any associated enrollments and events."
-
-msgid "Are you sure you want to delete?"
-msgstr "Are you sure you want to delete?"
-
-msgid "Error deleting {{ trackedEntityName }}"
-msgstr "Error deleting {{ trackedEntityName }}"
-
-msgid "There was an error while deleting the records. Please see the details below."
-msgstr "There was an error while deleting the records. Please see the details below."
-
-msgid "An error occurred while deleting the records"
-msgstr "An error occurred while deleting the records"
-
 msgid "Working list could not be updated"
 msgstr "Working list could not be updated"
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
index f3827ead29..834882776c 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.tsx
@@ -28,6 +28,7 @@ export const DeleteAction = ({
     stageDataWriteAccess,
     bulkDataEntryIsActive,
     onUpdateList,
+    removeRowsFromSelection,
     programId,
 }: Props) => {
     const [isModalOpen, setIsModalOpen] = useState(false);
@@ -44,6 +45,7 @@ export const DeleteAction = ({
         selectedRows,
         active: isModalOpen,
         onUpdateList,
+        removeRowsFromSelection,
         setIsModalOpen,
     });
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts
index 656f4b4c77..40c8734a8f 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/DeleteAction.types.ts
@@ -1,7 +1,8 @@
 export type Props = {
-    selectedRows: { [id: string]: boolean };
+    selectedRows: Record<string, boolean>;
     stageDataWriteAccess?: boolean;
-    onUpdateList: () => void;
+    onUpdateList: (disableClearSelection?: boolean) => void;
+    removeRowsFromSelection: (rows: Array<string>) => void;
     bulkDataEntryIsActive?: boolean;
     programId?: string;
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts
index 54da082e1e..51350ce997 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/Actions/DeleteAction/hooks/useBulkDeleteEvents.ts
@@ -8,7 +8,8 @@ import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon
 type Props = {
     selectedRows: Record<string, boolean>;
     active: boolean;
-    onUpdateList: () => void;
+    onUpdateList: (disableClearSelection?: boolean) => void;
+    removeRowsFromSelection: (rows: Array<string>) => void;
     setIsModalOpen: (open: boolean) => void;
 };
 
@@ -16,6 +17,7 @@ export const useBulkDeleteEvents = ({
     selectedRows,
     active,
     onUpdateList,
+    removeRowsFromSelection,
     setIsModalOpen,
 }: Props) => {
     const dataEngine = useDataEngine();
@@ -42,6 +44,14 @@ export const useBulkDeleteEvents = ({
             onUpdateList();
             setIsModalOpen(false);
         },
+        onPartialSuccess: (report) => {
+            const failedUids = new Set(
+                report.validationReport.errorReports.map(e => e.uid).filter(Boolean) as string[],
+            );
+            const succeededUids = Object.keys(selectedRows).filter(id => !failedUids.has(id));
+            removeRowsFromSelection(succeededUids);
+            onUpdateList(true);
+        },
         onFatalError: (serverResponse) => {
             log.error(errorCreator('An error occurred while deleting the events')({ serverResponse }));
             showAlert({ message: i18n.t('An error occurred while deleting the events') });
diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx
index 4744eb5501..35be8a1405 100644
--- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingListsCommon/EventBulkActions/EventBulkActions.tsx
@@ -45,6 +45,7 @@ export const EventBulkActions = ({
                 stageDataWriteAccess={stage.access.data.write}
                 bulkDataEntryIsActive={bulkDataEntryIsActive}
                 onUpdateList={onUpdateList}
+                removeRowsFromSelection={removeRowsFromSelection}
                 programId={programId}
             />
         </BulkActionBar>
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.tsx
index f6d1f5051a..02890efa9b 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.tsx
@@ -23,6 +23,7 @@ export const DeleteEnrollmentsAction = ({
     programDataWriteAccess,
     programId,
     onUpdateList,
+    removeRowsFromSelection,
     bulkDataEntryIsActive,
 }: PlainProps) => {
     const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
@@ -54,6 +55,7 @@ export const DeleteEnrollmentsAction = ({
                     selectedRows={selectedRows}
                     programId={programId}
                     onUpdateList={onUpdateList}
+                    removeRowsFromSelection={removeRowsFromSelection}
                     setIsDeleteDialogOpen={setIsDeleteDialogOpen}
                 />
             )}
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.types.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.types.ts
index 46b3c405eb..68a4533a35 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.types.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/DeleteEnrollmentsAction.types.ts
@@ -2,6 +2,7 @@ export type PlainProps = {
     selectedRows: Record<string, boolean>;
     programDataWriteAccess: boolean;
     programId: string;
-    onUpdateList: () => void;
+    onUpdateList: (disableClearSelection?: boolean) => void;
+    removeRowsFromSelection: (rows: Array<string>) => void;
     bulkDataEntryIsActive: boolean;
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
index 7055d35934..c314257f48 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
@@ -28,6 +28,7 @@ const EnrollmentDeleteModalPlain = ({
     selectedRows,
     programId,
     onUpdateList,
+    removeRowsFromSelection,
     setIsDeleteDialogOpen,
     classes,
 }: PlainProps & WithStyles<typeof styles>) => {
@@ -48,6 +49,7 @@ const EnrollmentDeleteModalPlain = ({
         programId,
         active: true,
         onUpdateList,
+        removeRowsFromSelection,
         setIsDeleteDialogOpen,
     });
 
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.types.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.types.ts
index d1183977f7..6702785f19 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.types.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.types.ts
@@ -1,6 +1,7 @@
 export type PlainProps = {
     selectedRows: Record<string, boolean>;
     programId: string;
-    onUpdateList: () => void;
+    onUpdateList: (disableClearSelection?: boolean) => void;
+    removeRowsFromSelection: (rows: Array<string>) => void;
     setIsDeleteDialogOpen: (open: boolean) => void;
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index 84cbf9d4c0..15cb179164 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -21,17 +21,38 @@ type Props = {
     selectedRows: Record<string, boolean>;
     programId: string;
     active: boolean;
-    onUpdateList: () => void;
+    onUpdateList: (disableClearSelection?: boolean) => void;
+    removeRowsFromSelection: (rows: Array<string>) => void;
     setIsDeleteDialogOpen: (open: boolean) => void;
 };
 
 const QueryKey = ['WorkingLists', 'BulkActionBar', 'DeleteEnrollmentsAction', 'trackedEntities'];
 
+const findFullyDeletedTeiIds = (
+    enrollments: Enrollment[],
+    statusToDelete: StatusToDelete,
+    failedEnrollmentUids: Set<string>,
+): string[] => {
+    const wasDeleted = ({ enrollment, status }: Enrollment) => {
+        const key = status?.toLowerCase();
+        if (!key || !(key in statusToDelete)) return false;
+        return statusToDelete[key as keyof StatusToDelete] && !failedEnrollmentUids.has(enrollment);
+    };
+    const grouped = enrollments.reduce<Record<string, Enrollment[]>>((acc, e) => ({
+        ...acc,
+        [e.trackedEntity]: [...(acc[e.trackedEntity] ?? []), e],
+    }), {});
+    return Object.entries(grouped)
+        .filter(([, teiEnrollments]) => teiEnrollments.every(wasDeleted))
+        .map(([teiId]) => teiId);
+};
+
 export const useDeleteEnrollments = ({
     selectedRows,
     programId,
     active,
     onUpdateList,
+    removeRowsFromSelection,
     setIsDeleteDialogOpen,
 }: Props) => {
     const queryClient = useQueryClient();
@@ -113,6 +134,17 @@ export const useDeleteEnrollments = ({
             onUpdateList();
             setIsDeleteDialogOpen(false);
         },
+        onPartialSuccess: (report) => {
+            const failedEnrollmentUids = new Set(
+                report.validationReport.errorReports.map(e => e.uid).filter(Boolean) as string[],
+            );
+            const fullyDeletedTeiIds = findFullyDeletedTeiIds(
+                enrollments ?? [], statusToDelete, failedEnrollmentUids,
+            );
+            removeRowsFromSelection(fullyDeletedTeiIds);
+            queryClient.removeQueries([ReactQueryAppNamespace, ...QueryKey]);
+            onUpdateList(true);
+        },
         onFatalError: (serverResponse) => {
             log.error(errorCreator('An error occurred when deleting enrollments')({ serverResponse }));
             showAlert({ message: i18n.t('An error occurred when deleting enrollments') });
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
deleted file mode 100644
index 03f9df1f6a..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import i18n from '@dhis2/d2-i18n';
-import { Button } from '@dhis2/ui';
-import { useAuthority } from '../../../../../../utils/userInfo/useAuthority';
-import { useLocationQuery } from '../../../../../../utils/routing';
-import { useCascadeDeleteTei } from './hooks/useCascadeDeleteTei';
-import {
-    BulkActionConfirmModal,
-} from '../../../../WorkingListsCommon/BulkActionBar/BulkActionConfirmModal';
-import {
-    BulkActionErrorModal,
-} from '../../../../WorkingListsCommon/BulkActionBar/BulkActionErrorModal';
-import { createTeiErrorHrefResolver } from '../../../../WorkingListsCommon/BulkActionBar/utils';
-import type { PlainProps } from './DeleteTeiAction.types';
-
-const CASCADE_DELETE_TEI_AUTHORITY = 'F_TEI_CASCADE_DELETE';
-
-// TODO - Add program and TEType access checks before adding action to prod
-export const DeleteTeiAction = ({
-    selectedRows,
-    selectedRowsCount,
-    trackedEntityName,
-    onUpdateList,
-    programId,
-}: PlainProps) => {
-    const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
-    const { hasAuthority } = useAuthority({ authority: CASCADE_DELETE_TEI_AUTHORITY });
-    const { orgUnitId } = useLocationQuery();
-
-    const {
-        mutate: deleteTeis,
-        isPending,
-        validationError,
-        reset,
-    } = useCascadeDeleteTei({
-        selectedRows,
-        active: isDeleteDialogOpen,
-        setIsDeleteDialogOpen,
-        onUpdateList,
-    });
-
-    const getRecordHref = useMemo(
-        () => createTeiErrorHrefResolver({
-            programId,
-            orgUnitId,
-            knownTeiUids: new Set(Object.keys(selectedRows)),
-        }),
-        [programId, orgUnitId, selectedRows],
-    );
-
-    const closeModal = () => {
-        setIsDeleteDialogOpen(false);
-        reset();
-    };
-
-    if (!hasAuthority) {
-        return null;
-    }
-
-    return (
-        <>
-            <Button
-                small
-                onClick={() => setIsDeleteDialogOpen(true)}
-            >
-                {i18n.t('Delete {{ trackedEntityName }} with all enrollments', {
-                    trackedEntityName: trackedEntityName.toLowerCase(),
-                })}
-            </Button>
-
-            {isDeleteDialogOpen && !validationError && (
-                <BulkActionConfirmModal
-                    title={i18n.t('Delete {{count}} {{ trackedEntityName }}', {
-                        count: selectedRowsCount,
-                        trackedEntityName: trackedEntityName.toLowerCase(),
-                        defaultValue: 'Delete {{count}} {{ trackedEntityName }}',
-                        defaultValue_plural: 'Delete {{count}} {{ trackedEntityName }}',
-                    })}
-                    confirmLabel={i18n.t('Delete')}
-                    onConfirm={() => deleteTeis()}
-                    onCancel={closeModal}
-                    isPending={isPending}
-                >
-                    {i18n.t('Deleting records will also delete any associated enrollments and events.')}
-                    {' '}
-                    {i18n.t('This cannot be undone.')}
-                    {' '}
-                    {i18n.t('Are you sure you want to delete?')}
-                </BulkActionConfirmModal>
-            )}
-
-            {isDeleteDialogOpen && validationError && (
-                <BulkActionErrorModal
-                    title={i18n.t('Error deleting {{ trackedEntityName }}', {
-                        trackedEntityName: trackedEntityName.toLowerCase(),
-                    })}
-                    introText={i18n.t(
-                        'There was an error while deleting the records. Please see the details below.',
-                    )}
-                    errorReports={validationError.validationReport.errorReports}
-                    getRecordHref={getRecordHref}
-                    onClose={closeModal}
-                />
-            )}
-        </>
-    );
-};
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts
deleted file mode 100644
index 5f202f963a..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/DeleteTeiAction.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type PlainProps = {
-    selectedRows: Record<string, boolean>;
-    selectedRowsCount: number;
-    trackedEntityName: string;
-    onUpdateList: () => void;
-    programId?: string;
-};
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
deleted file mode 100644
index 9c7150d35d..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/hooks/useCascadeDeleteTei.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useCallback } from 'react';
-import log from 'loglevel';
-import i18n from '@dhis2/d2-i18n';
-import { useAlert, useDataEngine } from '@dhis2/app-runtime';
-import { errorCreator } from 'capture-core-utils';
-import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
-
-type Props = {
-    selectedRows: Record<string, boolean>;
-    active: boolean;
-    setIsDeleteDialogOpen: (open: boolean) => void;
-    onUpdateList: () => void;
-};
-
-export const useCascadeDeleteTei = ({
-    selectedRows,
-    active,
-    setIsDeleteDialogOpen,
-    onUpdateList,
-}: Props) => {
-    const dataEngine = useDataEngine();
-    const { show: showAlert } = useAlert(
-        ({ message }) => message,
-        { critical: true },
-    );
-
-    const mutationFn = useCallback(
-        () => dataEngine.mutate({
-            resource: 'tracker?async=false&importStrategy=DELETE',
-            type: 'create',
-            data: {
-                trackedEntities: Object.keys(selectedRows).map(id => ({ trackedEntity: id })),
-            },
-        }),
-        [dataEngine, selectedRows],
-    );
-
-    return useBulkMutationWithValidation<any, void>({
-        mutationFn,
-        active,
-        onSuccess: () => {
-            onUpdateList();
-            setIsDeleteDialogOpen(false);
-        },
-        onFatalError: (serverResponse) => {
-            log.error(errorCreator('An error occurred while deleting the tracked entities')({ serverResponse }));
-            showAlert({ message: i18n.t('An error occurred while deleting the records') });
-        },
-    });
-};
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/index.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/index.ts
deleted file mode 100644
index 83e9ccc851..0000000000
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteTeiAction/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DeleteTeiAction } from './DeleteTeiAction';
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/index.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/index.ts
index 720e30341d..e8964a6255 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/index.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/index.ts
@@ -1,3 +1,2 @@
 export { CompleteAction } from './CompleteAction';
-export { DeleteTeiAction } from './DeleteTeiAction';
 export { DeleteEnrollmentsAction } from './DeleteEnrollmentsAction';
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/TrackedEntityBulkActions.component.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/TrackedEntityBulkActions.component.tsx
index c961ee9ffe..2ec901c458 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/TrackedEntityBulkActions.component.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/TrackedEntityBulkActions.component.tsx
@@ -45,14 +45,9 @@ export const TrackedEntityBulkActionsComponent = ({
                 programDataWriteAccess={programDataWriteAccess}
                 programId={programId}
                 onUpdateList={onUpdateList}
+                removeRowsFromSelection={removeRowsFromSelection}
                 bulkDataEntryIsActive={bulkDataEntryIsActive}
             />
-
-            {/* <DeleteTeiAction */}
-            {/*     selectedRows={selectedRows} */}
-            {/*     selectedRowsCount={selectedRowsCount} */}
-            {/*     onUpdateList={onUpdateList} */}
-            {/* /> */}
         </BulkActionBar>
     );
 };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
index b5f08d7c01..1053828fef 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
@@ -4,6 +4,19 @@ import { EventProgram, getProgramFromProgramIdThrowIfNotFound } from '../../../.
 import { buildUrlQueryString } from '../../../../../utils/routing';
 import type { ErrorReport, ErrorReportHrefResolver } from '../types';
 
+type EventRoute = 'viewEvent' | 'enrollmentEventEdit';
+
+const resolveEventRoute = (programId: string): EventRoute | null => {
+    try {
+        return getProgramFromProgramIdThrowIfNotFound(programId) instanceof EventProgram
+            ? 'viewEvent'
+            : 'enrollmentEventEdit';
+    } catch (error) {
+        log.error(errorCreator('Could not resolve program for error link')({ error, programId }));
+        return null;
+    }
+};
+
 type EventFlavorDeps = {
     programId?: string;
     orgUnitId?: string;
@@ -13,49 +26,17 @@ type EventFlavorDeps = {
 export const createEventErrorHrefResolver = ({
     programId, orgUnitId, knownEventUids,
 }: EventFlavorDeps): ErrorReportHrefResolver => {
-    let isEventProgram = false;
-    let programResolvable = false;
-    if (programId) {
-        try {
-            isEventProgram = getProgramFromProgramIdThrowIfNotFound(programId) instanceof EventProgram;
-            programResolvable = true;
-        } catch (error) {
-            log.error(errorCreator('Could not resolve program for error link')({ error, programId }));
-        }
-    }
+    const route = programId ? resolveEventRoute(programId) : null;
 
     return (errorReport: ErrorReport) => {
         const uid = errorReport.uid;
-        if (!uid || !programId || !orgUnitId || !programResolvable) return null;
-        if (!knownEventUids.has(uid)) return null;
-        if (isEventProgram) {
-            return `#/viewEvent?${buildUrlQueryString({ viewEventId: uid, orgUnitId })}`;
-        }
-        return `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
+        if (!uid || !orgUnitId || !route || !knownEventUids.has(uid)) return null;
+        return route === 'viewEvent'
+            ? `#/viewEvent?${buildUrlQueryString({ viewEventId: uid, orgUnitId })}`
+            : `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
     };
 };
 
-type TeiFlavorDeps = {
-    programId?: string;
-    orgUnitId?: string;
-    knownTeiUids: Set<string>;
-};
-
-export const createTeiErrorHrefResolver = ({
-    programId, orgUnitId, knownTeiUids,
-}: TeiFlavorDeps): ErrorReportHrefResolver =>
-    (errorReport: ErrorReport) => {
-        const uid = errorReport.uid;
-        if (!uid || !programId || !orgUnitId) return null;
-        if (!knownTeiUids.has(uid)) return null;
-        return `#/enrollment?${buildUrlQueryString({
-            teiId: uid,
-            programId,
-            orgUnitId,
-            enrollmentId: 'AUTO',
-        })}`;
-    };
-
 type EnrollmentFlavorDeps = {
     programId?: string;
     orgUnitId?: string;
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
index 48bdfc6090..32705b5c36 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/index.ts
@@ -1,6 +1,5 @@
 export { extractValidationReport } from './extractValidationReport';
 export {
     createEventErrorHrefResolver,
-    createTeiErrorHrefResolver,
     createEnrollmentErrorHrefResolver,
 } from './errorReportHrefResolvers';

From 36ab58bd890f0c309dee1e5ae43c9c341038707f Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Thu, 6 Aug 2026 13:39:25 +0000
Subject: [PATCH 10/12] feat: enhance bulk enrollment and deletion handling
 with validation improvements

---
 i18n/en.pot                                   |  4 ++--
 .../hooks/useCompleteBulkEnrollments.ts       | 24 ++++++++++++-------
 .../EnrollmentDeleteModal.tsx                 |  1 -
 .../hooks/useDeleteEnrollments.ts             |  3 ---
 .../hooks/useBulkMutationWithValidation.ts    |  4 ++--
 .../utils/errorReportHrefResolvers.ts         | 11 ++++-----
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 6a4ae2ef65..811fdae85d 100644
--- a/i18n/en.pot
+++ b/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-06T12:15:48.962Z\n"
-"PO-Revision-Date: 2026-08-06T12:15:48.962Z\n"
+"POT-Creation-Date: 2026-08-06T13:39:26.648Z\n"
+"PO-Revision-Date: 2026-08-06T13:39:26.648Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
index b8d25eff12..7576042ff2 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.ts
@@ -7,7 +7,7 @@ import { errorCreator, FEATURES, featureAvailable } from 'capture-core-utils';
 import { ReactQueryAppNamespace, useApiDataQuery } from '../../../../../../../utils/reactQueryHelpers';
 import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../../../../../utils/api';
 import { useBulkMutationWithValidation } from '../../../../../WorkingListsCommon/BulkActionBar/hooks';
-import type { ErrorReport } from '../../../../../WorkingListsCommon/BulkActionBar/types';
+import type { ErrorReport, ValidationReportContainer } from '../../../../../WorkingListsCommon/BulkActionBar/types';
 import type { ProgramStage } from '../../../../../../../metaData';
 
 type Enrollment = {
@@ -201,6 +201,18 @@ export const useCompleteBulkEnrollments = ({
         [dataEngine],
     );
 
+    const importValidSubset = (
+        report: ValidationReportContainer,
+        { enrollments }: { enrollments: Enrollment[] },
+    ) => {
+        const validEnrollments = filterValidEnrollments(
+            enrollments,
+            report.validationReport.errorReports,
+        );
+        if (validEnrollments.length === 0) return;
+        importPartialEnrollments({ enrollments: validEnrollments });
+    };
+
     const {
         mutate: validateAndImportEnrollments,
         isPending: isValidatingEnrollments,
@@ -211,14 +223,8 @@ export const useCompleteBulkEnrollments = ({
         onSuccess: (_response, { enrollments }) => {
             importEnrollments({ enrollments });
         },
-        onValidationError: (report, { enrollments }) => {
-            const validEnrollments = filterValidEnrollments(
-                enrollments,
-                report.validationReport.errorReports,
-            );
-            if (validEnrollments.length === 0) return;
-            importPartialEnrollments({ enrollments: validEnrollments });
-        },
+        onPartialSuccess: importValidSubset,
+        onValidationError: importValidSubset,
         onFatalError: (error, { enrollments }) => {
             log.error(errorCreator('An unknown error occurred when completing enrollments')({
                 error, enrollments,
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
index c314257f48..36baa0115c 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/EnrollmentDeleteModal/EnrollmentDeleteModal.tsx
@@ -47,7 +47,6 @@ const EnrollmentDeleteModalPlain = ({
     } = useDeleteEnrollments({
         selectedRows,
         programId,
-        active: true,
         onUpdateList,
         removeRowsFromSelection,
         setIsDeleteDialogOpen,
diff --git a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
index 15cb179164..a7613b0424 100644
--- a/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/TrackerWorkingLists/TrackedEntityBulkActions/Actions/DeleteEnrollmentsAction/hooks/useDeleteEnrollments.ts
@@ -20,7 +20,6 @@ type StatusToDelete = { active: boolean; completed: boolean; cancelled: boolean
 type Props = {
     selectedRows: Record<string, boolean>;
     programId: string;
-    active: boolean;
     onUpdateList: (disableClearSelection?: boolean) => void;
     removeRowsFromSelection: (rows: Array<string>) => void;
     setIsDeleteDialogOpen: (open: boolean) => void;
@@ -50,7 +49,6 @@ const findFullyDeletedTeiIds = (
 export const useDeleteEnrollments = ({
     selectedRows,
     programId,
-    active,
     onUpdateList,
     removeRowsFromSelection,
     setIsDeleteDialogOpen,
@@ -128,7 +126,6 @@ export const useDeleteEnrollments = ({
         validationError,
     } = useBulkMutationWithValidation<any, void>({
         mutationFn,
-        active,
         onSuccess: () => {
             queryClient.removeQueries([ReactQueryAppNamespace, ...QueryKey]);
             onUpdateList();
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
index 56c1e008da..895f018181 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/hooks/useBulkMutationWithValidation.ts
@@ -9,7 +9,7 @@ type Options<TData, TVariables> = {
     onPartialSuccess?: (report: ValidationReportContainer, variables: TVariables) => void;
     onValidationError?: (report: ValidationReportContainer, variables: TVariables) => void;
     onFatalError?: (error: any, variables: TVariables) => void;
-    active: boolean;
+    active?: boolean;
 };
 
 export const useBulkMutationWithValidation = <TData, TVariables>({
@@ -51,7 +51,7 @@ export const useBulkMutationWithValidation = <TData, TVariables>({
     );
 
     useEffect(() => {
-        if (!active) reset();
+        if (active === false) reset();
     }, [active, reset]);
 
     return { mutate, isPending, validationError, reset };
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
index 1053828fef..b6e73f85da 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
@@ -25,17 +25,16 @@ type EventFlavorDeps = {
 
 export const createEventErrorHrefResolver = ({
     programId, orgUnitId, knownEventUids,
-}: EventFlavorDeps): ErrorReportHrefResolver => {
-    const route = programId ? resolveEventRoute(programId) : null;
-
-    return (errorReport: ErrorReport) => {
+}: EventFlavorDeps): ErrorReportHrefResolver =>
+    (errorReport: ErrorReport) => {
         const uid = errorReport.uid;
-        if (!uid || !orgUnitId || !route || !knownEventUids.has(uid)) return null;
+        if (!uid || !programId || !orgUnitId || !knownEventUids.has(uid)) return null;
+        const route = resolveEventRoute(programId);
+        if (!route) return null;
         return route === 'viewEvent'
             ? `#/viewEvent?${buildUrlQueryString({ viewEventId: uid, orgUnitId })}`
             : `#/enrollmentEventEdit?${buildUrlQueryString({ eventId: uid, orgUnitId })}`;
     };
-};
 
 type EnrollmentFlavorDeps = {
     programId?: string;

From ae0f6f542a3a1de99344f4e9a35635f7a5698691 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Thu, 6 Aug 2026 14:25:06 +0000
Subject: [PATCH 11/12] fix: sonar qube

---
 i18n/en.pot                                                   | 4 ++--
 .../BulkActionErrorDetails.component.tsx                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 811fdae85d..c15b3fc763 100644
--- a/i18n/en.pot
+++ b/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-06T13:39:26.648Z\n"
-"PO-Revision-Date: 2026-08-06T13:39:26.648Z\n"
+"POT-Creation-Date: 2026-08-06T14:25:08.029Z\n"
+"PO-Revision-Date: 2026-08-06T14:25:08.029Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
index d5148a1a41..518646855d 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/BulkActionErrorDetails/BulkActionErrorDetails.component.tsx
@@ -53,7 +53,7 @@ const BulkActionErrorDetailsPlain = ({
             >
                 <span className={classes.errorContainer}>
                     <ul>
-                        {errorReports && errorReports.length ? errorReports.map((errorReport) => {
+                        {errorReports?.length ? errorReports.map((errorReport) => {
                             const href = getRecordHref?.(errorReport) ?? null;
                             return (
                                 <li

From f8c0a51ff0493babb8ce5c36e2b098c80af35e48 Mon Sep 17 00:00:00 2001
From: henrikmv <110386561+henrikmv@users.noreply.github.com>
Date: Wed, 19 Aug 2026 10:38:48 +0000
Subject: [PATCH 12/12] fix: (review) remove org unit check in hrefResolvers

---
 i18n/en.pot                                                   | 4 ++--
 .../BulkActionBar/utils/errorReportHrefResolvers.ts           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index b02613918c..49bf2c16bd 100644
--- a/i18n/en.pot
+++ b/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-12T10:36:50.151Z\n"
-"PO-Revision-Date: 2026-08-12T10:36:50.151Z\n"
+"POT-Creation-Date: 2026-08-19T10:38:49.855Z\n"
+"PO-Revision-Date: 2026-08-19T10:38:49.855Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
index b6e73f85da..5150eebc3e 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/BulkActionBar/utils/errorReportHrefResolvers.ts
@@ -28,7 +28,7 @@ export const createEventErrorHrefResolver = ({
 }: EventFlavorDeps): ErrorReportHrefResolver =>
     (errorReport: ErrorReport) => {
         const uid = errorReport.uid;
-        if (!uid || !programId || !orgUnitId || !knownEventUids.has(uid)) return null;
+        if (!uid || !programId || !knownEventUids.has(uid)) return null;
         const route = resolveEventRoute(programId);
         if (!route) return null;
         return route === 'viewEvent'
@@ -48,7 +48,7 @@ export const createEnrollmentErrorHrefResolver = ({
 }: EnrollmentFlavorDeps): ErrorReportHrefResolver =>
     (errorReport: ErrorReport) => {
         const uid = errorReport.uid;
-        if (!uid || !programId || !orgUnitId) return null;
+        if (!uid || !programId) return null;
 
         if (errorReport.trackerType === 'ENROLLMENT') {
             const teiId = enrollmentIdToTeiId[uid];