This is an automated email from the ASF dual-hosted git repository.

bbovenzi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 2abb33788c4 Add Mapped Task Summary page (#47120)
2abb33788c4 is described below

commit 2abb33788c4ef78ab51a3609e1179d19b97cacd2
Author: Brent Bovenzi <[email protected]>
AuthorDate: Thu Feb 27 09:39:29 2025 -0500

    Add Mapped Task Summary page (#47120)
    
    * Add Mapped Task Summary page
    
    * Remove mapped task instance lookup in dag breadcrumb
---
 airflow/ui/src/layouts/Details/DagBreadcrumb.tsx   | 39 ++++++-------
 airflow/ui/src/layouts/Details/DetailsLayout.tsx   |  2 +-
 airflow/ui/src/layouts/Details/Graph/TaskLink.tsx  |  8 +--
 airflow/ui/src/layouts/Details/Grid/GridTI.tsx     | 44 +++++++++++----
 .../ui/src/layouts/Details/Grid/TaskInstances.tsx  |  1 +
 airflow/ui/src/layouts/Details/NavTabs.tsx         |  9 +--
 .../Dashboard/HistoricalMetrics/AssetEvent.tsx     |  2 +-
 airflow/ui/src/pages/MappedTaskInstance/Header.tsx | 64 ++++++++++++++++++++++
 .../MappedTaskInstance.tsx}                        | 40 ++++----------
 .../links.ts => pages/MappedTaskInstance/index.ts} |  4 +-
 airflow/ui/src/pages/TaskInstance/Details.tsx      |  8 +--
 airflow/ui/src/pages/TaskInstance/ExtraLinks.tsx   | 11 ++--
 airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx    |  6 +-
 .../src/pages/TaskInstance/RenderedTemplates.tsx   | 10 +---
 airflow/ui/src/pages/TaskInstance/TaskInstance.tsx | 10 +---
 airflow/ui/src/pages/TaskInstances.tsx             | 13 ++++-
 airflow/ui/src/pages/XCom/XCom.tsx                 |  9 +--
 airflow/ui/src/router.tsx                          | 30 +++++++---
 airflow/ui/src/utils/links.ts                      |  2 +-
 19 files changed, 189 insertions(+), 123 deletions(-)

diff --git a/airflow/ui/src/layouts/Details/DagBreadcrumb.tsx 
b/airflow/ui/src/layouts/Details/DagBreadcrumb.tsx
index aa906a0b6ce..4b656764a65 100644
--- a/airflow/ui/src/layouts/Details/DagBreadcrumb.tsx
+++ b/airflow/ui/src/layouts/Details/DagBreadcrumb.tsx
@@ -19,12 +19,11 @@
 import { HStack, Stat } from "@chakra-ui/react";
 import type { ReactNode } from "react";
 import { LiaSlashSolid } from "react-icons/lia";
-import { Link as RouterLink, useParams, useSearchParams } from 
"react-router-dom";
+import { Link as RouterLink, useParams } from "react-router-dom";
 
 import {
   useDagRunServiceGetDagRun,
   useDagServiceGetDagDetails,
-  useTaskInstanceServiceGetMappedTaskInstance,
   useTaskServiceGetTask,
 } from "openapi/queries";
 import { StateBadge } from "src/components/StateBadge";
