Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,6 @@ export const Dag = () => {
// Get external views with dag destination
const externalTabs = usePluginTabs("dag");

const tabs = [
{ icon: <LuChartColumn />, label: translate("tabs.overview"), value: "" },
{ icon: <FiBarChart />, label: translate("tabs.runs"), value: "runs" },
{ icon: <TaskIcon />, label: translate("tabs.tasks"), value: "tasks" },
{ icon: <FiCalendar />, label: translate("tabs.calendar"), value: "calendar" },
{ icon: <FiUser />, label: translate("tabs.requiredActions"), value: "required_actions" },
{ icon: <RiArrowGoBackFill />, label: translate("tabs.backfills"), value: "backfills" },
{ icon: <MdOutlineEventNote />, label: translate("tabs.auditLog"), value: "events" },
{ icon: <FiCode />, label: translate("tabs.code"), value: "code" },
{ icon: <MdDetails />, label: translate("tabs.details"), value: "details" },
...externalTabs,
];

const refetchInterval = useAutoRefresh({ dagId });
const [hasPendingRuns, setHasPendingRuns] = useState<boolean | undefined>(false);

Expand Down Expand Up @@ -106,6 +93,19 @@ export const Dag = () => {
},
);

const tabs = [
{ icon: <LuChartColumn />, label: translate("tabs.overview"), value: "" },
{ icon: <FiBarChart />, label: translate("tabs.runs"), value: "runs" },
{ icon: <TaskIcon />, label: translate("tabs.tasks"), value: "tasks" },
{ icon: <FiCalendar />, label: translate("tabs.calendar"), value: "calendar" },
{ icon: <FiUser />, label: translate("tabs.requiredActions"), value: "required_actions" },
{ icon: <RiArrowGoBackFill />, label: translate("tabs.backfills"), value: "backfills" },
{ icon: <MdOutlineEventNote />, label: translate("tabs.auditLog"), value: "events" },
{ icon: <FiCode />, label: translate("tabs.code"), value: "code" },
{ icon: <MdDetails />, label: translate("tabs.details"), value: "details" },
...externalTabs,
];

const { tabs: processedTabs } = useRequiredActionTabs({ dagId }, tabs, {
refetchInterval:
(dag?.active_runs_count ?? 0) > 0 || (latestRun && isStatePending(latestRun.state))
Expand Down
19 changes: 17 additions & 2 deletions airflow-core/src/airflow/ui/src/pages/DagRuns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import { Flex, HStack, Link, Text } from "@chakra-ui/react";
import type { ColumnDef } from "@tanstack/react-table";
import type { TFunction } from "i18next";
import { useTranslation } from "react-i18next";
import { Link as RouterLink, useParams, useSearchParams } from "react-router-dom";
import { Link as RouterLink, Navigate, useLocation, useParams, useSearchParams } from "react-router-dom";

import { useDagRunServiceGetDagRuns } from "openapi/queries";
import { useDagRunServiceGetDagRuns, useDagServiceGetDagDetails } from "openapi/queries";
import type { DAGRunResponse } from "openapi/requests/types.gen";
import { ClearRunButton } from "src/components/Clear";
import { DagVersion } from "src/components/DagVersion";
Expand Down Expand Up @@ -188,6 +188,7 @@ const runColumns = (translate: TFunction, dagId?: string): Array<ColumnDef<DAGRu
export const DagRuns = () => {
const { t: translate } = useTranslation();
const { dagId } = useParams();
const location = useLocation();
const [searchParams] = useSearchParams();

const { setTableURLState, tableURLState } = useTableURLState({
Expand All @@ -203,6 +204,12 @@ export const DagRuns = () => {
const orderBy = sort ? [`${sort.desc ? "-" : ""}${sort.id}`] : ["-run_after"];

const { pageIndex, pageSize } = pagination;
const { data: dagDetails } = useDagServiceGetDagDetails(
{ dagId: dagId ?? "" },
undefined,
{ enabled: Boolean(dagId) },
);

const filteredState = searchParams.get(STATE_PARAM);
const filteredType = searchParams.get(RUN_TYPE_PARAM);
const filteredRunIdPattern = searchParams.get(RUN_ID_PATTERN_PARAM);
Expand Down Expand Up @@ -256,6 +263,14 @@ export const DagRuns = () => {

const columns = runColumns(translate, dagId);

if (dagId && dagDetails?.timetable_summary === "Partitioned Asset" && filteredType === null) {
const next = new URLSearchParams(searchParams);

next.set(RUN_TYPE_PARAM, "asset_triggered");

return <Navigate replace to={`${location.pathname}?${next.toString()}`} />;
}

return (
<>
<DagRunsFilters dagId={dagId} />
Expand Down
Loading