From d65d29c810bddf5fdfb8647e4c4fe964351dc289 Mon Sep 17 00:00:00 2001
From: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com>
Date: Tue, 5 May 2020 10:10:56 -0700
Subject: [PATCH] fix: css prop is now overwhelmed with emotion (#9742)

---
 .../dashboard/components/HeaderActionsDropdown_spec.jsx   | 2 +-
 superset-frontend/src/dashboard/components/Header.jsx     | 6 +++---
 .../src/dashboard/components/HeaderActionsDropdown.jsx    | 8 ++++----
 superset-frontend/src/dashboard/components/SaveModal.jsx  | 6 +++---
 .../src/dashboard/containers/DashboardHeader.jsx          | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/spec/javascripts/dashboard/components/HeaderActionsDropdown_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/HeaderActionsDropdown_spec.jsx
index cd1c0156c..6d2beb160 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/HeaderActionsDropdown_spec.jsx
+++ b/superset-frontend/spec/javascripts/dashboard/components/HeaderActionsDropdown_spec.jsx
@@ -32,7 +32,7 @@ describe('HeaderActionsDropdown', () => {
     dashboardId: 1,
     dashboardTitle: 'Title',
     hasUnsavedChanges: false,
-    css: '',
+    customCss: '',
     onChange: () => {},
     updateCss: () => {},
     forceRefreshAllCharts: () => {},
diff --git a/superset-frontend/src/dashboard/components/Header.jsx b/superset-frontend/src/dashboard/components/Header.jsx
index 8ed90a6af..89ba78545 100644
--- a/superset-frontend/src/dashboard/components/Header.jsx
+++ b/superset-frontend/src/dashboard/components/Header.jsx
@@ -56,7 +56,7 @@ const propTypes = {
   charts: PropTypes.objectOf(chartPropShape).isRequired,
   layout: PropTypes.object.isRequired,
   expandedSlices: PropTypes.object.isRequired,
-  css: PropTypes.string.isRequired,
+  customCss: PropTypes.string.isRequired,
   colorNamespace: PropTypes.string,
   colorScheme: PropTypes.string,
   isStarred: PropTypes.bool.isRequired,
@@ -301,7 +301,7 @@ class Header extends React.PureComponent {
       dashboardTitle,
       layout,
       expandedSlices,
-      css,
+      customCss,
       colorNamespace,
       colorScheme,
       onUndo,
@@ -476,7 +476,7 @@ class Header extends React.PureComponent {
             dashboardTitle={dashboardTitle}
             layout={layout}
             expandedSlices={expandedSlices}
-            css={css}
+            customCss={customCss}
             colorNamespace={colorNamespace}
             colorScheme={colorScheme}
             onSave={onSave}
diff --git a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
index c53c19679..357c858eb 100644
--- a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
+++ b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
@@ -37,7 +37,7 @@ const propTypes = {
   dashboardId: PropTypes.number.isRequired,
   dashboardTitle: PropTypes.string.isRequired,
   hasUnsavedChanges: PropTypes.bool.isRequired,
-  css: PropTypes.string.isRequired,
+  customCss: PropTypes.string.isRequired,
   colorNamespace: PropTypes.string,
   colorScheme: PropTypes.string,
   onChange: PropTypes.func.isRequired,
@@ -69,7 +69,7 @@ class HeaderActionsDropdown extends React.PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      css: props.css,
+      css: props.customCss,
       cssTemplates: [],
     };
 
@@ -116,7 +116,7 @@ class HeaderActionsDropdown extends React.PureComponent {
       forceRefreshAllCharts,
       refreshFrequency,
       editMode,
-      css,
+      customCss,
       colorNamespace,
       colorScheme,
       hasUnsavedChanges,
@@ -150,7 +150,7 @@ class HeaderActionsDropdown extends React.PureComponent {
             layout={layout}
             expandedSlices={expandedSlices}
             refreshFrequency={refreshFrequency}
-            css={css}
+            customCss={customCss}
             colorNamespace={colorNamespace}
             colorScheme={colorScheme}
             onSave={onSave}
diff --git a/superset-frontend/src/dashboard/components/SaveModal.jsx b/superset-frontend/src/dashboard/components/SaveModal.jsx
index 2f53c8a1f..e8dcb9171 100644
--- a/superset-frontend/src/dashboard/components/SaveModal.jsx
+++ b/superset-frontend/src/dashboard/components/SaveModal.jsx
@@ -36,7 +36,7 @@ const propTypes = {
   layout: PropTypes.object.isRequired,
   saveType: PropTypes.oneOf([SAVE_TYPE_OVERWRITE, SAVE_TYPE_NEWDASHBOARD]),
   triggerNode: PropTypes.node.isRequired,
-  css: PropTypes.string.isRequired,
+  customCss: PropTypes.string.isRequired,
   colorNamespace: PropTypes.string,
   colorScheme: PropTypes.string,
   onSave: PropTypes.func.isRequired,
@@ -95,7 +95,7 @@ class SaveModal extends React.PureComponent {
     const {
       dashboardTitle,
       layout: positions,
-      css,
+      customCss,
       colorNamespace,
       colorScheme,
       expandedSlices,
@@ -110,7 +110,7 @@ class SaveModal extends React.PureComponent {
     const labelColors = colorScheme ? scale.getColorMap() : {};
     const data = {
       positions,
-      css,
+      css: customCss,
       color_namespace: colorNamespace,
       color_scheme: colorScheme,
       label_colors: labelColors,
diff --git a/superset-frontend/src/dashboard/containers/DashboardHeader.jsx b/superset-frontend/src/dashboard/containers/DashboardHeader.jsx
index db45bb06b..9516f245e 100644
--- a/superset-frontend/src/dashboard/containers/DashboardHeader.jsx
+++ b/superset-frontend/src/dashboard/containers/DashboardHeader.jsx
@@ -71,7 +71,7 @@ function mapStateToProps({
     ).text,
     expandedSlices: dashboardState.expandedSlices,
     refreshFrequency: dashboardState.refreshFrequency,
-    css: dashboardState.css,
+    customCss: dashboardState.css,
     colorNamespace: dashboardState.colorNamespace,
     colorScheme: dashboardState.colorScheme,
     charts,