Skip to content

[v3-1-test] Convert Tasks Table from card to table mode (#60830) #60874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierrejeambrun merged 1 commit into from
Jan 21, 2026
Merged

[v3-1-test] Convert Tasks Table from card to table mode (#60830) #60874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 0 additions & 99 deletions airflow-core/src/airflow/ui/src/pages/Dag/Tasks/TaskCard.tsx
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions airflow-core/src/airflow/ui/src/pages/Dag/Tasks/TaskRecentRuns.tsx
View file
Open in desktop

This file was deleted.

61 changes: 51 additions & 10 deletions airflow-core/src/airflow/ui/src/pages/Dag/Tasks/Tasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,63 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Skeleton, Box } from "@chakra-ui/react";
import { Box, Link } from "@chakra-ui/react";
import type { ColumnDef } from "@tanstack/react-table";
import type { TFunction } from "i18next";
import { useTranslation } from "react-i18next";
import { useParams, useSearchParams } from "react-router-dom";
import { Link as RouterLink } from "react-router-dom";

import { useTaskServiceGetTasks } from "openapi/queries";
import type { TaskResponse } from "openapi/requests/types.gen";
import { DataTable } from "src/components/DataTable";
import type { CardDef } from "src/components/DataTable/types";
import { ErrorAlert } from "src/components/ErrorAlert";
import { TruncatedText } from "src/components/TruncatedText";
import { SearchParamsKeys } from "src/constants/searchParams.ts";
import { TaskFilters } from "src/pages/Dag/Tasks/TaskFilters/TaskFilters.tsx";

import { TaskCard } from "./TaskCard";
type TaskRow = { row: { original: TaskResponse } };

const cardDef = (dagId: string): CardDef<TaskResponse> => ({
card: ({ row }) => <TaskCard dagId={dagId} task={row} />,
meta: {
customSkeleton: <Skeleton height="120px" width="100%" />,
const createColumns = ({
dagId,
translate,
}: {
dagId: string;
translate: TFunction;
}): Array<ColumnDef<TaskResponse>> => [
{
accessorKey: "task_display_name",
cell: ({ row: { original } }: TaskRow) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={`/dags/${dagId}/tasks/${original.task_id}`}>
<TruncatedText text={original.task_display_name ?? original.task_id ?? ""} />
</RouterLink>
</Link>
),
enableSorting: false,
header: translate("common:taskId"),
},
});
{
accessorKey: "trigger_rule",
enableSorting: false,
header: translate("common:task.triggerRule"),
},
{
accessorKey: "operator_name",
enableSorting: false,
header: translate("common:task.operator"),
},
{
accessorKey: "retries",
enableSorting: false,
header: translate("tasks:retries"),
},
{
accessorKey: "is_mapped",
enableSorting: false,
header: translate("tasks:mapped"),
},
];

export const Tasks = () => {
const { dagId = "" } = useParams();
Expand All @@ -46,6 +84,10 @@ export const Tasks = () => {
const selectedMapped = searchParams.get(MAPPED) ?? undefined;
const namePattern = searchParams.get(NAME_PATTERN) ?? undefined;

const { t: translate } = useTranslation(["tasks", "common"]);

const columns = createColumns({ dagId, translate });

const {
data,
error: tasksError,
Expand Down Expand Up @@ -92,8 +134,7 @@ export const Tasks = () => {
<TaskFilters tasksData={data} />

<DataTable
cardDef={cardDef(dagId)}
columns={[]}
columns={columns}
data={filteredTasks}
displayMode="card"
isFetching={isFetching}
Expand Down
13 changes: 4 additions & 9 deletions airflow-core/src/airflow/ui/src/pages/HITLTaskInstances/HITLTaskInstances.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { getTaskInstanceLink } from "src/utils/links";

import { HITLFilters } from "./HITLFilters";

type TaskInstanceRow = { row: { original: HITLDetail } };
type HITLRow = { row: { original: HITLDetail } };

const {
DAG_DISPLAY_NAME_PATTERN,
Expand All @@ -60,14 +60,14 @@ const taskInstanceColumns = ({
}): Array<ColumnDef<HITLDetail>> => [
{
accessorKey: "task_instance_state",
cell: ({ row: { original } }: TaskInstanceRow) => (
cell: ({ row: { original } }: HITLRow) => (
<StateBadge state={original.task_instance.state}>{getHITLState(translate, original)}</StateBadge>
),
header: translate("requiredActionState"),
},
{
accessorKey: "subject",
cell: ({ row: { original } }: TaskInstanceRow) => (
cell: ({ row: { original } }: HITLRow) => (
<Link asChild color="fg.info" fontWeight="bold">
<RouterLink to={`${getTaskInstanceLink(original.task_instance)}/required_actions`}>
<TruncatedText text={original.subject} />
Expand All @@ -90,9 +90,7 @@ const taskInstanceColumns = ({
: [
{
accessorKey: "run_after",
cell: ({ row: { original } }: TaskInstanceRow) => (
<Time datetime={original.task_instance.run_after} />
),
cell: ({ row: { original } }: HITLRow) => <Time datetime={original.task_instance.run_after} />,
header: translate("common:dagRun.runAfter"),
},
]),
Expand All @@ -101,9 +99,6 @@ const taskInstanceColumns = ({
: [
{
accessorKey: "task_display_name",
cell: ({ row: { original } }: TaskInstanceRow) => (
<TruncatedText text={original.task_instance.task_display_name} />
),
enableSorting: false,
header: translate("common:taskId"),
},
Expand Down