From 1fbaaf42ede3125521aad4ce453f5cae79f3d1b5 Mon Sep 17 00:00:00 2001
From: biggdawg320 <biggdawg320@gmail.com>
Date: Tue, 29 Sep 2026 18:48:04 -0700
Subject: [PATCH] fix: clamp negative "messages left to delete" count

ServiceControl derives the remaining count for a group delete as
starting count minus deleted count, using two separate queries. When
new failures keep arriving in the group while a large delete is in
progress, the deleted count can exceed the starting count, driving
the remaining count negative. The frontend rendered that raw value
as-is. Clamp it to zero in the template so the UI never shows a
negative "Messages left to delete" figure.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../failedmessages/MessageGroupList.vue       |  2 +-
 .../messageGroupDeleteCounters.spec.ts        | 72 +++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/Frontend/src/components/failedmessages/messageGroupDeleteCounters.spec.ts

diff --git a/src/Frontend/src/components/failedmessages/MessageGroupList.vue b/src/Frontend/src/components/failedmessages/MessageGroupList.vue
index 977bbaf75b..c6072f07c5 100644
--- a/src/Frontend/src/components/failedmessages/MessageGroupList.vue
+++ b/src/Frontend/src/components/failedmessages/MessageGroupList.vue
@@ -565,7 +565,7 @@ defineExpose<IMessageGroupList>({
                             <span class="metadata">
                               <FAIcon :icon="faEnvelope" class="icon" />
                               Messages left to delete:
-                              {{ group.operation_remaining_count || 0 }}
+                              {{ Math.max(group.operation_remaining_count || 0, 0) }}
                             </span>
                             <span class="metadata">
                               <FAIcon :icon="faEnvelope" class="icon" />
diff --git a/src/Frontend/src/components/failedmessages/messageGroupDeleteCounters.spec.ts b/src/Frontend/src/components/failedmessages/messageGroupDeleteCounters.spec.ts
new file mode 100644
index 0000000000..6a6519ac02
--- /dev/null
+++ b/src/Frontend/src/components/failedmessages/messageGroupDeleteCounters.spec.ts
@@ -0,0 +1,72 @@
+import { describe, test, expect, beforeEach, vi } from "vitest";
+import { render } from "@testing-library/vue";
+import { createTestingPinia } from "@pinia/testing";
+import { defineComponent, h, nextTick, ref } from "vue";
+import { createRouter, createMemoryHistory } from "vue-router";
+import type GroupOperation from "@/resources/GroupOperation";
+import MessageGroupList, { type IMessageGroupList } from "@/components/failedmessages/MessageGroupList.vue";
+
+// Regression test for https://github.com/Particular/ServicePulse/issues/3126
+// While a group delete is in progress, ServiceControl's starting count and the
+// running deleted count come from separate queries. If more failures keep
+// arriving in the group, the deleted count can overtake the starting count,
+// which drives "Messages left to delete" (starting count - deleted count) negative.
+const groupBeingDeleted: GroupOperation = {
+  id: "group-1",
+  title: "SomeException",
+  type: "exception-type",
+  count: 666677,
+  operation_messages_completed_count: 670000,
+  comment: "",
+  operation_status: "ArchiveProgressing",
+  operation_failed: false,
+  operation_progress: 0.5,
+  operation_remaining_count: -3323,
+  need_user_acknowledgement: false,
+};
+
+vi.mock("@/components/failedmessages/messageGroupClient", () => ({
+  default: () => ({
+    getExceptionGroups: vi.fn().mockResolvedValue([groupBeingDeleted]),
+    isError: () => false,
+  }),
+}));
+
+async function renderGroupList() {
+  const listRef = ref<IMessageGroupList>();
+
+  const Harness = defineComponent({
+    setup() {
+      return () => h(MessageGroupList, { ref: listRef, sortFunction: () => 0 });
+    },
+  });
+
+  const router = createRouter({ history: createMemoryHistory(), routes: [{ path: "/:catchAll(.*)", component: { template: "<div />" } }] });
+
+  const result = render(Harness, {
+    global: {
+      plugins: [router, createTestingPinia({ stubActions: true })],
+    },
+  });
+
+  await nextTick();
+  await listRef.value?.loadFailedMessageGroups();
+  await nextTick();
+
+  return result;
+}
+
+describe("failed-message group delete counters", () => {
+  beforeEach(() => {
+    document.body.innerHTML = '<div id="modalDisplay"></div>';
+  });
+
+  test("Messages left to delete does not go negative when more failures arrive during a delete", async () => {
+    const { container } = await renderGroupList();
+
+    const text = container.textContent?.replace(/\s+/g, " ") ?? "";
+    const match = text.match(/Messages left to delete:\s*(-?\d+)/);
+
+    expect(match?.[1]).toBe("0");
+  });
+});