From f5955393ee0c95f49ecab043a8be7d851365e28c Mon Sep 17 00:00:00 2001
From: Alex <moijes12@gmail.com>
Date: Wed, 26 Aug 2026 08:55:50 +0000
Subject: [PATCH 1/2] Bug-1995794: Disable retrigger dropdown when there are no
 runs

Disable the Base and New retrigger count selects independently when
there are no retriggerable job ids for that side, and default a
disabled select to 0 so it does not look like jobs will start.
---
 .../CompareResults/Retrigger.test.tsx         | 57 +++++++++++++++++++
 .../Retrigger/RetriggerButton.tsx             |  2 +
 .../Retrigger/RetriggerConfigModal.tsx        | 21 +++++--
 3 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/src/__tests__/CompareResults/Retrigger.test.tsx b/src/__tests__/CompareResults/Retrigger.test.tsx
index 302972e45..4df03f040 100644
--- a/src/__tests__/CompareResults/Retrigger.test.tsx
+++ b/src/__tests__/CompareResults/Retrigger.test.tsx
@@ -267,6 +267,63 @@ describe('Retrigger', () => {
 
     expect(new MockedHooks().triggerHook).toHaveBeenCalled();
   });
+
+  async function openRetriggerConfigModal(
+    compareResult: typeof result = result,
+  ) {
+    setUpUserCredentials();
+    render(<RetriggerButton result={compareResult} variant='icon' />);
+
+    const openModalButton = await screen.findByRole('button', {
+      name: 'retrigger jobs',
+    });
+
+    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+    await user.click(openModalButton);
+
+    return {
+      baseSelect: await screen.findByLabelText('Base'),
+      newSelect: await screen.findByLabelText('New'),
+    };
+  }
+
+  it('should disable the Base dropdown when there are no base retriggerable jobs', async () => {
+    const { baseSelect, newSelect } = await openRetriggerConfigModal({
+      ...result,
+      base_retriggerable_job_ids: [],
+    });
+
+    // MUI Select uses a combobox div with aria-disabled rather than native disabled.
+    expect(baseSelect).toHaveAttribute('aria-disabled', 'true');
+    expect(baseSelect).toHaveTextContent('0');
+    expect(newSelect).not.toHaveAttribute('aria-disabled', 'true');
+    expect(newSelect).toHaveTextContent('5');
+  });
+
+  it('should disable the New dropdown when there are no new retriggerable jobs', async () => {
+    const { baseSelect, newSelect } = await openRetriggerConfigModal({
+      ...result,
+      new_retriggerable_job_ids: [],
+    });
+
+    expect(baseSelect).not.toHaveAttribute('aria-disabled', 'true');
+    expect(baseSelect).toHaveTextContent('5');
+    expect(newSelect).toHaveAttribute('aria-disabled', 'true');
+    expect(newSelect).toHaveTextContent('0');
+  });
+
+  it('should disable both dropdowns when there are no retriggerable jobs', async () => {
+    const { baseSelect, newSelect } = await openRetriggerConfigModal({
+      ...result,
+      base_retriggerable_job_ids: [],
+      new_retriggerable_job_ids: [],
+    });
+
+    expect(baseSelect).toHaveAttribute('aria-disabled', 'true');
+    expect(baseSelect).toHaveTextContent('0');
+    expect(newSelect).toHaveAttribute('aria-disabled', 'true');
+    expect(newSelect).toHaveTextContent('0');
+  });
 });
 
 describe('Retrigger in Subtests view', () => {
diff --git a/src/components/CompareResults/Retrigger/RetriggerButton.tsx b/src/components/CompareResults/Retrigger/RetriggerButton.tsx
index 520be1425..7c4f5bc96 100644
--- a/src/components/CompareResults/Retrigger/RetriggerButton.tsx
+++ b/src/components/CompareResults/Retrigger/RetriggerButton.tsx
@@ -210,6 +210,8 @@ export function RetriggerButton({ result, variant }: RetriggerButtonProps) {
         open={status === 'retrigger-modal'}
         onClose={() => setStatus('pending')}
         onRetriggerClick={onRetriggerConfirm}
+        hasBaseJobs={baseRetriggerableJobIds.length > 0}
+        hasNewJobs={newRetriggerableJobIds.length > 0}
       />
     </>
   );
diff --git a/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx b/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx
index 32220adb2..e9334b0be 100644
--- a/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx
+++ b/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx
@@ -16,17 +16,20 @@ const retriggerStrings = Strings.components.retrigger.config;
 function RetriggerCountSelect({
   prefix,
   label,
+  disabled = false,
 }: {
   prefix: string;
   label: string;
+  disabled?: boolean;
 }) {
   return (
-    <FormControl sx={{ width: '100%' }}>
+    <FormControl sx={{ width: '100%' }} disabled={disabled}>
       <InputLabel id={`${prefix}-retrigger-count-label`}>{label}</InputLabel>
       <Select
         labelId={`${prefix}-retrigger-count-label`}
         name={`${prefix}-retrigger-count`}
-        defaultValue={5}
+        defaultValue={disabled ? 0 : 5}
+        disabled={disabled}
         label={label}
         sx={{ height: 32 }}
       >
@@ -44,6 +47,8 @@ type RetriggerModalProps = {
   open: boolean;
   onClose: () => unknown;
   onRetriggerClick: (times: { baseTimes: number; newTimes: number }) => unknown;
+  hasBaseJobs: boolean;
+  hasNewJobs: boolean;
 };
 
 export function RetriggerConfigModal(props: RetriggerModalProps) {
@@ -77,10 +82,18 @@ export function RetriggerConfigModal(props: RetriggerModalProps) {
           }}
         >
           <Grid size={3}>
-            <RetriggerCountSelect prefix='base' label='Base' />
+            <RetriggerCountSelect
+              prefix='base'
+              label='Base'
+              disabled={!props.hasBaseJobs}
+            />
           </Grid>
           <Grid size={3}>
-            <RetriggerCountSelect prefix='new' label='New' />
+            <RetriggerCountSelect
+              prefix='new'
+              label='New'
+              disabled={!props.hasNewJobs}
+            />
           </Grid>
           <Grid
             size='auto'

From bea514f9242b8cc49307aa63cf4ae1c2c4f30024 Mon Sep 17 00:00:00 2001
From: Alex <moijes12@gmail.com>
Date: Wed, 2 Sep 2026 03:11:26 +0000
Subject: [PATCH 2/2] Address review: disable Retrigger when both sides have no
 jobs

Drop the redundant Select disabled prop, document why defaultValue is
safe, move the retrigger test helper to the top of the describe block,
and disable submit when neither base nor new can be retriggered.
---
 .../CompareResults/Retrigger.test.tsx         | 41 ++++++++++---------
 .../Retrigger/RetriggerConfigModal.tsx        | 13 +++++-
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/__tests__/CompareResults/Retrigger.test.tsx b/src/__tests__/CompareResults/Retrigger.test.tsx
index 4df03f040..fc3a1511e 100644
--- a/src/__tests__/CompareResults/Retrigger.test.tsx
+++ b/src/__tests__/CompareResults/Retrigger.test.tsx
@@ -127,6 +127,25 @@ describe('Retrigger', () => {
     mockedGetLocationOrigin.mockImplementation(() => 'http://localhost:3000');
   });
 
+  async function openRetriggerConfigModal(
+    compareResult: typeof result = result,
+  ) {
+    setUpUserCredentials();
+    render(<RetriggerButton result={compareResult} variant='icon' />);
+
+    const openModalButton = await screen.findByRole('button', {
+      name: 'retrigger jobs',
+    });
+
+    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+    await user.click(openModalButton);
+
+    return {
+      baseSelect: await screen.findByLabelText('Base'),
+      newSelect: await screen.findByLabelText('New'),
+    };
+  }
+
   it('should display Sign In modal when there are no credentials', async () => {
     render(<RetriggerButton result={result} variant='icon' />);
 
@@ -268,25 +287,6 @@ describe('Retrigger', () => {
     expect(new MockedHooks().triggerHook).toHaveBeenCalled();
   });
 
-  async function openRetriggerConfigModal(
-    compareResult: typeof result = result,
-  ) {
-    setUpUserCredentials();
-    render(<RetriggerButton result={compareResult} variant='icon' />);
-
-    const openModalButton = await screen.findByRole('button', {
-      name: 'retrigger jobs',
-    });
-
-    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
-    await user.click(openModalButton);
-
-    return {
-      baseSelect: await screen.findByLabelText('Base'),
-      newSelect: await screen.findByLabelText('New'),
-    };
-  }
-
   it('should disable the Base dropdown when there are no base retriggerable jobs', async () => {
     const { baseSelect, newSelect } = await openRetriggerConfigModal({
       ...result,
@@ -298,6 +298,7 @@ describe('Retrigger', () => {
     expect(baseSelect).toHaveTextContent('0');
     expect(newSelect).not.toHaveAttribute('aria-disabled', 'true');
     expect(newSelect).toHaveTextContent('5');
+    expect(screen.getByRole('button', { name: 'Retrigger' })).toBeEnabled();
   });
 
   it('should disable the New dropdown when there are no new retriggerable jobs', async () => {
@@ -310,6 +311,7 @@ describe('Retrigger', () => {
     expect(baseSelect).toHaveTextContent('5');
     expect(newSelect).toHaveAttribute('aria-disabled', 'true');
     expect(newSelect).toHaveTextContent('0');
+    expect(screen.getByRole('button', { name: 'Retrigger' })).toBeEnabled();
   });
 
   it('should disable both dropdowns when there are no retriggerable jobs', async () => {
@@ -323,6 +325,7 @@ describe('Retrigger', () => {
     expect(baseSelect).toHaveTextContent('0');
     expect(newSelect).toHaveAttribute('aria-disabled', 'true');
     expect(newSelect).toHaveTextContent('0');
+    expect(screen.getByRole('button', { name: 'Retrigger' })).toBeDisabled();
   });
 });
 
diff --git a/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx b/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx
index e9334b0be..569be654d 100644
--- a/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx
+++ b/src/components/CompareResults/Retrigger/RetriggerConfigModal.tsx
@@ -25,11 +25,15 @@ function RetriggerCountSelect({
   return (
     <FormControl sx={{ width: '100%' }} disabled={disabled}>
       <InputLabel id={`${prefix}-retrigger-count-label`}>{label}</InputLabel>
+      {/*
+        defaultValue is safe here because CenteredModal unmounts when closed,
+        so the select remounts with a fresh default each time the modal opens.
+        FormControl's disabled state is passed to Select via context.
+      */}
       <Select
         labelId={`${prefix}-retrigger-count-label`}
         name={`${prefix}-retrigger-count`}
         defaultValue={disabled ? 0 : 5}
-        disabled={disabled}
         label={label}
         sx={{ height: 32 }}
       >
@@ -101,7 +105,12 @@ export function RetriggerConfigModal(props: RetriggerModalProps) {
               ml: 'auto',
             }}
           >
-            <Button type='submit'>{retriggerStrings.submitButton}</Button>
+            <Button
+              type='submit'
+              disabled={!props.hasBaseJobs && !props.hasNewJobs}
+            >
+              {retriggerStrings.submitButton}
+            </Button>
           </Grid>
         </Grid>
       </form>