Skip to content

Commit

Permalink
update superset-ui for z-index and opacity
Browse files Browse the repository at this point in the history
  • Loading branch information
lilykuang committed Jun 29, 2020
1 parent 7d8aaa2 commit ceb0b76
Show file tree
Hide file tree
Showing 8 changed files with 3,790 additions and 11,424 deletions.
15,174 changes: 3,760 additions & 11,414 deletions superset-frontend/package-lock.json

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions superset-frontend/package.json
Expand Up @@ -61,14 +61,14 @@
"@emotion/core": "^10.0.28",
"@superset-ui/chart": "^0.14.1",
"@superset-ui/chart-composition": "^0.14.1",
"@superset-ui/color": "^0.14.2",
"@superset-ui/chart-controls": "^0.14.1",
"@superset-ui/color": "^0.14.1",
"@superset-ui/connection": "^0.14.0",
"@superset-ui/chart-controls": "^0.14.2",
"@superset-ui/core": "^0.14.0",
"@superset-ui/dimension": "^0.14.0",
"@superset-ui/legacy-plugin-chart-calendar": "^0.14.1",
"@superset-ui/legacy-plugin-chart-chord": "^0.14.1",
"@superset-ui/legacy-plugin-chart-country-map": "^0.14.2",
"@superset-ui/legacy-plugin-chart-country-map": "^0.14.1",
"@superset-ui/legacy-plugin-chart-event-flow": "^0.14.1",
"@superset-ui/legacy-plugin-chart-force-directed": "^0.14.1",
"@superset-ui/legacy-plugin-chart-heatmap": "^0.14.1",
Expand All @@ -85,7 +85,7 @@
"@superset-ui/legacy-plugin-chart-sankey": "^0.14.1",
"@superset-ui/legacy-plugin-chart-sankey-loop": "^0.14.1",
"@superset-ui/legacy-plugin-chart-sunburst": "^0.14.1",
"@superset-ui/plugin-chart-table": "^0.14.2",
"@superset-ui/legacy-plugin-chart-table": "^0.14.1",
"@superset-ui/legacy-plugin-chart-treemap": "^0.14.1",
"@superset-ui/legacy-plugin-chart-world-map": "^0.14.1",
"@superset-ui/legacy-preset-chart-big-number": "^0.14.1",
Expand All @@ -95,8 +95,8 @@
"@superset-ui/plugin-chart-word-cloud": "^0.14.1",
"@superset-ui/preset-chart-xy": "^0.14.1",
"@superset-ui/query": "^0.14.1",
"@superset-ui/style": "^0.14.0",
"@superset-ui/superset-ui": "^0.14.2",
"@superset-ui/style": "^0.14.3",
"@superset-ui/superset-ui": "^0.14.3",
"@superset-ui/time-format": "^0.14.1",
"@superset-ui/translation": "^0.14.0",
"@superset-ui/validator": "^0.14.1",
Expand Down Expand Up @@ -138,6 +138,7 @@
"mousetrap": "^1.6.1",
"mustache": "^2.2.1",
"omnibar": "^2.1.1",
"path": "^0.12.7",
"prop-types": "^15.7.2",
"re-resizable": "^4.3.1",
"react": "^16.13.1",
Expand Down Expand Up @@ -183,7 +184,8 @@
"rison": "^0.1.1",
"shortid": "^2.2.6",
"urijs": "^1.18.10",
"use-query-params": "^0.4.5"
"use-query-params": "^0.4.5",
"zlib": "^1.0.5"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
Expand Down
Expand Up @@ -22,6 +22,7 @@ import { shallow, mount } from 'enzyme';
import sinon from 'sinon';

import { ParentSize } from '@vx/responsive';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import { Sticky, StickyContainer } from 'react-sticky';
import { TabContainer, TabContent, TabPane } from 'react-bootstrap';

