From c424f5c6282dedd350fe4a45c36e9634ac85680b Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Fri, 30 Sep 2022 19:19:16 -0700
Subject: [PATCH 1/3] Move a user-facing string to a template for better
 model-view separation

---
 airflow/models/dag.py                   |  9 ++++++---
 airflow/www/templates/airflow/dags.html |  4 +++-
 tests/models/test_dag.py                | 15 ++++++++++++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/airflow/models/dag.py b/airflow/models/dag.py
index ba14c7b519982..ddf369c39e586 100644
--- a/airflow/models/dag.py
+++ b/airflow/models/dag.py
@@ -200,13 +200,16 @@ def get_last_dagrun(dag_id, session, include_externally_triggered=False):
     return query.first()
 
 
-def get_dataset_triggered_next_run_info(dag_ids: list[str], *, session: Session) -> dict[str, str]:
+def get_dataset_triggered_next_run_info(dag_ids: list[str], *, session: Session) -> dict[str, dict[str, int]]:
     """
     Given a list of dag_ids, get string representing how close any that are dataset triggered are
     their next run, e.g. "1 of 2 datasets updated"
     """
     return {
-        x.dag_id: f"{x.ready} of {x.total} datasets updated"
+        x.dag_id: {
+            "ready": x.ready,
+            "total": x.total,
+        }
         for x in session.query(
             DagScheduleDatasetReference.dag_id,
             func.count().label("total"),
@@ -3416,7 +3419,7 @@ def calculate_dagrun_date_fields(
         )
 
     @provide_session
-    def get_dataset_triggered_next_run_info(self, *, session=NEW_SESSION) -> str | None:
+    def get_dataset_triggered_next_run_info(self, *, session=NEW_SESSION) -> dict | None:
         if self.schedule_interval != "Dataset":
             return None
         return get_dataset_triggered_next_run_info([self.dag_id], session=session)[self.dag_id]
diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 0884a06c179fb..0a603ffd527b5 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -308,7 +308,9 @@ <h2>{{ page_title }}</h2>
                     data-dag-id="{{ dag.dag_id }}"
                     data-summary="{{ dataset_triggered_next_run_info[dag.dag_id] }}"
                   >
-                    {{ dataset_triggered_next_run_info[dag.dag_id] }}
+                    {% with %}{% set ds_info = dataset_triggered_next_run_info[dag.dag_id] %}
+                    {{ ds_info.ready }} of {{ ds_info.total }} datasets updated
+                    {% endwith %}
                   </div>
                 </span>
               {% endif %}
diff --git a/tests/models/test_dag.py b/tests/models/test_dag.py
index 452f508917798..379fb0593721a 100644
--- a/tests/models/test_dag.py
+++ b/tests/models/test_dag.py
@@ -3032,12 +3032,21 @@ def test_get_dataset_triggered_next_run_info(dag_maker):
     session.flush()
 
     info = get_dataset_triggered_next_run_info([dag1.dag_id], session=session)
-    assert "0 of 1 datasets updated" == info[dag1.dag_id]
+    assert info[dag1.dag_id] == {
+        "ready": 0,
+        "total": 1,
+    }
 
     # This time, check both dag2 and dag3 at the same time (tests filtering)
     info = get_dataset_triggered_next_run_info([dag2.dag_id, dag3.dag_id], session=session)
-    assert "1 of 2 datasets updated" == info[dag2.dag_id]
-    assert "1 of 3 datasets updated" == info[dag3.dag_id]
+    assert info[dag2.dag_id] == {
+        "ready": 1,
+        "total": 2,
+    }
+    assert info[dag3.dag_id] == {
+        "ready": 1,
+        "total": 3,
+    }
 
 
 def test_dag_uses_timetable_for_run_id(session):

From 649a6a83811da8a97ed51e3908c426a8d9c935fd Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Mon, 3 Oct 2022 14:23:49 -0700
Subject: [PATCH 2/3] fixup

Co-authored-by: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com>
---
 airflow/www/templates/airflow/dags.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 0a603ffd527b5..c675b4a05aa0a 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -308,7 +308,7 @@ <h2>{{ page_title }}</h2>
                     data-dag-id="{{ dag.dag_id }}"
                     data-summary="{{ dataset_triggered_next_run_info[dag.dag_id] }}"
                   >
-                    {% with %}{% set ds_info = dataset_triggered_next_run_info[dag.dag_id] %}
+                    {% with ds_info = dataset_triggered_next_run_info[dag.dag_id] %}
                     {{ ds_info.ready }} of {{ ds_info.total }} datasets updated
                     {% endwith %}
                   </div>

From 48fa04fbf7b83eda7ad41716aea12674de59c0d8 Mon Sep 17 00:00:00 2001
From: blag <blag@users.noreply.github.com>
Date: Mon, 3 Oct 2022 14:44:00 -0700
Subject: [PATCH 3/3] fixup

Co-authored-by: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com>
---
 airflow/models/dag.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow/models/dag.py b/airflow/models/dag.py
index ddf369c39e586..7adfdc45898df 100644
--- a/airflow/models/dag.py
+++ b/airflow/models/dag.py
@@ -3419,7 +3419,7 @@ def calculate_dagrun_date_fields(
         )
 
     @provide_session
-    def get_dataset_triggered_next_run_info(self, *, session=NEW_SESSION) -> dict | None:
+    def get_dataset_triggered_next_run_info(self, *, session=NEW_SESSION) -> dict[str, int] | None:
         if self.schedule_interval != "Dataset":
             return None
         return get_dataset_triggered_next_run_info([self.dag_id], session=session)[self.dag_id]