QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 16:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: import emotion-theming methods from @superset-ui/style (#10157)

Browse Source 
This makes the code cleaner and fixes missing theme variables when `npm link @superset-ui/style`.
This commit is contained in:
Jesse Yang
2020-06-24 19:23:51 -07:00
committed by GitHub
parent 7a794ed684
commit ecb44a4243
14 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
superset-frontend/package.json
View File

@@ -125,7 +125,6 @@
"dnd-core": "^2.6.0",
"dom-to-image": "^2.6.0",
"dompurify": "^2.0.7",
"emotion-theming": "^10.0.27",
"geolib": "^2.0.24",
"immutable": "^3.8.2",
"interweave": "^11.2.0",

3
superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx
View File

@@ -28,8 +28,7 @@ import ListViewFilters from 'src/components/ListView/Filters';
import ListViewPagination from 'src/components/ListView/Pagination';
import Pagination from 'src/components/Pagination';
import { areArraysShallowEqual } from 'src/reduxUtils';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
export function makeMockLocation(query) {
const queryStr = encodeURIComponent(query);

3
superset-frontend/spec/javascripts/views/chartList/ChartList_spec.jsx
View File

@@ -21,8 +21,7 @@ import { mount } from 'enzyme';
import thunk from 'redux-thunk';
import configureStore from 'redux-mock-store';
import fetchMock from 'fetch-mock';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import ChartList from 'src/views/chartList/ChartList';
import ListView from 'src/components/ListView/ListView';

3
superset-frontend/spec/javascripts/views/dashboardList/DashboardList_spec.jsx
View File

@@ -21,8 +21,7 @@ import { mount } from 'enzyme';
import thunk from 'redux-thunk';
import configureStore from 'redux-mock-store';
import fetchMock from 'fetch-mock';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import DashboardList from 'src/views/dashboardList/DashboardList';
import ListView from 'src/components/ListView/ListView';

3
superset-frontend/spec/javascripts/views/datasetList/DatasetList_spec.jsx
View File

@@ -24,8 +24,7 @@ import fetchMock from 'fetch-mock';
import DatasetList from 'src/views/datasetList/DatasetList';
import ListView from 'src/components/ListView/ListView';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
// store needed for withToasts(datasetTable)
const mockStore = configureStore([thunk]);

3
superset-frontend/spec/javascripts/welcome/DashboardTable_spec.jsx
View File

@@ -21,8 +21,7 @@ import { mount } from 'enzyme';
import thunk from 'redux-thunk';
import configureStore from 'redux-mock-store';
import fetchMock from 'fetch-mock';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import ListView from 'src/components/ListView/ListView';
import DashboardTable from 'src/welcome/DashboardTable';

3
superset-frontend/src/SqlLab/App.jsx
View File

@@ -21,8 +21,7 @@ import { createStore, compose, applyMiddleware } from 'redux';
import { Provider } from 'react-redux';
import thunkMiddleware from 'redux-thunk';
import { hot } from 'react-hot-loader/root';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import {
initFeatureFlags,
isFeatureEnabled,

3
superset-frontend/src/SqlLab/components/App.jsx
View File

@@ -23,8 +23,7 @@ import { connect } from 'react-redux';
import $ from 'jquery';
import { t } from '@superset-ui/translation';
import throttle from 'lodash/throttle';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import TabbedSqlEditors from './TabbedSqlEditors';
import QueryAutoRefresh from './QueryAutoRefresh';
import QuerySearch from './QuerySearch';

3
superset-frontend/src/addSlice/App.tsx
View File

@@ -18,8 +18,7 @@
*/
import React from 'react';
import { hot } from 'react-hot-loader/root';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import setupApp from '../setup/setupApp';
import setupPlugins from '../setup/setupPlugins';
import AddSliceContainer from './AddSliceContainer';

3
superset-frontend/src/components/ListView/Filters.tsx
View File

@@ -17,8 +17,7 @@
* under the License.
*/
import React, { useState } from 'react';
import styled from '@superset-ui/style';
import { withTheme } from 'emotion-theming';
import { styled, withTheme } from '@superset-ui/style';
import {
Select,

3
superset-frontend/src/dashboard/App.jsx
View File

@@ -19,8 +19,7 @@
import { hot } from 'react-hot-loader/root';
import React from 'react';
import { Provider } from 'react-redux';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import setupApp from '../setup/setupApp';
import setupPlugins from '../setup/setupPlugins';

3
superset-frontend/src/explore/App.jsx
View File

@@ -19,8 +19,7 @@
import React from 'react';
import { hot } from 'react-hot-loader/root';
import { Provider } from 'react-redux';
import { ThemeProvider } from 'emotion-theming';
import styled, { supersetTheme } from '@superset-ui/style';
import { styled, supersetTheme, ThemeProvider } from '@superset-ui/style';
import ToastPresenter from '../messageToasts/containers/ToastPresenter';
import ExploreViewContainer from './components/ExploreViewContainer';
import setupApp from '../setup/setupApp';

3
superset-frontend/src/profile/App.jsx
View File

@@ -21,8 +21,7 @@ import { hot } from 'react-hot-loader/root';
import thunk from 'redux-thunk';
import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
import { Provider } from 'react-redux';
import { ThemeProvider } from 'emotion-theming';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import App from './components/App';
import messageToastReducer from '../messageToasts/reducers';
import { initEnhancer } from '../reduxUtils';

3
superset-frontend/src/welcome/App.jsx
View File

@@ -23,10 +23,9 @@ import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
import { Provider } from 'react-redux';
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { QueryParamProvider } from 'use-query-params';
import { ThemeProvider } from 'emotion-theming';
import { initFeatureFlags } from 'src/featureFlags';
import { supersetTheme } from '@superset-ui/style';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import ErrorBoundary from 'src/components/ErrorBoundary';
import Menu from 'src/components/Menu/Menu';
import FlashProvider from 'src/components/FlashProvider';