From 688117b1b000c0de07b77e114bc46faa77f49211 Mon Sep 17 00:00:00 2001 From: Jed Cunningham Date: Wed, 25 May 2022 17:53:39 -0600 Subject: [PATCH 1/3] Only return non-None task summaries for grid view If we do return None's, it breaks the grid view when a new task is added to a DAG. --- airflow/www/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/www/views.py b/airflow/www/views.py index 4c3d33a6b1e05..5df6ad5192bc2 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -258,7 +258,7 @@ def task_group_to_grid(task_item_or_group, dag, dag_runs, session): if isinstance(task_item_or_group, AbstractOperator): return { 'id': task_item_or_group.task_id, - 'instances': [wwwutils.get_task_summary(dr, task_item_or_group, session) for dr in dag_runs], + 'instances': [ts for ts in [wwwutils.get_task_summary(dr, task_item_or_group, session) for dr in dag_runs] if ts is not None], 'label': task_item_or_group.label, 'extra_links': task_item_or_group.extra_links, 'is_mapped': task_item_or_group.is_mapped, From abfb0338e88bf4995aa2091703647ac068566c22 Mon Sep 17 00:00:00 2001 From: Jed Cunningham Date: Wed, 25 May 2022 21:37:02 -0600 Subject: [PATCH 2/3] Fix static checks --- airflow/www/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airflow/www/views.py b/airflow/www/views.py index 5df6ad5192bc2..16ca1b2bc820b 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -258,7 +258,11 @@ def task_group_to_grid(task_item_or_group, dag, dag_runs, session): if isinstance(task_item_or_group, AbstractOperator): return { 'id': task_item_or_group.task_id, - 'instances': [ts for ts in [wwwutils.get_task_summary(dr, task_item_or_group, session) for dr in dag_runs] if ts is not None], + 'instances': [ + ts + for ts in [wwwutils.get_task_summary(dr, task_item_or_group, session) for dr in dag_runs] + if ts is not None + ], 'label': task_item_or_group.label, 'extra_links': task_item_or_group.extra_links, 'is_mapped': task_item_or_group.is_mapped, From bc056ff62f34f17bd7e02fc18c44b403407efd73 Mon Sep 17 00:00:00 2001 From: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com> Date: Wed, 25 May 2022 23:15:16 -0600 Subject: [PATCH 3/3] Update airflow/www/views.py Co-authored-by: Tzu-ping Chung --- airflow/www/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/www/views.py b/airflow/www/views.py index 16ca1b2bc820b..7d8a768e324e4 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -260,7 +260,7 @@ def task_group_to_grid(task_item_or_group, dag, dag_runs, session): 'id': task_item_or_group.task_id, 'instances': [ ts - for ts in [wwwutils.get_task_summary(dr, task_item_or_group, session) for dr in dag_runs] + for ts in (wwwutils.get_task_summary(dr, task_item_or_group, session) for dr in dag_runs) if ts is not None ], 'label': task_item_or_group.label,