bbovenzi commented on code in PR #51667:
URL: https://github.com/apache/airflow/pull/51667#discussion_r2277659346
##########
airflow-core/src/airflow/ui/src/layouts/Details/PanelButtons.tsx:
##########
@@ -72,10 +78,19 @@ const deps = ["all", "immediate", "tasks"];
type Dependency = (typeof deps)[number];
-export const PanelButtons = ({ dagView, limit, panelGroupRef, setDagView,
setLimit }: Props) => {
+export const PanelButtons = ({
+ dagView,
+ limit,
+ panelGroupRef,
+ setDagView,
+ setLimit,
+ setShowGantt,
+ showGantt,
+}: Props) => {
const { t: translate } = useTranslation(["components", "dag"]);
- const { dagId = "" } = useParams();
+ const { dagId = "", runId, taskId } = useParams();
const { fitView } = useReactFlow();
+ const shouldShowToggleButtons = Boolean(runId ?? taskId);
Review Comment:
Shouldn't this just be `Boolean(runId)`?
In the future we can make a custom /gantt endpoint to generate a box-whisker
plot to show trends across runs.
##########
airflow-core/src/airflow/ui/src/layouts/Details/Gantt/Gantt.tsx:
##########
@@ -0,0 +1,291 @@
+/*!
+ * 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, useToken } from "@chakra-ui/react";
+import {
+ Chart as ChartJS,
+ CategoryScale,
+ LinearScale,
+ PointElement,
+ LineElement,
+ BarElement,
+ Filler,
+ Title,
+ Tooltip,
+ Legend,
+ TimeScale,
+ type TooltipItem,
+} from "chart.js";
+import "chart.js/auto";
+import "chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm";
+import annotationPlugin from "chartjs-plugin-annotation";
+import { useMemo, useRef } from "react";
+import { Bar } from "react-chartjs-2";
+import { useTranslation } from "react-i18next";
+import { useParams } from "react-router-dom";
+
+import { useTaskInstanceServiceGetTaskInstances } from "openapi/queries";
+import { useColorMode } from "src/context/colorMode";
+import { useOpenGroups } from "src/context/openGroups";
+import { useTimezone } from "src/context/timezone";
+import { flattenNodes } from "src/layouts/Details/Grid/utils";
+import { useGridRuns } from "src/queries/useGridRuns";
+import { useGridStructure } from "src/queries/useGridStructure";
+import { useGridTiSummaries } from "src/queries/useGridTISummaries";
+import { system } from "src/theme";
+import { getDuration, isStatePending, useAutoRefresh } from "src/utils";
+import { formatDate } from "src/utils/datetimeUtils";
+
+ChartJS.register(
+ CategoryScale,
+ LinearScale,
+ PointElement,
+ BarElement,
+ LineElement,
+ Filler,
+ Title,
+ Tooltip,
+ Legend,
+ annotationPlugin,
+ TimeScale,
+);
+
+type Props = {
+ readonly limit: number;
+};
+
+const CHART_PADDING = 36;
+const CHART_ROW_HEIGHT = 20;
+const MIN_BAR_WIDTH = 10;
+
+export const Gantt = ({ limit }: Props) => {
+ const { dagId = "", groupId: selectedGroupId, runId, taskId: selectedTaskId
} = useParams();
+ const { openGroupIds } = useOpenGroups();
+ const { t: translate } = useTranslation("common");
+ const { selectedTimezone } = useTimezone();
+ const { colorMode } = useColorMode();
+ const ref = useRef();
+
+ const [lightGridColor, darkGridColor, lightSelectedColor, darkSelectedColor]
= useToken("colors", [
+ "gray.200",
+ "gray.800",
+ "blue.200",
+ "blue.800",
+ ]);
+ const gridColor = colorMode === "light" ? lightGridColor : darkGridColor;
+ const selectedItemColor = colorMode === "light" ? lightSelectedColor :
darkSelectedColor;
+
+ const { data: gridRuns, isLoading: runsLoading } = useGridRuns({ limit });
+ const { data: dagStructure, isLoading: structureLoading } =
useGridStructure({ limit });
+ const selectedRun = gridRuns?.find((run) => run.run_id === runId);
+ const refetchInterval = useAutoRefresh({ dagId });
+
+ // Get grid summaries for groups (which have min/max times)
+ const { data: gridTiSummaries, isLoading: summariesLoading } =
useGridTiSummaries({
+ dagId,
+ runId: runId ?? "",
+ state: selectedRun?.state,
+ });
+
+ // Get individual task instances for tasks (which have start/end times)
+ const { data: taskInstancesData, isLoading: tiLoading } =
useTaskInstanceServiceGetTaskInstances(
+ {
+ dagId,
+ dagRunId: runId ?? "~",
+ },
+ undefined,
+ {
+ enabled: Boolean(dagId),
+ refetchInterval: (query) =>
+ query.state.data?.task_instances.some((ti) =>
isStatePending(ti.state)) ? refetchInterval : false,
+ },
+ );
+
+ const { flatNodes } = useMemo(() => flattenNodes(dagStructure,
openGroupIds), [dagStructure, openGroupIds]);
+
+ const isLoading = runsLoading || structureLoading || summariesLoading ||
tiLoading;
+
+ const data = useMemo(() => {
+ if (isLoading || runId === undefined) {
+ return [];
+ }
+
+ const gridSummaries = gridTiSummaries?.task_instances ?? [];
+ const taskInstances = taskInstancesData?.task_instances ?? [];
+
+ return flatNodes
+ .map((node) => {
+ const gridSummary = gridSummaries.find((ti) => ti.task_id === node.id);
+
+ if (node.isGroup && gridSummary) {
+ // Group node - use min/max times from grid summary
+ return {
+ isGroup: true,
+ state: gridSummary.state,
+ x: [
+ formatDate(gridSummary.min_start_date, selectedTimezone,
"YYYY-MM-DD HH:mm:ss.SSS"),
+ formatDate(gridSummary.max_end_date, selectedTimezone,
"YYYY-MM-DD HH:mm:ss.SSS"),
+ ],
+ y: gridSummary.task_id,
+ };
+ } else if (!node.isGroup) {
+ // Individual task - use individual task instance data
+ const taskInstance = taskInstances.find((ti) => ti.task_id ===
node.id);
+
+ if (taskInstance) {
+ return {
+ isGroup: false,
+ state: taskInstance.state,
+ x: [
+ formatDate(taskInstance.start_date, selectedTimezone,
"YYYY-MM-DD HH:mm:ss.SSS"),
+ formatDate(taskInstance.end_date, selectedTimezone,
"YYYY-MM-DD HH:mm:ss.SSS"),
+ ],
+ y: taskInstance.task_id,
+ };
+ }
+ }
+
+ return undefined;
+ })
+ .filter((item) => item !== undefined);
+ }, [flatNodes, gridTiSummaries, taskInstancesData, selectedTimezone,
isLoading, runId]);
+
+ const chartData = useMemo(
+ () => ({
+ datasets: [
+ {
+ backgroundColor: data.map(
+ (dataItem) =>
+
system.tokens.categoryMap.get("colors")?.get(`${dataItem.state}.600`)?.value as
string,
+ ),
+ data,
+ maxBarThickness: CHART_ROW_HEIGHT,
+ minBarLength: MIN_BAR_WIDTH,
+ },
+ ],
+ labels: [],
+ }),
+ [data],
+ );
+
+ const fixedHeight = data.length * CHART_ROW_HEIGHT + CHART_PADDING;
+ const selectedId = selectedTaskId ?? selectedGroupId;
+
+ const chartOptions = useMemo(
+ () => ({
+ animation: {
+ duration: 100,
+ },
+ indexAxis: "y" as const,
+ maintainAspectRatio: false,
+ plugins: {
+ annotation: {
+ annotations:
+ selectedId === undefined
+ ? []
+ : [
+ {
+ backgroundColor: selectedItemColor,
+ borderWidth: 0,
+ drawTime: "beforeDatasetsDraw" as const,
+ type: "box" as const,
+ xMax: "max" as const,
+ xMin: "min" as const,
+ yMax: data.findIndex((dataItem) => dataItem.y ===
selectedId) + 0.5,
+ yMin: data.findIndex((dataItem) => dataItem.y ===
selectedId) - 0.5,
+ },
+ ],
+ },
+ legend: {
+ display: false,
+ },
+ tooltip: {
Review Comment:
Not a blocker, this can be a later PR. but it would be nice to try to use
the custom tooltip option to pass chakra jsx components and have it match
tooltips in the rest of the UI
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
