From dcd6e1609f07474740f5a0a21d1463419283255d Mon Sep 17 00:00:00 2001 From: mhpeng Date: Tue, 18 May 2021 16:57:04 +0800 Subject: [PATCH 1/3] Make task ID on legend have enough width and width of line chart to be 100%. --- airflow/www/views.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/airflow/www/views.py b/airflow/www/views.py index 6d8a90e314bcd..ce995d54acb96 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -439,6 +439,10 @@ def render_template(self, *args, **kwargs): **kwargs, ) + chart_attr = { + 'legend.maxKeyLength': 200, + } + def add_user_permissions_to_dag(sender, template, context, **extra): # noqa pylint: disable=unused-argument """ @@ -2270,8 +2274,12 @@ def duration(self, session=None): if root: dag = dag.sub_dag(task_ids_or_regex=root, include_upstream=True, include_downstream=False) chart_height = wwwutils.get_chart_height(dag) - chart = nvd3.lineChart(name="lineChart", x_is_date=True, height=chart_height, width="1200") - cum_chart = nvd3.lineChart(name="cumLineChart", x_is_date=True, height=chart_height, width="1200") + chart = nvd3.lineChart( + name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.chart_attr + ) + cum_chart = nvd3.lineChart( + name="cumLineChart", x_is_date=True, height=chart_height, chart_attr=self.chart_attr + ) y_points = defaultdict(list) x_points = defaultdict(list) @@ -2390,7 +2398,8 @@ def tries(self, session=None): chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( - name="lineChart", x_is_date=True, y_axis_format='d', height=chart_height, width="1200" + name="lineChart", x_is_date=True, y_axis_format='d', height=chart_height, + chart_attr=self.chart_attr ) for task in dag.tasks: @@ -2460,7 +2469,9 @@ def landing_times(self, session=None): dag = dag.sub_dag(task_ids_or_regex=root, include_upstream=True, include_downstream=False) chart_height = wwwutils.get_chart_height(dag) - chart = nvd3.lineChart(name="lineChart", x_is_date=True, height=chart_height, width="1200") + chart = nvd3.lineChart( + name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.chart_attr + ) y_points = {} x_points = {} for task in dag.tasks: From 0ab726f641a23c18ce3ce10f87f4684561d4e810 Mon Sep 17 00:00:00 2001 From: mhpeng Date: Tue, 18 May 2021 17:06:23 +0800 Subject: [PATCH 2/3] Make task ID on legend have enough width and width of line chart to be 100%. --- airflow/www/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/airflow/www/views.py b/airflow/www/views.py index ce995d54acb96..a49dc93673cc1 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -439,7 +439,7 @@ def render_template(self, *args, **kwargs): **kwargs, ) - chart_attr = { + line_chart_attr = { 'legend.maxKeyLength': 200, } @@ -2275,10 +2275,10 @@ def duration(self, session=None): dag = dag.sub_dag(task_ids_or_regex=root, include_upstream=True, include_downstream=False) chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( - name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.chart_attr + name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.line_chart_attr ) cum_chart = nvd3.lineChart( - name="cumLineChart", x_is_date=True, height=chart_height, chart_attr=self.chart_attr + name="cumLineChart", x_is_date=True, height=chart_height, chart_attr=self.line_chart_attr ) y_points = defaultdict(list) @@ -2399,7 +2399,7 @@ def tries(self, session=None): chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( name="lineChart", x_is_date=True, y_axis_format='d', height=chart_height, - chart_attr=self.chart_attr + chart_attr=self.line_chart_attr ) for task in dag.tasks: @@ -2470,7 +2470,7 @@ def landing_times(self, session=None): chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( - name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.chart_attr + name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.line_chart_attr ) y_points = {} x_points = {} From 6bab8f7a7a607d8684d84d3999f5900a189821c0 Mon Sep 17 00:00:00 2001 From: mhpeng Date: Fri, 28 May 2021 11:26:20 +0800 Subject: [PATCH 3/3] Fix pylint errors. --- airflow/www/views.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/airflow/www/views.py b/airflow/www/views.py index a49dc93673cc1..eadec6cb5c3ac 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -431,6 +431,10 @@ class AirflowBaseView(BaseView): # noqa: D101 'macros': macros, } + line_chart_attr = { + 'legend.maxKeyLength': 200, + } + def render_template(self, *args, **kwargs): return super().render_template( *args, @@ -439,10 +443,6 @@ def render_template(self, *args, **kwargs): **kwargs, ) - line_chart_attr = { - 'legend.maxKeyLength': 200, - } - def add_user_permissions_to_dag(sender, template, context, **extra): # noqa pylint: disable=unused-argument """ @@ -2275,10 +2275,16 @@ def duration(self, session=None): dag = dag.sub_dag(task_ids_or_regex=root, include_upstream=True, include_downstream=False) chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( - name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.line_chart_attr + name="lineChart", + x_is_date=True, + height=chart_height, + chart_attr=self.line_chart_attr ) cum_chart = nvd3.lineChart( - name="cumLineChart", x_is_date=True, height=chart_height, chart_attr=self.line_chart_attr + name="cumLineChart", + x_is_date=True, + height=chart_height, + chart_attr=self.line_chart_attr ) y_points = defaultdict(list) @@ -2398,7 +2404,10 @@ def tries(self, session=None): chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( - name="lineChart", x_is_date=True, y_axis_format='d', height=chart_height, + name="lineChart", + x_is_date=True, + y_axis_format='d', + height=chart_height, chart_attr=self.line_chart_attr ) @@ -2470,7 +2479,10 @@ def landing_times(self, session=None): chart_height = wwwutils.get_chart_height(dag) chart = nvd3.lineChart( - name="lineChart", x_is_date=True, height=chart_height, chart_attr=self.line_chart_attr + name="lineChart", + x_is_date=True, + height=chart_height, + chart_attr=self.line_chart_attr ) y_points = {} x_points = {}