Add try_number to extra links query (apache#35317)

* Add try_number to extra links query Add try_number to extra links query * Do not include try_number in uri if undefined
sungwy · Nov 16, 2023 · be6e2cd · be6e2cd
1 parent 9877f36
commit be6e2cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/airflow/www/static/js/api/useExtraLinks.ts b/airflow/www/static/js/api/useExtraLinks.ts
@@ -34,19 +34,23 @@ export default function useExtraLinks({
   executionDate,
   mapIndex,
   extraLinks,
+  tryNumber,
 }: {
   dagId: string;
   taskId: string;
   executionDate: string;
   mapIndex?: number | undefined;
   extraLinks: string[];
+  tryNumber?: number | undefined;
 }) {
   return useQuery(
-    ["extraLinks", dagId, taskId, executionDate, mapIndex],
+    ["extraLinks", dagId, taskId, executionDate, mapIndex, tryNumber],
     async () => {
       const data = await Promise.all(
         extraLinks.map(async (link) => {
           const definedMapIndex = mapIndex ?? -1;
+          const tryNumberParam =
+            tryNumber !== undefined ? `&try_number=${tryNumber}` : "";
           const url = `${extraLinksUrl}?task_id=${encodeURIComponent(
             taskId
           )}&dag_id=${encodeURIComponent(
@@ -55,7 +59,7 @@ export default function useExtraLinks({
             executionDate
           )}&link_name=${encodeURIComponent(
             link
-          )}&map_index=${definedMapIndex}`;
+          )}&map_index=${definedMapIndex}${tryNumberParam}`;
           try {
             const datum = await axios.get<AxiosResponse, LinkData>(url);
             return {

diff --git a/airflow/www/static/js/dag/details/taskInstance/ExtraLinks.tsx b/airflow/www/static/js/dag/details/taskInstance/ExtraLinks.tsx
@@ -28,6 +28,7 @@ interface Props {
   executionDate: string;
   mapIndex?: number | undefined;
   extraLinks: string[];
+  tryNumber?: number | undefined;
 }
 
 const ExtraLinks = ({
@@ -36,13 +37,15 @@ const ExtraLinks = ({
   executionDate,
   mapIndex,
   extraLinks,
+  tryNumber,
 }: Props) => {
   const { data: links } = useExtraLinks({
     dagId,
     taskId,
     executionDate,
     mapIndex,
     extraLinks,
+    tryNumber,
   });
 
   if (!links?.length) return null;

diff --git a/airflow/www/static/js/dag/details/taskInstance/index.tsx b/airflow/www/static/js/dag/details/taskInstance/index.tsx
@@ -106,6 +106,7 @@ const TaskInstance = ({ taskId, runId, mapIndex }: Props) => {
           mapIndex={mapIndex}
           executionDate={executionDate}
           extraLinks={group?.extraLinks}
+          tryNumber={instance.tryNumber}
         />
       )}
       {!isMapped && group.extraLinks && (
@@ -114,6 +115,7 @@ const TaskInstance = ({ taskId, runId, mapIndex }: Props) => {
           dagId={dagId}
           executionDate={executionDate}
           extraLinks={group?.extraLinks}
+          tryNumber={instance.tryNumber}
         />
       )}
       <Details instance={instance} group={group} dagId={dagId} />