feat(dataset_event): add showSource and showTriggeredDagRuns to Datas…

…etEventCard (#41300)
apache · Aug 8, 2024 · 472e683 · 472e683
1 parent 49669c9
commit 472e683
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/airflow/www/static/js/components/DatasetEventCard.tsx b/airflow/www/static/js/components/DatasetEventCard.tsx
@@ -44,11 +44,17 @@ import TriggeredDagRuns from "./TriggeredDagRuns";
 
 type CardProps = {
   datasetEvent: DatasetEvent;
+  showSource?: boolean;
+  showTriggeredDagRuns?: boolean;
 };
 
 const datasetsUrl = getMetaValue("datasets_url");
 
-const DatasetEventCard = ({ datasetEvent }: CardProps) => {
+const DatasetEventCard = ({
+  datasetEvent,
+  showSource = true,
+  showTriggeredDagRuns = true,
+}: CardProps) => {
   const [searchParams] = useSearchParams();
 
   const selectedUri = decodeURIComponent(searchParams.get("uri") || "");
@@ -92,25 +98,29 @@ const DatasetEventCard = ({ datasetEvent }: CardProps) => {
           </Flex>
         </GridItem>
         <GridItem>
-          Source:
-          {fromRestApi && (
-            <Tooltip
-              portalProps={{ containerRef }}
-              hasArrow
-              placement="top"
-              label="Manually created from REST API"
-            >
-              <Box width="20px">
-                <TbApi size="20px" />
-              </Box>
-            </Tooltip>
-          )}
-          {!!datasetEvent.sourceTaskId && (
-            <SourceTaskInstance datasetEvent={datasetEvent} />
+          {showSource && (
+            <>
+              Source:
+              {fromRestApi && (
+                <Tooltip
+                  portalProps={{ containerRef }}
+                  hasArrow
+                  placement="top"
+                  label="Manually created from REST API"
+                >
+                  <Box width="20px">
+                    <TbApi size="20px" />
+                  </Box>
+                </Tooltip>
+              )}
+              {!!datasetEvent.sourceTaskId && (
+                <SourceTaskInstance datasetEvent={datasetEvent} />
+              )}
+            </>
           )}
         </GridItem>
         <GridItem>
-          {!!datasetEvent?.createdDagruns?.length && (
+          {showTriggeredDagRuns && !!datasetEvent?.createdDagruns?.length && (
             <>
               Triggered Dag Runs:
               <TriggeredDagRuns createdDagRuns={datasetEvent?.createdDagruns} />

diff --git a/airflow/www/static/js/dag/details/dagRun/DatasetTriggerEvents.tsx b/airflow/www/static/js/dag/details/dagRun/DatasetTriggerEvents.tsx
@@ -33,7 +33,9 @@ interface Props {
 const dagId = getMetaValue("dag_id");
 
 const cardDef: CardDef<DatasetEvent> = {
-  card: ({ row }) => <DatasetEventCard datasetEvent={row} />,
+  card: ({ row }) => (
+    <DatasetEventCard datasetEvent={row} showTriggeredDagRuns={false} />
+  ),
 };
 
 const DatasetTriggerEvents = ({ runId }: Props) => {
@@ -56,10 +58,6 @@ const DatasetTriggerEvents = ({ runId }: Props) => {
         Header: "Source Task Instance",
         accessor: "sourceTaskId",
       },
-      {
-        Header: "Triggered Runs",
-        accessor: "createdDagruns",
-      },
       {
         Header: "Extra",
         accessor: "extra",

diff --git a/airflow/www/static/js/dag/details/taskInstance/DatasetUpdateEvents.tsx b/airflow/www/static/js/dag/details/taskInstance/DatasetUpdateEvents.tsx
@@ -32,7 +32,7 @@ interface Props {
 }
 
 const cardDef: CardDef<DatasetEvent> = {
-  card: ({ row }) => <DatasetEventCard datasetEvent={row} />,
+  card: ({ row }) => <DatasetEventCard datasetEvent={row} showSource={false} />,
 };
 
 const dagId = getMetaValue("dag_id") || undefined;
@@ -57,10 +57,6 @@ const DatasetUpdateEvents = ({ runId, taskId }: Props) => {
         Header: "Dataset",
         accessor: "datasetUri",
       },
-      {
-        Header: "Source Task Instance",
-        accessor: "sourceTaskId",
-      },
       {
         Header: "Triggered Runs",
         accessor: "createdDagruns",