From f270836e439e63e4cf16396b4521ea1800263714 Mon Sep 17 00:00:00 2001
From: Amogh <adesai@cloudera.com>
Date: Tue, 23 May 2023 10:40:27 +0530
Subject: [PATCH 1/4] Better wording the next and last run DAG columns

---
 airflow/www/templates/airflow/dags.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 99e59808814aa..3c6252e2236e3 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -215,13 +215,13 @@ <h2>{{ page_title }}</h2>
                   title="Status of all previous DAG runs.">info</span>
           </th>
           <th>Schedule</th>
-          <th style="width:180px;">{{ sortable_column("Last Run", "last_dagrun") }}
+          <th style="width:180px;">{{ sortable_column("Last Data Interval", "last_dagrun_data_interval") }}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
-                  title="Date/Time of the latest Dag Run.">info</span>
+                  title="Starting Date/Time interval of the latest Dag Run.">info</span>
           </th>
-          <th style="width:180px;">{{ sortable_column("Next Run", "next_dagrun") }}
+          <th style="width:180px;">{{ sortable_column("Next Data Interval", "next_dagrun_data_interval") }}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
-                  title="Expected date/time of the next DAG Run, or for dataset triggered DAGs, how many datasets have been updated since the last DAG Run.">info</span>
+                  title="Starting Date/Time interval of the next DAG Run, or for dataset triggered DAGs, how many datasets have been updated since the last DAG Run.">info</span>
           </th>
           <th>Recent Tasks
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"

From 0828913368f3f80d19378830fb8999ecb9be90dd Mon Sep 17 00:00:00 2001
From: Amogh <adesai@cloudera.com>
Date: Fri, 26 May 2023 11:09:29 +0530
Subject: [PATCH 2/4] review comments from brent

---
 airflow/www/templates/airflow/dags.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 3c6252e2236e3..be712bc7dfac4 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -215,11 +215,11 @@ <h2>{{ page_title }}</h2>
                   title="Status of all previous DAG runs.">info</span>
           </th>
           <th>Schedule</th>
-          <th style="width:180px;">{{ sortable_column("Last Data Interval", "last_dagrun_data_interval") }}
+          <th style="width:180px;">{{ sortable_column("Last Data Interval", "last_dagrun") }}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
                   title="Starting Date/Time interval of the latest Dag Run.">info</span>
           </th>
-          <th style="width:180px;">{{ sortable_column("Next Data Interval", "next_dagrun_data_interval") }}
+          <th style="width:180px;">{{ sortable_column("Next Data Interval", "next_dagrun") }}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
                   title="Starting Date/Time interval of the next DAG Run, or for dataset triggered DAGs, how many datasets have been updated since the last DAG Run.">info</span>
           </th>

From 8d075225a9c257ea7101e0ebe5442f9ab822592d Mon Sep 17 00:00:00 2001
From: Amogh <adesai@cloudera.com>
Date: Wed, 31 May 2023 09:51:10 +0530
Subject: [PATCH 3/4] review comments from Jed

---
 airflow/www/templates/airflow/dags.html | 8 ++++----
 tests/utils/test_db.py                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index be712bc7dfac4..2f591d38c9041 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -215,13 +215,13 @@ <h2>{{ page_title }}</h2>
                   title="Status of all previous DAG runs.">info</span>
           </th>
           <th>Schedule</th>
-          <th style="width:180px;">{{ sortable_column("Last Data Interval", "last_dagrun") }}
+          <th style="width:180px;">{{ sortable_column("Last Run", "last_dagrun") }}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
-                  title="Starting Date/Time interval of the latest Dag Run.">info</span>
+                  title="Logical Date/Time of the latest Dag Run.">info</span>
           </th>
-          <th style="width:180px;">{{ sortable_column("Next Data Interval", "next_dagrun") }}
+          <th style="width:180px;">{{ sortable_column("Next Run", "next_dagrun") }}
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
-                  title="Starting Date/Time interval of the next DAG Run, or for dataset triggered DAGs, how many datasets have been updated since the last DAG Run.">info</span>
+                  title="Logical Date/Time interval of the next DAG Run, or for dataset triggered DAGs, how many datasets have been updated since the last DAG Run.">info</span>
           </th>
           <th>Recent Tasks
             <span class="material-icons text-muted js-tooltip" aria-hidden="true"
diff --git a/tests/utils/test_db.py b/tests/utils/test_db.py
index dee5118331b78..e17dee6fe6b60 100644
--- a/tests/utils/test_db.py
+++ b/tests/utils/test_db.py
@@ -230,7 +230,7 @@ def test_resetdb(
         session_mock = MagicMock()
         resetdb(session_mock, skip_init=skip_init)
         mock_drop_airflow.assert_called_once_with(mock_connect.return_value)
-        mock_drop_moved.assert_called_once_with(session_mock)
+        mock_drop_moved.assert_called_once_with(mock_connect.return_value)
         if skip_init:
             mock_init.assert_not_called()
         else:

From 0bccae1645c22a2590d4178dedb18a44b491a637 Mon Sep 17 00:00:00 2001
From: Amogh Desai <amoghdesai.oss@gmail.com>
Date: Thu, 1 Jun 2023 10:58:31 +0530
Subject: [PATCH 4/4] Undoing test changes

---
 tests/utils/test_db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utils/test_db.py b/tests/utils/test_db.py
index e17dee6fe6b60..dee5118331b78 100644
--- a/tests/utils/test_db.py
+++ b/tests/utils/test_db.py
@@ -230,7 +230,7 @@ def test_resetdb(
         session_mock = MagicMock()
         resetdb(session_mock, skip_init=skip_init)
         mock_drop_airflow.assert_called_once_with(mock_connect.return_value)
-        mock_drop_moved.assert_called_once_with(mock_connect.return_value)
+        mock_drop_moved.assert_called_once_with(session_mock)
         if skip_init:
             mock_init.assert_not_called()
         else: