From 8a9a4f37c15e4824271f030af817b5259842b264 Mon Sep 17 00:00:00 2001
From: Brent Bovenzi <brent.bovenzi@gmail.com>
Date: Wed, 13 Mar 2024 10:33:26 -0700
Subject: [PATCH] Add dataset_expression to grid dag details

---
 airflow/api_connexion/openapi/v1.yaml         |  4 ++++
 airflow/www/static/js/dag/details/dag/Dag.tsx | 16 ++++++++++++++++
 airflow/www/static/js/types/api-generated.ts  |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/airflow/api_connexion/openapi/v1.yaml b/airflow/api_connexion/openapi/v1.yaml
index 22bb4451eace8..4d8a48e04fb68 100644
--- a/airflow/api_connexion/openapi/v1.yaml
+++ b/airflow/api_connexion/openapi/v1.yaml
@@ -3830,6 +3830,10 @@ components:
             dag_run_timeout:
               $ref: "#/components/schemas/TimeDelta"
               nullable: true
+            dataset_expression:
+              type: object
+              description: Nested dataset any/all conditions
+              nullable: true
             doc_md:
               type: string
               readOnly: true
diff --git a/airflow/www/static/js/dag/details/dag/Dag.tsx b/airflow/www/static/js/dag/details/dag/Dag.tsx
index fad12b06144f2..7cfd36f516418 100644
--- a/airflow/www/static/js/dag/details/dag/Dag.tsx
+++ b/airflow/www/static/js/dag/details/dag/Dag.tsx
@@ -242,6 +242,22 @@ const Dag = () => {
                 </Td>
                 <Td />
               </Tr>
+              {!!dagDetailsData.datasetExpression && (
+                <Tr>
+                  <Td>Dataset Conditions</Td>
+                  <Td>
+                    <Code>
+                      <pre>
+                        {JSON.stringify(
+                          dagDetailsData.datasetExpression,
+                          null,
+                          2
+                        )}
+                      </pre>
+                    </Code>
+                  </Td>
+                </Tr>
+              )}
               {renderDagDetailsData(dagDetailsData, dagDataExcludeFields)}
               <Tr>
                 <Td>Owners</Td>
diff --git a/airflow/www/static/js/types/api-generated.ts b/airflow/www/static/js/types/api-generated.ts
index 1142fd42f1380..ea9c0c1df63a1 100644
--- a/airflow/www/static/js/types/api-generated.ts
+++ b/airflow/www/static/js/types/api-generated.ts
@@ -1536,6 +1536,8 @@ export interface components {
        */
       start_date?: string | null;
       dag_run_timeout?: components["schemas"]["TimeDelta"] | null;
+      /** @description Nested dataset any/all conditions */
+      dataset_expression?: { [key: string]: unknown } | null;
       doc_md?: string | null;
       default_view?: string | null;
       /**