[airflow] 05/14: Maintain grid view selection on filtering upstream (#23779)

[ep...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ephraimanierobi pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 4e654037769f4225c7bd1098deedd2c85e834b20
Author: Brent Bovenzi <br...@gmail.com>
AuthorDate: Wed May 18 21:52:02 2022 -0400

    Maintain grid view selection on filtering upstream (#23779)
    
    * Maintain grid selection on filter upstream
    
    The grid view selection was being cleared when clicking "Filter Upstream". The selection should persist.
    
    Also, added a left margin to the "Reset root" button
    
    * fix linting
    
    (cherry picked from commit 9db2271fad751b51127ac0c2dc0477dc95b271d5)
---
 airflow/www/static/js/grid/ResetRoot.jsx                          | 2 +-
 airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx   | 4 +++-
 airflow/www/static/js/grid/details/content/taskInstance/index.jsx | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/airflow/www/static/js/grid/ResetRoot.jsx b/airflow/www/static/js/grid/ResetRoot.jsx
index c69e8dbb84..bd6a89e3b7 100644
--- a/airflow/www/static/js/grid/ResetRoot.jsx
+++ b/airflow/www/static/js/grid/ResetRoot.jsx
@@ -33,7 +33,7 @@ const ResetRoot = () => (
         variant="outline"
         href={url}
         colorScheme="blue"
-        mr={2}
+        mx={2}
         title="Reset root to show the whole DAG"
       >
         Reset Root
diff --git a/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx b/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx
index 93ee175b69..08c33d1e65 100644
--- a/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx
+++ b/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx
@@ -47,7 +47,7 @@ const LinkButton = ({ children, ...rest }) => (
 );
 
 const Nav = ({
-  taskId, executionDate, operator, isMapped,
+  runId, taskId, executionDate, operator, isMapped,
 }) => {
   const params = new URLSearchParams({
     task_id: taskId,
@@ -68,6 +68,8 @@ const Nav = ({
   }).toString();
 
   const filterParams = new URLSearchParams({
+    task_id: taskId,
+    dag_run_id: runId,
     base_date: baseDate,
     num_runs: numRuns,
     root: taskId,
diff --git a/airflow/www/static/js/grid/details/content/taskInstance/index.jsx b/airflow/www/static/js/grid/details/content/taskInstance/index.jsx
index b6aad7d4d3..90ef2e839e 100644
--- a/airflow/www/static/js/grid/details/content/taskInstance/index.jsx
+++ b/airflow/www/static/js/grid/details/content/taskInstance/index.jsx
@@ -83,6 +83,7 @@ const TaskInstance = ({ taskId, runId }) => {
       {!isGroup && (
         <TaskNav
           taskId={taskId}
+          runId={runId}
           isMapped={isMapped}
           executionDate={executionDate}
           operator={operator}