@@ -33,11 +32,7 @@ import { TogglePause } from "src/components/TogglePause";
 import { Breadcrumb } from "src/components/ui";
 
 export const DagBreadcrumb = () => {
-  const { dagId = "", runId, taskId } = useParams();
-
-  const [searchParams] = useSearchParams();
-  const mapIndexParam = searchParams.get("map_index");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
+  const { dagId = "", mapIndex = "-1", runId, taskId } = useParams();
 
   const { data: dag } = useDagServiceGetDagDetails({
     dagId,
@@ -56,19 +51,6 @@ export const DagBreadcrumb = () => {
 
   const { data: task } = useTaskServiceGetTask({ dagId, taskId }, undefined, { 
enabled: Boolean(taskId) });
 
-  const { data: taskInstance } = useTaskInstanceServiceGetMappedTaskInstance(
-    {
-      dagId,
-      dagRunId: runId ?? "",
-      mapIndex,
-      taskId: taskId ?? "",
-    },
-    undefined,
-    {
-      enabled: Boolean(runId) && Boolean(taskId),
-    },
-  );
-
   const links: Array<{ label: ReactNode | string; labelExtra?: ReactNode; 
title?: string; value?: string }> =
     [
       { label: "Dags", value: "/dags" },
@@ -99,7 +81,18 @@ export const DagBreadcrumb = () => {
 
   // Add task breadcrumb
   if (runId !== undefined && taskId !== undefined) {
-    links.push({ label: taskInstance?.task_display_name ?? taskId, title: 
"Task" });
+    if (task?.is_mapped) {
+      links.push({
+        label: `${task.task_display_name ?? taskId} [ ]`,
+        title: "Task",
+        value: `/dags/${dagId}/runs/${runId}/tasks/${taskId}/mapped`,
+      });
+    } else {
+      links.push({
+        label: task?.task_display_name ?? taskId,
+        title: "Task",
+      });
+    }
   }
 
   if (runId === undefined && taskId !== undefined) {
@@ -107,8 +100,8 @@ export const DagBreadcrumb = () => {
     links.push({ label: task?.task_display_name ?? taskId, title: "Task" });
   }
 
-  if (mapIndexParam !== null) {
-    links.push({ label: mapIndexParam, title: "Map Index" });
+  if (mapIndex !== "-1") {
+    links.push({ label: mapIndex, title: "Map Index" });
   }
 
   return (
diff --git a/airflow/ui/src/layouts/Details/DetailsLayout.tsx 
b/airflow/ui/src/layouts/Details/DetailsLayout.tsx
index 0b2178e8f0a..e2fa8cf77b5 100644
--- a/airflow/ui/src/layouts/Details/DetailsLayout.tsx
+++ b/airflow/ui/src/layouts/Details/DetailsLayout.tsx
@@ -92,7 +92,7 @@ export const DetailsLayout = ({ children, error, isLoading, 
tabs }: Props) => {
               {children}
               <ErrorAlert error={error} />
               <ProgressBar size="xs" visibility={isLoading ? "visible" : 
"hidden"} />
-              <NavTabs keepSearch tabs={tabs} />
+              <NavTabs tabs={tabs} />
               <Box h="100%" overflow="auto" px={2}>
                 <Outlet />
               </Box>
diff --git a/airflow/ui/src/layouts/Details/Graph/TaskLink.tsx 
b/airflow/ui/src/layouts/Details/Graph/TaskLink.tsx
index dab512d822a..e933329b029 100644
--- a/airflow/ui/src/layouts/Details/Graph/TaskLink.tsx
+++ b/airflow/ui/src/layouts/Details/Graph/TaskLink.tsx
@@ -25,13 +25,13 @@ type Props = {
   readonly id: string;
 } & TaskNameProps;
 
-export const TaskLink = ({ id, isGroup, ...rest }: Props) => {
+export const TaskLink = ({ id, isGroup, isMapped, ...rest }: Props) => {
   const { dagId = "", runId, taskId } = useParams();
   const [searchParams] = useSearchParams();
 
   // We don't have a task group details page to link to
   if (isGroup) {
-    return <TaskName isGroup={true} {...rest} />;
+    return <TaskName isGroup={true} isMapped={isMapped} {...rest} />;
   }
 
   return (
@@ -39,11 +39,11 @@ export const TaskLink = ({ id, isGroup, ...rest }: Props) 
=> {
       <RouterLink
         to={{
           // Do not include runId if there is no selected run, clicking a 
second time will deselect a task id
-          pathname: `/dags/${dagId}/${runId === undefined ? "" : 
`runs/${runId}/`}${taskId === id ? "" : `tasks/${id}`}`,
+          pathname: `/dags/${dagId}/${runId === undefined ? "" : 
`runs/${runId}/`}${taskId === id ? "" : `tasks/${id}`}${isMapped ? "/mapped" : 
""}`,
           search: searchParams.toString(),
         }}
       >
-        <TaskName {...rest} />
+        <TaskName isMapped={isMapped} {...rest} />
       </RouterLink>
     </Link>
   );
diff --git a/airflow/ui/src/layouts/Details/Grid/GridTI.tsx 
b/airflow/ui/src/layouts/Details/Grid/GridTI.tsx
index fc939eb8f21..85a8342d8ac 100644
--- a/airflow/ui/src/layouts/Details/Grid/GridTI.tsx
+++ b/airflow/ui/src/layouts/Details/Grid/GridTI.tsx
@@ -27,6 +27,7 @@ import { StateIcon } from "src/components/StateIcon";
 type Props = {
   readonly dagId: string;
   readonly isGroup?: boolean;
+  readonly isMapped?: boolean | null;
   readonly label: string;
   readonly runId: string;
   readonly search: string;
@@ -50,9 +51,9 @@ const onMouseLeave = (event: MouseEvent<HTMLDivElement>) => {
   });
 };
 
-const Instance = ({ dagId, runId, search, state, taskId }: Props) => (
+const Instance = ({ dagId, isGroup, isMapped, runId, search, state, taskId }: 
Props) => (
   <Flex
-    alignItems="flex-end"
+    alignItems="center"
     height="20px"
     id={taskId.replaceAll(".", "-")}
     justifyContent="center"
@@ -64,13 +65,7 @@ const Instance = ({ dagId, runId, search, state, taskId }: 
Props) => (
     transition="background-color 0.2s"
     zIndex={1}
   >
-    <Link
-      replace
-      to={{
-        pathname: `/dags/${dagId}/runs/${runId}/tasks/${taskId}`,
-        search,
-      }}
-    >
+    {isGroup ? (
       <Badge
         borderRadius={4}
         colorPalette={state === null ? "none" : state}
@@ -91,7 +86,36 @@ const Instance = ({ dagId, runId, search, state, taskId }: 
Props) => (
           />
         )}
       </Badge>
-    </Link>
+    ) : (
+      <Link
+        replace
+        to={{
+          pathname: `/dags/${dagId}/runs/${runId}/tasks/${taskId}${isMapped ? 
"/mapped" : ""}`,
+          search,
+        }}
+      >
+        <Badge
+          borderRadius={4}
+          colorPalette={state === null ? "none" : state}
+          height="14px"
+          minH={0}
+          opacity={state === "success" ? 0.6 : 1}
+          p={0}
+          variant="solid"
+          width="14px"
+        >
+          {state === undefined ? undefined : (
+            <StateIcon
+              size={10}
+              state={state}
+              style={{
+                marginLeft: "2px",
+              }}
+            />
+          )}
+        </Badge>
+      </Link>
+    )}
   </Flex>
 );
 
diff --git a/airflow/ui/src/layouts/Details/Grid/TaskInstances.tsx 
b/airflow/ui/src/layouts/Details/Grid/TaskInstances.tsx
index 4e0929e7182..7c763999bac 100644
--- a/airflow/ui/src/layouts/Details/Grid/TaskInstances.tsx
+++ b/airflow/ui/src/layouts/Details/Grid/TaskInstances.tsx
@@ -47,6 +47,7 @@ export const TaskInstances = ({ nodes, runId, taskInstances 
}: Props) => {
       <GridTI
         dagId={dagId}
         isGroup={node.isGroup}
+        isMapped={node.is_mapped}
         key={node.id}
         label={node.label}
         runId={runId}
diff --git a/airflow/ui/src/layouts/Details/NavTabs.tsx 
b/airflow/ui/src/layouts/Details/NavTabs.tsx
index a1cc44c00ff..ee09657bf24 100644
--- a/airflow/ui/src/layouts/Details/NavTabs.tsx
+++ b/airflow/ui/src/layouts/Details/NavTabs.tsx
@@ -18,18 +18,15 @@
  */
 import { Center, Flex } from "@chakra-ui/react";
 import { useRef, type ReactNode } from "react";
-import { NavLink, useSearchParams } from "react-router-dom";
+import { NavLink } from "react-router-dom";
 
 import { useContainerWidth } from "src/utils";
 
 type Props = {
-  readonly keepSearch?: boolean;
   readonly tabs: Array<{ icon?: ReactNode; label: string; value: string }>;
 };
 
-export const NavTabs = ({ keepSearch, tabs }: Props) => {
-  const [searchParams] = useSearchParams();
-
+export const NavTabs = ({ tabs }: Props) => {
   const containerRef = useRef<HTMLDivElement>(null);
   const containerWidth = useContainerWidth(containerRef);
 
@@ -42,8 +39,6 @@ export const NavTabs = ({ keepSearch, tabs }: Props) => {
           title={label}
           to={{
             pathname: value,
-            // Preserve search params when navigating
-            search: keepSearch ? searchParams.toString() : undefined,
           }}
         >
           {({ isActive }) => (
diff --git a/airflow/ui/src/pages/Dashboard/HistoricalMetrics/AssetEvent.tsx 
b/airflow/ui/src/pages/Dashboard/HistoricalMetrics/AssetEvent.tsx
index 9acc43e8d31..e5bf931d173 100644
--- a/airflow/ui/src/pages/Dashboard/HistoricalMetrics/AssetEvent.tsx
+++ b/airflow/ui/src/pages/Dashboard/HistoricalMetrics/AssetEvent.tsx
@@ -58,7 +58,7 @@ export const AssetEvent = ({ event }: { readonly event: 
AssetEventResponse }) =>
         <MdOutlineAccountTree /> <Text> Source: </Text>
         {source === "" ? (
           <Link
-            
to={`/dags/${event.source_dag_id}/runs/${event.source_run_id}/tasks/${event.source_task_id}?map_index=${event.source_map_index}`}
+            
to={`/dags/${event.source_dag_id}/runs/${event.source_run_id}/tasks/${event.source_task_id}${event.source_map_index
 > -1 ? `/mapped/${event.source_map_index}` : ""}`}
           >
             <Text color="fg.info"> {event.source_dag_id} </Text>
           </Link>
diff --git a/airflow/ui/src/pages/MappedTaskInstance/Header.tsx 
b/airflow/ui/src/pages/MappedTaskInstance/Header.tsx
new file mode 100644
index 00000000000..9396802a2d8
--- /dev/null
+++ b/airflow/ui/src/pages/MappedTaskInstance/Header.tsx
@@ -0,0 +1,64 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { Box } from "@chakra-ui/react";
+import type { ReactNode } from "react";
+import { MdOutlineTask } from "react-icons/md";
+
+import type { GridTaskInstanceSummary } from "openapi/requests/types.gen";
+import { HeaderCard } from "src/components/HeaderCard";
+import Time from "src/components/Time";
+import { getDuration } from "src/utils";
+
+export const Header = ({
+  isRefreshing,
+  taskInstance,
+}: {
+  readonly isRefreshing?: boolean;
+  readonly taskInstance: GridTaskInstanceSummary;
+}) => {
+  const entries: Array<{ label: string; value: number | ReactNode | string }> 
= [];
+
+  if (taskInstance.child_states !== null) {
+    Object.entries(taskInstance.child_states).forEach(([state, count]) => {
+      if (count > 0) {
+        entries.push({ label: `Total ${state}`, value: count });
+      }
+    });
+  }
+  const stats = [
+    { label: "Task Count", value: taskInstance.task_count },
+    ...entries,
+    { label: "Start", value: <Time datetime={taskInstance.start_date} /> },
+    { label: "End", value: <Time datetime={taskInstance.end_date} /> },
+    { label: "Duration", value: `${getDuration(taskInstance.start_date, 
taskInstance.end_date)}s` },
+  ];
+
+  return (
+    <Box>
+      <HeaderCard
+        icon={<MdOutlineTask />}
+        isRefreshing={isRefreshing}
+        state={taskInstance.state}
+        stats={stats}
+        subTitle={<Time datetime={taskInstance.start_date} />}
+        title={`${taskInstance.task_id} [ ]`}
+      />
+    </Box>
+  );
+};
diff --git a/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx 
b/airflow/ui/src/pages/MappedTaskInstance/MappedTaskInstance.tsx
similarity index 59%
copy from airflow/ui/src/pages/TaskInstance/TaskInstance.tsx
copy to airflow/ui/src/pages/MappedTaskInstance/MappedTaskInstance.tsx
index bcda0736dd1..fba902cd33b 100644
--- a/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx
+++ b/airflow/ui/src/pages/MappedTaskInstance/MappedTaskInstance.tsx
@@ -17,33 +17,19 @@
  * under the License.
  */
 import { ReactFlowProvider } from "@xyflow/react";
-import { FiCode } from "react-icons/fi";
-import { MdDetails, MdOutlineEventNote, MdReorder, MdSyncAlt } from 
"react-icons/md";
-import { PiBracketsCurlyBold } from "react-icons/pi";
-import { useParams, useSearchParams } from "react-router-dom";
+import { MdOutlineTask } from "react-icons/md";
+import { useParams } from "react-router-dom";
 
-import { useDagServiceGetDagDetails, 
useTaskInstanceServiceGetMappedTaskInstance } from "openapi/queries";
+import { useDagServiceGetDagDetails, useGridServiceGridData } from 
"openapi/queries";
 import { DetailsLayout } from "src/layouts/Details/DetailsLayout";
 import { isStatePending, useAutoRefresh } from "src/utils";
 
 import { Header } from "./Header";
 
-const tabs = [
-  { icon: <MdReorder />, label: "Logs", value: "" },
-  { icon: <PiBracketsCurlyBold />, label: "Rendered Templates", value: 
"rendered_templates" },
-  { icon: <MdSyncAlt />, label: "XCom", value: "xcom" },
-  { icon: <MdOutlineEventNote />, label: "Events", value: "events" },
-  { icon: <FiCode />, label: "Code", value: "code" },
-  { icon: <MdDetails />, label: "Details", value: "details" },
-];
+const tabs = [{ icon: <MdOutlineTask />, label: "Task Instances", value: "" }];
 
-export const TaskInstance = () => {
+export const MappedTaskInstance = () => {
   const { dagId = "", runId = "", taskId = "" } = useParams();
-  const [searchParams] = useSearchParams();
-
-  const mapIndexParam = searchParams.get("map_index");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
-
   const refetchInterval = useAutoRefresh({ dagId });
 
   const {
@@ -54,23 +40,21 @@ export const TaskInstance = () => {
     dagId,
   });
 
-  const {
-    data: taskInstance,
-    error,
-    isLoading,
-  } = useTaskInstanceServiceGetMappedTaskInstance(
+  const { data, error, isLoading } = useGridServiceGridData(
     {
       dagId,
-      dagRunId: runId,
-      mapIndex,
-      taskId,
     },
     undefined,
     {
-      refetchInterval: (query) => (isStatePending(query.state.data?.state) ? 
refetchInterval : false),
+      refetchInterval: (query) =>
+        query.state.data?.dag_runs.some((dr) => isStatePending(dr.state)) ? 
refetchInterval : false,
     },
   );
 
+  const taskInstance = data?.dag_runs
+    .find((dr) => dr.dag_run_id === runId)
+    ?.task_instances.find((ti) => ti.task_id === taskId);
+
   return (
     <ReactFlowProvider>
       <DetailsLayout dag={dag} error={error ?? dagError} isLoading={isLoading 
|| isDagLoading} tabs={tabs}>
diff --git a/airflow/ui/src/utils/links.ts 
b/airflow/ui/src/pages/MappedTaskInstance/index.ts
similarity index 75%
copy from airflow/ui/src/utils/links.ts
copy to airflow/ui/src/pages/MappedTaskInstance/index.ts
index 18be2bb642b..efb943c636b 100644
--- a/airflow/ui/src/utils/links.ts
+++ b/airflow/ui/src/pages/MappedTaskInstance/index.ts
@@ -16,7 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import type { TaskInstanceResponse } from "openapi/requests/types.gen";
 
-export const getTaskInstanceLink = (ti: TaskInstanceResponse) =>
-  `/dags/${ti.dag_id}/runs/${ti.dag_run_id}/tasks/${ti.task_id}${ti.map_index 
>= 0 ? `?map_index=${ti.map_index}` : ""}`;
+export { MappedTaskInstance } from "./MappedTaskInstance";
diff --git a/airflow/ui/src/pages/TaskInstance/Details.tsx 
b/airflow/ui/src/pages/TaskInstance/Details.tsx
index 24aa9e31aa9..550120a1641 100644
--- a/airflow/ui/src/pages/TaskInstance/Details.tsx
+++ b/airflow/ui/src/pages/TaskInstance/Details.tsx
@@ -33,17 +33,15 @@ import { ExtraLinks } from "./ExtraLinks";
 import { TriggererInfo } from "./TriggererInfo";
 
 export const Details = () => {
-  const { dagId = "", runId = "", taskId = "" } = useParams();
+  const { dagId = "", mapIndex = "-1", runId = "", taskId = "" } = useParams();
   const [searchParams, setSearchParams] = useSearchParams();
 
-  const mapIndexParam = searchParams.get("map_index");
   const tryNumberParam = searchParams.get("try_number");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
 
   const { data: taskInstance } = useTaskInstanceServiceGetMappedTaskInstance({
     dagId,
     dagRunId: runId,
-    mapIndex,
+    mapIndex: parseInt(mapIndex, 10),
     taskId,
   });
 
@@ -64,7 +62,7 @@ export const Details = () => {
     {
       dagId,
       dagRunId: runId,
-      mapIndex,
+      mapIndex: parseInt(mapIndex, 10),
       taskId,
       taskTryNumber: tryNumber ?? 1,
     },
diff --git a/airflow/ui/src/pages/TaskInstance/ExtraLinks.tsx 
b/airflow/ui/src/pages/TaskInstance/ExtraLinks.tsx
index 5990c6fdb5f..e30c4b92d6e 100644
--- a/airflow/ui/src/pages/TaskInstance/ExtraLinks.tsx
+++ b/airflow/ui/src/pages/TaskInstance/ExtraLinks.tsx
@@ -17,26 +17,23 @@
  * under the License.
  */
 import { Box, Button, Heading, HStack } from "@chakra-ui/react";
-import { useParams, useSearchParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 
 import { useTaskInstanceServiceGetExtraLinks } from "openapi/queries";
 
 export const ExtraLinks = () => {
-  const { dagId = "", runId = "", taskId = "" } = useParams();
-  const [searchParams] = useSearchParams();
-  const mapIndexParam = searchParams.get("map_index");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
+  const { dagId = "", mapIndex = "-1", runId = "", taskId = "" } = useParams();
 
   const { data } = useTaskInstanceServiceGetExtraLinks({
     dagId,
     dagRunId: runId,
-    mapIndex,
+    mapIndex: parseInt(mapIndex, 10),
     taskId,
   });
 
   return data && Object.keys(data).length > 0 ? (
     <Box py={1}>
-      <Heading size="sm"> Extra Links </Heading>
+      <Heading size="sm">Extra Links</Heading>
       <HStack gap={2} py={2}>
         {Object.entries(data).map(([key, value], _) =>
           value === null ? undefined : (
diff --git a/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx 
b/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx
index c062c7f4b2b..340198a46b2 100644
--- a/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx
+++ b/airflow/ui/src/pages/TaskInstance/Logs/Logs.tsx
@@ -29,12 +29,10 @@ import { TaskLogContent } from "./TaskLogContent";
 import { TaskLogHeader } from "./TaskLogHeader";
 
 export const Logs = () => {
-  const { dagId = "", runId = "", taskId = "" } = useParams();
+  const { dagId = "", mapIndex = "-1", runId = "", taskId = "" } = useParams();
   const [searchParams, setSearchParams] = useSearchParams();
 
-  const mapIndexParam = searchParams.get("map_index");
   const tryNumberParam = searchParams.get("try_number");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
 
   const {
     data: taskInstance,
@@ -43,7 +41,7 @@ export const Logs = () => {
   } = useTaskInstanceServiceGetMappedTaskInstance({
     dagId,
     dagRunId: runId,
-    mapIndex,
+    mapIndex: parseInt(mapIndex, 10),
     taskId,
   });
 
diff --git a/airflow/ui/src/pages/TaskInstance/RenderedTemplates.tsx 
b/airflow/ui/src/pages/TaskInstance/RenderedTemplates.tsx
index 9d1a4324875..d8b6d7bf5a7 100644
--- a/airflow/ui/src/pages/TaskInstance/RenderedTemplates.tsx
+++ b/airflow/ui/src/pages/TaskInstance/RenderedTemplates.tsx
@@ -17,22 +17,18 @@
  * under the License.
  */
 import { Box, HStack, Table, Code } from "@chakra-ui/react";
-import { useParams, useSearchParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 
 import { useTaskInstanceServiceGetMappedTaskInstance } from "openapi/queries";
 import { ClipboardRoot, ClipboardIconButton } from "src/components/ui";
 
 export const RenderedTemplates = () => {
-  const { dagId = "", runId = "", taskId = "" } = useParams();
-  const [searchParams] = useSearchParams();
-
-  const mapIndexParam = searchParams.get("map_index");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
+  const { dagId = "", mapIndex = "-1", runId = "", taskId = "" } = useParams();
 
   const { data: taskInstance } = useTaskInstanceServiceGetMappedTaskInstance({
     dagId,
     dagRunId: runId,
-    mapIndex,
+    mapIndex: parseInt(mapIndex, 10),
     taskId,
   });
 
diff --git a/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx 
b/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx
index bcda0736dd1..f6993b87b27 100644
--- a/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx
+++ b/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx
@@ -20,7 +20,7 @@ import { ReactFlowProvider } from "@xyflow/react";
 import { FiCode } from "react-icons/fi";
 import { MdDetails, MdOutlineEventNote, MdReorder, MdSyncAlt } from 
"react-icons/md";
 import { PiBracketsCurlyBold } from "react-icons/pi";
-import { useParams, useSearchParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 
 import { useDagServiceGetDagDetails, 
useTaskInstanceServiceGetMappedTaskInstance } from "openapi/queries";
 import { DetailsLayout } from "src/layouts/Details/DetailsLayout";
@@ -38,11 +38,7 @@ const tabs = [
 ];
 
 export const TaskInstance = () => {
-  const { dagId = "", runId = "", taskId = "" } = useParams();
-  const [searchParams] = useSearchParams();
-
-  const mapIndexParam = searchParams.get("map_index");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
+  const { dagId = "", mapIndex = "-1", runId = "", taskId = "" } = useParams();
 
   const refetchInterval = useAutoRefresh({ dagId });
 
@@ -62,7 +58,7 @@ export const TaskInstance = () => {
     {
       dagId,
       dagRunId: runId,
-      mapIndex,
+      mapIndex: parseInt(mapIndex, 10),
       taskId,
     },
     undefined,
diff --git a/airflow/ui/src/pages/TaskInstances.tsx 
b/airflow/ui/src/pages/TaskInstances.tsx
index 20dff17bb2e..5424b0d3e9e 100644
--- a/airflow/ui/src/pages/TaskInstances.tsx
+++ b/airflow/ui/src/pages/TaskInstances.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+
 /*!
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -100,7 +102,16 @@ const taskInstanceColumns = (
   },
   {
     accessorKey: "start_date",
-    cell: ({ row: { original } }) => <Time datetime={original.start_date} />,
+    cell: ({ row: { original } }) =>
+      Boolean(taskId) && Boolean(runId) ? (
+        <Link asChild color="fg.info" fontWeight="bold">
+          <RouterLink to={getTaskInstanceLink(original)}>
+            <Time datetime={original.start_date} />
+          </RouterLink>
+        </Link>
+      ) : (
+        <Time datetime={original.start_date} />
+      ),
     header: "Start Date",
   },
   {
diff --git a/airflow/ui/src/pages/XCom/XCom.tsx 
b/airflow/ui/src/pages/XCom/XCom.tsx
index f309d2532da..2b10ce704d6 100644
--- a/airflow/ui/src/pages/XCom/XCom.tsx
+++ b/airflow/ui/src/pages/XCom/XCom.tsx
@@ -18,7 +18,7 @@
  */
 import { Box } from "@chakra-ui/react";
 import type { ColumnDef } from "@tanstack/react-table";
-import { useParams, useSearchParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 
 import { useXcomServiceGetXcomEntries } from "openapi/queries";
 import type { XComResponse } from "openapi/requests/types.gen";
@@ -50,10 +50,7 @@ const columns: Array<ColumnDef<XComResponse>> = [
 ];
 
 export const XCom = () => {
-  const { dagId = "~", runId = "~", taskId = "~" } = useParams();
-  const [searchParams] = useSearchParams();
-  const mapIndexParam = searchParams.get("map_index");
-  const mapIndex = parseInt(mapIndexParam ?? "-1", 10);
+  const { dagId = "~", mapIndex = "-1", runId = "~", taskId = "~" } = 
useParams();
 
   const { setTableURLState, tableURLState } = useTableURLState();
   const { pagination } = tableURLState;
@@ -63,7 +60,7 @@ export const XCom = () => {
       dagId,
       dagRunId: runId,
       limit: pagination.pageSize,
-      mapIndex,
+      mapIndex: mapIndex === "-1" ? undefined : parseInt(mapIndex, 10),
       offset: pagination.pageIndex * pagination.pageSize,
       taskId,
     },
diff --git a/airflow/ui/src/router.tsx b/airflow/ui/src/router.tsx
index c33feb6bbef..d8e0228a77b 100644
--- a/airflow/ui/src/router.tsx
+++ b/airflow/ui/src/router.tsx
@@ -33,6 +33,7 @@ import { DagsList } from "src/pages/DagsList";
 import { Dashboard } from "src/pages/Dashboard";
 import { ErrorPage } from "src/pages/Error";
 import { Events } from "src/pages/Events";
+import { MappedTaskInstance } from "src/pages/MappedTaskInstance";
 import { Plugins } from "src/pages/Plugins";
 import { Pools } from "src/pages/Pools";
 import { Providers } from "src/pages/Providers";
@@ -49,6 +50,16 @@ import { XCom } from "src/pages/XCom";
 
 import { queryClient } from "./queryClient";
 
+const taskInstanceRoutes = [
+  { element: <Logs />, index: true },
+  { element: <Events />, path: "events" },
+  { element: <XCom />, path: "xcom" },
+  { element: <Code />, path: "code" },
+  { element: <Details />, path: "details" },
+  { element: <RenderedTemplates />, path: "rendered_templates" },
+  { element: <TaskInstances />, path: "task_instances" },
+];
+
 export const routerConfig = [
   {
     children: [
@@ -126,17 +137,20 @@ export const routerConfig = [
         path: "dags/:dagId/runs/:runId",
       },
       {
-        children: [
-          { element: <Logs />, index: true },
-          { element: <Events />, path: "events" },
-          { element: <XCom />, path: "xcom" },
-          { element: <Code />, path: "code" },
-          { element: <Details />, path: "details" },
-          { element: <RenderedTemplates />, path: "rendered_templates" },
-        ],
+        children: taskInstanceRoutes,
         element: <TaskInstance />,
         path: "dags/:dagId/runs/:runId/tasks/:taskId",
       },
+      {
+        children: [{ element: <TaskInstances />, index: true }],
+        element: <MappedTaskInstance />,
+        path: "dags/:dagId/runs/:runId/tasks/:taskId/mapped",
+      },
+      {
+        children: taskInstanceRoutes,
+        element: <TaskInstance />,
+        path: "dags/:dagId/runs/:runId/tasks/:taskId/mapped/:mapIndex",
+      },
       {
         children: [
           { element: <TaskOverview />, index: true },
diff --git a/airflow/ui/src/utils/links.ts b/airflow/ui/src/utils/links.ts
index 18be2bb642b..a4b70aa3e47 100644
--- a/airflow/ui/src/utils/links.ts
+++ b/airflow/ui/src/utils/links.ts
@@ -19,4 +19,4 @@
 import type { TaskInstanceResponse } from "openapi/requests/types.gen";
 
 export const getTaskInstanceLink = (ti: TaskInstanceResponse) =>
-  `/dags/${ti.dag_id}/runs/${ti.dag_run_id}/tasks/${ti.task_id}${ti.map_index 
>= 0 ? `?map_index=${ti.map_index}` : ""}`;
+  `/dags/${ti.dag_id}/runs/${ti.dag_run_id}/tasks/${ti.task_id}${ti.map_index 
>= 0 ? `/mapped/${ti.map_index}` : ""}`;

Reply via email to