diff --git a/airflow/www/package.json b/airflow/www/package.json index 0332f95cbc94..7e494cadd4cf 100644 --- a/airflow/www/package.json +++ b/airflow/www/package.json @@ -129,7 +129,7 @@ "moment-timezone": "^0.5.43", "react": "^18.0.0", "react-dom": "^18.0.0", - "react-icons": "^5.1.0", + "react-icons": "^5.2.1", "react-json-view": "^1.21.3", "react-markdown": "^8.0.4", "react-query": "^3.39.1", diff --git a/airflow/www/static/css/graph.css b/airflow/www/static/css/graph.css index 5dc33fe2f935..f175a7e025d7 100644 --- a/airflow/www/static/css/graph.css +++ b/airflow/www/static/css/graph.css @@ -166,6 +166,11 @@ g.node text { background-color: #fcecd4; } +.legend-item.dataset-alias { + float: left; + background-color: #e8cfe4; +} + g.node.dag rect { fill: #e8f7e4; } @@ -181,3 +186,7 @@ g.node.sensor rect { g.node.dataset rect { fill: #fcecd4; } + +g.node.dataset-alias rect { + fill: #e8cfe4; +} diff --git a/airflow/www/static/js/datasets/Graph/Legend.tsx b/airflow/www/static/js/datasets/Graph/Legend.tsx index 3ecbed766473..5110dc3fd3eb 100644 --- a/airflow/www/static/js/datasets/Graph/Legend.tsx +++ b/airflow/www/static/js/datasets/Graph/Legend.tsx @@ -21,6 +21,7 @@ import React from "react"; import { Flex, Box, Text } from "@chakra-ui/react"; import { MdOutlineAccountTree } from "react-icons/md"; import { HiDatabase } from "react-icons/hi"; +import { PiRectangleDashed } from "react-icons/pi"; const Legend = () => ( ( DAG - + Dataset + + + Dataset Alias + ); diff --git a/airflow/www/static/js/datasets/Graph/Node.tsx b/airflow/www/static/js/datasets/Graph/Node.tsx index 72b5505ffb06..baef11aa8366 100644 --- a/airflow/www/static/js/datasets/Graph/Node.tsx +++ b/airflow/www/static/js/datasets/Graph/Node.tsx @@ -22,6 +22,7 @@ import { Box, Text, Flex, useTheme } from "@chakra-ui/react"; import { Handle, NodeProps, Position } from "reactflow"; import { MdPlayArrow, MdSensors } from "react-icons/md"; import { HiDatabase } from "react-icons/hi"; +import { PiRectangleDashed } from "react-icons/pi"; import DagNode from "./DagNode"; @@ -72,6 +73,7 @@ const BaseNode = ({ {type === "dataset" && } {type === "sensor" && } {type === "trigger" && } + {type === "dataset-alias" && } {label} )} diff --git a/airflow/www/templates/airflow/dag_dependencies.html b/airflow/www/templates/airflow/dag_dependencies.html index 70a4d291121c..542a5b7b47b8 100644 --- a/airflow/www/templates/airflow/dag_dependencies.html +++ b/airflow/www/templates/airflow/dag_dependencies.html @@ -44,6 +44,7 @@

trigger sensor dataset + dataset alias
Last refresh:
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock index adcb29da9f98..20d9ce752095 100644 --- a/airflow/www/yarn.lock +++ b/airflow/www/yarn.lock @@ -10003,10 +10003,10 @@ react-focus-lock@^2.9.1: use-callback-ref "^1.3.0" use-sidecar "^1.1.2" -react-icons@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.1.0.tgz#9e7533cc256571a610c2a1ec8a7a143fb1222943" - integrity sha512-D3zug1270S4hbSlIRJ0CUS97QE1yNNKDjzQe3HqY0aefp2CBn9VgzgES27sRR2gOvFK+0CNx/BW0ggOESp6fqQ== +react-icons@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.2.1.tgz#28c2040917b2a2eda639b0f797bff1888e018e4a" + integrity sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw== react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1"