From e315ac410a8526f3c6c94330c49cf569673dd385 Mon Sep 17 00:00:00 2001
From: Vedant Mamgain <mamgainvedant@gmail.com>
Date: Fri, 26 Sep 2025 19:28:12 +0530
Subject: [PATCH 1/2] Replace defaultValue with value in TaskTrySelect

Changed the Select component to use the controlled 'value' prop instead of 'defaultValue' for try number selection, ensuring the selected value updates correctly with state changes.
---
 airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx b/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx
index 1d5614ba04a84..6abb059033f42 100644
--- a/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx
+++ b/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx
@@ -89,7 +89,7 @@ export const TaskTrySelect = ({ onSelectTryNumber, selectedTryNumber, taskInstan
         <Select.Root
           collection={tryOptions}
           data-testid="select-task-try"
-          defaultValue={[selectedTryNumber?.toString() ?? finalTryNumber.toString()]}
+          value={[selectedTryNumber?.toString() ?? finalTryNumber.toString()]}
           onValueChange={(details) => {
             if (onSelectTryNumber) {
               onSelectTryNumber(

From fec8f200b6da6b85927b950e7ddfd912138100c4 Mon Sep 17 00:00:00 2001
From: Vedant Mamgain <mamgainvedant@gmail.com>
Date: Tue, 30 Sep 2025 18:19:43 +0530
Subject: [PATCH 2/2] fix: Reorder props in TaskTrySelect for linting
 compliance

Applied prop ordering fix as requested in code review.
Props are now alphabetically ordered in the Select.Root component.
---
 airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx b/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx
index 6abb059033f42..bfb9f48c1cea5 100644
--- a/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx
+++ b/airflow-core/src/airflow/ui/src/components/TaskTrySelect.tsx
@@ -89,7 +89,6 @@ export const TaskTrySelect = ({ onSelectTryNumber, selectedTryNumber, taskInstan
         <Select.Root
           collection={tryOptions}
           data-testid="select-task-try"
-          value={[selectedTryNumber?.toString() ?? finalTryNumber.toString()]}
           onValueChange={(details) => {
             if (onSelectTryNumber) {
               onSelectTryNumber(
@@ -97,6 +96,7 @@ export const TaskTrySelect = ({ onSelectTryNumber, selectedTryNumber, taskInstan
               );
             }
           }}
+          value={[selectedTryNumber?.toString() ?? finalTryNumber.toString()]}
           width="200px"
         >
           <Select.Trigger>