Expand Down Expand Up @@ -77,6 +78,10 @@ describe('DashboardBuilder', () => {
<Provider store={store}>
<WithDragDropContext>{builder}</WithDragDropContext>
</Provider>,
{
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
},
)
: shallow(builder);
}
Expand Down
Expand Up @@ -23,18 +23,21 @@ import ResizableHandle from 'src/dashboard/components/resizable/ResizableHandle'

describe('ResizableHandle', () => {
it('should render a right resize handle', () => {
// eslint-disable-next-line react/jsx-pascal-case
const wrapper = shallow(<ResizableHandle.right />);
expect(wrapper.find('.resize-handle.resize-handle--right')).toHaveLength(1);
});

it('should render a bottom resize handle', () => {
// eslint-disable-next-line react/jsx-pascal-case
const wrapper = shallow(<ResizableHandle.bottom />);
expect(wrapper.find('.resize-handle.resize-handle--bottom')).toHaveLength(
1,
);
});

it('should render a bottomRight resize handle', () => {
// eslint-disable-next-line react/jsx-pascal-case
const wrapper = shallow(<ResizableHandle.bottomRight />);
expect(
wrapper.find('.resize-handle.resize-handle--bottom-right'),
Expand Down
Expand Up @@ -34,9 +34,9 @@ describe('ToastPresenter', () => {
return wrapper;
}

it('should render a div with class toast-presenter', () => {
it('should render a div with id toast-presenter', () => {
const wrapper = setup();
expect(wrapper.find('.toast-presenter')).toHaveLength(1);
expect(wrapper.find('#toast-presenter')).toHaveLength(1);
});

it('should render a Toast for each toast object', () => {
Expand Down
Expand Up @@ -23,6 +23,7 @@ import URI from 'urijs';
import { Tab } from 'react-bootstrap';
import { shallow, mount } from 'enzyme';
import sinon from 'sinon';
import { supersetTheme, ThemeProvider } from '@superset-ui/style';
import TabbedSqlEditors from 'src/SqlLab/components/TabbedSqlEditors';
import SqlEditor from 'src/SqlLab/components/SqlEditor';

Expand Down Expand Up @@ -98,6 +99,8 @@ describe('TabbedSqlEditors', () => {
uriStub.returns({ id: 1 });
wrapper = mount(<TabbedSqlEditors {...mockedProps} />, {
context: { store },
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
});
expect(TabbedSqlEditors.prototype.componentDidMount.calledOnce).toBe(
true,
Expand All @@ -110,6 +113,8 @@ describe('TabbedSqlEditors', () => {
uriStub.returns({ savedQueryId: 1 });
wrapper = mount(<TabbedSqlEditors {...mockedProps} />, {
context: { store },
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
});
expect(TabbedSqlEditors.prototype.componentDidMount.calledOnce).toBe(
true,
Expand All @@ -122,6 +127,8 @@ describe('TabbedSqlEditors', () => {
uriStub.returns({ sql: 1, dbid: 1 });
wrapper = mount(<TabbedSqlEditors {...mockedProps} />, {
context: { store },
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
});
expect(TabbedSqlEditors.prototype.componentDidMount.calledOnce).toBe(
true,
Expand Down
3 changes: 3 additions & 0 deletions superset-frontend/src/components/ListView/Filters.tsx
Expand Up @@ -145,8 +145,11 @@ function SelectFilter({
data-test="filters-select"
themeConfig={filterSelectTheme}
stylesConfig={filterSelectStyles}
// @ts-ignore
value={selectedOption}
// @ts-ignore
onChange={onChange}
// @ts-ignore
loadOptions={fetchAndFormatSelects}
placeholder={emptyLabel}
loadingMessage={() => 'Loading...'}
Expand Down
Expand Up @@ -86,7 +86,7 @@ interface ToastPresenterProps {

const ToastPresenter = ({ toasts, removeToast }: ToastPresenterProps) =>
toasts.length > 0 && (
<StyledToastPresenter>
<StyledToastPresenter id="toast-presenter">
{toasts.map(toast => (
<Toast key={toast.id} toast={toast} onCloseToast={removeToast} />
))}
Expand Down

0 comments on commit ceb0b76

Please sign in to comment.