Skip to content

Commit

Permalink
Check that the dataset<>task exists before trying to render graph (#3…
Browse files Browse the repository at this point in the history
…9069)

(cherry picked from commit 57c6a4b)
  • Loading branch information
bbovenzi authored and jedcunningham committed Apr 26, 2024
1 parent ed4cd93 commit 5fcf36c
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions airflow/www/static/js/dag/details/graph/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { BiCollapse, BiExpand } from "react-icons/bi";

import { useDatasets, useGraphData, useGridData } from "src/api";
import useSelection from "src/dag/useSelection";
import { getMetaValue, useOffsetTop } from "src/utils";
import { getMetaValue, getTask, useOffsetTop } from "src/utils";
import { useGraphLayout } from "src/utils/graph";
import Edge from "src/components/Graph/Edge";
import type { DepNode, WebserverEdge } from "src/types";
Expand Down Expand Up @@ -68,6 +68,10 @@ const Graph = ({
const [hasRendered, setHasRendered] = useState(false);
const [isZoomedOut, setIsZoomedOut] = useState(false);

const {
data: { dagRuns, groups },
} = useGridData();

useEffect(() => {
setArrange(data?.arrange || "LR");
}, [data?.arrange]);
Expand Down Expand Up @@ -104,7 +108,11 @@ const Graph = ({
);
const consumingDag = dataset?.consumingDags?.find((d) => d.dagId === dagId);
if (dataset.id) {
if (producingTask?.taskId) {
// check that the task is in the graph
if (
producingTask?.taskId &&
getTask({ taskId: producingTask?.taskId, task: groups })
) {
datasetEdges.push({
sourceId: producingTask.taskId,
targetId: dataset.id.toString(),
Expand All @@ -130,9 +138,6 @@ const Graph = ({

const { selected } = useSelection();

const {
data: { dagRuns, groups },
} = useGridData();
const { colors } = useTheme();
const { getZoom, fitView } = useReactFlow();
const latestDagRunId = dagRuns[dagRuns.length - 1]?.runId;
Expand Down

0 comments on commit 5fcf36c

Please sign in to comment.