refactor: update name of theme

apache · Feb 1, 2021 · 008d2d2 · 008d2d2
1 parent 026907c
commit 008d2d2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/superset-frontend/src/SqlLab/App.jsx b/superset-frontend/src/SqlLab/App.jsx
@@ -41,7 +41,7 @@ import setupApp from '../setup/setupApp';
 import './main.less';
 import '../../stylesheets/reactable-pagination.less';
 import '../components/FilterableTable/FilterableTableStyles.less';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 setupApp();
 
@@ -110,7 +110,7 @@ if (sqlLabMenu) {
 
 const Application = () => (
   <Provider store={store}>
-    <ThemeProvider theme={customTheme}>
+    <ThemeProvider theme={theme}>
       <App />
     </ThemeProvider>
   </Provider>

diff --git a/superset-frontend/src/addSlice/App.tsx b/superset-frontend/src/addSlice/App.tsx
@@ -24,7 +24,7 @@ import setupPlugins from '../setup/setupPlugins';
 import { DynamicPluginProvider } from '../components/DynamicPlugins';
 import AddSliceContainer from './AddSliceContainer';
 import { initFeatureFlags } from '../featureFlags';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 setupApp();
 setupPlugins();
@@ -37,7 +37,7 @@ const bootstrapData = JSON.parse(
 initFeatureFlags(bootstrapData.common.feature_flags);
 
 const App = () => (
-  <ThemeProvider theme={customTheme}>
+  <ThemeProvider theme={theme}>
     <DynamicPluginProvider>
       <AddSliceContainer datasources={bootstrapData.datasources} />
     </DynamicPluginProvider>

diff --git a/superset-frontend/src/dashboard/App.jsx b/superset-frontend/src/dashboard/App.jsx
@@ -26,15 +26,15 @@ import { DynamicPluginProvider } from 'src/components/DynamicPlugins';
 import setupApp from '../setup/setupApp';
 import setupPlugins from '../setup/setupPlugins';
 import DashboardContainer from './containers/Dashboard';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 setupApp();
 setupPlugins();
 
 const App = ({ store }) => (
   <Provider store={store}>
     <DndProvider backend={HTML5Backend}>
-      <ThemeProvider theme={customTheme}>
+      <ThemeProvider theme={theme}>
         <DynamicPluginProvider>
           <DashboardContainer />
         </DynamicPluginProvider>

diff --git a/superset-frontend/src/explore/App.jsx b/superset-frontend/src/explore/App.jsx
@@ -29,15 +29,15 @@ import setupApp from '../setup/setupApp';
 import setupPlugins from '../setup/setupPlugins';
 import './main.less';
 import '../../stylesheets/reactable-pagination.less';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 setupApp();
 setupPlugins();
 
 const App = ({ store }) => (
   <Provider store={store}>
     <DndProvider backend={HTML5Backend}>
-      <ThemeProvider theme={customTheme}>
+      <ThemeProvider theme={theme}>
         <DynamicPluginProvider>
           <ExploreViewContainer />
           <ToastPresenter />

diff --git a/superset-frontend/src/preamble.ts b/superset-frontend/src/preamble.ts
@@ -76,7 +76,7 @@ setupColors(extraCategoricalColorSchemes, extraSequentialColorSchemes);
 // Setup number formatters
 setupFormatters();
 
-export const customTheme = merge(
+export const theme = merge(
   supersetTheme,
   bootstrapData?.common?.theme_overrides ?? {},
 );
diff --git a/superset-frontend/src/profile/App.tsx b/superset-frontend/src/profile/App.tsx
@@ -27,7 +27,7 @@ import messageToastReducer from '../messageToasts/reducers';
 import { initEnhancer } from '../reduxUtils';
 import setupApp from '../setup/setupApp';
 import './main.less';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 setupApp();
 
@@ -46,7 +46,7 @@ const store = createStore(
 
 const Application = () => (
   <Provider store={store}>
-    <ThemeProvider theme={customTheme}>
+    <ThemeProvider theme={theme}>
       <App user={bootstrap.user} />
     </ThemeProvider>
   </Provider>

diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx
@@ -47,7 +47,7 @@ import setupApp from '../setup/setupApp';
 import setupPlugins from '../setup/setupPlugins';
 import Welcome from './CRUD/welcome/Welcome';
 import ToastPresenter from '../messageToasts/containers/ToastPresenter';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 setupApp();
 setupPlugins();
@@ -69,7 +69,7 @@ const store = createStore(
 
 const App = () => (
   <ReduxProvider store={store}>
-    <ThemeProvider theme={customTheme}>
+    <ThemeProvider theme={theme}>
       <FlashProvider common={common}>
         <Router>
           <DynamicPluginProvider>

diff --git a/superset-frontend/src/views/menu.tsx b/superset-frontend/src/views/menu.tsx
@@ -20,14 +20,14 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { ThemeProvider } from '@superset-ui/core';
 import Menu from 'src/components/Menu/Menu';
-import { customTheme } from '../preamble';
+import { theme } from '../preamble';
 
 const container = document.getElementById('app');
 const bootstrapJson = container?.getAttribute('data-bootstrap') ?? '{}';
 const bootstrap = JSON.parse(bootstrapJson);
 const menu = { ...bootstrap.common.menu_data };
 const app = (
-  <ThemeProvider theme={customTheme}>
+  <ThemeProvider theme={theme}>
     <Menu data={menu} />
   </ThemeProvider>
 );