From 376faefa1b91a8b87307f0b42482972375b81f38 Mon Sep 17 00:00:00 2001
From: Ash Berlin-Taylor <ash@apache.org>
Date: Fri, 17 Jun 2022 18:39:14 +0100
Subject: [PATCH] Rename grid.css to chart.css (#24529)

Given it was no longer used in the new grid view and only the chart
pages, _and_ we want to have a new css file for the react grid
components it is better to rename this one now.
---
 airflow/www/static/css/{grid.css => charts.css}   | 0
 airflow/www/templates/airflow/chart.html          | 2 +-
 airflow/www/templates/airflow/duration_chart.html | 2 +-
 airflow/www/templates/airflow/gantt.html          | 2 +-
 airflow/www/webpack.config.js                     | 3 ++-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename airflow/www/static/css/{grid.css => charts.css} (100%)

diff --git a/airflow/www/static/css/grid.css b/airflow/www/static/css/charts.css
similarity index 100%
rename from airflow/www/static/css/grid.css
rename to airflow/www/static/css/charts.css
diff --git a/airflow/www/templates/airflow/chart.html b/airflow/www/templates/airflow/chart.html
index 040dcd98b73b6..bca6ac02b7080 100644
--- a/airflow/www/templates/airflow/chart.html
+++ b/airflow/www/templates/airflow/chart.html
@@ -23,7 +23,7 @@
 
 {% block head_css %}
   {{ super() }}
-  <link rel="stylesheet" type="text/css" href="{{ url_for_asset('grid.css') }}">
+  <link rel="stylesheet" type="text/css" href="{{ url_for_asset('chart.css') }}">
   <link rel="stylesheet" type="text/css" href="{{ url_for_asset('nv.d3.min.css') }}">
   <script src="{{ url_for_asset('d3.min.js') }}"></script>
   <script src="{{ url_for_asset('nv.d3.min.js') }}"></script>
diff --git a/airflow/www/templates/airflow/duration_chart.html b/airflow/www/templates/airflow/duration_chart.html
index eddc4c334f8e3..97f7d0b03fcdb 100644
--- a/airflow/www/templates/airflow/duration_chart.html
+++ b/airflow/www/templates/airflow/duration_chart.html
@@ -22,7 +22,7 @@
 
 {% block head_css %}
   {{ super() }}
-  <link rel="stylesheet" type="text/css" href="{{ url_for_asset('grid.css') }}">
+  <link rel="stylesheet" type="text/css" href="{{ url_for_asset('chart.css') }}">
   <link rel="stylesheet" type="text/css" href="{{ url_for_asset('nv.d3.min.css') }}">
   <script src="{{ url_for_asset('d3.min.js') }}"></script>
   <script src="{{ url_for_asset('nv.d3.min.js') }}"></script>
diff --git a/airflow/www/templates/airflow/gantt.html b/airflow/www/templates/airflow/gantt.html
index e6711749c7965..11e59ccb30835 100644
--- a/airflow/www/templates/airflow/gantt.html
+++ b/airflow/www/templates/airflow/gantt.html
@@ -24,7 +24,7 @@
 {% block head_css %}
   {{ super() }}
   <link rel="stylesheet" type="text/css" href="{{ url_for_asset('gantt.css') }}">
-  <link rel="stylesheet" type="text/css" href="{{ url_for_asset('grid.css') }}">
+  <link rel="stylesheet" type="text/css" href="{{ url_for_asset('chart.css') }}">
   <style type="text/css">
     {% for state, state_color in state_color_mapping.items() %}
       rect.{{state}} {
diff --git a/airflow/www/webpack.config.js b/airflow/www/webpack.config.js
index e48b01c687736..e4230cb5a91ca 100644
--- a/airflow/www/webpack.config.js
+++ b/airflow/www/webpack.config.js
@@ -57,6 +57,7 @@ const config = {
   entry: {
     airflowDefaultTheme: `${CSS_DIR}/bootstrap-theme.css`,
     connectionForm: `${JS_DIR}/connection_form.js`,
+    chart: [`${CSS_DIR}/chart.css`],
     dag: `${JS_DIR}/dag.js`,
     dagCode: `${JS_DIR}/dag_code.js`,
     dagDependencies: `${JS_DIR}/dag_dependencies.js`,
@@ -72,7 +73,7 @@ const config = {
     task: `${JS_DIR}/task.js`,
     taskInstances: `${JS_DIR}/task_instances.js`,
     tiLog: `${JS_DIR}/ti_log.js`,
-    grid: [`${CSS_DIR}/grid.css`, `${JS_DIR}/grid/index.jsx`],
+    grid: [`${JS_DIR}/grid/index.jsx`],
     calendar: [`${CSS_DIR}/calendar.css`, `${JS_DIR}/calendar.js`],
     durationChart: `${JS_DIR}/duration_chart.js`,
     trigger: `${JS_DIR}/trigger.js`,