From 9a59bdda486f90b8faeafdc79af3bcdbb7c3d250 Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Wed, 9 Sep 2020 13:18:55 -0700 Subject: [PATCH] refactor: merge/upgrade superset-ui packages (#10790) * refactor: merge/upgrade superset-ui packages * Fix flaky big number test * Fix Flaky AdhocFilters test --- superset-frontend/.prettierrc | 5 - superset-frontend/.storybook/preview.jsx | 2 +- .../integration/explore/AdhocFilters.test.ts | 6 +- .../explore/visualizations/big_number.test.js | 2 +- superset-frontend/package-lock.json | 1591 +++++------------ superset-frontend/package.json | 74 +- superset-frontend/prettier.config.js | 23 + .../spec/helpers/setupSupersetClient.js | 2 +- superset-frontend/spec/helpers/shim.ts | 2 +- superset-frontend/spec/helpers/theming.ts | 2 +- .../javascripts/chart/ChartRenderer_spec.jsx | 2 +- .../javascripts/chart/chartActions_spec.js | 2 +- .../components/AlteredSliceTag_spec.jsx | 2 +- .../components/ConfirmStatusChange_spec.jsx | 2 +- .../components/ListView/ListView_spec.jsx | 2 +- .../spec/javascripts/components/Menu_spec.jsx | 2 +- .../dashboard/actions/dashboardState_spec.js | 2 +- .../dashboard/components/CodeModal_spec.jsx | 2 +- .../components/DashboardBuilder_spec.jsx | 2 +- .../datasource/ChangeDatasourceModal_spec.jsx | 2 +- .../datasource/DatasourceModal_spec.jsx | 2 +- .../components/ColorPickerControl_spec.jsx | 2 +- .../explore/components/ColorScheme_spec.jsx | 2 +- .../ControlPanelsContainer_spec.jsx | 3 +- .../components/VizTypeControl_spec.jsx | 2 +- .../javascripts/explore/controlUtils_spec.jsx | 8 +- .../spec/javascripts/explore/store_spec.jsx | 2 +- .../spec/javascripts/explore/utils_spec.jsx | 2 +- .../javascripts/middleware/logger_spec.js | 2 +- .../sqllab/TabbedSqlEditors_spec.jsx | 2 +- .../utils/getControlsForVizType_spec.js | 3 +- .../CRUD/welcome/DashboardTable_spec.tsx | 2 +- .../src/CRUD/CollectionTable.tsx | 2 +- superset-frontend/src/SqlLab/App.jsx | 2 +- .../src/SqlLab/actions/sqlLab.js | 3 +- .../src/SqlLab/components/App.jsx | 3 +- .../components/EstimateQueryCostButton.jsx | 2 +- .../components/ExploreCtasResultsButton.jsx | 2 +- .../components/ExploreResultsButton.jsx | 2 +- .../src/SqlLab/components/HighlightedSql.jsx | 2 +- .../src/SqlLab/components/LimitControl.tsx | 3 +- .../SqlLab/components/QueryAutoRefresh.jsx | 2 +- .../src/SqlLab/components/QueryHistory.jsx | 2 +- .../src/SqlLab/components/QuerySearch.jsx | 3 +- .../src/SqlLab/components/QueryTable.jsx | 2 +- .../src/SqlLab/components/ResultSet.tsx | 2 +- .../components/RunQueryActionButton.tsx | 2 +- .../src/SqlLab/components/SaveQuery.jsx | 2 +- .../SqlLab/components/ScheduleQueryButton.jsx | 2 +- .../SqlLab/components/ShareSqlLabQuery.jsx | 2 +- .../src/SqlLab/components/SouthPane.jsx | 2 +- .../src/SqlLab/components/SqlEditor.jsx | 2 +- .../SqlLab/components/SqlEditorLeftBar.jsx | 2 +- .../SqlLab/components/TabbedSqlEditors.jsx | 2 +- .../src/SqlLab/components/TableElement.jsx | 2 +- .../components/TemplateParamsEditor.jsx | 2 +- .../src/SqlLab/reducers/getInitialState.js | 2 +- .../src/SqlLab/reducers/sqlLab.js | 2 +- .../src/addSlice/AddSliceContainer.tsx | 2 +- superset-frontend/src/addSlice/App.tsx | 2 +- superset-frontend/src/chart/Chart.jsx | 3 +- superset-frontend/src/chart/ChartRenderer.jsx | 3 +- superset-frontend/src/chart/chartAction.js | 3 +- superset-frontend/src/chart/chartReducer.js | 2 +- .../src/common/components/Modal.tsx | 3 +- .../src/common/components/Tabs.tsx | 2 +- .../src/common/components/index.ts | 2 +- .../src/components/AlteredSliceTag.jsx | 2 +- .../src/components/AnchorLink.jsx | 2 +- .../src/components/AsyncSelect.jsx | 3 +- .../src/components/AvatarIcon.tsx | 2 +- .../src/components/Button/index.tsx | 2 +- .../src/components/CachedLabel.jsx | 2 +- .../components/CertifiedIconWithTooltip.tsx | 3 +- .../src/components/CopyToClipboard.jsx | 2 +- .../src/components/DeleteModal.tsx | 3 +- .../src/components/EditableTitle.tsx | 2 +- .../src/components/ErrorBoundary.jsx | 2 +- .../ErrorMessage/DatabaseErrorMessage.tsx | 2 +- .../components/ErrorMessage/ErrorAlert.tsx | 3 +- .../ErrorMessageWithStackTrace.tsx | 2 +- .../ErrorMessage/TimeoutErrorMessage.tsx | 2 +- superset-frontend/src/components/FaveStar.tsx | 2 +- .../FilterableTable/FilterableTable.tsx | 3 +- .../src/components/FormLabel.tsx | 2 +- .../src/components/Icon/icon.stories.jsx | 2 +- .../src/components/IndeterminateCheckbox.tsx | 2 +- .../src/components/Label/index.tsx | 2 +- .../components/ListView/CardCollection.tsx | 2 +- .../components/ListView/CardSortSelect.tsx | 2 +- .../src/components/ListView/Filters.tsx | 2 +- .../src/components/ListView/ListView.tsx | 3 +- .../components/ListView/TableCollection.tsx | 2 +- .../src/components/ListViewCard/index.tsx | 2 +- superset-frontend/src/components/Loading.tsx | 2 +- .../src/components/Menu/Menu.tsx | 3 +- .../src/components/Menu/NewMenu.tsx | 2 +- .../src/components/Menu/SubMenu.tsx | 2 +- .../src/components/Menu/UserMenu.tsx | 2 +- superset-frontend/src/components/Modal.tsx | 3 +- .../src/components/NavDropdown/index.tsx | 2 +- .../src/components/OmniContainer.jsx | 3 +- .../src/components/Pagination.tsx | 2 +- .../src/components/RefreshChartOverlay.tsx | 3 +- .../src/components/SearchInput.tsx | 2 +- .../src/components/Select/styles.tsx | 2 +- .../src/components/TableLoader.jsx | 3 +- .../src/components/TableSelector.jsx | 4 +- .../src/components/URLShortLinkButton.jsx | 2 +- .../src/components/URLShortLinkModal.jsx | 2 +- superset-frontend/src/dashboard/App.jsx | 2 +- .../src/dashboard/actions/dashboardLayout.js | 2 +- .../src/dashboard/actions/dashboardState.js | 3 +- .../src/dashboard/actions/datasources.js | 2 +- .../src/dashboard/actions/sliceEntities.js | 3 +- .../src/dashboard/components/AddSliceCard.jsx | 2 +- .../components/BuilderComponentPane.jsx | 2 +- .../src/dashboard/components/CodeModal.jsx | 2 +- .../components/ColorSchemeControlWrapper.jsx | 3 +- .../src/dashboard/components/CssEditor.jsx | 2 +- .../src/dashboard/components/Dashboard.jsx | 2 +- .../components/DeleteComponentModal.jsx | 2 +- .../dashboard/components/FilterIndicator.jsx | 2 +- .../components/FilterIndicatorGroup.jsx | 2 +- .../components/FilterIndicatorTooltip.jsx | 2 +- .../src/dashboard/components/Header.jsx | 4 +- .../components/HeaderActionsDropdown.jsx | 3 +- .../src/dashboard/components/MissingChart.jsx | 2 +- .../dashboard/components/PropertiesModal.jsx | 3 +- .../dashboard/components/PublishedStatus.jsx | 2 +- .../components/RefreshIntervalModal.jsx | 2 +- .../src/dashboard/components/SaveModal.jsx | 3 +- .../src/dashboard/components/SliceAdder.jsx | 2 +- .../src/dashboard/components/SliceHeader.jsx | 2 +- .../components/SliceHeaderControls.jsx | 2 +- .../filterscope/FilterScopeSelector.jsx | 2 +- .../components/filterscope/treeIcons.jsx | 2 +- .../components/gridComponents/Header.jsx | 2 +- .../components/gridComponents/Markdown.jsx | 2 +- .../gridComponents/new/NewColumn.jsx | 2 +- .../gridComponents/new/NewDivider.jsx | 2 +- .../gridComponents/new/NewHeader.jsx | 2 +- .../components/gridComponents/new/NewRow.jsx | 2 +- .../components/gridComponents/new/NewTabs.jsx | 2 +- .../components/menu/MarkdownModeDropdown.jsx | 2 +- .../src/dashboard/reducers/getInitialState.js | 2 +- .../src/dashboard/reducers/sliceEntities.js | 2 +- superset-frontend/src/dashboard/types.ts | 2 +- .../dashboard/util/backgroundStyleOptions.ts | 2 +- .../util/charts/getEffectiveExtraFilters.ts | 2 +- .../charts/getFormDataWithExtraFilters.ts | 6 +- .../dashboard/util/getFilterFieldNodesTree.js | 2 +- .../dashboard/util/getFilterScopeNodesTree.js | 2 +- .../src/dashboard/util/headerStyleOptions.ts | 2 +- .../src/datasource/ChangeDatasourceModal.tsx | 3 +- .../src/datasource/DatasourceEditor.jsx | 4 +- .../src/datasource/DatasourceModal.tsx | 3 +- superset-frontend/src/explore/App.jsx | 2 +- .../src/explore/actions/exploreActions.js | 3 +- .../src/explore/actions/saveModalActions.js | 2 +- .../components/AdhocFilterEditPopover.jsx | 2 +- ...AdhocFilterEditPopoverSimpleTabContent.jsx | 3 +- .../AdhocFilterEditPopoverSqlTabContent.jsx | 2 +- .../explore/components/AdhocFilterOption.jsx | 3 +- .../components/AdhocMetricEditPopover.jsx | 3 +- .../explore/components/AdhocMetricOption.jsx | 2 +- .../src/explore/components/ControlHeader.jsx | 4 +- .../components/ControlPanelsContainer.jsx | 3 +- .../explore/components/DisplayQueryButton.jsx | 2 +- .../explore/components/EmbedCodeButton.jsx | 2 +- .../components/ExploreActionButtons.jsx | 2 +- .../explore/components/ExploreChartHeader.jsx | 3 +- .../explore/components/ExploreChartPanel.jsx | 2 +- .../components/ExploreViewContainer.jsx | 4 +- .../explore/components/PropertiesModal.tsx | 3 +- .../explore/components/QueryAndSaveBtns.jsx | 3 +- .../src/explore/components/RowCountLabel.jsx | 3 +- .../src/explore/components/SaveModal.jsx | 2 +- .../controls/AdhocFilterControl.jsx | 4 +- .../components/controls/AnnotationLayer.jsx | 14 +- .../controls/AnnotationLayerControl.jsx | 3 +- .../components/controls/BoundsControl.jsx | 2 +- .../components/controls/ColorMapControl.jsx | 2 +- .../controls/ColorPickerControl.jsx | 2 +- .../components/controls/DatasourceControl.jsx | 2 +- .../components/controls/DateFilterControl.jsx | 3 +- .../controls/FilterBoxItemControl.jsx | 4 +- .../components/controls/MetricsControl.jsx | 2 +- .../controls/SelectAsyncControl.jsx | 2 +- .../components/controls/SelectControl.jsx | 2 +- .../components/controls/SpatialControl.jsx | 2 +- .../components/controls/TextAreaControl.jsx | 2 +- .../components/controls/TextControl.tsx | 5 +- .../controls/TimeSeriesColumnControl.jsx | 4 +- .../components/controls/VizTypeControl.jsx | 3 +- .../components/controls/withVerification.jsx | 3 +- superset-frontend/src/explore/constants.js | 2 +- .../src/explore/controlPanels/DeckArc.js | 6 +- .../src/explore/controlPanels/DeckGeojson.js | 6 +- .../src/explore/controlPanels/DeckGrid.js | 3 +- .../src/explore/controlPanels/DeckHex.js | 2 +- .../src/explore/controlPanels/DeckMulti.js | 3 +- .../src/explore/controlPanels/DeckPath.js | 2 +- .../src/explore/controlPanels/DeckPolygon.js | 2 +- .../src/explore/controlPanels/DeckScatter.js | 3 +- .../explore/controlPanels/DeckScreengrid.js | 3 +- .../src/explore/controlPanels/Separator.js | 3 +- .../explore/controlPanels/Shared_DeckGL.jsx | 11 +- .../src/explore/controlPanels/TimeTable.js | 3 +- .../src/explore/controlPanels/sections.jsx | 2 +- superset-frontend/src/explore/controlUtils.js | 2 +- superset-frontend/src/explore/controls.jsx | 8 +- .../src/explore/dateFilterUtils.ts | 2 +- superset-frontend/src/explore/exploreUtils.js | 8 +- superset-frontend/src/explore/store.js | 2 +- .../src/messageToasts/components/Toast.tsx | 2 +- .../components/ToastPresenter.tsx | 2 +- .../src/middleware/loggerMiddleware.js | 2 +- superset-frontend/src/preamble.ts | 2 +- superset-frontend/src/profile/App.tsx | 2 +- .../src/profile/components/App.tsx | 2 +- .../src/profile/components/CreatedContent.tsx | 2 +- .../src/profile/components/Favorites.tsx | 2 +- .../src/profile/components/Security.tsx | 2 +- .../src/profile/components/UserInfo.tsx | 2 +- superset-frontend/src/setup/setupApp.ts | 2 +- superset-frontend/src/setup/setupClient.js | 3 +- superset-frontend/src/setup/setupColors.js | 20 +- .../src/setup/setupFormatters.js | 4 +- superset-frontend/src/setup/setupPlugins.ts | 2 +- superset-frontend/src/utils/common.js | 7 +- .../src/utils/downloadAsImage.ts | 2 +- .../src/utils/getClientErrorObject.ts | 3 +- .../src/utils/getControlsForVizType.js | 2 +- superset-frontend/src/views/App.tsx | 2 +- .../src/views/CRUD/chart/ChartList.tsx | 4 +- .../views/CRUD/dashboard/DashboardList.tsx | 3 +- .../src/views/CRUD/data/common.ts | 2 +- .../views/CRUD/data/database/DatabaseList.tsx | 4 +- .../CRUD/data/database/DatabaseModal.tsx | 3 +- .../CRUD/data/dataset/AddDatasetModal.tsx | 4 +- .../views/CRUD/data/dataset/DatasetList.tsx | 3 +- superset-frontend/src/views/CRUD/hooks.ts | 3 +- superset-frontend/src/views/CRUD/utils.tsx | 4 +- .../src/views/CRUD/welcome/DashboardTable.tsx | 3 +- .../src/views/CRUD/welcome/Welcome.tsx | 2 +- superset-frontend/src/views/menu.tsx | 2 +- .../visualizations/FilterBox/FilterBox.jsx | 4 +- .../FilterBox/FilterBoxChartPlugin.js | 3 +- .../visualizations/FilterBox/controlPanel.jsx | 2 +- .../TimeTable/FormattedNumber.jsx | 2 +- .../TimeTable/SparklineCell.jsx | 3 +- .../visualizations/TimeTable/TimeTable.jsx | 5 +- .../TimeTable/TimeTableChartPlugin.js | 3 +- .../stylesheets/less/cosmo/cosmoTheme.js | 59 +- .../components/ExploreCtasResultsButton.jsx | 2 +- 256 files changed, 830 insertions(+), 1594 deletions(-) delete mode 100644 superset-frontend/.prettierrc create mode 100644 superset-frontend/prettier.config.js diff --git a/superset-frontend/.prettierrc b/superset-frontend/.prettierrc deleted file mode 100644 index 5393aaf2d..000000000 --- a/superset-frontend/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "singleQuote": true, - "trailingComma": "all", - "arrowParens": "avoid" -} diff --git a/superset-frontend/.storybook/preview.jsx b/superset-frontend/.storybook/preview.jsx index f4e8b00e5..ee216575f 100644 --- a/superset-frontend/.storybook/preview.jsx +++ b/superset-frontend/.storybook/preview.jsx @@ -22,7 +22,7 @@ import { jsxDecorator } from 'storybook-addon-jsx'; import { addParameters } from '@storybook/react'; import { withPaddings } from 'storybook-addon-paddings'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import '../src/theme.ts'; import './storybook.css'; diff --git a/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts index 576304a4e..d38a60a6f 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts @@ -30,12 +30,12 @@ describe('AdhocFilters', () => { cy.get('[data-test=adhoc_filters]').within(() => { cy.get('.Select__control').click(); - cy.get('input[type=text]').type('name{enter}'); + cy.get('input[type=text]').focus().type('name{enter}'); }); cy.get('#filter-edit-popover').within(() => { cy.get('[data-test=adhoc-filter-simple-value]').within(() => { cy.get('.Select__control').click(); - cy.get('input[type=text]').type('Any{enter}'); + cy.get('input[type=text]').focus().type('Any{enter}'); }); cy.get('button').contains('Save').click(); }); @@ -53,7 +53,7 @@ describe('AdhocFilters', () => { cy.get('[data-test=adhoc_filters]').within(() => { cy.get('.Select__control').click(); - cy.get('input[type=text]').type('name{enter}'); + cy.get('input[type=text]').focus().type('name{enter}'); }); cy.get('#filter-edit-popover').within(() => { diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/big_number.test.js b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/big_number.test.js index 89ca8c4a5..6f6ed8d8e 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/big_number.test.js +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/big_number.test.js @@ -43,7 +43,7 @@ describe('Visualization > Big Number with Trendline', () => { cy.visitChartByParams(JSON.stringify(formData)); cy.verifySliceSuccess({ waitAlias: '@getJson', - chartSelector: '.big_number', + chartSelector: '.superset-legacy-chart-big-number', }); } diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index e39ac5af2..72858db3d 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -4398,6 +4398,81 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, + "@encodable/color": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@encodable/color/-/color-1.1.0.tgz", + "integrity": "sha512-a7A1XP6AQbydQb4/LDqj0/fCvaljTTf91PrIV7/C7o6OvBQeU304Mmn6wfPRyFVkCGZZw5A+8pR8Ucd2fJjqJA==", + "requires": { + "@encodable/registry": "^1.0.3", + "@types/d3-interpolate": "^1.3.1", + "@types/d3-scale": "^2.2.0", + "@types/d3-scale-chromatic": "^1.2.0", + "d3-interpolate": "^2.0.1", + "d3-scale": "^3.2.1", + "d3-scale-chromatic": "^2.0.0" + }, + "dependencies": { + "d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "requires": { + "d3-color": "1 - 2" + } + }, + "d3-scale": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz", + "integrity": "sha512-3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg==", + "requires": { + "d3-array": "1.2.0 - 2", + "d3-format": "1 - 2", + "d3-interpolate": "1.2.0 - 2", + "d3-time": "1 - 2", + "d3-time-format": "2 - 3" + } + } + } + }, + "@encodable/format": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@encodable/format/-/format-1.0.6.tgz", + "integrity": "sha512-gtzLMQyw4AJ7m3TIANm2z2QfzZJLGLdhVmKbizRRu9MRMlYIVXhk+46zPm10RNxGv4ybpsfcCfkCd4nL3RlZRg==", + "requires": { + "@encodable/registry": "^1.0.3", + "@types/d3-format": "^1.3.1", + "@types/d3-time": "^1.0.10", + "@types/d3-time-format": "^2.1.1", + "d3-format": "^2.0.0", + "d3-time": "^2.0.0", + "d3-time-format": "^3.0.0" + }, + "dependencies": { + "d3-format": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz", + "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==" + }, + "d3-time": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz", + "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==" + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } + } + } + }, + "@encodable/registry": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@encodable/registry/-/registry-1.0.3.tgz", + "integrity": "sha512-YH2nSBZJKgbH/9MkQXzAEE9UwTaVcWiKgVFyEU/gvrfmNWqecYaHMTyObo+ADSTGF4kk0cZZkr7VqZgIQbvrUw==" + }, "@hot-loader/react-dom": { "version": "16.13.0", "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.13.0.tgz", @@ -5555,9 +5630,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", - "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -5591,11 +5666,11 @@ }, "dependencies": { "math.gl": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.2.1.tgz", - "integrity": "sha512-oved17Wf89bzoV2lVF7GC9wfy4TttvU+8vb9MoMRhMy4ZqoQjx3t4nndqKzVLOEhyCiJowkmWoj9GfnfOiXShg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.2.2.tgz", + "integrity": "sha512-lkM9y3DirpOBMpCCrsOMV3AWkxtwql8fvF98EUN0SLOMWAIjnkQBS9NPleN5uvqpnjSVZd3Y3cn+fbIuA4npmQ==", "requires": { - "@math.gl/core": "3.2.1" + "@math.gl/core": "3.2.2" } } } @@ -5610,11 +5685,11 @@ }, "dependencies": { "math.gl": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.2.1.tgz", - "integrity": "sha512-oved17Wf89bzoV2lVF7GC9wfy4TttvU+8vb9MoMRhMy4ZqoQjx3t4nndqKzVLOEhyCiJowkmWoj9GfnfOiXShg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/math.gl/-/math.gl-3.2.2.tgz", + "integrity": "sha512-lkM9y3DirpOBMpCCrsOMV3AWkxtwql8fvF98EUN0SLOMWAIjnkQBS9NPleN5uvqpnjSVZd3Y3cn+fbIuA4npmQ==", "requires": { - "@math.gl/core": "3.2.1" + "@math.gl/core": "3.2.2" } } } @@ -5712,18 +5787,18 @@ "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==" }, "@math.gl/core": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.2.1.tgz", - "integrity": "sha512-jGGEbPieTAUubVOeDRrdj8PUrtQ7I1ASX1sHKUuevsh3s2vqrnC16z7+aocfVFhs3bOLJtKWlSrdTwOjqSONDg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-3.2.2.tgz", + "integrity": "sha512-R1UQwg699pfReLHy0N+ach2KdGqH4XsniEPKM7H0WbeDhEvuoMRWB9oNtIw9qPQV39lBv3Dzplaw5DPscwgMPQ==", "requires": { "@babel/runtime": "^7.0.0", "gl-matrix": "^3.0.0" } }, "@math.gl/web-mercator": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.2.1.tgz", - "integrity": "sha512-D7h5jMTtKOqnto3GtqgKn9Pkblz62G5hZzsk8YIcais8d42MnBTXJbiRf0Fz5wliVYeHIkPpFQWscltKaAomhg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.2.2.tgz", + "integrity": "sha512-uZbLlST7gbfJV227Ev1oShpYQGon9Nk/i0AoM81mVoEYtd+XxKuoDBYaRIdPNVkkALwF9xFG1lwxHqblrs3v5w==", "requires": { "@babel/runtime": "^7.0.0", "gl-matrix": "^3.0.0" @@ -14863,90 +14938,59 @@ } } }, - "@superset-ui/chart": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/chart/-/chart-0.14.23.tgz", - "integrity": "sha512-9SWXsPbD3XUbZ1JJXg1rWdXm3fpjM/Amr6uuZAq43uJy60fyVphzt1IQRdfkNyyoaGBju7t1dm1C27P65AIA9g==", - "requires": { - "@types/react": "^16.9.43", - "@types/react-loadable": "^5.4.2", - "@vx/responsive": "^0.0.197", - "prop-types": "^15.6.2", - "react-error-boundary": "^1.2.5", - "react-loadable": "^5.5.0", - "reselect": "^4.0.0" - }, - "dependencies": { - "@vx/responsive": { - "version": "0.0.197", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz", - "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==", - "requires": { - "@types/lodash": "^4.14.146", - "@types/react": "*", - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.1" - } - } - } - }, - "@superset-ui/chart-composition": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-composition/-/chart-composition-0.14.23.tgz", - "integrity": "sha512-h5CaZqblfj2dIkOC3gx2EVnKSroDSoUwAIrdIOWetVWMtj1tFgcWBvU9g9jBHdGUBwBlbCUcnHzCZo9x0JuMhw==", - "requires": { - "@types/react": "^16.9.43", - "@vx/responsive": "^0.0.197", - "csstype": "^2.6.4" - }, - "dependencies": { - "@vx/responsive": { - "version": "0.0.197", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz", - "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==", - "requires": { - "@types/lodash": "^4.14.146", - "@types/react": "*", - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.1" - } - } - } - }, "@superset-ui/chart-controls": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.14.23.tgz", - "integrity": "sha512-uf3/d4P3VJ2zuq1h8FZwcRz1/YI0kLabPMfyGXjwwvYcaUFc0natNXUduHIEY60jsUUR8iBfZRq8H8+GJUs5aQ==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.15.1.tgz", + "integrity": "sha512-U2SBqi/7khdU2pQ6pT7ekzO2CeMhjs1YkN98hUyijYon6C7eneWHRuJ6KCsLYJ3pxQM8dyoe0vUfuc40HaKt7g==", "requires": { - "@types/react-bootstrap": "0.32.21", + "@superset-ui/core": "0.15.1", "lodash": "^4.17.15", - "prop-types": "^15.7.2", - "react-bootstrap": "^0.33.1" - }, - "dependencies": { - "@types/react-bootstrap": { - "version": "0.32.21", - "resolved": "https://registry.npmjs.org/@types/react-bootstrap/-/react-bootstrap-0.32.21.tgz", - "integrity": "sha512-AV/6cMUBbKArEQcjXEzpoHexHi6hJL0cH3Vcw9qI4Ob2g/XFRvyTAFdMlGlp8HZmOHXL35PdF0K75Z31Po87qg==", - "requires": { - "@types/react": "*" - } - } + "prop-types": "^15.7.2" } }, - "@superset-ui/color": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/color/-/color-0.14.23.tgz", - "integrity": "sha512-JHznmtj+BRwIIVWw8bYNfIsrKrMTTDVIFvgpIxIZChbC9FFsZ+Zd44y7fH+Uemd3Gb0zqhVlRC7+FOybHcS2RA==", + "@superset-ui/core": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.15.1.tgz", + "integrity": "sha512-RfP9kJ4BhcN+i9OzNv0FicazUTUnqBih7yyd6tmoX+/JxH78LrHIit7EXekzjFkcMk33yr6ociQ4M85zM4ZGlA==", "requires": { + "@babel/runtime": "^7.1.2", + "@emotion/core": "^10.0.28", + "@emotion/styled": "^10.0.27", + "@types/d3-format": "^1.3.0", "@types/d3-interpolate": "^1.3.1", "@types/d3-scale": "^2.1.1", + "@types/d3-time": "^1.0.9", + "@types/d3-time-format": "^2.1.0", + "@types/lodash": "^4.14.149", + "@vx/responsive": "^0.0.197", + "csstype": "^2.6.4", + "d3-format": "^1.3.2", "d3-interpolate": "^1.4.0", - "d3-scale": "^3.0.0" + "d3-scale": "^3.0.0", + "d3-time": "^1.0.10", + "d3-time-format": "^2.2.0", + "emotion-theming": "^10.0.27", + "fetch-retry": "^4.0.1", + "jed": "^1.1.1", + "lodash": "^4.17.11", + "pretty-ms": "^7.0.0", + "react-error-boundary": "^1.2.5", + "reselect": "^4.0.0", + "whatwg-fetch": "^3.0.0" }, "dependencies": { + "@vx/responsive": { + "version": "0.0.197", + "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.197.tgz", + "integrity": "sha512-Qv15PJ/Hy79LjyfJ/9E8z+zacKAnD43O2Jg9wvB6PFSNs73xPEDy/mHTYxH+FZv94ruAE3scBO0330W29sQpyg==", + "requires": { + "@types/lodash": "^4.14.146", + "@types/react": "*", + "lodash": "^4.17.10", + "prop-types": "^15.6.1", + "resize-observer-polyfill": "1.5.1" + } + }, "d3-interpolate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz", @@ -14966,37 +15010,21 @@ "d3-time": "1 - 2", "d3-time-format": "2 - 3" } + }, + "d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "requires": { + "d3-time": "1" + } } } }, - "@superset-ui/connection": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/connection/-/connection-0.14.23.tgz", - "integrity": "sha512-DDxLYCbBL9T28lmc31iq9ulxThb9mjSHjH1/g6AFz6uLrdn8NvvdOwPD0sAJ1H1t0cKB2rBRzdhX0NY2sZ8etg==", - "requires": { - "@babel/runtime": "^7.1.2", - "fetch-retry": "^4.0.1", - "whatwg-fetch": "^3.0.0" - } - }, - "@superset-ui/core": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.14.23.tgz", - "integrity": "sha512-lEA8Unmyl55LLwIgEtC81l2Wr4ue+k7krePjLNxx5r/kKXBThrRqa5e6Uzz4eWYo0bdFX/tnv4NWPfQzfelkZA==", - "requires": { - "@types/lodash": "^4.14.149", - "lodash": "^4.17.11" - } - }, - "@superset-ui/dimension": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/dimension/-/dimension-0.14.23.tgz", - "integrity": "sha512-uqGtj4YT9prJD8eG79IWkELMuZfwNtSP8hbd4aywnzlyJwnEWC5qYKhKJgDCnWTh6OwrH2RieXwVRu2ZwytuBA==" - }, "@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.14.23.tgz", - "integrity": "sha512-Ht1pn9eWL4MB57o0+UC0QiTUB37iCjbxQ8Q5fX9ASbHP4hlNSfRuk7CHcwA18aj8M0891u6lZUzqFH4T7uj2tQ==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.15.1.tgz", + "integrity": "sha512-+boW1QRRjON/NaAMh9akR4lNm48wN72b6YmopXW1l0L8/mr0iUefj5Gsw5GOT1OFfLZTTnhE3SU947vZFIu5kQ==", "requires": { "d3-array": "^2.0.3", "d3-selection": "^1.4.0", @@ -15012,21 +15040,24 @@ } }, "@superset-ui/legacy-plugin-chart-chord": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.14.23.tgz", - "integrity": "sha512-nHBeiwCutXypJcIacbQG2gZo7NriFVCHulwioLUxjt0vaqjutw/DKapTewG4e8Ygh59ulURQ5dxfz6acbgjPfA==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.15.1.tgz", + "integrity": "sha512-/Nzn3ssLkoP3mGmtPso2vBnUNXh1b3woRG6iE8FOH84cNyFvRu7JoHShyUmgK5bbiCU0xhYfvdZ1XCThdkZiOw==", "requires": { - "@superset-ui/style": "0.14.23", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "prop-types": "^15.6.2", "react": "^16.13.1" } }, "@superset-ui/legacy-plugin-chart-country-map": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.14.23.tgz", - "integrity": "sha512-C7bTT9FA86hf0LhtVNkZMfiPkGgzAbihA750IHMWL6s0Uu5n0wr663BEqOB/RYrjzI2y7eNdmukhY4ES5Fy87g==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.15.1.tgz", + "integrity": "sha512-W9VDyliJucI+Uj40R7n4axAMiq1zZzK4xBOLDtMZ+M+B1VASy2Q12hKaFosNlX+7YoiWJtJvL81on6IQObqP0g==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "d3-array": "^2.0.3", "prop-types": "^15.6.2" @@ -15040,27 +15071,32 @@ } }, "@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.14.23.tgz", - "integrity": "sha512-ID2ZWFF1QjsmlKnJ41dxvqJ/T5vJYb1vKGw5MvazrulqojdRqLXk1tJLux4SPVHq62SY9X1EeBJ+EhAQK5zxOQ==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.15.1.tgz", + "integrity": "sha512-3251PaNwN3O5ClhDA34wG8kVVfNFyglIhmMj/zi+3cE9phR+UyUUvJjsCQUigsYBAaaNOEPgjEW+rkXz6jctXA==", "requires": { "@data-ui/event-flow": "^0.0.84", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.14.23.tgz", - "integrity": "sha512-R4IAYUoJBqkdz2QETFUY4i+zLlbCaZZshhZKp9oSaownteVPHoqgwM05yA7BxRfCpufZCIB0vOHx/CkJEa95Sw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.15.1.tgz", + "integrity": "sha512-NNwiHnHTfsLJpGB9zHDO9FjywzMmGRl9WSe4VDUASAK/U8WR9JamfkBPrgidkHBbFC67uj3PBH1IOZzvnp+wJw==", "requires": { - "d3": "^3.5.17" + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", + "d3": "^3.5.17", + "prop-types": "^15.7.2" } }, "@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.14.23.tgz", - "integrity": "sha512-oK5T3trJP1QvkIi3IvGph6mIQihO598m56uVysfxaaUyv7giIwPUGvsTIRe2+HowWxp4YbaIQBY5I3UKysgwFg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.15.1.tgz", + "integrity": "sha512-gguXPtkurIsaqGy0rvgbQ2nkam45BNngUuIg/QIKFl4MK0LZGi1A3y7DVfPZfiZ40r9KRAbLaCmHwUhoDA7Opw==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "d3-svg-legend": "^1.x", "d3-tip": "^0.9.1", @@ -15068,12 +15104,14 @@ } }, "@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.14.23.tgz", - "integrity": "sha512-DqJUbDNu5gHLIH63ssAOrUzyteMO0Nqfz2NpvSp6m0jvoyynr/kTcJ/0GqrsWpKU6IIKnFclFx1ifzCuIurFjw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.15.1.tgz", + "integrity": "sha512-v3qLHo8dwCCQYovHKGI8+M6344cELJnRtrPok8Z7t8+j1P8pf7CzBJ4ilee5Sf16aL2ceVg5gdA9QrY+hP5BqA==", "requires": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "@vx/legend": "^0.0.198", "@vx/responsive": "^0.0.197", "@vx/scale": "^0.0.197", @@ -15141,10 +15179,12 @@ } }, "@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.14.23.tgz", - "integrity": "sha512-YnJFlvVWzDV/5BLwM69larKjWg409dT7gg15aAmpadIFb76P2rzuc8dvcCaTCRQyRzgKunPmnLWDG/lgahOyEQ==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.15.1.tgz", + "integrity": "sha512-aqWOZdNCJxKQ/lbWad3WoIs3GUKarpR2U1IWdfPQi4FKEx/Q0WfXcmeWALqEE2HeKsvhyShvd5DaSLoZnvUkgw==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3-array": "^2.0.3", "d3-scale": "^3.0.1", "prop-types": "^15.6.2" @@ -15170,10 +15210,12 @@ } }, "@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.14.23.tgz", - "integrity": "sha512-XYuEyKEjOTrzbmFZyV22qWlLml8AzCeheiGg4k7uHFvBpYkFYDiJFyT9BjkZyO6if7MkxwyYnf8AWxrey/2Jbw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.15.1.tgz", + "integrity": "sha512-X1GZLGWS9UI2H4rc/lOL/Im9UJNzRhqcekmGmdLyAtONprwvQzPox6/x0Jen2unENunxE3kWTCHsSAL+Q6nZ8A==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "immutable": "^3.8.2", "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", @@ -15183,10 +15225,12 @@ } }, "@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.14.23.tgz", - "integrity": "sha512-clQSSMcaEEw22KpvenRFroATF98BuyVrVduEbzXXnMjkRcv3JjK35ZYlSRFUm7yXtRhdxZqi4RXLCSm6ot99Cw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.15.1.tgz", + "integrity": "sha512-u2N3LgtdNSkZTIo4bnXyzI/4Avfkv4lE+1kW/OT/GgzxKQ9yNRiS/zAN3X5Ws+dJ3Ca4cUSusTnX9dG+iUN34g==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "distributions": "^1.0.0", "prop-types": "^15.6.2", "reactable-arc": "0.15.0" @@ -15200,38 +15244,44 @@ } }, "@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.14.23.tgz", - "integrity": "sha512-NRNTSfcXPxW0klwKZ4etNgB8Hqf+dBuStK7dwKC6RDu9BXP7XBXBuZT0h9FDDh4aiTyNSxsAWBgG5f4zOW87Zw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.15.1.tgz", + "integrity": "sha512-SyyfGosnK1GPzjY8FR2heU5Gr6c6mRYlk9CI9EA/daQtxJ6A7UXUZiBtxgPKMBURC1KBu1ife0uCvt3ebhMN3g==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "prop-types": "^15.7.2" } }, "@superset-ui/legacy-plugin-chart-partition": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.14.23.tgz", - "integrity": "sha512-I5NIt2efK7YgC7fZ8FqVQ4OSkR1n1GMu4vXUNUulNBmSo+Tv9uSmWci5/ROYVpz/6qougB/uW209RAKOx+ddNw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.15.1.tgz", + "integrity": "sha512-q5wD3N4W4YsrsQA18Hgw/5kwfdmAkdh0pOcVh7i5yazP7+P3NU1Km0J6z98dfsv9U/zEHRPcbs+BcFcmgBEG7A==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.14.23.tgz", - "integrity": "sha512-RcAalfvBjmEpMDFxHvJWmmsvC0ez1sHu91NihdLw7aRChpkgZtctC76O0OCLKMZN2dARdAejZjUUU/3956nm1A==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.15.1.tgz", + "integrity": "sha512-2Qed/pQPDoHd2N/CC29LmXWRw656bBn1UIC/Kzk39mOMcV4/BhJVPqonGzxn/Yyu79AvwEI1bYgmgg8I+NMxbA==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-rose": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.14.23.tgz", - "integrity": "sha512-tbx7SuvsBsBSw6LqHPtBnzEJVBmwhlC5Hp86IIz/gPkUesB06+ZrScN2XNQa7+liD/MvaBuMgMCx6VW6zTh7uA==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.15.1.tgz", + "integrity": "sha512-5vHyyCEJTXVLDeZcUgu81dI2gfelORKP4VupIDgqM8kreIMJJIR7DjJKJ4evaJhBaZKAkoqsIa2YfAGvdEosXg==", "requires": { "d3": "^3.5.17", "nvd3": "1.8.6", @@ -15239,48 +15289,59 @@ } }, "@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.14.23.tgz", - "integrity": "sha512-kZSAApKZ9kfkwz0V7PTG6LQFQN4lTkXvuEz69lGPmQ8wX0UXjOrDPQtM2dQwFR67GxjyApjDmaqrL2KQC4gUeg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.15.1.tgz", + "integrity": "sha512-1OuEq9MVgGM7QRcS1p98mHXFqc6I/NZKX4yQtnz211LXxM/A4ufubzvBNdkYpaYjS4C36r27q7n/M2VXwYoVqw==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", - "d3-sankey": "^0.4.2" + "d3-sankey": "^0.4.2", + "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.14.23.tgz", - "integrity": "sha512-QghVAVq+ATxfDr2WjMuqRwcAawac3apmuiA40LCnR0ZKdLYdrlKbQDWE2Y2OuTLzDJ+1gzVlOZZpIxCnlOoihQ==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.15.1.tgz", + "integrity": "sha512-xGM6BuyFT8vmIDSvO4KWN5vi25q15v2LaOcUFkp7UyMHoWZ0vXwAgcJaLEpjWlESZmFoeWjYwRCGF2BoY6ukXg==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3-sankey-diagram": "^0.7.3", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sunburst": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.14.23.tgz", - "integrity": "sha512-HbpM2TANnx9bNsuZ7n3l6qIYCIJvJNp/lHg3Xb+1kXmE/xgPi8l2tTl0B6wU438R+g45cHol5HU7Emdf88cuNA==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.15.1.tgz", + "integrity": "sha512-+VB3Ga4R6/gdDcUAXQ8jAdZrhNFsdEJDa/oROPm8tjYJM/n7GZq0BUg1yesEJAjvysvQurZo7Nd/k/OaTDh8+Q==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.14.23.tgz", - "integrity": "sha512-rkuHH8DgvRs22kIGp5qOevJUV8Cp46cKWocb3CvhTM56YQQHiTLs1ezrhFKZBKVCnHAa+YjJX4JU+/JnCZohig==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.15.1.tgz", + "integrity": "sha512-2rxJctQAPPo1OZkB3ZgX5iqME0eu2bNZCocuY13x+pw4yJCTsiQIvqE9PLEm36qKODrML9AiQCWlT+hV0YksiA==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3-hierarchy": "^1.1.8", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-world-map": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.14.23.tgz", - "integrity": "sha512-yxTWnp56Pae4ClgdUyWeMbFm3ChQTKjOtQm2OPEFDJu7RYEv18WV03chVLm8nC7dKKda2Qt+fAcFb57tLvfbFA==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.15.1.tgz", + "integrity": "sha512-UtuA5jO2ggoDglm4CiWyQEfB3DZoUvoDWZHR+MtpP/lRoEQdZCWd3/PPSHs1757SnNRNGLypL3vjV/3htvzW3g==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "d3-array": "^2.4.0", "d3-color": "^1.4.1", @@ -15301,11 +15362,13 @@ } }, "@superset-ui/legacy-preset-chart-big-number": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.14.23.tgz", - "integrity": "sha512-86eKenuVrHALEGKzXcVuEaD6bKg3zU5BV7yjCZatuwdkCyxeLr1mPO4Qce2We9CbwDFZCXOsYhymcX8vuutcCg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.15.1.tgz", + "integrity": "sha512-ULgfY+Zco0SG59PWLirSAn1ocgS4DfalZWa9zlsn6rMRVBnWJ1G9xkEmVtFGjym3c4QUw2/EdFiSyZx2Ypnwzg==", "requires": { "@data-ui/xy-chart": "^0.0.84", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", @@ -15313,11 +15376,11 @@ } }, "@superset-ui/legacy-preset-chart-deckgl": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.2.4.tgz", - "integrity": "sha512-gafGy92XDK4YodvYuj58E2fWSXdjuaL2XYqdqTuPdPMYYh6eTs67bxzIDe5Dnoj8sVz8ghyB3VA0e+7FN9e0xQ==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.3.1.tgz", + "integrity": "sha512-mHX2vWJH+1Hq5QuQu2wlKstLgql3/ukNU1SVoLyjDX/BdTqeZiISMCumj2UUMbf0cK1zjHPHrVUCLzJwfsQbUQ==", "requires": { - "@math.gl/web-mercator": "^3.1.3", + "@math.gl/web-mercator": "^3.2.2", "@types/d3-array": "^2.0.0", "bootstrap-slider": "^10.0.0", "d3-array": "^1.2.4", @@ -15338,11 +15401,13 @@ } }, "@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.14.23.tgz", - "integrity": "sha512-yXdxdBbZ77sgixqKNatLyliuLbZOUYo1+T4XF0gri3U8ZoPrNAKeV919v+YiKxLKfl9jZKEyz5exspPRldKQ/Q==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.15.1.tgz", + "integrity": "sha512-rzeYpJl+7r1wJRNlTbh8ZGOrJmL1k0JC09F52YCbCh0HRnZoK41PC7bZNFm/R2ahaMqBg7UagLOdIxCIYUUsuA==", "requires": { "@data-ui/xy-chart": "^0.0.84", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "d3": "^3.5.17", "d3-tip": "^0.9.1", "dompurify": "^2.0.6", @@ -15355,35 +15420,27 @@ "urijs": "^1.18.10" } }, - "@superset-ui/number-format": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/number-format/-/number-format-0.14.23.tgz", - "integrity": "sha512-mLY/b2lRUsazZFOxF9eBJOkan0029YrZep+KvIACagYgyVxGP/Kli0h3mhuNeXN3zQqZvDXfqsc7nZHLzX1cZw==", - "requires": { - "@types/d3-format": "^1.3.0", - "d3-format": "^1.3.2", - "pretty-ms": "^7.0.0" - } - }, "@superset-ui/plugin-chart-echarts": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.14.23.tgz", - "integrity": "sha512-GL8ad4WGyxkKrokesDMC9Ej2RA9P9z0LLZEw5oPTJN5aKLO5mQsJOPD5P9PEJ2qIf2dJrWh8/a40xpip75NZlw==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.15.1.tgz", + "integrity": "sha512-fRFHfIwopNh8n7tfkCQtYt2bLUBvNgwHEPk0hWycl8Jn08lLc4lvfoWOhxGqv11UZC9klx9iPp78/5fhe4bVfg==", "requires": { - "@superset-ui/time-format": "0.14.23", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "@types/echarts": "^4.6.3", "echarts": "^4.9.0" } }, "@superset-ui/plugin-chart-table": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.14.23.tgz", - "integrity": "sha512-q0h7aOrLJVFbTw6CYBWyNJrdCry+h6fXHGQ+W0gzh9JR5PEcFrRIqglmnyDYz24xkwyo8OnOp+dcl5XhdRZ43g==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.15.1.tgz", + "integrity": "sha512-Xp8DasOjaLOcEZKPdp/sCmwfvu+QoINUOYRpi0Aln22OLrvv2aOfgOb9zVcqKM5yamYDkXxpkThgZ58IXBqkCA==", "requires": { "@emotion/core": "^10.0.28", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "@types/d3-array": "^2.0.0", "@types/match-sorter": "^4.0.0", - "@types/react": "^16.9.43", "@types/react-table": "^7.0.19", "d3-array": "^2.4.0", "match-sorter": "^4.1.0", @@ -15402,17 +15459,18 @@ } }, "@superset-ui/plugin-chart-word-cloud": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.14.23.tgz", - "integrity": "sha512-fNda+PhIp7RzR7LRqqZlSQ9lgo+gKtchtZqyNqdrqO7z9Gana5YWwWZttg2vpXtK+Qw9a0u4nK3F+pY2TBL2iA==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.15.1.tgz", + "integrity": "sha512-oqBy/g8w5MonniFlns+SSfEjL/676ANber6n6MhgHX7tHi6VXTlSBRN1D/IzzZ0a0r0ockW/cP9unh4HvEB1Ng==", "requires": { + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", - "@types/react": "^16.9.43", "d3-cloud": "^1.2.5", "d3-scale": "^3.0.1", "emotion-theming": "^10.0.27", - "encodable": "^0.3.7" + "encodable": "^0.7.6" }, "dependencies": { "d3-scale": { @@ -15430,17 +15488,19 @@ } }, "@superset-ui/preset-chart-xy": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.14.23.tgz", - "integrity": "sha512-vfbKbXRPRelg3Z/GsSMcW/2E27ds96exJhxPCImDK5rXj9u1HSYkjaC/9bhHaVWB/wpi58MZ7Uo4kaPqn08XJg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.15.1.tgz", + "integrity": "sha512-tpKN6mjJIYaDfszLhvNnVOKhrk0duLSUsH+0FlkjCatoxEwfMCB2qONSmV/Pu6bsGZyA19S1g9kMj5tEblNKeQ==", "requires": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", + "@superset-ui/chart-controls": "0.15.1", + "@superset-ui/core": "0.15.1", "@vx/axis": "^0.0.198", "@vx/legend": "^0.0.198", "@vx/scale": "^0.0.197", "csstype": "^2.6.3", - "encodable": "^0.3.4", + "encodable": "^0.7.6", "lodash": "^4.17.11", "reselect": "^4.0.0" }, @@ -15553,75 +15613,6 @@ } } }, - "@superset-ui/query": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.14.23.tgz", - "integrity": "sha512-AlUsxJhO0tKifHprf1L7PJ74L5gbdL6z0vy2q/XXYMpttY63FzUKN3IfmFk1zw+6oH8YBe13S6hiORk8CeoXxA==" - }, - "@superset-ui/style": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/style/-/style-0.14.23.tgz", - "integrity": "sha512-/ac0au8jKyvqo5GO/buKy+WYZ2Q3u0z3stcUDW+RmZ//DB47FAqkXSoKhkTIsKsZU0sERMww03Fj2FP+d6BBUw==", - "requires": { - "@emotion/core": "^10.0.28", - "@emotion/styled": "^10.0.27", - "emotion-theming": "^10.0.27" - } - }, - "@superset-ui/superset-ui": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/superset-ui/-/superset-ui-0.14.23.tgz", - "integrity": "sha512-WaWQNltpgL4WyBR1z8PsLSx/1eOJQCPv0rFdECU1Id8D89lA5kFsevCeo6LEF8kbhyBJbajIUYbiejr2TKdRCQ==", - "requires": { - "@superset-ui/chart": "0.14.23", - "@superset-ui/chart-composition": "0.14.23", - "@superset-ui/chart-controls": "0.14.23", - "@superset-ui/color": "0.14.23", - "@superset-ui/connection": "0.14.23", - "@superset-ui/core": "0.14.23", - "@superset-ui/dimension": "0.14.23", - "@superset-ui/number-format": "0.14.23", - "@superset-ui/query": "0.14.23", - "@superset-ui/style": "0.14.23", - "@superset-ui/time-format": "0.14.23", - "@superset-ui/translation": "0.14.23", - "@superset-ui/validator": "0.14.23" - } - }, - "@superset-ui/time-format": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/time-format/-/time-format-0.14.23.tgz", - "integrity": "sha512-S74NRA00kMnBi0jmL1ZaVgxwR2zeQsdNZUxQwc0yYSp5SqK5tyaUhGfXHW5gJlx29hYjvXJ6CKyya0VijFp5iw==", - "requires": { - "@types/d3-time": "^1.0.9", - "@types/d3-time-format": "^2.1.0", - "d3-time": "^1.0.10", - "d3-time-format": "^2.2.0" - }, - "dependencies": { - "d3-time-format": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", - "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", - "requires": { - "d3-time": "1" - } - } - } - }, - "@superset-ui/translation": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/translation/-/translation-0.14.23.tgz", - "integrity": "sha512-jTLTbmEJDrpL1IrnPKDqtXgwGO87R24+ZIdhCNWpNry8/chayr8hb6eMTJhuKZRhBkrn7I/qmpKZ5IiNwoiq4A==", - "requires": { - "jed": "^1.1.1" - } - }, - "@superset-ui/validator": { - "version": "0.14.23", - "resolved": "https://registry.npmjs.org/@superset-ui/validator/-/validator-0.14.23.tgz", - "integrity": "sha512-pHHubcKg6Xmpaqkq94J+UFEKyqI6d9B7F8uyYukLuGkQSlx33ccNWDixfAJhUbfxh1MBGh9A77F52ceCLQE+bw==" - }, "@svgr/babel-plugin-add-jsx-attribute": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz", @@ -16694,7 +16685,8 @@ "@types/anymatch": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz", - "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==" + "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==", + "dev": true }, "@types/babel__core": { "version": "7.1.9", @@ -16770,15 +16762,11 @@ "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.10.tgz", "integrity": "sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==" }, - "@types/clone": { - "version": "0.1.30", - "resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz", - "integrity": "sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ=" - }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true }, "@types/d3": { "version": "3.5.38", @@ -16829,6 +16817,11 @@ "@types/d3-time": "*" } }, + "@types/d3-scale-chromatic": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz", + "integrity": "sha512-9/D7cOBKdZdTCPc6re0HeSUFBM0aFzdNdmYggUWT9SRRiYSOa6Ys2xdTwHKgc1WS3gGfwTMatBOdWCS863REsg==" + }, "@types/d3-shape": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-1.3.2.tgz", @@ -16895,11 +16888,6 @@ "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", "dev": true }, - "@types/fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha512-mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ==" - }, "@types/fetch-mock": { "version": "7.3.2", "resolved": "https://registry.npmjs.org/@types/fetch-mock/-/fetch-mock-7.3.2.tgz", @@ -17014,6 +17002,14 @@ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz", "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==" }, + "@types/lodash.get": { + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/@types/lodash.get/-/lodash.get-4.4.6.tgz", + "integrity": "sha512-E6zzjR3GtNig8UJG/yodBeJeIOtgPkMgsLjDU3CbgCAPC++vJ0eCMnJhVpRZb/ENqEFlov1+3K9TKtY4UdWKtQ==", + "requires": { + "@types/lodash": "*" + } + }, "@types/markdown-to-jsx": { "version": "6.11.1", "resolved": "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.1.tgz", @@ -17055,7 +17051,8 @@ "@types/node": { "version": "10.12.15", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.15.tgz", - "integrity": "sha512-9kROxduaN98QghwwHmxXO2Xz3MaWf+I1sLVAA6KJDF5xix+IyXVhds0MAfdNwtcpSrzhaTsNB0/jnL86fgUhqA==" + "integrity": "sha512-9kROxduaN98QghwwHmxXO2Xz3MaWf+I1sLVAA6KJDF5xix+IyXVhds0MAfdNwtcpSrzhaTsNB0/jnL86fgUhqA==", + "dev": true }, "@types/node-fetch": { "version": "2.5.7", @@ -17206,15 +17203,6 @@ "@types/react": "*" } }, - "@types/react-loadable": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/@types/react-loadable/-/react-loadable-5.5.3.tgz", - "integrity": "sha512-BRzQhbMo5CjfxFU2tmmBNh16QqKUwNiaX0vflCwIVPVG8g/pCOyJ3rOdSPo4m+TPS7C9q/TupaqYXXTMtFoyng==", - "requires": { - "@types/react": "*", - "@types/webpack": "*" - } - }, "@types/react-redux": { "version": "5.0.21", "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-5.0.21.tgz", @@ -17394,7 +17382,8 @@ "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", - "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==" + "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==", + "dev": true }, "@types/stack-utils": { "version": "1.0.1", @@ -17405,12 +17394,14 @@ "@types/tapable": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.4.tgz", - "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==" + "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==", + "dev": true }, "@types/uglify-js": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz", "integrity": "sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ==", + "dev": true, "requires": { "source-map": "^0.6.1" }, @@ -17418,7 +17409,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -17432,6 +17424,7 @@ "version": "4.39.1", "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.39.1.tgz", "integrity": "sha512-rgO9ihNu/l72Sjx3shqwc9r6gi+tOMsqxhMEZhOEVIZt82GFOeUyEdpTk1BO2HqEHLS/XJW8ldUTIIfIMMyYFQ==", + "dev": true, "requires": { "@types/anymatch": "*", "@types/node": "*", @@ -17444,7 +17437,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -17458,6 +17452,7 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz", "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==", + "dev": true, "requires": { "@types/node": "*", "@types/source-list-map": "*", @@ -17467,7 +17462,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -18419,11 +18415,6 @@ "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", "dev": true }, - "array-flat-polyfill": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz", - "integrity": "sha512-hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw==" - }, "array-flatten": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", @@ -20491,28 +20482,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "", + "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "resolved": "", + "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": "", + "resolved": false, "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -20523,14 +20514,14 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "", + "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, @@ -20541,35 +20532,35 @@ }, "code-point-at": { "version": "1.1.0", - "resolved": "", + "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "", + "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -20579,35 +20570,35 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": "", + "resolved": false, "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "", + "resolved": false, "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs.realpath": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "", + "resolved": false, "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -20624,7 +20615,7 @@ }, "glob": { "version": "7.1.3", - "resolved": "", + "resolved": false, "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -20639,14 +20630,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": "", + "resolved": false, "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -20656,7 +20647,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": "", + "resolved": false, "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -20666,7 +20657,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "", + "resolved": false, "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -20677,21 +20668,21 @@ }, "inherits": { "version": "2.0.3", - "resolved": "", + "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": false, "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, @@ -20701,14 +20692,14 @@ }, "isarray": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "", + "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, @@ -20725,14 +20716,14 @@ }, "ms": { "version": "2.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true }, "needle": { "version": "2.3.0", - "resolved": "", + "resolved": false, "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -20744,7 +20735,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": "", + "resolved": false, "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -20763,7 +20754,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, @@ -20774,14 +20765,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": "", + "resolved": false, "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": "", + "resolved": false, "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -20792,7 +20783,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "", + "resolved": false, "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -20805,21 +20796,21 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": "", + "resolved": false, "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "", + "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, @@ -20829,21 +20820,21 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "", + "resolved": false, "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -20854,21 +20845,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "", + "resolved": false, "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": "", + "resolved": false, "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -20881,7 +20872,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "", + "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, @@ -20897,7 +20888,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": "", + "resolved": false, "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -20907,49 +20898,49 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "", + "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "", + "resolved": false, "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "", + "resolved": false, "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "resolved": "", + "resolved": false, "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, @@ -20961,7 +20952,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -20971,7 +20962,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, @@ -20981,21 +20972,21 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "util-deprecate": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": "", + "resolved": false, "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -21005,7 +20996,7 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true @@ -21245,6 +21236,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -21254,22 +21246,26 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -21280,6 +21276,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, "requires": { "ansi-regex": "^5.0.0" } @@ -21289,7 +21286,8 @@ "clone": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true }, "clone-deep": { "version": "0.2.4", @@ -22767,14 +22765,6 @@ "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz", "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw==" }, - "d3-delaunay": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz", - "integrity": "sha512-amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w==", - "requires": { - "delaunator": "4" - } - }, "d3-dispatch": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", @@ -22804,36 +22794,11 @@ "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz", "integrity": "sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==" }, - "d3-force": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz", - "integrity": "sha512-nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew==", - "requires": { - "d3-dispatch": "1 - 2", - "d3-quadtree": "1 - 2", - "d3-timer": "1 - 2" - } - }, "d3-format": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.3.2.tgz", "integrity": "sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==" }, - "d3-geo": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz", - "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==", - "requires": { - "d3-array": ">=2.5" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - } - } - }, "d3-geo-projection": { "version": "0.2.16", "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz", @@ -22865,11 +22830,6 @@ "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.7.tgz", "integrity": "sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA==" }, - "d3-quadtree": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz", - "integrity": "sha512-b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw==" - }, "d3-queue": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz", @@ -22913,6 +22873,15 @@ "d3-time-format": "2" } }, + "d3-scale-chromatic": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz", + "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==", + "requires": { + "d3-color": "1 - 2", + "d3-interpolate": "1 - 2" + } + }, "d3-selection": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz", @@ -23103,7 +23072,8 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decimal.js": { "version": "9.0.1", @@ -23293,11 +23263,6 @@ } } }, - "delaunator": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz", - "integrity": "sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==" - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -23568,9 +23533,9 @@ } }, "dompurify": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.14.tgz", - "integrity": "sha512-oqcjyCLHLjWugZ6VwK0YfmRND/DFy/CuZhdasmymMfnxbzaaQxBSA1ATZIXWESGDj/nvq1vKLmRa7rTdbGgrmQ==" + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.15.tgz", + "integrity": "sha512-8AnYW8iXOC7xC7K3FBvQ7+GdmtOsgDGZC5dDXaewCC674qcId7G5mhz5VIEnVShJVjQdlcaPjxpaOzaV9JC3Tg==" }, "domutils": { "version": "1.5.1", @@ -23812,23 +23777,23 @@ } }, "encodable": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/encodable/-/encodable-0.3.7.tgz", - "integrity": "sha512-aFbrhAsxPUN+OMZ28+N2tOqaeIFs4I1t/Li9+WmQwPFONrsu7InwMehLR3XTOQjmo+ucCBcSV9ABjQqMawgKNw==", + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/encodable/-/encodable-0.7.8.tgz", + "integrity": "sha512-rh5isin1c3ZJuultMyJZGBRbGIh8IrVHQuwlEG3lPMGZQ5yQUb2STIbXGGEbSifxT4POnojKjTxhm3ITTSdriw==", "requires": { + "@encodable/color": "^1.1.0", + "@encodable/format": "^1.0.5", "@types/d3-array": "^2.0.0", "@types/d3-interpolate": "^1.3.1", "@types/d3-scale": "^2.1.1", "@types/d3-time": "^1.0.10", - "@types/lodash": "^4.14.149", + "@types/lodash.get": "^4.4.6", "d3-array": "^2.3.1", - "d3-interpolate": "^1.3.2", + "d3-interpolate": "^2.0.1", "d3-scale": "^3.0.1", - "d3-time": "^1.0.11", - "lodash": "^4.17.15", - "reselect": "^4.0.0", - "vega": "^5.9.1", - "vega-lite": "~4.1.0" + "d3-time": "^2.0.0", + "lodash.get": "^4.4.2", + "reselect": "^4.0.0" }, "dependencies": { "d3-array": { @@ -23836,6 +23801,14 @@ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" }, + "d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "requires": { + "d3-color": "1 - 2" + } + }, "d3-scale": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz", @@ -23849,9 +23822,9 @@ } }, "d3-time": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz", - "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz", + "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==" } } }, @@ -25794,7 +25767,8 @@ "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true }, "get-package-type": { "version": "0.1.0", @@ -25945,6 +25919,11 @@ "process": "^0.11.10" } }, + "global-box": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/global-box/-/global-box-1.2.0.tgz", + "integrity": "sha512-IgpqqAYWNG3eluK1tsCkI8Uxff16+OYWLEhDS/QrfkfmbRQ/tVlBXZfURn5tSoPPT6wtmeJp7VKhXrcc5jl/1A==" + }, "global-cache": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/global-cache/-/global-cache-1.2.1.tgz", @@ -26082,9 +26061,9 @@ } }, "h3-js": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-3.6.3.tgz", - "integrity": "sha512-sSfUD4WrqKDoGsGjeY/ih2kbl/HqunGzdAr4NL8Q1qHSAyGMvev3jABbsMvK9wJGmnGuGhIzgxX9kCbUsYcnwg==" + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/h3-js/-/h3-js-3.6.4.tgz", + "integrity": "sha512-wMu0Y+vdh4xx2WT1jqy4QDBgJupjBfHsGaMtMsFocdZdIsfxLFufzjGcmReOSfKQ+twRO2XjXAmDY9h1nq99EA==" }, "hammerjs": { "version": "2.0.8", @@ -31698,11 +31677,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json-stringify-pretty-compact": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz", - "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==" - }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -33202,7 +33176,8 @@ "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", + "dev": true }, "node-forge": { "version": "0.9.0", @@ -36477,9 +36452,9 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "prettier": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", - "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz", + "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==", "dev": true }, "prettier-linter-helpers": { @@ -40728,12 +40703,14 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true }, "require-package-name": { "version": "2.0.1", @@ -41196,7 +41173,8 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true }, "set-value": { "version": "2.0.1", @@ -43617,14 +43595,6 @@ "shapefile": "0.3" } }, - "topojson-client": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz", - "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==", - "requires": { - "commander": "2" - } - }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -44055,9 +44025,9 @@ } }, "underscore": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz", - "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz", + "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw==" }, "unfetch": { "version": "4.1.0", @@ -44526,684 +44496,6 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, - "vega": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/vega/-/vega-5.15.0.tgz", - "integrity": "sha512-uygUtkZJm3/HNvNGLQSugZld4qvaiOMtH34tOGuS/MSGj7MaP0CLoFrthlas30lyMPQ42UfzX8tk5X+I91dFKQ==", - "requires": { - "vega-crossfilter": "~4.0.4", - "vega-dataflow": "~5.7.2", - "vega-encode": "~4.8.2", - "vega-event-selector": "~2.0.5", - "vega-expression": "~2.7.0", - "vega-force": "~4.0.6", - "vega-format": "~1.0.3", - "vega-functions": "~5.7.3", - "vega-geo": "~4.3.6", - "vega-hierarchy": "~4.0.8", - "vega-loader": "~4.3.2", - "vega-parser": "~6.0.3", - "vega-projection": "~1.4.4", - "vega-regression": "~1.0.8", - "vega-runtime": "~6.1.2", - "vega-scale": "~7.1.0", - "vega-scenegraph": "~4.9.1", - "vega-statistics": "~1.7.8", - "vega-time": "~2.0.3", - "vega-transforms": "~4.9.2", - "vega-typings": "~0.18.2", - "vega-util": "~1.15.1", - "vega-view": "~5.8.2", - "vega-view-transforms": "~4.5.7", - "vega-voronoi": "~4.1.4", - "vega-wordcloud": "~4.1.2" - } - }, - "vega-canvas": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.4.tgz", - "integrity": "sha512-BI44AIAa13xSindGXMQm0FAhI2zx3F3conFmXhey63hqGsfvH/19nv+A0PEvSVa/lK4iPneMTpw583iffDiq3w==" - }, - "vega-crossfilter": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.4.tgz", - "integrity": "sha512-mXKhHxkgxJPwtTrMgK3Uw1bStfD+rmfKXsUvdIh1ZwmpheGOQM2Uflo3tQNh9j9wqu8xHywCcddohKpSRBt8HQ==", - "requires": { - "d3-array": "^2.7.0", - "vega-dataflow": "^5.7.2", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - } - } - }, - "vega-dataflow": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.2.tgz", - "integrity": "sha512-O6CEchGAQtEhDKfI3UHWVUbUcXSMsq5JrefvvB2hldx3XbHkEQioXtgAnK6OosyKpB1dJlVvFRMR40pwdNO1hw==", - "requires": { - "vega-format": "^1.0.3", - "vega-loader": "^4.3.2", - "vega-util": "^1.15.1" - } - }, - "vega-encode": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.2.tgz", - "integrity": "sha512-+PEimVqZysvLEScU/EJrpElBrNMcDHeVGmMhLkswxfVrFix4ialV3/iGB9Wcr5g1pOQcsBdNn7qUy2bjvAvIvA==", - "requires": { - "d3-array": "^2.7.0", - "d3-interpolate": "^2.0.1", - "vega-dataflow": "^5.7.2", - "vega-scale": "^7.0.2", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-interpolate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", - "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", - "requires": { - "d3-color": "1 - 2" - } - } - } - }, - "vega-event-selector": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.5.tgz", - "integrity": "sha512-bRm02Fnd+YrZDni0yr5y9Co1Z1zrjd7hkwY+gi/Y7zDFOxnESGrbYtpHvWT8fL9AqmYU3wDpsJZGyP4htRUNAQ==" - }, - "vega-expression": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-2.7.0.tgz", - "integrity": "sha512-fMnHtcFfVAxuwjsKGh0qqP8OJNVABGIg0aSp33Jxh1D86LwDwaRe+EtwF1fv8YKD2AEiBl4UObC68QMT56MekQ==", - "requires": { - "vega-util": "^1.15.1" - } - }, - "vega-force": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.0.6.tgz", - "integrity": "sha512-acB5DshAhSbaxKAk/DgzUK4ondTAZbD3tRY4Cy0NmZL+6QqM3RRePM1PQBAFAQMp9kXT9X/fh8tOlMKx/rwQnQ==", - "requires": { - "d3-force": "^2.1.1", - "vega-dataflow": "^5.7.2", - "vega-util": "^1.15.1" - } - }, - "vega-format": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/vega-format/-/vega-format-1.0.3.tgz", - "integrity": "sha512-hZpYZM/KRNnd+qmJ5oCGHvOzlxga9d2anqw+ji/jbA41piMzsyAa2f8CAoHpXgzsZNkGp+BL2Oya+251uZOjQw==", - "requires": { - "d3-array": "^2.7.0", - "d3-format": "^2.0.0", - "d3-time-format": "^3.0.0", - "vega-time": "^2.0.3", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-format": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz", - "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==" - }, - "d3-time-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", - "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", - "requires": { - "d3-time": "1 - 2" - } - } - } - }, - "vega-functions": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.7.3.tgz", - "integrity": "sha512-9X9bKhKZvglfRaFIDg2yRyBzayabsQHRAyVk0bJBU04mgfj6myKRhO6JF4av+LgNHyJFsOPeJxkiOYZ3x6Z6rg==", - "requires": { - "d3-array": "^2.7.0", - "d3-color": "^2.0.0", - "d3-geo": "^2.0.1", - "vega-dataflow": "^5.7.2", - "vega-expression": "^2.7.0", - "vega-scale": "^7.1.0", - "vega-scenegraph": "^4.9.1", - "vega-selections": "^5.1.3", - "vega-statistics": "^1.7.8", - "vega-time": "^2.0.3", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", - "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" - } - } - }, - "vega-geo": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.6.tgz", - "integrity": "sha512-miRnxnf3KSgmHMR0H8y3NSg58BnijVtxg508PDrw3T4ARRYxGf5yglcEYFcc06iRYTV3B43pOg0Se5dLowmTEw==", - "requires": { - "d3-array": "^2.7.0", - "d3-color": "^2.0.0", - "d3-geo": "^2.0.1", - "vega-canvas": "^1.2.4", - "vega-dataflow": "^5.7.2", - "vega-projection": "^1.4.4", - "vega-statistics": "^1.7.8", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", - "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" - } - } - }, - "vega-hierarchy": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.8.tgz", - "integrity": "sha512-8O2asfoAEaW8Hfu/06m6t5BErrNo0OJzU8XyKon8aeGY2YbQMKT7fiEzUrzDC39Zb2suThuzBOjpcwiu7rh/Hg==", - "requires": { - "d3-hierarchy": "^2.0.0", - "vega-dataflow": "^5.7.2", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-hierarchy": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz", - "integrity": "sha512-SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw==" - } - } - }, - "vega-lite": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.1.1.tgz", - "integrity": "sha512-D2seO6ZbY8aZQ8+ZQfU+5NYwot3ryIDyvdQdcVoupMSgJ/oGv4QqEwL3rmu8abdSG6NhFiac0trsI+wBb0F6vQ==", - "requires": { - "@types/clone": "~0.1.30", - "@types/fast-json-stable-stringify": "^2.0.0", - "array-flat-polyfill": "^1.0.1", - "clone": "~2.1.2", - "fast-deep-equal": "~3.1.1", - "fast-json-stable-stringify": "~2.1.0", - "json-stringify-pretty-compact": "~2.0.0", - "tslib": "~1.10.0", - "vega-event-selector": "~2.0.2", - "vega-expression": "~2.6.3", - "vega-typings": "~0.12.0", - "vega-util": "~1.12.2", - "yargs": "~15.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - }, - "vega-expression": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-2.6.6.tgz", - "integrity": "sha512-zxPzXO33FawU3WQHRmHJaRreyJlyMaNMn1uuCFSouJttPkBBWB5gCrha2f5+pF3t4NMFWTnSrgCkR6mcaubnng==", - "requires": { - "vega-util": "^1.15.0" - }, - "dependencies": { - "vega-util": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.15.1.tgz", - "integrity": "sha512-kEbRQiVUP42dyou2LF8I+3TlBtk4TODTlnLzdSoI//uahXvDnz1ulfprWljfcHPbVjziObaFNWkpT56oSMTx+g==" - } - } - }, - "vega-typings": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.12.4.tgz", - "integrity": "sha512-2tnAfFMxaGul1875q6v6vZW20s+j9hYGlt/lpp3yVYYGARG7hjgwyHpOKnHzw3C/huy4JaHaMhf3psXgG/VnHw==", - "requires": { - "vega-util": "^1.12.1" - } - }, - "vega-util": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.12.2.tgz", - "integrity": "sha512-p02+oQ/XU/gzY9S/CTZinym2NKWEMIneLc+FYdUeJZZnDGa3DvcNgUDlVR90JlwLcYZNs5dBdfYLfdRHsKZKiw==" - }, - "yargs": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz", - "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==", - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^16.1.0" - } - }, - "yargs-parser": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", - "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "vega-loader": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.2.tgz", - "integrity": "sha512-g+hd4xCxGP4zlSdvvprDrHTulUN1xB1k63ooqtCzhps3fji7N8DQ3RWPTJZLyuwYpjxim3BYrp4aJk3OHElcaA==", - "requires": { - "d3-dsv": "^2.0.0", - "node-fetch": "^2.6.0", - "topojson-client": "^3.1.0", - "vega-format": "^1.0.3", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-dsv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz", - "integrity": "sha512-E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w==", - "requires": { - "commander": "2", - "iconv-lite": "0.4", - "rw": "1" - } - } - } - }, - "vega-parser": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.0.4.tgz", - "integrity": "sha512-AxFvM0JgS/hyqlIdcN1B74PRO5cpU9SRRh8wBfirHRkFWPxqfP2EeFmQxisGV5wSqAUVTqqqk0suWQuU3YHPcQ==", - "requires": { - "vega-dataflow": "^5.7.2", - "vega-event-selector": "^2.0.5", - "vega-functions": "^5.7.2", - "vega-scale": "^7.1.0", - "vega-util": "^1.15.1" - } - }, - "vega-projection": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.4.tgz", - "integrity": "sha512-v1Tx/8khpOmzpscXkxq2+MGjs7jG3A8yFfQJ8kTh8eIko0f5V+QLujTfEvdllYXw6f3DE6K2fYInb71B0GAjIw==", - "requires": { - "d3-geo": "^2.0.1", - "d3-geo-projection": "^3.0.0" - }, - "dependencies": { - "d3-geo-projection": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-3.0.0.tgz", - "integrity": "sha512-1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA==", - "requires": { - "commander": "2", - "d3-array": "1 - 2", - "d3-geo": "1.12.0 - 2", - "resolve": "^1.1.10" - } - } - } - }, - "vega-regression": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.8.tgz", - "integrity": "sha512-NdLoDctaxtCKP4udGg2SmplyK8098L8EAFEy/TEECx0wbRcBzPs2e/U4uCShzoPHILFULdOqs+sq/xwhp9X3lA==", - "requires": { - "d3-array": "^2.7.0", - "vega-dataflow": "^5.7.2", - "vega-statistics": "^1.7.8", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - } - } - }, - "vega-runtime": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.2.tgz", - "integrity": "sha512-baaMe8PKynJlJfpcZR4jHDSbTM9TYzU4x/XLphQ/6lZnF9WMH+gGOVlVRWZCLH4K0sgCxBMKC/THOpRFkO6jJA==", - "requires": { - "vega-dataflow": "^5.7.2", - "vega-util": "^1.15.1" - } - }, - "vega-scale": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.0.tgz", - "integrity": "sha512-8QgHarFLgnX60DL9h91GNSzvXtBVUfCx57+XKUlCROfHti4KASTRMicBgfJ3lwJBACNefpEW+9ut+1iuIHONwQ==", - "requires": { - "d3-array": "^2.7.0", - "d3-interpolate": "^2.0.1", - "d3-scale": "^3.2.2", - "vega-time": "^2.0.2", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-interpolate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", - "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", - "requires": { - "d3-color": "1 - 2" - } - }, - "d3-scale": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz", - "integrity": "sha512-3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg==", - "requires": { - "d3-array": "1.2.0 - 2", - "d3-format": "1 - 2", - "d3-interpolate": "1.2.0 - 2", - "d3-time": "1 - 2", - "d3-time-format": "2 - 3" - } - } - } - }, - "vega-scenegraph": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.1.tgz", - "integrity": "sha512-4OyFlMXwecM7C18zrXeBgckzLaFncLdnj1ExcF3dFfsgPLBSRW2x+eCRQZmD12UHoLFGuehB5s3YNfoQtCP5YA==", - "requires": { - "d3-path": "^2.0.0", - "d3-shape": "^2.0.0", - "vega-canvas": "^1.2.4", - "vega-loader": "^4.3.2", - "vega-scale": "^7.1.0", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz", - "integrity": "sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==" - }, - "d3-shape": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.0.0.tgz", - "integrity": "sha512-djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw==", - "requires": { - "d3-path": "1 - 2" - } - } - } - }, - "vega-selections": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.3.tgz", - "integrity": "sha512-fy+EBPA3pA3i4IeQ2EUHQI83RZMCS4ZoXu1RI1Oa/CFLu8iXxwraRaD9sUH93GPj4pU22g4ywjbHzsrZ7x4ONg==", - "requires": { - "vega-expression": "^2.7.0", - "vega-util": "^1.15.1" - } - }, - "vega-statistics": { - "version": "1.7.8", - "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.8.tgz", - "integrity": "sha512-JkxS7hkFLOMBgEOfITQ1kisLGuWtJ0gAhxQ1OmuIx5Un9yyFY3+hk8HSgeZHwIPktsV+2Bx5aPUHES85YzBD/Q==", - "requires": { - "d3-array": "^2.7.0" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - } - } - }, - "vega-time": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-2.0.3.tgz", - "integrity": "sha512-LXsB5Ej56jcDRvoWHp1YegNuZSD+cFWGBEWobRXbigmRNDfa4HGmzUon46G+KBj+VeRRGeu5Zq4LSG2goWmIYw==", - "requires": { - "d3-array": "^2.7.0", - "d3-time": "^2.0.0", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-time": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz", - "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==" - } - } - }, - "vega-transforms": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.2.tgz", - "integrity": "sha512-vDI8jJOlnswSuEf6BekI04jWNttgOLzDRONaWZGTH8X5yI3GgkB4Ts45U0LayRExQSq7gxt95k/02jXGGzOTpA==", - "requires": { - "d3-array": "^2.7.0", - "vega-dataflow": "^5.7.2", - "vega-statistics": "^1.7.8", - "vega-time": "^2.0.3", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - } - } - }, - "vega-typings": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.18.2.tgz", - "integrity": "sha512-t7PAmcqPUmSV44l2NVJOoblhomPlgjO7rxAUs/HXnmyVbGHI+6ulUPjGBWWZU1ebu09T+SYazAwjr6lAd2CHgQ==", - "requires": { - "vega-util": "^1.15.1" - } - }, - "vega-util": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.15.1.tgz", - "integrity": "sha512-kEbRQiVUP42dyou2LF8I+3TlBtk4TODTlnLzdSoI//uahXvDnz1ulfprWljfcHPbVjziObaFNWkpT56oSMTx+g==" - }, - "vega-view": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.8.2.tgz", - "integrity": "sha512-d+u5FGs3t7LUVRoGimvroHkbO2orrtJMUt2P8UVu4alMdDcgZUSmwOZWc/gMkBGlWD8P9q7832xTWdJ3gSXL4A==", - "requires": { - "d3-array": "^2.7.0", - "d3-timer": "^2.0.0", - "vega-dataflow": "^5.7.2", - "vega-format": "^1.0.3", - "vega-functions": "^5.7.3", - "vega-runtime": "^6.1.2", - "vega-scenegraph": "^4.9.1", - "vega-util": "^1.15.1" - }, - "dependencies": { - "d3-array": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz", - "integrity": "sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==" - }, - "d3-timer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz", - "integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==" - } - } - }, - "vega-view-transforms": { - "version": "4.5.7", - "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.7.tgz", - "integrity": "sha512-dcrEHJL/+KPAe7Eq4Me7rq5+O13yWL1X/n3Fu6xKGL2TnBSBy4WVla+WFBdD82GRIU0Fi5DFkL/dE3cTeitvag==", - "requires": { - "vega-dataflow": "^5.7.2", - "vega-scenegraph": "^4.9.1", - "vega-util": "^1.15.1" - } - }, - "vega-voronoi": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.4.tgz", - "integrity": "sha512-z5aAprA9XbdKZ2oAs1tWR9Cw+W9LQJZCn9kH+x6VmnqiVhCbMZPDoZK9sIgso163RDF9Fdu+0zLXX58l+AjzWA==", - "requires": { - "d3-delaunay": "^5.3.0", - "vega-dataflow": "^5.7.2", - "vega-util": "^1.15.1" - } - }, - "vega-wordcloud": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.2.tgz", - "integrity": "sha512-LZzqaRuE0bR9x9e9dLax6GYnUO+MtJhGx5fRk4F0Q8+X2f0u/BfOyMG459tnbyZQIy9SP8ZBLBlkp+ujmK8XXQ==", - "requires": { - "vega-canvas": "^1.2.4", - "vega-dataflow": "^5.7.2", - "vega-scale": "^7.1.0", - "vega-statistics": "^1.7.8", - "vega-util": "^1.15.1" - } - }, "vendors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz", @@ -47136,7 +46428,8 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true }, "wide-align": { "version": "1.1.3", @@ -47223,6 +46516,7 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -47232,12 +46526,14 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, "requires": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" @@ -47247,6 +46543,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -47254,22 +46551,26 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -47280,6 +46581,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, "requires": { "ansi-regex": "^5.0.0" } @@ -47359,7 +46661,8 @@ "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true }, "yallist": { "version": "3.1.1", diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 5d50f3ec7..02a234df5 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -22,6 +22,8 @@ "prettier-check": "prettier --check '{src,stylesheets}/**/*.{css,less,sass,scss}'", "lint-fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx,.ts,tsx . && npm run clean-css && npm run type", "clean-css": "prettier --write '{src,stylesheets}/**/*.{css,less,sass,scss}'", + "format": "prettier --write './{src,spec,stylesheets,cypress-base}/**/*{.js,.jsx,.ts,.tsx,.css,.less,.scss,.sass}'", + "prettier": "npm run format", "check-translation": "prettier --check ../superset/translations/**/LC_MESSAGES/*.json", "clean-translation": "prettier --write ../superset/translations/**/LC_MESSAGES/*.json", "storybook": "NODE_ENV=development BABEL_ENV=development start-storybook -p 6006", @@ -61,46 +63,34 @@ "@babel/runtime-corejs3": "^7.8.4", "@data-ui/sparkline": "^0.0.54", "@emotion/core": "^10.0.28", - "@superset-ui/chart": "^0.14.23", - "@superset-ui/chart-composition": "^0.14.23", - "@superset-ui/chart-controls": "^0.14.23", - "@superset-ui/color": "^0.14.23", - "@superset-ui/connection": "^0.14.23", - "@superset-ui/core": "^0.14.23", - "@superset-ui/dimension": "^0.14.23", - "@superset-ui/legacy-plugin-chart-calendar": "^0.14.23", - "@superset-ui/legacy-plugin-chart-chord": "^0.14.23", - "@superset-ui/legacy-plugin-chart-country-map": "^0.14.23", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.14.23", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.14.23", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.14.23", - "@superset-ui/legacy-plugin-chart-histogram": "^0.14.23", - "@superset-ui/legacy-plugin-chart-horizon": "^0.14.23", - "@superset-ui/legacy-plugin-chart-map-box": "^0.14.23", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.14.23", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.14.23", - "@superset-ui/legacy-plugin-chart-partition": "^0.14.23", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.14.23", - "@superset-ui/legacy-plugin-chart-rose": "^0.14.23", - "@superset-ui/legacy-plugin-chart-sankey": "^0.14.23", - "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.14.23", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.14.23", - "@superset-ui/legacy-plugin-chart-treemap": "^0.14.23", - "@superset-ui/legacy-plugin-chart-world-map": "^0.14.23", - "@superset-ui/legacy-preset-chart-big-number": "^0.14.23", - "@superset-ui/legacy-preset-chart-deckgl": "^0.2.4", - "@superset-ui/legacy-preset-chart-nvd3": "^0.14.23", - "@superset-ui/number-format": "^0.14.23", - "@superset-ui/plugin-chart-echarts": "^0.14.23", - "@superset-ui/plugin-chart-table": "^0.14.23", - "@superset-ui/plugin-chart-word-cloud": "^0.14.23", - "@superset-ui/preset-chart-xy": "^0.14.23", - "@superset-ui/query": "^0.14.23", - "@superset-ui/style": "^0.14.23", - "@superset-ui/superset-ui": "^0.14.23", - "@superset-ui/time-format": "^0.14.23", - "@superset-ui/translation": "^0.14.23", - "@superset-ui/validator": "^0.14.23", + "@superset-ui/chart-controls": "^0.15.1", + "@superset-ui/core": "^0.15.1", + "@superset-ui/legacy-plugin-chart-calendar": "^0.15.1", + "@superset-ui/legacy-plugin-chart-chord": "^0.15.1", + "@superset-ui/legacy-plugin-chart-country-map": "^0.15.1", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.15.1", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.15.1", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.15.1", + "@superset-ui/legacy-plugin-chart-histogram": "^0.15.1", + "@superset-ui/legacy-plugin-chart-horizon": "^0.15.1", + "@superset-ui/legacy-plugin-chart-map-box": "^0.15.1", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.15.1", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.15.1", + "@superset-ui/legacy-plugin-chart-partition": "^0.15.1", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.15.1", + "@superset-ui/legacy-plugin-chart-rose": "^0.15.1", + "@superset-ui/legacy-plugin-chart-sankey": "^0.15.1", + "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.15.1", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.15.1", + "@superset-ui/legacy-plugin-chart-treemap": "^0.15.1", + "@superset-ui/legacy-plugin-chart-world-map": "^0.15.1", + "@superset-ui/legacy-preset-chart-big-number": "^0.15.1", + "@superset-ui/legacy-preset-chart-deckgl": "^0.3.1", + "@superset-ui/legacy-preset-chart-nvd3": "^0.15.1", + "@superset-ui/plugin-chart-echarts": "^0.15.1", + "@superset-ui/plugin-chart-table": "^0.15.1", + "@superset-ui/plugin-chart-word-cloud": "^0.15.1", + "@superset-ui/preset-chart-xy": "^0.15.1", "@vx/responsive": "^0.0.195", "abortcontroller-polyfill": "^1.1.9", "antd": "^4.5.2", @@ -118,6 +108,7 @@ "dnd-core": "^2.6.0", "dom-to-image": "^2.6.0", "geolib": "^2.0.24", + "global-box": "^1.2.0", "immutable": "^3.8.2", "interweave": "^11.2.0", "jquery": "^3.5.1", @@ -149,6 +140,7 @@ "react-hot-loader": "^4.12.20", "react-json-tree": "^0.11.2", "react-jsonschema-form": "^1.2.0", + "react-loadable": "^5.5.0", "react-markdown": "^4.3.1", "react-redux": "^5.1.2", "react-router-dom": "^5.1.2", @@ -268,7 +260,7 @@ "node-fetch": "^2.6.0", "optimize-css-assets-webpack-plugin": "^5.0.1", "po2json": "^0.4.5", - "prettier": "^2.0.5", + "prettier": "^2.1.1", "react-test-renderer": "^16.9.0", "redux-mock-store": "^1.2.3", "sinon": "^9.0.2", diff --git a/superset-frontend/prettier.config.js b/superset-frontend/prettier.config.js new file mode 100644 index 000000000..5ee96a0cf --- /dev/null +++ b/superset-frontend/prettier.config.js @@ -0,0 +1,23 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +module.exports = { + singleQuote: true, + trailingComma: 'all', + arrowParens: 'avoid', +}; diff --git a/superset-frontend/spec/helpers/setupSupersetClient.js b/superset-frontend/spec/helpers/setupSupersetClient.js index c03f27c9c..a5f4740ba 100644 --- a/superset-frontend/spec/helpers/setupSupersetClient.js +++ b/superset-frontend/spec/helpers/setupSupersetClient.js @@ -17,7 +17,7 @@ * under the License. */ import fetchMock from 'fetch-mock'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; export default function setupSupersetClient() { // The following is needed to mock out SupersetClient requests diff --git a/superset-frontend/spec/helpers/shim.ts b/superset-frontend/spec/helpers/shim.ts index 029d8e76b..f269b4f55 100644 --- a/superset-frontend/spec/helpers/shim.ts +++ b/superset-frontend/spec/helpers/shim.ts @@ -23,7 +23,7 @@ import 'jest-enzyme'; import jQuery from 'jquery'; import { configure } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; -import { configure as configureTranslation } from '@superset-ui/translation'; +import { configure as configureTranslation } from '@superset-ui/core'; import setupSupersetClient from './setupSupersetClient'; diff --git a/superset-frontend/spec/helpers/theming.ts b/superset-frontend/spec/helpers/theming.ts index 7f8316563..dbb130a11 100644 --- a/superset-frontend/spec/helpers/theming.ts +++ b/superset-frontend/spec/helpers/theming.ts @@ -17,7 +17,7 @@ * under the License. */ import { shallow as enzymeShallow, mount as enzymeMount } from 'enzyme'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { ReactElement } from 'react'; type optionsType = { diff --git a/superset-frontend/spec/javascripts/chart/ChartRenderer_spec.jsx b/superset-frontend/spec/javascripts/chart/ChartRenderer_spec.jsx index b509e8481..51fe07305 100644 --- a/superset-frontend/spec/javascripts/chart/ChartRenderer_spec.jsx +++ b/superset-frontend/spec/javascripts/chart/ChartRenderer_spec.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { shallow } from 'enzyme'; -import { SuperChart } from '@superset-ui/chart'; +import { SuperChart } from '@superset-ui/core'; import ChartRenderer from 'src/chart/ChartRenderer'; diff --git a/superset-frontend/spec/javascripts/chart/chartActions_spec.js b/superset-frontend/spec/javascripts/chart/chartActions_spec.js index 13710744d..dc57e22b7 100644 --- a/superset-frontend/spec/javascripts/chart/chartActions_spec.js +++ b/superset-frontend/spec/javascripts/chart/chartActions_spec.js @@ -20,7 +20,7 @@ import URI from 'urijs'; import fetchMock from 'fetch-mock'; import sinon from 'sinon'; -import * as chartlib from '@superset-ui/chart'; +import * as chartlib from '@superset-ui/core'; import { LOG_EVENT } from 'src/logger/actions'; import * as exploreUtils from 'src/explore/exploreUtils'; import * as actions from 'src/chart/chartAction'; diff --git a/superset-frontend/spec/javascripts/components/AlteredSliceTag_spec.jsx b/superset-frontend/spec/javascripts/components/AlteredSliceTag_spec.jsx index 5f0b38992..11bf28935 100644 --- a/superset-frontend/spec/javascripts/components/AlteredSliceTag_spec.jsx +++ b/superset-frontend/spec/javascripts/components/AlteredSliceTag_spec.jsx @@ -19,7 +19,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Table, Thead, Td, Th, Tr } from 'reactable-arc'; -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry } from '@superset-ui/core'; import AlteredSliceTag from 'src/components/AlteredSliceTag'; import ModalTrigger from 'src/components/ModalTrigger'; diff --git a/superset-frontend/spec/javascripts/components/ConfirmStatusChange_spec.jsx b/superset-frontend/spec/javascripts/components/ConfirmStatusChange_spec.jsx index 4b002637b..506280b59 100644 --- a/superset-frontend/spec/javascripts/components/ConfirmStatusChange_spec.jsx +++ b/superset-frontend/spec/javascripts/components/ConfirmStatusChange_spec.jsx @@ -19,7 +19,7 @@ import React from 'react'; import { mount } from 'enzyme'; import Button from 'src/components/Button'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import ConfirmStatusChange from 'src/components/ConfirmStatusChange'; import Modal from 'src/components/Modal'; diff --git a/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx b/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx index 120b34944..118e01bbd 100644 --- a/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx +++ b/superset-frontend/spec/javascripts/components/ListView/ListView_spec.jsx @@ -20,7 +20,7 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import { act } from 'react-dom/test-utils'; import { QueryParamProvider } from 'use-query-params'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import Button from 'src/components/Button'; import { Empty } from 'src/common/components'; diff --git a/superset-frontend/spec/javascripts/components/Menu_spec.jsx b/superset-frontend/spec/javascripts/components/Menu_spec.jsx index ab3bdb193..c0a10ea72 100644 --- a/superset-frontend/spec/javascripts/components/Menu_spec.jsx +++ b/superset-frontend/spec/javascripts/components/Menu_spec.jsx @@ -20,7 +20,7 @@ import React from 'react'; import { shallow, mount } from 'enzyme'; import { Nav, MenuItem } from 'react-bootstrap'; import NavDropdown from 'src/components/NavDropdown'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { Menu } from 'src/components/Menu/Menu'; diff --git a/superset-frontend/spec/javascripts/dashboard/actions/dashboardState_spec.js b/superset-frontend/spec/javascripts/dashboard/actions/dashboardState_spec.js index 3d1913bc5..aadc648cc 100644 --- a/superset-frontend/spec/javascripts/dashboard/actions/dashboardState_spec.js +++ b/superset-frontend/spec/javascripts/dashboard/actions/dashboardState_spec.js @@ -17,7 +17,7 @@ * under the License. */ import sinon from 'sinon'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import { removeSliceFromDashboard, diff --git a/superset-frontend/spec/javascripts/dashboard/components/CodeModal_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/CodeModal_spec.jsx index cf27ff789..52239a60d 100644 --- a/superset-frontend/spec/javascripts/dashboard/components/CodeModal_spec.jsx +++ b/superset-frontend/spec/javascripts/dashboard/components/CodeModal_spec.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { mount } from 'enzyme'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import CodeModal from 'src/dashboard/components/CodeModal'; diff --git a/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx index 3d0f3637e..82211c4ca 100644 --- a/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx +++ b/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx @@ -22,7 +22,7 @@ import { shallow, mount } from 'enzyme'; import sinon from 'sinon'; import { ParentSize } from '@vx/responsive'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { Sticky, StickyContainer } from 'react-sticky'; import { TabContainer, TabContent, TabPane } from 'react-bootstrap'; diff --git a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx index f4143a4b3..da4854124 100644 --- a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx +++ b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx @@ -23,7 +23,7 @@ import configureStore from 'redux-mock-store'; import fetchMock from 'fetch-mock'; import thunk from 'redux-thunk'; import sinon from 'sinon'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { act } from 'react-dom/test-utils'; import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal'; diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx index f8bf0c0a9..dde67f9d5 100644 --- a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx +++ b/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx @@ -24,7 +24,7 @@ import { mount } from 'enzyme'; import fetchMock from 'fetch-mock'; import thunk from 'redux-thunk'; import sinon from 'sinon'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import DatasourceModal from 'src/datasource/DatasourceModal'; diff --git a/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx index 8e7494908..ee2b7ec7a 100644 --- a/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/ColorPickerControl_spec.jsx @@ -24,7 +24,7 @@ import { SketchPicker } from 'react-color'; import { CategoricalScheme, getCategoricalSchemeRegistry, -} from '@superset-ui/color'; +} from '@superset-ui/core'; import ColorPickerControl from 'src/explore/components/controls/ColorPickerControl'; import ControlHeader from 'src/explore/components/ControlHeader'; diff --git a/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx index b7785198f..7f279f0c1 100644 --- a/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/ColorScheme_spec.jsx @@ -20,7 +20,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { Select } from 'src/components/Select'; -import { getCategoricalSchemeRegistry } from '@superset-ui/color'; +import { getCategoricalSchemeRegistry } from '@superset-ui/core'; import ColorSchemeControl from 'src/explore/components/controls/ColorSchemeControl'; diff --git a/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx b/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx index 11ef2fc0c..c39ea94a0 100644 --- a/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx @@ -18,8 +18,7 @@ */ import React from 'react'; import { shallow } from 'enzyme'; -import { getChartControlPanelRegistry } from '@superset-ui/chart'; -import { t } from '@superset-ui/translation'; +import { getChartControlPanelRegistry, t } from '@superset-ui/core'; import { defaultControls } from 'src/explore/store'; import { getFormDataFromControls } from 'src/explore/controlUtils'; import { ControlPanelsContainer } from 'src/explore/components/ControlPanelsContainer'; diff --git a/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx index 4271b5872..cce63b0c5 100644 --- a/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx @@ -20,7 +20,7 @@ import React from 'react'; import sinon from 'sinon'; import { shallow } from 'enzyme'; import { Modal } from 'react-bootstrap'; -import { getChartMetadataRegistry, ChartMetadata } from '@superset-ui/chart'; +import { getChartMetadataRegistry, ChartMetadata } from '@superset-ui/core'; import VizTypeControl from 'src/explore/components/controls/VizTypeControl'; const defaultProps = { diff --git a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx index ad87021f4..02c683f77 100644 --- a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx @@ -18,9 +18,11 @@ */ import React from 'react'; -import { getChartControlPanelRegistry } from '@superset-ui/chart'; -import { t } from '@superset-ui/translation'; -import { ColumnOption } from '@superset-ui/chart-controls'; +import { + getChartControlPanelRegistry, + ColumnOption, + t, +} from '@superset-ui/core'; import { getControlConfig, getControlState, diff --git a/superset-frontend/spec/javascripts/explore/store_spec.jsx b/superset-frontend/spec/javascripts/explore/store_spec.jsx index dacdb7f6e..56293f09b 100644 --- a/superset-frontend/spec/javascripts/explore/store_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/store_spec.jsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry } from '@superset-ui/core'; import { applyDefaultFormData } from 'src/explore/store'; describe('store', () => { diff --git a/superset-frontend/spec/javascripts/explore/utils_spec.jsx b/superset-frontend/spec/javascripts/explore/utils_spec.jsx index ce3b064be..c8a29cbae 100644 --- a/superset-frontend/spec/javascripts/explore/utils_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/utils_spec.jsx @@ -30,7 +30,7 @@ import { formatTimeRange, } from 'src/explore/dateFilterUtils'; import * as hostNamesConfig from 'src/utils/hostNamesConfig'; -import { getChartMetadataRegistry } from '@superset-ui/chart'; +import { getChartMetadataRegistry } from '@superset-ui/core'; describe('exploreUtils', () => { const location = window.location; diff --git a/superset-frontend/spec/javascripts/middleware/logger_spec.js b/superset-frontend/spec/javascripts/middleware/logger_spec.js index 4a02cef30..24b6bd77d 100644 --- a/superset-frontend/spec/javascripts/middleware/logger_spec.js +++ b/superset-frontend/spec/javascripts/middleware/logger_spec.js @@ -17,7 +17,7 @@ * under the License. */ import sinon from 'sinon'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import logger from 'src/middleware/loggerMiddleware'; import { LOG_EVENT } from 'src/logger/actions'; import { LOG_ACTIONS_LOAD_CHART } from 'src/logger/LogUtils'; diff --git a/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx b/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx index b6c99be08..2d6823222 100644 --- a/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx +++ b/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx @@ -23,7 +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 { supersetTheme, ThemeProvider } from '@superset-ui/core'; import TabbedSqlEditors from 'src/SqlLab/components/TabbedSqlEditors'; import SqlEditor from 'src/SqlLab/components/SqlEditor'; diff --git a/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js b/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js index 2066362eb..3819782eb 100644 --- a/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js +++ b/superset-frontend/spec/javascripts/utils/getControlsForVizType_spec.js @@ -17,9 +17,8 @@ * under the License. */ -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry, t } from '@superset-ui/core'; import getControlsForVizType from 'src/utils/getControlsForVizType'; -import { t } from '@superset-ui/translation'; const fakePluginControls = { controlPanelSections: [ diff --git a/superset-frontend/spec/javascripts/views/CRUD/welcome/DashboardTable_spec.tsx b/superset-frontend/spec/javascripts/views/CRUD/welcome/DashboardTable_spec.tsx index 135613a38..e09b5fea0 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/welcome/DashboardTable_spec.tsx +++ b/superset-frontend/spec/javascripts/views/CRUD/welcome/DashboardTable_spec.tsx @@ -21,7 +21,7 @@ import { mount } from 'enzyme'; import thunk from 'redux-thunk'; import configureStore from 'redux-mock-store'; import fetchMock from 'fetch-mock'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import ListView from 'src/components/ListView'; import DashboardTable from 'src/views/CRUD/welcome/DashboardTable'; diff --git a/superset-frontend/src/CRUD/CollectionTable.tsx b/superset-frontend/src/CRUD/CollectionTable.tsx index 11d3105ad..2b1fc3950 100644 --- a/superset-frontend/src/CRUD/CollectionTable.tsx +++ b/superset-frontend/src/CRUD/CollectionTable.tsx @@ -18,7 +18,7 @@ */ import React, { ReactNode } from 'react'; import shortid from 'shortid'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button from 'src/components/Button'; import Fieldset from './Fieldset'; import { recurseReactClone } from './utils'; diff --git a/superset-frontend/src/SqlLab/App.jsx b/superset-frontend/src/SqlLab/App.jsx index 7f6f7ec0c..10f1e51bb 100644 --- a/superset-frontend/src/SqlLab/App.jsx +++ b/superset-frontend/src/SqlLab/App.jsx @@ -21,7 +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 { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { initFeatureFlags, isFeatureEnabled, diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js index 2221079cc..7c1bce3e1 100644 --- a/superset-frontend/src/SqlLab/actions/sqlLab.js +++ b/superset-frontend/src/SqlLab/actions/sqlLab.js @@ -18,8 +18,7 @@ */ import shortid from 'shortid'; import JSONbig from 'json-bigint'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import invert from 'lodash/invert'; import mapKeys from 'lodash/mapKeys'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; diff --git a/superset-frontend/src/SqlLab/components/App.jsx b/superset-frontend/src/SqlLab/components/App.jsx index 9cdf6688e..14484bf06 100644 --- a/superset-frontend/src/SqlLab/components/App.jsx +++ b/superset-frontend/src/SqlLab/components/App.jsx @@ -21,9 +21,8 @@ import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import $ from 'jquery'; -import { t } from '@superset-ui/translation'; +import { t, supersetTheme, ThemeProvider } from '@superset-ui/core'; import throttle from 'lodash/throttle'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; import TabbedSqlEditors from './TabbedSqlEditors'; import QueryAutoRefresh from './QueryAutoRefresh'; import QuerySearch from './QuerySearch'; diff --git a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx index 69d0095c6..1c9612f6b 100644 --- a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx +++ b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Table } from 'reactable-arc'; import { Alert } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button from 'src/components/Button'; import Loading from '../../components/Loading'; diff --git a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx index ff48a61ec..5e11204b6 100644 --- a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx +++ b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import Dialog from 'react-bootstrap-dialog'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx index 9a8cef6db..aa35b95e7 100644 --- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx +++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx @@ -23,7 +23,7 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import { Alert } from 'react-bootstrap'; import Dialog from 'react-bootstrap-dialog'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; import shortid from 'shortid'; diff --git a/superset-frontend/src/SqlLab/components/HighlightedSql.jsx b/superset-frontend/src/SqlLab/components/HighlightedSql.jsx index 0c343cae0..e2409fd91 100644 --- a/superset-frontend/src/SqlLab/components/HighlightedSql.jsx +++ b/superset-frontend/src/SqlLab/components/HighlightedSql.jsx @@ -23,7 +23,7 @@ import SyntaxHighlighter, { } from 'react-syntax-highlighter/dist/light'; import sql from 'react-syntax-highlighter/dist/languages/hljs/sql'; import github from 'react-syntax-highlighter/dist/styles/hljs/github'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ModalTrigger from '../../components/ModalTrigger'; diff --git a/superset-frontend/src/SqlLab/components/LimitControl.tsx b/superset-frontend/src/SqlLab/components/LimitControl.tsx index d93928874..2259a01f1 100644 --- a/superset-frontend/src/SqlLab/components/LimitControl.tsx +++ b/superset-frontend/src/SqlLab/components/LimitControl.tsx @@ -19,8 +19,7 @@ import React from 'react'; import { FormGroup, FormControl, Overlay, Popover } from 'react-bootstrap'; import Button from 'src/components/Button'; -import { t } from '@superset-ui/translation'; -import styled from '@superset-ui/style'; +import { t, styled } from '@superset-ui/core'; import Label from 'src/components/Label'; import ControlHeader from '../../explore/components/ControlHeader'; diff --git a/superset-frontend/src/SqlLab/components/QueryAutoRefresh.jsx b/superset-frontend/src/SqlLab/components/QueryAutoRefresh.jsx index cbbcb6c77..9413fa8e2 100644 --- a/superset-frontend/src/SqlLab/components/QueryAutoRefresh.jsx +++ b/superset-frontend/src/SqlLab/components/QueryAutoRefresh.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import * as Actions from '../actions/sqlLab'; diff --git a/superset-frontend/src/SqlLab/components/QueryHistory.jsx b/superset-frontend/src/SqlLab/components/QueryHistory.jsx index a40b813ff..59c1e72d9 100644 --- a/superset-frontend/src/SqlLab/components/QueryHistory.jsx +++ b/superset-frontend/src/SqlLab/components/QueryHistory.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Alert } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import QueryTable from './QueryTable'; diff --git a/superset-frontend/src/SqlLab/components/QuerySearch.jsx b/superset-frontend/src/SqlLab/components/QuerySearch.jsx index f75ed1055..cb517af03 100644 --- a/superset-frontend/src/SqlLab/components/QuerySearch.jsx +++ b/superset-frontend/src/SqlLab/components/QuerySearch.jsx @@ -20,8 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Button from 'src/components/Button'; import Select from 'src/components/Select'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import Loading from '../../components/Loading'; import QueryTable from './QueryTable'; diff --git a/superset-frontend/src/SqlLab/components/QueryTable.jsx b/superset-frontend/src/SqlLab/components/QueryTable.jsx index 969bed805..e92940d4f 100644 --- a/superset-frontend/src/SqlLab/components/QueryTable.jsx +++ b/superset-frontend/src/SqlLab/components/QueryTable.jsx @@ -22,7 +22,7 @@ import moment from 'moment'; import { Table } from 'reactable-arc'; import { ProgressBar, Well } from 'react-bootstrap'; import Label from 'src/components/Label'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button from 'src/components/Button'; import Link from '../../components/Link'; diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx index db40267bf..5a08a4b14 100644 --- a/superset-frontend/src/SqlLab/components/ResultSet.tsx +++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx @@ -20,7 +20,7 @@ import React, { CSSProperties } from 'react'; import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap'; import Button from 'src/components/Button'; import shortid from 'shortid'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace'; import Loading from '../../components/Loading'; diff --git a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx index 0dffab44e..12da271ce 100644 --- a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx +++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button, { ButtonProps } from 'src/components/Button'; diff --git a/superset-frontend/src/SqlLab/components/SaveQuery.jsx b/superset-frontend/src/SqlLab/components/SaveQuery.jsx index 5e7a878fe..ccb075d9c 100644 --- a/superset-frontend/src/SqlLab/components/SaveQuery.jsx +++ b/superset-frontend/src/SqlLab/components/SaveQuery.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormControl, FormGroup, Row, Col } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button from 'src/components/Button'; import FormLabel from 'src/components/FormLabel'; diff --git a/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx b/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx index ed710c09c..96d055efc 100644 --- a/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx +++ b/superset-frontend/src/SqlLab/components/ScheduleQueryButton.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import Form from 'react-jsonschema-form'; import chrono from 'chrono-node'; import { Col, FormControl, FormGroup, Row } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button from 'src/components/Button'; import ModalTrigger from 'src/components/ModalTrigger'; diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx index 75291db5e..0056a5c14 100644 --- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx +++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Popover, OverlayTrigger } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/SqlLab/components/SouthPane.jsx b/superset-frontend/src/SqlLab/components/SouthPane.jsx index 170b0a245..72c54dd54 100644 --- a/superset-frontend/src/SqlLab/components/SouthPane.jsx +++ b/superset-frontend/src/SqlLab/components/SouthPane.jsx @@ -22,7 +22,7 @@ import shortid from 'shortid'; import { Alert, Tab, Tabs } from 'react-bootstrap'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; import Label from 'src/components/Label'; diff --git a/superset-frontend/src/SqlLab/components/SqlEditor.jsx b/superset-frontend/src/SqlLab/components/SqlEditor.jsx index 4f3e72c86..4496aab63 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditor.jsx +++ b/superset-frontend/src/SqlLab/components/SqlEditor.jsx @@ -28,7 +28,7 @@ import { Tooltip, } from 'react-bootstrap'; import Split from 'react-split'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import debounce from 'lodash/debounce'; import throttle from 'lodash/throttle'; diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx index 6bb7546d9..dfd04e0a1 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx +++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Button from 'src/components/Button'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TableElement from './TableElement'; import TableSelector from '../../components/TableSelector'; diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx index 13a57b09d..0e22681d4 100644 --- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx +++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx @@ -22,7 +22,7 @@ import { MenuItem, DropdownButton, Tab, Tabs } from 'react-bootstrap'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import URI from 'urijs'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; import * as Actions from '../actions/sqlLab'; diff --git a/superset-frontend/src/SqlLab/components/TableElement.jsx b/superset-frontend/src/SqlLab/components/TableElement.jsx index 31d7dee85..a3572d1a5 100644 --- a/superset-frontend/src/SqlLab/components/TableElement.jsx +++ b/superset-frontend/src/SqlLab/components/TableElement.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { ButtonGroup, Collapse, Fade, Well } from 'react-bootstrap'; import shortid from 'shortid'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import CopyToClipboard from '../../components/CopyToClipboard'; import Link from '../../components/Link'; diff --git a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx index 15f6572fd..1993ec619 100644 --- a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx +++ b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx @@ -26,7 +26,7 @@ import 'brace/mode/html'; import 'brace/mode/markdown'; import 'brace/theme/textmate'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js index fd3c8ae74..3dd5736c4 100644 --- a/superset-frontend/src/SqlLab/reducers/getInitialState.js +++ b/superset-frontend/src/SqlLab/reducers/getInitialState.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import getToastsFromPyFlashMessages from '../../messageToasts/utils/getToastsFromPyFlashMessages'; export default function getInitialState({ diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js index d47a45aa2..f7e03ac51 100644 --- a/superset-frontend/src/SqlLab/reducers/sqlLab.js +++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import getInitialState from './getInitialState'; import * as actions from '../actions/sqlLab'; diff --git a/superset-frontend/src/addSlice/AddSliceContainer.tsx b/superset-frontend/src/addSlice/AddSliceContainer.tsx index 436397d87..0180839f8 100644 --- a/superset-frontend/src/addSlice/AddSliceContainer.tsx +++ b/superset-frontend/src/addSlice/AddSliceContainer.tsx @@ -20,7 +20,7 @@ import React from 'react'; import { Panel } from 'react-bootstrap'; import Button from 'src/components/Button'; import Select from 'src/components/Select'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import VizTypeControl from '../explore/components/controls/VizTypeControl'; diff --git a/superset-frontend/src/addSlice/App.tsx b/superset-frontend/src/addSlice/App.tsx index 7fdb05dbf..71f0909ba 100644 --- a/superset-frontend/src/addSlice/App.tsx +++ b/superset-frontend/src/addSlice/App.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { hot } from 'react-hot-loader/root'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import setupApp from '../setup/setupApp'; import setupPlugins from '../setup/setupPlugins'; import AddSliceContainer from './AddSliceContainer'; diff --git a/superset-frontend/src/chart/Chart.jsx b/superset-frontend/src/chart/Chart.jsx index b92222864..118cfe18f 100644 --- a/superset-frontend/src/chart/Chart.jsx +++ b/superset-frontend/src/chart/Chart.jsx @@ -19,8 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { Alert } from 'react-bootstrap'; -import styled from '@superset-ui/style'; -import { logging } from '@superset-ui/core'; +import { styled, logging } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; import { Logger, LOG_ACTIONS_RENDER_CHART } from '../logger/LogUtils'; diff --git a/superset-frontend/src/chart/ChartRenderer.jsx b/superset-frontend/src/chart/ChartRenderer.jsx index 8c5010f76..dce5e754d 100644 --- a/superset-frontend/src/chart/ChartRenderer.jsx +++ b/superset-frontend/src/chart/ChartRenderer.jsx @@ -19,8 +19,7 @@ import { snakeCase } from 'lodash'; import PropTypes from 'prop-types'; import React from 'react'; -import { SuperChart } from '@superset-ui/chart'; -import { logging } from '@superset-ui/core'; +import { SuperChart, logging } from '@superset-ui/core'; import { Logger, LOG_ACTIONS_RENDER_CHART } from '../logger/LogUtils'; const propTypes = { diff --git a/superset-frontend/src/chart/chartAction.js b/superset-frontend/src/chart/chartAction.js index e5363e4fa..fb19186cb 100644 --- a/superset-frontend/src/chart/chartAction.js +++ b/superset-frontend/src/chart/chartAction.js @@ -19,8 +19,7 @@ /* eslint no-undef: 'error' */ /* eslint no-param-reassign: ["error", { "props": false }] */ import moment from 'moment'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from '../featureFlags'; import { getAnnotationJsonUrl, diff --git a/superset-frontend/src/chart/chartReducer.js b/superset-frontend/src/chart/chartReducer.js index c50c0074b..d080f76b2 100644 --- a/superset-frontend/src/chart/chartReducer.js +++ b/superset-frontend/src/chart/chartReducer.js @@ -17,7 +17,7 @@ * under the License. */ /* eslint camelcase: 0 */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { now } from '../modules/dates'; import * as actions from './chartAction'; diff --git a/superset-frontend/src/common/components/Modal.tsx b/superset-frontend/src/common/components/Modal.tsx index 9757315c4..5895c4058 100644 --- a/superset-frontend/src/common/components/Modal.tsx +++ b/superset-frontend/src/common/components/Modal.tsx @@ -17,9 +17,8 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled, t } from '@superset-ui/core'; import { Modal as BaseModal } from 'src/common/components'; -import { t } from '@superset-ui/translation'; import Button from 'src/components/Button'; interface ModalProps { diff --git a/superset-frontend/src/common/components/Tabs.tsx b/superset-frontend/src/common/components/Tabs.tsx index 0d358ad6e..a02401581 100644 --- a/superset-frontend/src/common/components/Tabs.tsx +++ b/superset-frontend/src/common/components/Tabs.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import { Tabs as AntdTabs } from 'src/common/components'; const StyledTabs = styled(AntdTabs)` diff --git a/superset-frontend/src/common/components/index.ts b/superset-frontend/src/common/components/index.ts index cb37127b5..4f72e4c3c 100644 --- a/superset-frontend/src/common/components/index.ts +++ b/superset-frontend/src/common/components/index.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import { Skeleton } from 'antd'; /* diff --git a/superset-frontend/src/components/AlteredSliceTag.jsx b/superset-frontend/src/components/AlteredSliceTag.jsx index d1584614a..e923a5de1 100644 --- a/superset-frontend/src/components/AlteredSliceTag.jsx +++ b/superset-frontend/src/components/AlteredSliceTag.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { Table, Tr, Td, Thead, Th } from 'reactable-arc'; import { isEqual, isEmpty } from 'lodash'; import getControlsForVizType from 'src/utils/getControlsForVizType'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TooltipWrapper from './TooltipWrapper'; import ModalTrigger from './ModalTrigger'; import { safeStringify } from '../utils/safeStringify'; diff --git a/superset-frontend/src/components/AnchorLink.jsx b/superset-frontend/src/components/AnchorLink.jsx index 6f6a526df..26d9ed75b 100644 --- a/superset-frontend/src/components/AnchorLink.jsx +++ b/superset-frontend/src/components/AnchorLink.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import URLShortLinkButton from './URLShortLinkButton'; import getDashboardUrl from '../dashboard/util/getDashboardUrl'; diff --git a/superset-frontend/src/components/AsyncSelect.jsx b/superset-frontend/src/components/AsyncSelect.jsx index 2e3d717f6..fc9c5eeb5 100644 --- a/superset-frontend/src/components/AsyncSelect.jsx +++ b/superset-frontend/src/components/AsyncSelect.jsx @@ -20,8 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; // TODO: refactor this with `import { AsyncSelect } from src/components/Select` import { Select } from 'src/components/Select'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import getClientErrorObject from '../utils/getClientErrorObject'; const propTypes = { diff --git a/superset-frontend/src/components/AvatarIcon.tsx b/superset-frontend/src/components/AvatarIcon.tsx index f1a2fd32a..01ff1f10d 100644 --- a/superset-frontend/src/components/AvatarIcon.tsx +++ b/superset-frontend/src/components/AvatarIcon.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { getCategoricalSchemeRegistry } from '@superset-ui/color'; +import { getCategoricalSchemeRegistry } from '@superset-ui/core'; import Avatar, { ConfigProvider } from 'react-avatar'; import TooltipWrapper from 'src/components/TooltipWrapper'; diff --git a/superset-frontend/src/components/Button/index.tsx b/superset-frontend/src/components/Button/index.tsx index d40d3f980..a72668fed 100644 --- a/superset-frontend/src/components/Button/index.tsx +++ b/superset-frontend/src/components/Button/index.tsx @@ -26,7 +26,7 @@ import { OverlayTrigger, MenuItem, } from 'react-bootstrap'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; export type OnClickHandler = React.MouseEventHandler; diff --git a/superset-frontend/src/components/CachedLabel.jsx b/superset-frontend/src/components/CachedLabel.jsx index bb0d46f2e..db4bd2e46 100644 --- a/superset-frontend/src/components/CachedLabel.jsx +++ b/superset-frontend/src/components/CachedLabel.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Label from 'src/components/Label'; import TooltipWrapper from './TooltipWrapper'; diff --git a/superset-frontend/src/components/CertifiedIconWithTooltip.tsx b/superset-frontend/src/components/CertifiedIconWithTooltip.tsx index fcd2fe30f..e96b35f51 100644 --- a/superset-frontend/src/components/CertifiedIconWithTooltip.tsx +++ b/superset-frontend/src/components/CertifiedIconWithTooltip.tsx @@ -17,8 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; -import { supersetTheme } from '@superset-ui/style'; +import { t, supersetTheme } from '@superset-ui/core'; import Icon from 'src/components/Icon'; import TooltipWrapper from 'src/components/TooltipWrapper'; diff --git a/superset-frontend/src/components/CopyToClipboard.jsx b/superset-frontend/src/components/CopyToClipboard.jsx index 389991b01..918e3608c 100644 --- a/superset-frontend/src/components/CopyToClipboard.jsx +++ b/superset-frontend/src/components/CopyToClipboard.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Tooltip, OverlayTrigger, MenuItem } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import withToasts from 'src/messageToasts/enhancers/withToasts'; const propTypes = { diff --git a/superset-frontend/src/components/DeleteModal.tsx b/superset-frontend/src/components/DeleteModal.tsx index d142ce1d9..62421ea12 100644 --- a/superset-frontend/src/components/DeleteModal.tsx +++ b/superset-frontend/src/components/DeleteModal.tsx @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t, styled } from '@superset-ui/core'; import React, { useState } from 'react'; -import styled from '@superset-ui/style'; import { FormGroup, FormControl } from 'react-bootstrap'; import Modal from 'src/components/Modal'; import FormLabel from 'src/components/FormLabel'; diff --git a/superset-frontend/src/components/EditableTitle.tsx b/superset-frontend/src/components/EditableTitle.tsx index ba72a2822..65ef58a24 100644 --- a/superset-frontend/src/components/EditableTitle.tsx +++ b/superset-frontend/src/components/EditableTitle.tsx @@ -18,7 +18,7 @@ */ import React, { useEffect, useState, useRef } from 'react'; import cx from 'classnames'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TooltipWrapper from './TooltipWrapper'; interface EditableTitleProps { diff --git a/superset-frontend/src/components/ErrorBoundary.jsx b/superset-frontend/src/components/ErrorBoundary.jsx index f1fa94238..72c1af4f9 100644 --- a/superset-frontend/src/components/ErrorBoundary.jsx +++ b/superset-frontend/src/components/ErrorBoundary.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ErrorMessageWithStackTrace from './ErrorMessage/ErrorMessageWithStackTrace'; const propTypes = { diff --git a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx index 6968163aa..6fdff3116 100644 --- a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx +++ b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t, tn } from '@superset-ui/translation'; +import { t, tn } from '@superset-ui/core'; import { ErrorMessageComponentProps } from './types'; import IssueCode from './IssueCode'; diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx index 2b569addc..1bd97e0d8 100644 --- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx +++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx @@ -18,8 +18,7 @@ */ import React, { useState, ReactNode } from 'react'; import { Modal } from 'react-bootstrap'; -import { styled, supersetTheme } from '@superset-ui/style'; -import { t } from '@superset-ui/translation'; +import { styled, supersetTheme, t } from '@superset-ui/core'; import { noOp } from 'src/utils/common'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx index ab44376e9..1c0dcc9d3 100644 --- a/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx +++ b/superset-frontend/src/components/ErrorMessage/ErrorMessageWithStackTrace.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import getErrorMessageComponentRegistry from './getErrorMessageComponentRegistry'; import { SupersetError, ErrorSource } from './types'; diff --git a/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx index c04d3d28e..89805956f 100644 --- a/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx +++ b/superset-frontend/src/components/ErrorMessage/TimeoutErrorMessage.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t, tn } from '@superset-ui/translation'; +import { t, tn } from '@superset-ui/core'; import { ErrorMessageComponentProps } from './types'; import IssueCode from './IssueCode'; diff --git a/superset-frontend/src/components/FaveStar.tsx b/superset-frontend/src/components/FaveStar.tsx index dc1f6e847..992506bd5 100644 --- a/superset-frontend/src/components/FaveStar.tsx +++ b/superset-frontend/src/components/FaveStar.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TooltipWrapper from './TooltipWrapper'; import Icon from './Icon'; diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx index 1ecd6180f..34b44e7f5 100644 --- a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx +++ b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx @@ -30,8 +30,7 @@ import { Table, SortDirectionType, } from 'react-virtualized'; -import { getMultipleTextDimensions } from '@superset-ui/dimension'; -import { t } from '@superset-ui/translation'; +import { t, getMultipleTextDimensions } from '@superset-ui/core'; import Button from '../Button'; import CopyToClipboard from '../CopyToClipboard'; diff --git a/superset-frontend/src/components/FormLabel.tsx b/superset-frontend/src/components/FormLabel.tsx index e1979f579..393aa9ac8 100644 --- a/superset-frontend/src/components/FormLabel.tsx +++ b/superset-frontend/src/components/FormLabel.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -// import styled from '@superset-ui/style'; +// import { styled } from '@superset-ui/core'; import React, { ReactNode } from 'react'; import { ControlLabel } from 'react-bootstrap'; diff --git a/superset-frontend/src/components/Icon/icon.stories.jsx b/superset-frontend/src/components/Icon/icon.stories.jsx index ad408e811..67b910996 100644 --- a/superset-frontend/src/components/Icon/icon.stories.jsx +++ b/superset-frontend/src/components/Icon/icon.stories.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { withKnobs, select } from '@storybook/addon-knobs'; -import { styled, supersetTheme } from '@superset-ui/style'; +import { styled, supersetTheme } from '@superset-ui/core'; import Icon, { iconsRegistry } from './'; export default { diff --git a/superset-frontend/src/components/IndeterminateCheckbox.tsx b/superset-frontend/src/components/IndeterminateCheckbox.tsx index ffdb7b2ac..57b9ed658 100644 --- a/superset-frontend/src/components/IndeterminateCheckbox.tsx +++ b/superset-frontend/src/components/IndeterminateCheckbox.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import Icon from 'src/components/Icon'; interface IndeterminateCheckboxProps { diff --git a/superset-frontend/src/components/Label/index.tsx b/superset-frontend/src/components/Label/index.tsx index f4dcfed8a..466e3fe2a 100644 --- a/superset-frontend/src/components/Label/index.tsx +++ b/superset-frontend/src/components/Label/index.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { Label as BootstrapLabel } from 'react-bootstrap'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import cx from 'classnames'; export type OnClickHandler = React.MouseEventHandler; diff --git a/superset-frontend/src/components/ListView/CardCollection.tsx b/superset-frontend/src/components/ListView/CardCollection.tsx index 49e49552a..8ecc57d0a 100644 --- a/superset-frontend/src/components/ListView/CardCollection.tsx +++ b/superset-frontend/src/components/ListView/CardCollection.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { TableInstance, Row } from 'react-table'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import cx from 'classnames'; interface CardCollectionProps { diff --git a/superset-frontend/src/components/ListView/CardSortSelect.tsx b/superset-frontend/src/components/ListView/CardSortSelect.tsx index 1dbad37ff..c28e47283 100644 --- a/superset-frontend/src/components/ListView/CardSortSelect.tsx +++ b/superset-frontend/src/components/ListView/CardSortSelect.tsx @@ -17,7 +17,7 @@ * under the License. */ import React, { useState } from 'react'; -import { styled, withTheme, SupersetThemeProps } from '@superset-ui/style'; +import { styled, withTheme, SupersetThemeProps } from '@superset-ui/core'; import { PartialThemeConfig, Select } from 'src/components/Select'; import { CardSortSelectOption, FetchDataConfig, SortColumn } from './types'; import { filterSelectStyles } from './utils'; diff --git a/superset-frontend/src/components/ListView/Filters.tsx b/superset-frontend/src/components/ListView/Filters.tsx index 370e3dcd8..3f17d2a3b 100644 --- a/superset-frontend/src/components/ListView/Filters.tsx +++ b/superset-frontend/src/components/ListView/Filters.tsx @@ -17,7 +17,7 @@ * under the License. */ import React, { useState, ReactNode } from 'react'; -import { styled, withTheme, SupersetThemeProps } from '@superset-ui/style'; +import { styled, withTheme, SupersetThemeProps } from '@superset-ui/core'; import { Select, diff --git a/superset-frontend/src/components/ListView/ListView.tsx b/superset-frontend/src/components/ListView/ListView.tsx index cafec4b29..e7dd2c1fb 100644 --- a/superset-frontend/src/components/ListView/ListView.tsx +++ b/superset-frontend/src/components/ListView/ListView.tsx @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ +import { t, styled } from '@superset-ui/core'; import React, { useState } from 'react'; -import { t } from '@superset-ui/translation'; import { Alert } from 'react-bootstrap'; import { Empty } from 'src/common/components'; -import styled from '@superset-ui/style'; import cx from 'classnames'; import Button from 'src/components/Button'; import Icon from 'src/components/Icon'; diff --git a/superset-frontend/src/components/ListView/TableCollection.tsx b/superset-frontend/src/components/ListView/TableCollection.tsx index 71680b8b1..4dbbc86bc 100644 --- a/superset-frontend/src/components/ListView/TableCollection.tsx +++ b/superset-frontend/src/components/ListView/TableCollection.tsx @@ -19,7 +19,7 @@ import React from 'react'; import cx from 'classnames'; import { TableInstance } from 'react-table'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import Icon from 'src/components/Icon'; interface TableCollectionProps { diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx index a668487a6..2018f474c 100644 --- a/superset-frontend/src/components/ListViewCard/index.tsx +++ b/superset-frontend/src/components/ListViewCard/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import Icon from 'src/components/Icon'; import { Card, Skeleton, ThinSkeleton } from 'src/common/components'; import ImageLoader from './ImageLoader'; diff --git a/superset-frontend/src/components/Loading.tsx b/superset-frontend/src/components/Loading.tsx index 74b4e3e8d..1af60550b 100644 --- a/superset-frontend/src/components/Loading.tsx +++ b/superset-frontend/src/components/Loading.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; interface Props { position?: string; diff --git a/superset-frontend/src/components/Menu/Menu.tsx b/superset-frontend/src/components/Menu/Menu.tsx index ef01b3544..56974381b 100644 --- a/superset-frontend/src/components/Menu/Menu.tsx +++ b/superset-frontend/src/components/Menu/Menu.tsx @@ -17,10 +17,9 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t, styled } from '@superset-ui/core'; import { Nav, Navbar, NavItem, MenuItem } from 'react-bootstrap'; import NavDropdown from 'src/components/NavDropdown'; -import styled from '@superset-ui/style'; import MenuObject, { MenuObjectProps, MenuObjectChildProps, diff --git a/superset-frontend/src/components/Menu/NewMenu.tsx b/superset-frontend/src/components/Menu/NewMenu.tsx index 5ac1fd226..fc8d41bc2 100644 --- a/superset-frontend/src/components/Menu/NewMenu.tsx +++ b/superset-frontend/src/components/Menu/NewMenu.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button, { DropdownItemProps } from '../Button'; const dropdownItems: DropdownItemProps[] = [ diff --git a/superset-frontend/src/components/Menu/SubMenu.tsx b/superset-frontend/src/components/Menu/SubMenu.tsx index 145000155..15995ed02 100644 --- a/superset-frontend/src/components/Menu/SubMenu.tsx +++ b/superset-frontend/src/components/Menu/SubMenu.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import { Nav, Navbar, MenuItem } from 'react-bootstrap'; import Button, { OnClickHandler } from 'src/components/Button'; diff --git a/superset-frontend/src/components/Menu/UserMenu.tsx b/superset-frontend/src/components/Menu/UserMenu.tsx index bbda0ef4d..4483f5112 100644 --- a/superset-frontend/src/components/Menu/UserMenu.tsx +++ b/superset-frontend/src/components/Menu/UserMenu.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { MenuItem } from 'react-bootstrap'; import NavDropdown from 'src/components/NavDropdown'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; interface UserMenuProps { userInfoUrl: string; diff --git a/superset-frontend/src/components/Modal.tsx b/superset-frontend/src/components/Modal.tsx index 0c179bb84..774154c78 100644 --- a/superset-frontend/src/components/Modal.tsx +++ b/superset-frontend/src/components/Modal.tsx @@ -17,9 +17,8 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled, t } from '@superset-ui/core'; import { Modal as BaseModal } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; import Button from 'src/components/Button'; interface ModalProps { diff --git a/superset-frontend/src/components/NavDropdown/index.tsx b/superset-frontend/src/components/NavDropdown/index.tsx index cb80c5cfd..f4b9f6cab 100644 --- a/superset-frontend/src/components/NavDropdown/index.tsx +++ b/superset-frontend/src/components/NavDropdown/index.tsx @@ -17,7 +17,7 @@ * under the License. */ -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import { NavDropdown as ReactBootstrapNavDropdown } from 'react-bootstrap'; const NavDropdown = styled(ReactBootstrapNavDropdown)` diff --git a/superset-frontend/src/components/OmniContainer.jsx b/superset-frontend/src/components/OmniContainer.jsx index 3c2bd7471..3020d9a82 100644 --- a/superset-frontend/src/components/OmniContainer.jsx +++ b/superset-frontend/src/components/OmniContainer.jsx @@ -19,8 +19,7 @@ import React from 'react'; import { Modal } from 'react-bootstrap'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; import Omnibar from 'omnibar'; import { LOG_ACTIONS_OMNIBAR_TRIGGERED } from '../logger/LogUtils'; diff --git a/superset-frontend/src/components/Pagination.tsx b/superset-frontend/src/components/Pagination.tsx index 78e806c54..a34b67ea0 100644 --- a/superset-frontend/src/components/Pagination.tsx +++ b/superset-frontend/src/components/Pagination.tsx @@ -18,7 +18,7 @@ */ import React, { PureComponent } from 'react'; import cx from 'classnames'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; interface PaginationButton { disabled?: boolean; diff --git a/superset-frontend/src/components/RefreshChartOverlay.tsx b/superset-frontend/src/components/RefreshChartOverlay.tsx index 26a0994ba..063a9a40e 100644 --- a/superset-frontend/src/components/RefreshChartOverlay.tsx +++ b/superset-frontend/src/components/RefreshChartOverlay.tsx @@ -17,8 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; -import styled from '@superset-ui/style'; +import { t, styled } from '@superset-ui/core'; import Button from 'src/components/Button'; type Callback = (...args: any[]) => void; diff --git a/superset-frontend/src/components/SearchInput.tsx b/superset-frontend/src/components/SearchInput.tsx index 2d0077555..d73817402 100644 --- a/superset-frontend/src/components/SearchInput.tsx +++ b/superset-frontend/src/components/SearchInput.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import React from 'react'; import Icon from 'src/components/Icon'; diff --git a/superset-frontend/src/components/Select/styles.tsx b/superset-frontend/src/components/Select/styles.tsx index 22b65b407..7158578bb 100644 --- a/superset-frontend/src/components/Select/styles.tsx +++ b/superset-frontend/src/components/Select/styles.tsx @@ -18,7 +18,7 @@ */ import React, { CSSProperties } from 'react'; import { css, SerializedStyles } from '@emotion/core'; -import { supersetTheme } from '@superset-ui/style'; +import { supersetTheme } from '@superset-ui/core'; import { Styles, Theme, diff --git a/superset-frontend/src/components/TableLoader.jsx b/superset-frontend/src/components/TableLoader.jsx index 785109670..b0e937009 100644 --- a/superset-frontend/src/components/TableLoader.jsx +++ b/superset-frontend/src/components/TableLoader.jsx @@ -19,8 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Table, Tr, Td } from 'reactable-arc'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import withToasts from '../messageToasts/enhancers/withToasts'; import Loading from '../components/Loading'; diff --git a/superset-frontend/src/components/TableSelector.jsx b/superset-frontend/src/components/TableSelector.jsx index 95b1689ef..7c27c437f 100644 --- a/superset-frontend/src/components/TableSelector.jsx +++ b/superset-frontend/src/components/TableSelector.jsx @@ -17,12 +17,10 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled, SupersetClient, t } from '@superset-ui/core'; import PropTypes from 'prop-types'; import rison from 'rison'; import { AsyncSelect, CreatableSelect, Select } from 'src/components/Select'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; import Label from 'src/components/Label'; import FormLabel from 'src/components/FormLabel'; diff --git a/superset-frontend/src/components/URLShortLinkButton.jsx b/superset-frontend/src/components/URLShortLinkButton.jsx index af4b8e203..68fd7a921 100644 --- a/superset-frontend/src/components/URLShortLinkButton.jsx +++ b/superset-frontend/src/components/URLShortLinkButton.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Popover, OverlayTrigger } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import CopyToClipboard from './CopyToClipboard'; import { getShortUrl } from '../utils/common'; import withToasts from '../messageToasts/enhancers/withToasts'; diff --git a/superset-frontend/src/components/URLShortLinkModal.jsx b/superset-frontend/src/components/URLShortLinkModal.jsx index ec3982ea8..b999712ee 100644 --- a/superset-frontend/src/components/URLShortLinkModal.jsx +++ b/superset-frontend/src/components/URLShortLinkModal.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import CopyToClipboard from './CopyToClipboard'; import { getShortUrl } from '../utils/common'; import withToasts from '../messageToasts/enhancers/withToasts'; diff --git a/superset-frontend/src/dashboard/App.jsx b/superset-frontend/src/dashboard/App.jsx index 2deb9f624..8eb99c10c 100644 --- a/superset-frontend/src/dashboard/App.jsx +++ b/superset-frontend/src/dashboard/App.jsx @@ -19,7 +19,7 @@ import { hot } from 'react-hot-loader/root'; import React from 'react'; import { Provider } from 'react-redux'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import setupApp from '../setup/setupApp'; import setupPlugins from '../setup/setupPlugins'; diff --git a/superset-frontend/src/dashboard/actions/dashboardLayout.js b/superset-frontend/src/dashboard/actions/dashboardLayout.js index 7ef8edb73..51df31503 100644 --- a/superset-frontend/src/dashboard/actions/dashboardLayout.js +++ b/superset-frontend/src/dashboard/actions/dashboardLayout.js @@ -17,7 +17,7 @@ * under the License. */ import { ActionCreators as UndoActionCreators } from 'redux-undo'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { addWarningToast } from '../../messageToasts/actions'; import { updateLayoutComponents } from './dashboardFilters'; diff --git a/superset-frontend/src/dashboard/actions/dashboardState.js b/superset-frontend/src/dashboard/actions/dashboardState.js index bd07cef4a..7b6f51b88 100644 --- a/superset-frontend/src/dashboard/actions/dashboardState.js +++ b/superset-frontend/src/dashboard/actions/dashboardState.js @@ -18,8 +18,7 @@ */ /* eslint camelcase: 0 */ import { ActionCreators as UndoActionCreators } from 'redux-undo'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import { addChart, removeChart, refreshChart } from '../../chart/chartAction'; import { chart as initChart } from '../../chart/chartReducer'; diff --git a/superset-frontend/src/dashboard/actions/datasources.js b/superset-frontend/src/dashboard/actions/datasources.js index 07c4f9b52..40cba8559 100644 --- a/superset-frontend/src/dashboard/actions/datasources.js +++ b/superset-frontend/src/dashboard/actions/datasources.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import getClientErrorObject from '../../utils/getClientErrorObject'; export const SET_DATASOURCE = 'SET_DATASOURCE'; diff --git a/superset-frontend/src/dashboard/actions/sliceEntities.js b/superset-frontend/src/dashboard/actions/sliceEntities.js index b0db62614..bf9b5ac04 100644 --- a/superset-frontend/src/dashboard/actions/sliceEntities.js +++ b/superset-frontend/src/dashboard/actions/sliceEntities.js @@ -17,8 +17,7 @@ * under the License. */ /* eslint camelcase: 0 */ -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import { addDangerToast } from '../../messageToasts/actions'; import { getDatasourceParameter } from '../../modules/utils'; diff --git a/superset-frontend/src/dashboard/components/AddSliceCard.jsx b/superset-frontend/src/dashboard/components/AddSliceCard.jsx index 525aac5db..f68bd5b06 100644 --- a/superset-frontend/src/dashboard/components/AddSliceCard.jsx +++ b/superset-frontend/src/dashboard/components/AddSliceCard.jsx @@ -19,7 +19,7 @@ import cx from 'classnames'; import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; const propTypes = { datasourceUrl: PropTypes.string, diff --git a/superset-frontend/src/dashboard/components/BuilderComponentPane.jsx b/superset-frontend/src/dashboard/components/BuilderComponentPane.jsx index 336f39969..c697cdad2 100644 --- a/superset-frontend/src/dashboard/components/BuilderComponentPane.jsx +++ b/superset-frontend/src/dashboard/components/BuilderComponentPane.jsx @@ -23,7 +23,7 @@ import { Tabs, Tab } from 'react-bootstrap'; import { StickyContainer, Sticky } from 'react-sticky'; import { ParentSize } from '@vx/responsive'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import NewColumn from './gridComponents/new/NewColumn'; import NewDivider from './gridComponents/new/NewDivider'; diff --git a/superset-frontend/src/dashboard/components/CodeModal.jsx b/superset-frontend/src/dashboard/components/CodeModal.jsx index dfb438289..45981610a 100644 --- a/superset-frontend/src/dashboard/components/CodeModal.jsx +++ b/superset-frontend/src/dashboard/components/CodeModal.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ModalTrigger from '../../components/ModalTrigger'; diff --git a/superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx b/superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx index edbfa2adc..89d8e4d95 100644 --- a/superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx +++ b/superset-frontend/src/dashboard/components/ColorSchemeControlWrapper.jsx @@ -19,8 +19,7 @@ /* eslint-env browser */ import PropTypes from 'prop-types'; import React from 'react'; -import { getCategoricalSchemeRegistry } from '@superset-ui/color'; -import { t } from '@superset-ui/translation'; +import { getCategoricalSchemeRegistry, t } from '@superset-ui/core'; import ColorSchemeControl from 'src/explore/components/controls/ColorSchemeControl'; diff --git a/superset-frontend/src/dashboard/components/CssEditor.jsx b/superset-frontend/src/dashboard/components/CssEditor.jsx index d0088959a..4048cd897 100644 --- a/superset-frontend/src/dashboard/components/CssEditor.jsx +++ b/superset-frontend/src/dashboard/components/CssEditor.jsx @@ -22,7 +22,7 @@ import Select from 'src/components/Select'; import AceEditor from 'react-ace'; import 'brace/mode/css'; import 'brace/theme/github'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ModalTrigger from '../../components/ModalTrigger'; diff --git a/superset-frontend/src/dashboard/components/Dashboard.jsx b/superset-frontend/src/dashboard/components/Dashboard.jsx index 33eb420ae..19833c470 100644 --- a/superset-frontend/src/dashboard/components/Dashboard.jsx +++ b/superset-frontend/src/dashboard/components/Dashboard.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import getChartIdsFromLayout from '../util/getChartIdsFromLayout'; import getLayoutComponentFromChartId from '../util/getLayoutComponentFromChartId'; diff --git a/superset-frontend/src/dashboard/components/DeleteComponentModal.jsx b/superset-frontend/src/dashboard/components/DeleteComponentModal.jsx index 5efcb792f..c37e11cd0 100644 --- a/superset-frontend/src/dashboard/components/DeleteComponentModal.jsx +++ b/superset-frontend/src/dashboard/components/DeleteComponentModal.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Button from 'src/components/Button'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ModalTrigger from '../../components/ModalTrigger'; diff --git a/superset-frontend/src/dashboard/components/FilterIndicator.jsx b/superset-frontend/src/dashboard/components/FilterIndicator.jsx index a038f39d3..f4daa70c3 100644 --- a/superset-frontend/src/dashboard/components/FilterIndicator.jsx +++ b/superset-frontend/src/dashboard/components/FilterIndicator.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isEmpty } from 'lodash'; import { filterIndicatorPropShape } from '../util/propShapes'; diff --git a/superset-frontend/src/dashboard/components/FilterIndicatorGroup.jsx b/superset-frontend/src/dashboard/components/FilterIndicatorGroup.jsx index 49e4cf439..8fa547cb5 100644 --- a/superset-frontend/src/dashboard/components/FilterIndicatorGroup.jsx +++ b/superset-frontend/src/dashboard/components/FilterIndicatorGroup.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isEmpty } from 'lodash'; import FilterBadgeIcon from '../../components/FilterBadgeIcon'; diff --git a/superset-frontend/src/dashboard/components/FilterIndicatorTooltip.jsx b/superset-frontend/src/dashboard/components/FilterIndicatorTooltip.jsx index e8f9ce4eb..28f48d91b 100644 --- a/superset-frontend/src/dashboard/components/FilterIndicatorTooltip.jsx +++ b/superset-frontend/src/dashboard/components/FilterIndicatorTooltip.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isEmpty } from 'lodash'; import FormLabel from 'src/components/FormLabel'; diff --git a/superset-frontend/src/dashboard/components/Header.jsx b/superset-frontend/src/dashboard/components/Header.jsx index fa418b4af..76a8f96d0 100644 --- a/superset-frontend/src/dashboard/components/Header.jsx +++ b/superset-frontend/src/dashboard/components/Header.jsx @@ -20,10 +20,8 @@ import moment from 'moment'; import React from 'react'; import PropTypes from 'prop-types'; -import styled from '@superset-ui/style'; +import { styled, CategoricalColorNamespace, t } from '@superset-ui/core'; import { ButtonGroup } from 'react-bootstrap'; -import { CategoricalColorNamespace } from '@superset-ui/color'; -import { t } from '@superset-ui/translation'; import Icon from 'src/components/Icon'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx index 8a1c2e902..00ba41fdc 100644 --- a/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx +++ b/superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx @@ -19,9 +19,8 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient, t } from '@superset-ui/core'; import { DropdownButton, MenuItem } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; import Icon from 'src/components/Icon'; diff --git a/superset-frontend/src/dashboard/components/MissingChart.jsx b/superset-frontend/src/dashboard/components/MissingChart.jsx index e46f100e3..68a995466 100644 --- a/superset-frontend/src/dashboard/components/MissingChart.jsx +++ b/superset-frontend/src/dashboard/components/MissingChart.jsx @@ -18,7 +18,7 @@ */ import PropTypes from 'prop-types'; import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; const propTypes = { height: PropTypes.number.isRequired, diff --git a/superset-frontend/src/dashboard/components/PropertiesModal.jsx b/superset-frontend/src/dashboard/components/PropertiesModal.jsx index 9f7fd2fac..838aac0e8 100644 --- a/superset-frontend/src/dashboard/components/PropertiesModal.jsx +++ b/superset-frontend/src/dashboard/components/PropertiesModal.jsx @@ -24,8 +24,7 @@ import Dialog from 'react-bootstrap-dialog'; import { AsyncSelect } from 'src/components/Select'; import AceEditor from 'react-ace'; import rison from 'rison'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import FormLabel from 'src/components/FormLabel'; import ColorSchemeControlWrapper from 'src/dashboard/components/ColorSchemeControlWrapper'; diff --git a/superset-frontend/src/dashboard/components/PublishedStatus.jsx b/superset-frontend/src/dashboard/components/PublishedStatus.jsx index 2bff31266..bb7561b0a 100644 --- a/superset-frontend/src/dashboard/components/PublishedStatus.jsx +++ b/superset-frontend/src/dashboard/components/PublishedStatus.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TooltipWrapper from 'src/components/TooltipWrapper'; import Label from 'src/components/Label'; diff --git a/superset-frontend/src/dashboard/components/RefreshIntervalModal.jsx b/superset-frontend/src/dashboard/components/RefreshIntervalModal.jsx index 7a001471c..2710e66aa 100644 --- a/superset-frontend/src/dashboard/components/RefreshIntervalModal.jsx +++ b/superset-frontend/src/dashboard/components/RefreshIntervalModal.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Select from 'src/components/Select'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { Alert } from 'react-bootstrap'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/dashboard/components/SaveModal.jsx b/superset-frontend/src/dashboard/components/SaveModal.jsx index 7e8b87ba8..eb2b0bd9b 100644 --- a/superset-frontend/src/dashboard/components/SaveModal.jsx +++ b/superset-frontend/src/dashboard/components/SaveModal.jsx @@ -21,8 +21,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormControl, FormGroup, Radio } from 'react-bootstrap'; import Button from 'src/components/Button'; -import { CategoricalColorNamespace } from '@superset-ui/color'; -import { t } from '@superset-ui/translation'; +import { t, CategoricalColorNamespace } from '@superset-ui/core'; import ModalTrigger from '../../components/ModalTrigger'; import Checkbox from '../../components/Checkbox'; diff --git a/superset-frontend/src/dashboard/components/SliceAdder.jsx b/superset-frontend/src/dashboard/components/SliceAdder.jsx index 76ebe52f4..70e6493e2 100644 --- a/superset-frontend/src/dashboard/components/SliceAdder.jsx +++ b/superset-frontend/src/dashboard/components/SliceAdder.jsx @@ -22,7 +22,7 @@ import PropTypes from 'prop-types'; import { DropdownButton, MenuItem } from 'react-bootstrap'; import { List } from 'react-virtualized'; import SearchInput, { createFilter } from 'react-search-input'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import AddSliceCard from './AddSliceCard'; import AddSliceDragPreview from './dnd/AddSliceDragPreview'; diff --git a/superset-frontend/src/dashboard/components/SliceHeader.jsx b/superset-frontend/src/dashboard/components/SliceHeader.jsx index 07fba4993..941c0ad25 100644 --- a/superset-frontend/src/dashboard/components/SliceHeader.jsx +++ b/superset-frontend/src/dashboard/components/SliceHeader.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import EditableTitle from '../../components/EditableTitle'; import TooltipWrapper from '../../components/TooltipWrapper'; import SliceHeaderControls from './SliceHeaderControls'; diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx b/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx index 9a820810a..0e6b18868 100644 --- a/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx +++ b/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; import { Dropdown, MenuItem } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import URLShortLinkModal from '../../components/URLShortLinkModal'; import downloadAsImage from '../../utils/downloadAsImage'; import getDashboardUrl from '../util/getDashboardUrl'; diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx b/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx index 204eb2097..145d7ca1d 100644 --- a/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx +++ b/superset-frontend/src/dashboard/components/filterscope/FilterScopeSelector.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import cx from 'classnames'; import Button from 'src/components/Button'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import buildFilterScopeTreeEntry from '../../util/buildFilterScopeTreeEntry'; import getFilterScopeNodesTree from '../../util/getFilterScopeNodesTree'; diff --git a/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx b/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx index a11fec63d..b7730f21d 100644 --- a/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx +++ b/superset-frontend/src/dashboard/components/filterscope/treeIcons.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import 'react-checkbox-tree/lib/react-checkbox-tree.css'; import { diff --git a/superset-frontend/src/dashboard/components/gridComponents/Header.jsx b/superset-frontend/src/dashboard/components/gridComponents/Header.jsx index e45b39393..3e380773f 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/Header.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/Header.jsx @@ -129,7 +129,7 @@ class Header extends React.PureComponent { {({ dropIndicatorProps, dragSourceRef }) => (
{editMode && - depth <= 2 && ( // drag handle looks bad when nested + depth <= 2 && ( // drag handle looks bad when nested diff --git a/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx b/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx index e46472065..2078f3e8c 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx @@ -23,7 +23,7 @@ import cx from 'classnames'; import AceEditor from 'react-ace'; import 'brace/mode/markdown'; import 'brace/theme/textmate'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import DeleteComponentButton from '../DeleteComponentButton'; import DragDroppable from '../dnd/DragDroppable'; diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx index 065e3162d..6f2e920f3 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { COLUMN_TYPE } from '../../../util/componentTypes'; import { NEW_COLUMN_ID } from '../../../util/constants'; diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx index a51b34681..a2e94357b 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { DIVIDER_TYPE } from '../../../util/componentTypes'; import { NEW_DIVIDER_ID } from '../../../util/constants'; diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx index b4e49f52d..44a6176ac 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { HEADER_TYPE } from '../../../util/componentTypes'; import { NEW_HEADER_ID } from '../../../util/constants'; diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx index 5ce0af02f..c7c1bd342 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { ROW_TYPE } from '../../../util/componentTypes'; import { NEW_ROW_ID } from '../../../util/constants'; diff --git a/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx index 48ef68b79..af9d13d09 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { TABS_TYPE } from '../../../util/componentTypes'; import { NEW_TABS_ID } from '../../../util/constants'; diff --git a/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx b/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx index 40ef81136..62a289a37 100644 --- a/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx +++ b/superset-frontend/src/dashboard/components/menu/MarkdownModeDropdown.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import PopoverDropdown from './PopoverDropdown'; diff --git a/superset-frontend/src/dashboard/reducers/getInitialState.js b/superset-frontend/src/dashboard/reducers/getInitialState.js index 2e419dfd8..439ff5878 100644 --- a/superset-frontend/src/dashboard/reducers/getInitialState.js +++ b/superset-frontend/src/dashboard/reducers/getInitialState.js @@ -19,7 +19,7 @@ /* eslint-disable camelcase */ import { isString } from 'lodash'; import shortid from 'shortid'; -import { CategoricalColorNamespace } from '@superset-ui/color'; +import { CategoricalColorNamespace } from '@superset-ui/core'; import { chart } from '../../chart/chartReducer'; import { diff --git a/superset-frontend/src/dashboard/reducers/sliceEntities.js b/superset-frontend/src/dashboard/reducers/sliceEntities.js index 84d9b38fe..f34a0b612 100644 --- a/superset-frontend/src/dashboard/reducers/sliceEntities.js +++ b/superset-frontend/src/dashboard/reducers/sliceEntities.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { FETCH_ALL_SLICES_FAILED, diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts index 4b6a8091c..edf31b69b 100644 --- a/superset-frontend/src/dashboard/types.ts +++ b/superset-frontend/src/dashboard/types.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { ChartProps } from '@superset-ui/chart'; +import { ChartProps } from '@superset-ui/core'; import { chart } from 'src/chart/chartReducer'; export type ChartReducerInitialState = typeof chart; diff --git a/superset-frontend/src/dashboard/util/backgroundStyleOptions.ts b/superset-frontend/src/dashboard/util/backgroundStyleOptions.ts index 729e9954d..b8399961d 100644 --- a/superset-frontend/src/dashboard/util/backgroundStyleOptions.ts +++ b/superset-frontend/src/dashboard/util/backgroundStyleOptions.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { BACKGROUND_TRANSPARENT, BACKGROUND_WHITE } from './constants'; export default [ diff --git a/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts b/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts index 7f56c77d1..eeb765d76 100644 --- a/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts +++ b/superset-frontend/src/dashboard/util/charts/getEffectiveExtraFilters.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { DataRecordFilters } from '@superset-ui/chart'; +import { DataRecordFilters } from '@superset-ui/core'; export default function getEffectiveExtraFilters(filters: DataRecordFilters) { return Object.entries(filters) diff --git a/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts b/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts index 5eb60750a..a562e89e8 100644 --- a/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts +++ b/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts @@ -17,8 +17,10 @@ * under the License. */ import { isEqual } from 'lodash'; -import { CategoricalColorNamespace } from '@superset-ui/color'; -import { DataRecordFilters } from '@superset-ui/chart'; +import { + CategoricalColorNamespace, + DataRecordFilters, +} from '@superset-ui/core'; import { ChartQueryPayload } from 'src/dashboard/types'; import getEffectiveExtraFilters from './getEffectiveExtraFilters'; diff --git a/superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js b/superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js index b19d28c1b..727fc3e27 100644 --- a/superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js +++ b/superset-frontend/src/dashboard/util/getFilterFieldNodesTree.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { getDashboardFilterKey } from './getDashboardFilterKey'; import { ALL_FILTERS_ROOT } from './constants'; diff --git a/superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js b/superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js index 60669bdf3..243d9c193 100644 --- a/superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js +++ b/superset-frontend/src/dashboard/util/getFilterScopeNodesTree.js @@ -17,7 +17,7 @@ * under the License. */ import { isEmpty } from 'lodash'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { DASHBOARD_ROOT_ID } from './constants'; import { diff --git a/superset-frontend/src/dashboard/util/headerStyleOptions.ts b/superset-frontend/src/dashboard/util/headerStyleOptions.ts index db9f82734..3ebc3a883 100644 --- a/superset-frontend/src/dashboard/util/headerStyleOptions.ts +++ b/superset-frontend/src/dashboard/util/headerStyleOptions.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { SMALL_HEADER, MEDIUM_HEADER, LARGE_HEADER } from './constants'; export default [ diff --git a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx index a63efadee..d2c462c57 100644 --- a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx +++ b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx @@ -20,8 +20,7 @@ import React, { FunctionComponent, useState, useRef } from 'react'; // @ts-ignore import { Table } from 'reactable-arc'; import { Alert, FormControl, Modal } from 'react-bootstrap'; -import { SupersetClient } from '@superset-ui/connection'; -import { t } from '@superset-ui/translation'; +import { SupersetClient, t } from '@superset-ui/core'; import getClientErrorObject from '../utils/getClientErrorObject'; import Loading from '../components/Loading'; diff --git a/superset-frontend/src/datasource/DatasourceEditor.jsx b/superset-frontend/src/datasource/DatasourceEditor.jsx index c2c5dd1a7..fca366187 100644 --- a/superset-frontend/src/datasource/DatasourceEditor.jsx +++ b/superset-frontend/src/datasource/DatasourceEditor.jsx @@ -20,9 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Alert, Badge, Col, Tabs, Tab, Well } from 'react-bootstrap'; import shortid from 'shortid'; -import styled from '@superset-ui/style'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { styled, SupersetClient, t } from '@superset-ui/core'; import Label from 'src/components/Label'; import Button from 'src/components/Button'; diff --git a/superset-frontend/src/datasource/DatasourceModal.tsx b/superset-frontend/src/datasource/DatasourceModal.tsx index fec7d4d62..4f60028c4 100644 --- a/superset-frontend/src/datasource/DatasourceModal.tsx +++ b/superset-frontend/src/datasource/DatasourceModal.tsx @@ -21,8 +21,7 @@ import { Alert, Modal } from 'react-bootstrap'; import Button from 'src/components/Button'; // @ts-ignore import Dialog from 'react-bootstrap-dialog'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import getClientErrorObject from '../utils/getClientErrorObject'; import DatasourceEditor from './DatasourceEditor'; diff --git a/superset-frontend/src/explore/App.jsx b/superset-frontend/src/explore/App.jsx index e1f8b83e9..7a39066d5 100644 --- a/superset-frontend/src/explore/App.jsx +++ b/superset-frontend/src/explore/App.jsx @@ -19,7 +19,7 @@ import React from 'react'; import { hot } from 'react-hot-loader/root'; import { Provider } from 'react-redux'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import ToastPresenter from '../messageToasts/containers/ToastPresenter'; import ExploreViewContainer from './components/ExploreViewContainer'; import setupApp from '../setup/setupApp'; diff --git a/superset-frontend/src/explore/actions/exploreActions.js b/superset-frontend/src/explore/actions/exploreActions.js index e4fd73265..56c112b0e 100644 --- a/superset-frontend/src/explore/actions/exploreActions.js +++ b/superset-frontend/src/explore/actions/exploreActions.js @@ -17,8 +17,7 @@ * under the License. */ /* eslint camelcase: 0 */ -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import { addDangerToast } from '../../messageToasts/actions'; const FAVESTAR_BASE_URL = '/superset/favstar/slice'; diff --git a/superset-frontend/src/explore/actions/saveModalActions.js b/superset-frontend/src/explore/actions/saveModalActions.js index a32f9563b..2137bc1ed 100644 --- a/superset-frontend/src/explore/actions/saveModalActions.js +++ b/superset-frontend/src/explore/actions/saveModalActions.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import { getExploreUrl } from '../exploreUtils'; export const FETCH_DASHBOARDS_SUCCEEDED = 'FETCH_DASHBOARDS_SUCCEEDED'; diff --git a/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx b/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx index e28e1187e..ba02483e7 100644 --- a/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx +++ b/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Popover, Tab, Tabs } from 'react-bootstrap'; import Button from 'src/components/Button'; -import { ThemeProvider } from '@superset-ui/style'; +import { ThemeProvider } from '@superset-ui/core'; import columnType from '../propTypes/columnType'; import adhocMetricType from '../propTypes/adhocMetricType'; diff --git a/superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx b/superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx index cc3ed2f3b..bed810370 100644 --- a/superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx +++ b/superset-frontend/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx @@ -20,8 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormGroup } from 'react-bootstrap'; import { Select } from 'src/components/Select'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import AdhocFilter, { EXPRESSION_TYPES, CLAUSES } from '../AdhocFilter'; import adhocMetricType from '../propTypes/adhocMetricType'; diff --git a/superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx b/superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx index 2d7083253..49d616bd4 100644 --- a/superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx +++ b/superset-frontend/src/explore/components/AdhocFilterEditPopoverSqlTabContent.jsx @@ -25,7 +25,7 @@ import 'brace/theme/github'; import 'brace/ext/language_tools'; import { FormGroup } from 'react-bootstrap'; import Select from 'src/components/Select'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import sqlKeywords from '../../SqlLab/utils/sqlKeywords'; import AdhocFilter, { EXPRESSION_TYPES, CLAUSES } from '../AdhocFilter'; diff --git a/superset-frontend/src/explore/components/AdhocFilterOption.jsx b/superset-frontend/src/explore/components/AdhocFilterOption.jsx index 1ba5ef106..c7cfb0265 100644 --- a/superset-frontend/src/explore/components/AdhocFilterOption.jsx +++ b/superset-frontend/src/explore/components/AdhocFilterOption.jsx @@ -19,9 +19,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { OverlayTrigger } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t, withTheme } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; -import { withTheme } from '@superset-ui/style'; import Label from 'src/components/Label'; import AdhocFilterEditPopover from './AdhocFilterEditPopover'; diff --git a/superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx b/superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx index 4e8d5779d..ccaa6e3bf 100644 --- a/superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx +++ b/superset-frontend/src/explore/components/AdhocMetricEditPopover.jsx @@ -26,9 +26,8 @@ import AceEditor from 'react-ace'; import 'brace/mode/sql'; import 'brace/theme/github'; import 'brace/ext/language_tools'; -import { t } from '@superset-ui/translation'; +import { t, ThemeProvider } from '@superset-ui/core'; import { ColumnOption } from '@superset-ui/chart-controls'; -import { ThemeProvider } from '@superset-ui/style'; import FormLabel from 'src/components/FormLabel'; diff --git a/superset-frontend/src/explore/components/AdhocMetricOption.jsx b/superset-frontend/src/explore/components/AdhocMetricOption.jsx index 7d84697bd..68042b6b2 100644 --- a/superset-frontend/src/explore/components/AdhocMetricOption.jsx +++ b/superset-frontend/src/explore/components/AdhocMetricOption.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { OverlayTrigger } from 'react-bootstrap'; -import { withTheme } from '@superset-ui/style'; +import { withTheme } from '@superset-ui/core'; import Label from 'src/components/Label'; import AdhocMetricEditPopover from './AdhocMetricEditPopover'; diff --git a/superset-frontend/src/explore/components/ControlHeader.jsx b/superset-frontend/src/explore/components/ControlHeader.jsx index bf2c2bc9c..da520c813 100644 --- a/superset-frontend/src/explore/components/ControlHeader.jsx +++ b/superset-frontend/src/explore/components/ControlHeader.jsx @@ -18,9 +18,9 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; -import { OverlayTrigger, Tooltip } from 'react-bootstrap'; +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; +import { OverlayTrigger, Tooltip } from 'react-bootstrap'; import FormLabel from 'src/components/FormLabel'; const propTypes = { diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.jsx b/superset-frontend/src/explore/components/ControlPanelsContainer.jsx index 0ac6005ec..74c3b44d9 100644 --- a/superset-frontend/src/explore/components/ControlPanelsContainer.jsx +++ b/superset-frontend/src/explore/components/ControlPanelsContainer.jsx @@ -22,8 +22,7 @@ import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import { Alert, Tab, Tabs } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; -import styled from '@superset-ui/style'; +import { t, styled } from '@superset-ui/core'; import ControlPanelSection from './ControlPanelSection'; import ControlRow from './ControlRow'; diff --git a/superset-frontend/src/explore/components/DisplayQueryButton.jsx b/superset-frontend/src/explore/components/DisplayQueryButton.jsx index 495bf61fa..907389e73 100644 --- a/superset-frontend/src/explore/components/DisplayQueryButton.jsx +++ b/superset-frontend/src/explore/components/DisplayQueryButton.jsx @@ -36,7 +36,7 @@ import { FormControl, } from 'react-bootstrap'; import { Table } from 'reactable-arc'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Button from 'src/components/Button'; import getClientErrorObject from '../../utils/getClientErrorObject'; diff --git a/superset-frontend/src/explore/components/EmbedCodeButton.jsx b/superset-frontend/src/explore/components/EmbedCodeButton.jsx index 9513d8ca1..c74c252fe 100644 --- a/superset-frontend/src/explore/components/EmbedCodeButton.jsx +++ b/superset-frontend/src/explore/components/EmbedCodeButton.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Popover, OverlayTrigger } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import FormLabel from 'src/components/FormLabel'; import CopyToClipboard from 'src/components/CopyToClipboard'; diff --git a/superset-frontend/src/explore/components/ExploreActionButtons.jsx b/superset-frontend/src/explore/components/ExploreActionButtons.jsx index 7b45d9da4..b509de983 100644 --- a/superset-frontend/src/explore/components/ExploreActionButtons.jsx +++ b/superset-frontend/src/explore/components/ExploreActionButtons.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import cx from 'classnames'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import URLShortLinkButton from '../../components/URLShortLinkButton'; import EmbedCodeButton from './EmbedCodeButton'; diff --git a/superset-frontend/src/explore/components/ExploreChartHeader.jsx b/superset-frontend/src/explore/components/ExploreChartHeader.jsx index ff0e85b14..de91bd76f 100644 --- a/superset-frontend/src/explore/components/ExploreChartHeader.jsx +++ b/superset-frontend/src/explore/components/ExploreChartHeader.jsx @@ -20,8 +20,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import PropTypes from 'prop-types'; -import styled from '@superset-ui/style'; -import { t } from '@superset-ui/translation'; +import { styled, t } from '@superset-ui/core'; import { chartPropShape } from '../../dashboard/util/propShapes'; import ExploreActionButtons from './ExploreActionButtons'; diff --git a/superset-frontend/src/explore/components/ExploreChartPanel.jsx b/superset-frontend/src/explore/components/ExploreChartPanel.jsx index 3826b31d7..dea7d9843 100644 --- a/superset-frontend/src/explore/components/ExploreChartPanel.jsx +++ b/superset-frontend/src/explore/components/ExploreChartPanel.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { ParentSize } from '@vx/responsive'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import { chartPropShape } from '../../dashboard/util/propShapes'; import ChartContainer from '../../chart/ChartContainer'; import ExploreChartHeader from './ExploreChartHeader'; diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx index 6b9642340..85ff4c006 100644 --- a/superset-frontend/src/explore/components/ExploreViewContainer.jsx +++ b/superset-frontend/src/explore/components/ExploreViewContainer.jsx @@ -21,9 +21,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import styled from '@superset-ui/style'; -import { t } from '@superset-ui/translation'; -import { logging } from '@superset-ui/core'; +import { styled, logging, t } from '@superset-ui/core'; import ExploreChartPanel from './ExploreChartPanel'; import ControlPanelsContainer from './ControlPanelsContainer'; diff --git a/superset-frontend/src/explore/components/PropertiesModal.tsx b/superset-frontend/src/explore/components/PropertiesModal.tsx index 8b5d76d2a..2b24b2345 100644 --- a/superset-frontend/src/explore/components/PropertiesModal.tsx +++ b/superset-frontend/src/explore/components/PropertiesModal.tsx @@ -31,8 +31,7 @@ import Dialog from 'react-bootstrap-dialog'; import { OptionsType } from 'react-select/src/types'; import { AsyncSelect } from 'src/components/Select'; import rison from 'rison'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import Chart from 'src/types/Chart'; import FormLabel from 'src/components/FormLabel'; import getClientErrorObject from '../../utils/getClientErrorObject'; diff --git a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx index d39fa6acb..b5f939d4c 100644 --- a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx +++ b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx @@ -19,8 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { ButtonGroup, OverlayTrigger, Tooltip } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; -import styled from '@superset-ui/style'; +import { t, styled } from '@superset-ui/core'; import Button from 'src/components/Button'; import Hotkeys from '../../components/Hotkeys'; diff --git a/superset-frontend/src/explore/components/RowCountLabel.jsx b/superset-frontend/src/explore/components/RowCountLabel.jsx index 29c0ab838..201dc4d5f 100644 --- a/superset-frontend/src/explore/components/RowCountLabel.jsx +++ b/superset-frontend/src/explore/components/RowCountLabel.jsx @@ -18,8 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { getNumberFormatter } from '@superset-ui/number-format'; -import { t } from '@superset-ui/translation'; +import { getNumberFormatter, t } from '@superset-ui/core'; import Label from 'src/components/Label'; import TooltipWrapper from '../../components/TooltipWrapper'; diff --git a/superset-frontend/src/explore/components/SaveModal.jsx b/superset-frontend/src/explore/components/SaveModal.jsx index e57189b73..4e36e04b8 100644 --- a/superset-frontend/src/explore/components/SaveModal.jsx +++ b/superset-frontend/src/explore/components/SaveModal.jsx @@ -24,7 +24,7 @@ import { Alert, FormControl, FormGroup, Modal, Radio } from 'react-bootstrap'; import Button from 'src/components/Button'; import FormLabel from 'src/components/FormLabel'; import { CreatableSelect } from 'src/components/Select/SupersetStyledSelect'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ReactMarkdown from 'react-markdown'; const propTypes = { diff --git a/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx b/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx index c3fde3211..1440215b5 100644 --- a/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx +++ b/superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx @@ -19,9 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; -import { logging } from '@superset-ui/core'; +import { t, logging, SupersetClient } from '@superset-ui/core'; import OnPasteSelect from 'src/components/Select/OnPasteSelect'; diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx index d90cdd116..0b11408fa 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx @@ -21,12 +21,14 @@ import PropTypes from 'prop-types'; import { CompactPicker } from 'react-color'; import Button from 'src/components/Button'; import mathjs from 'mathjs'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; -import { getCategoricalSchemeRegistry } from '@superset-ui/color'; -import { getChartMetadataRegistry } from '@superset-ui/chart'; -import { validateNonEmpty } from '@superset-ui/validator'; -import { ThemeProvider } from '@superset-ui/style'; +import { + t, + SupersetClient, + getCategoricalSchemeRegistry, + getChartMetadataRegistry, + ThemeProvider, + validateNonEmpty, +} from '@superset-ui/core'; import SelectControl from './SelectControl'; import TextControl from './TextControl'; diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx index 3eb594cf3..f6f49f204 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl.jsx @@ -25,8 +25,7 @@ import { ListGroupItem, } from 'react-bootstrap'; import { connect } from 'react-redux'; -import { t } from '@superset-ui/translation'; -import { withTheme } from '@superset-ui/style'; +import { t, withTheme } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; import { getChartKey } from '../../exploreUtils'; import { runAnnotationQuery } from '../../../chart/chartAction'; diff --git a/superset-frontend/src/explore/components/controls/BoundsControl.jsx b/superset-frontend/src/explore/components/controls/BoundsControl.jsx index 929a4ea79..bdd364f5c 100644 --- a/superset-frontend/src/explore/components/controls/BoundsControl.jsx +++ b/superset-frontend/src/explore/components/controls/BoundsControl.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Col, Row, FormGroup, FormControl } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ControlHeader from '../ControlHeader'; const propTypes = { diff --git a/superset-frontend/src/explore/components/controls/ColorMapControl.jsx b/superset-frontend/src/explore/components/controls/ColorMapControl.jsx index a0ab0d12f..269780ff9 100644 --- a/superset-frontend/src/explore/components/controls/ColorMapControl.jsx +++ b/superset-frontend/src/explore/components/controls/ColorMapControl.jsx @@ -18,7 +18,7 @@ */ import PropTypes from 'prop-types'; import React from 'react'; -import { CategoricalColorNamespace } from '@superset-ui/color'; +import { CategoricalColorNamespace } from '@superset-ui/core'; const propTypes = { onChange: PropTypes.func, diff --git a/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx b/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx index 9356a06b6..54cf3b3b3 100644 --- a/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx +++ b/superset-frontend/src/explore/components/controls/ColorPickerControl.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { OverlayTrigger, Popover } from 'react-bootstrap'; import { SketchPicker } from 'react-color'; -import { getCategoricalSchemeRegistry } from '@superset-ui/color'; +import { getCategoricalSchemeRegistry } from '@superset-ui/core'; import ControlHeader from '../ControlHeader'; const propTypes = { diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx index 46b59ba8f..bb5f634f6 100644 --- a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx +++ b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx @@ -28,7 +28,7 @@ import { Tooltip, Well, } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { ColumnOption, MetricOption } from '@superset-ui/chart-controls'; import Label from 'src/components/Label'; diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl.jsx b/superset-frontend/src/explore/components/controls/DateFilterControl.jsx index 8e02c6086..0d4c09a75 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl.jsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl.jsx @@ -35,8 +35,7 @@ import Button from 'src/components/Button'; import Datetime from 'react-datetime'; import 'react-datetime/css/react-datetime.css'; import moment from 'moment'; -import { t } from '@superset-ui/translation'; -import { styled, withTheme } from '@superset-ui/style'; +import { t, styled, withTheme } from '@superset-ui/core'; import { buildTimeRangeString, diff --git a/superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx b/superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx index 8e4b21e8a..192c701a6 100644 --- a/superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx +++ b/superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx @@ -19,9 +19,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { OverlayTrigger, Popover } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; - +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; + import FormRow from '../../../components/FormRow'; import SelectControl from './SelectControl'; import CheckboxControl from './CheckboxControl'; diff --git a/superset-frontend/src/explore/components/controls/MetricsControl.jsx b/superset-frontend/src/explore/components/controls/MetricsControl.jsx index 769c74f60..39fdff41c 100644 --- a/superset-frontend/src/explore/components/controls/MetricsControl.jsx +++ b/superset-frontend/src/explore/components/controls/MetricsControl.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { isEqual } from 'lodash'; import OnPasteSelect from 'src/components/Select/OnPasteSelect'; diff --git a/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx b/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx index 744385fd5..9efff88c8 100644 --- a/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx +++ b/superset-frontend/src/explore/components/controls/SelectAsyncControl.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Select from '../../../components/AsyncSelect'; import ControlHeader from '../ControlHeader'; diff --git a/superset-frontend/src/explore/components/controls/SelectControl.jsx b/superset-frontend/src/explore/components/controls/SelectControl.jsx index fc2180f6d..908ff314a 100644 --- a/superset-frontend/src/explore/components/controls/SelectControl.jsx +++ b/superset-frontend/src/explore/components/controls/SelectControl.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { Select, CreatableSelect, OnPasteSelect } from 'src/components/Select'; import ControlHeader from 'src/explore/components/ControlHeader'; diff --git a/superset-frontend/src/explore/components/controls/SpatialControl.jsx b/superset-frontend/src/explore/components/controls/SpatialControl.jsx index 4bef1b2f6..111cddcca 100644 --- a/superset-frontend/src/explore/components/controls/SpatialControl.jsx +++ b/superset-frontend/src/explore/components/controls/SpatialControl.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Row, Col, OverlayTrigger, Popover } from 'react-bootstrap'; import Button from 'src/components/Button'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Label from 'src/components/Label'; import ControlHeader from '../ControlHeader'; diff --git a/superset-frontend/src/explore/components/controls/TextAreaControl.jsx b/superset-frontend/src/explore/components/controls/TextAreaControl.jsx index 0a09f9306..7ebe02fac 100644 --- a/superset-frontend/src/explore/components/controls/TextAreaControl.jsx +++ b/superset-frontend/src/explore/components/controls/TextAreaControl.jsx @@ -29,7 +29,7 @@ import 'brace/mode/markdown'; import 'brace/mode/javascript'; import 'brace/theme/textmate'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import ControlHeader from '../ControlHeader'; import ModalTrigger from '../../../components/ModalTrigger'; diff --git a/superset-frontend/src/explore/components/controls/TextControl.tsx b/superset-frontend/src/explore/components/controls/TextControl.tsx index da3550e63..ac676a344 100644 --- a/superset-frontend/src/explore/components/controls/TextControl.tsx +++ b/superset-frontend/src/explore/components/controls/TextControl.tsx @@ -18,10 +18,7 @@ */ import React from 'react'; import { FormGroup, FormControl } from 'react-bootstrap'; -import { - legacyValidateNumber, - legacyValidateInteger, -} from '@superset-ui/validator'; +import { legacyValidateNumber, legacyValidateInteger } from '@superset-ui/core'; import ControlHeader from '../ControlHeader'; interface TextControlProps { diff --git a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx index 926b0963f..dda54788f 100644 --- a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx +++ b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl.jsx @@ -26,9 +26,9 @@ import { Popover, } from 'react-bootstrap'; import Select from 'src/components/Select'; -import { t } from '@superset-ui/translation'; - +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; + import BoundsControl from './BoundsControl'; import CheckboxControl from './CheckboxControl'; diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx index 513b6b541..ee1a4bf61 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx @@ -27,8 +27,7 @@ import { OverlayTrigger, Tooltip, } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; -import { getChartMetadataRegistry } from '@superset-ui/chart'; +import { t, getChartMetadataRegistry } from '@superset-ui/core'; import ControlHeader from '../ControlHeader'; import './VizTypeControl.less'; diff --git a/superset-frontend/src/explore/components/controls/withVerification.jsx b/superset-frontend/src/explore/components/controls/withVerification.jsx index 1ca3c2853..b0a8e63c6 100644 --- a/superset-frontend/src/explore/components/controls/withVerification.jsx +++ b/superset-frontend/src/explore/components/controls/withVerification.jsx @@ -17,8 +17,7 @@ * under the License. */ import React from 'react'; -import { SupersetClient } from '@superset-ui/connection'; -import { logging } from '@superset-ui/core'; +import { SupersetClient, logging } from '@superset-ui/core'; import { isEqual } from 'lodash'; diff --git a/superset-frontend/src/explore/constants.js b/superset-frontend/src/explore/constants.js index b3d3a8004..004cbe05b 100644 --- a/superset-frontend/src/explore/constants.js +++ b/superset-frontend/src/explore/constants.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; export const AGGREGATES = { AVG: 'AVG', diff --git a/superset-frontend/src/explore/controlPanels/DeckArc.js b/superset-frontend/src/explore/controlPanels/DeckArc.js index 67f9041d1..4aaad9407 100644 --- a/superset-frontend/src/explore/controlPanels/DeckArc.js +++ b/superset-frontend/src/explore/controlPanels/DeckArc.js @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { - validateNonEmpty, - legacyValidateInteger, -} from '@superset-ui/validator'; +import { t, validateNonEmpty, legacyValidateInteger } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from './timeGrainSqlaAnimationOverrides'; import { columnChoices, PRIMARY_COLOR } from '../controls'; import { formatSelectOptions } from '../../modules/utils'; diff --git a/superset-frontend/src/explore/controlPanels/DeckGeojson.js b/superset-frontend/src/explore/controlPanels/DeckGeojson.js index 23590444a..9e75c3f49 100644 --- a/superset-frontend/src/explore/controlPanels/DeckGeojson.js +++ b/superset-frontend/src/explore/controlPanels/DeckGeojson.js @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { - validateNonEmpty, - legacyValidateInteger, -} from '@superset-ui/validator'; +import { t, validateNonEmpty, legacyValidateInteger } from '@superset-ui/core'; import { formatSelectOptions } from '../../modules/utils'; import { columnChoices } from '../controls'; import { diff --git a/superset-frontend/src/explore/controlPanels/DeckGrid.js b/superset-frontend/src/explore/controlPanels/DeckGrid.js index 598e2207b..9c076e400 100644 --- a/superset-frontend/src/explore/controlPanels/DeckGrid.js +++ b/superset-frontend/src/explore/controlPanels/DeckGrid.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; +import { t, validateNonEmpty } from '@superset-ui/core'; import { filterNulls, autozoom, diff --git a/superset-frontend/src/explore/controlPanels/DeckHex.js b/superset-frontend/src/explore/controlPanels/DeckHex.js index b67bcfb92..6d7adc99c 100644 --- a/superset-frontend/src/explore/controlPanels/DeckHex.js +++ b/superset-frontend/src/explore/controlPanels/DeckHex.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { formatSelectOptions } from '../../modules/utils'; import { filterNulls, diff --git a/superset-frontend/src/explore/controlPanels/DeckMulti.js b/superset-frontend/src/explore/controlPanels/DeckMulti.js index 5a15be483..0b367fce1 100644 --- a/superset-frontend/src/explore/controlPanels/DeckMulti.js +++ b/superset-frontend/src/explore/controlPanels/DeckMulti.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; +import { t, validateNonEmpty } from '@superset-ui/core'; import { viewport, mapboxStyle } from './Shared_DeckGL'; export default { diff --git a/superset-frontend/src/explore/controlPanels/DeckPath.js b/superset-frontend/src/explore/controlPanels/DeckPath.js index 8ff3362cd..24bc230cc 100644 --- a/superset-frontend/src/explore/controlPanels/DeckPath.js +++ b/superset-frontend/src/explore/controlPanels/DeckPath.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { filterNulls, autozoom, diff --git a/superset-frontend/src/explore/controlPanels/DeckPolygon.js b/superset-frontend/src/explore/controlPanels/DeckPolygon.js index b238f490a..b2d91c5b5 100644 --- a/superset-frontend/src/explore/controlPanels/DeckPolygon.js +++ b/superset-frontend/src/explore/controlPanels/DeckPolygon.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from './timeGrainSqlaAnimationOverrides'; import { formatSelectOptions } from '../../modules/utils'; import { diff --git a/superset-frontend/src/explore/controlPanels/DeckScatter.js b/superset-frontend/src/explore/controlPanels/DeckScatter.js index 48d01f071..957376c25 100644 --- a/superset-frontend/src/explore/controlPanels/DeckScatter.js +++ b/superset-frontend/src/explore/controlPanels/DeckScatter.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; +import { t, validateNonEmpty } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from './timeGrainSqlaAnimationOverrides'; import { filterNulls, diff --git a/superset-frontend/src/explore/controlPanels/DeckScreengrid.js b/superset-frontend/src/explore/controlPanels/DeckScreengrid.js index 236a85aeb..3879621eb 100644 --- a/superset-frontend/src/explore/controlPanels/DeckScreengrid.js +++ b/superset-frontend/src/explore/controlPanels/DeckScreengrid.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; +import { t, validateNonEmpty } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from './timeGrainSqlaAnimationOverrides'; import { filterNulls, diff --git a/superset-frontend/src/explore/controlPanels/Separator.js b/superset-frontend/src/explore/controlPanels/Separator.js index cb2693a4b..19ab99bf0 100644 --- a/superset-frontend/src/explore/controlPanels/Separator.js +++ b/superset-frontend/src/explore/controlPanels/Separator.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; +import { t, validateNonEmpty } from '@superset-ui/core'; import { formatSelectOptions } from '../../modules/utils'; export default { diff --git a/superset-frontend/src/explore/controlPanels/Shared_DeckGL.jsx b/superset-frontend/src/explore/controlPanels/Shared_DeckGL.jsx index b5c504cf0..1dd0679ff 100644 --- a/superset-frontend/src/explore/controlPanels/Shared_DeckGL.jsx +++ b/superset-frontend/src/explore/controlPanels/Shared_DeckGL.jsx @@ -20,10 +20,13 @@ // These are control configurations that are shared ONLY within the DeckGL viz plugin repo. import React from 'react'; -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; -import { sharedControls } from '@superset-ui/chart-controls'; -import { D3_FORMAT_OPTIONS, columnChoices, PRIMARY_COLOR } from '../controls'; +import { t, validateNonEmpty } from '@superset-ui/core'; +import { + sharedControls, + D3_FORMAT_OPTIONS, + columnChoices, +} from '@superset-ui/chart-controls'; +import { PRIMARY_COLOR } from '../controls'; import { DEFAULT_VIEWPORT } from '../../explore/components/controls/ViewportControl'; const sandboxUrl = diff --git a/superset-frontend/src/explore/controlPanels/TimeTable.js b/superset-frontend/src/explore/controlPanels/TimeTable.js index c29601833..cae1d8dbb 100644 --- a/superset-frontend/src/explore/controlPanels/TimeTable.js +++ b/superset-frontend/src/explore/controlPanels/TimeTable.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { validateNonEmpty } from '@superset-ui/validator'; +import { t, validateNonEmpty } from '@superset-ui/core'; export default { controlPanelSections: [ diff --git a/superset-frontend/src/explore/controlPanels/sections.jsx b/superset-frontend/src/explore/controlPanels/sections.jsx index 78732b9f2..f9cae320b 100644 --- a/superset-frontend/src/explore/controlPanels/sections.jsx +++ b/superset-frontend/src/explore/controlPanels/sections.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { formatSelectOptions } from '../../modules/utils'; export const druidTimeSeries = { diff --git a/superset-frontend/src/explore/controlUtils.js b/superset-frontend/src/explore/controlUtils.js index 8ce05d946..84513c802 100644 --- a/superset-frontend/src/explore/controlUtils.js +++ b/superset-frontend/src/explore/controlUtils.js @@ -17,7 +17,7 @@ * under the License. */ import memoizeOne from 'memoize-one'; -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry } from '@superset-ui/core'; import { expandControlConfig } from '@superset-ui/chart-controls'; import * as SECTIONS from './controlPanels/sections'; diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx index 046a6ed2a..616e3b79f 100644 --- a/superset-frontend/src/explore/controls.jsx +++ b/superset-frontend/src/explore/controls.jsx @@ -57,17 +57,15 @@ * each and every visualization type. */ import React from 'react'; -import { t } from '@superset-ui/translation'; import { + t, getCategoricalSchemeRegistry, getSequentialSchemeRegistry, -} from '@superset-ui/color'; -import { legacyValidateInteger, validateNonEmpty, -} from '@superset-ui/validator'; + ColumnOption, +} from '@superset-ui/core'; -import { ColumnOption } from '@superset-ui/chart-controls'; import { formatSelectOptions, mainMetric } from '../modules/utils'; import { TIME_FILTER_LABELS } from './constants'; diff --git a/superset-frontend/src/explore/dateFilterUtils.ts b/superset-frontend/src/explore/dateFilterUtils.ts index f113e6c3a..122e4cd38 100644 --- a/superset-frontend/src/explore/dateFilterUtils.ts +++ b/superset-frontend/src/explore/dateFilterUtils.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { TimeRangeEndpoints } from '@superset-ui/query'; +import { TimeRangeEndpoints } from '@superset-ui/core'; const SEPARATOR = ' : '; diff --git a/superset-frontend/src/explore/exploreUtils.js b/superset-frontend/src/explore/exploreUtils.js index af89a281f..748d20324 100644 --- a/superset-frontend/src/explore/exploreUtils.js +++ b/superset-frontend/src/explore/exploreUtils.js @@ -18,13 +18,13 @@ */ /* eslint camelcase: 0 */ import URI from 'urijs'; -import { buildQueryContext } from '@superset-ui/query'; -import { availableDomains } from 'src/utils/hostNamesConfig'; -import { safeStringify } from 'src/utils/safeStringify'; import { + buildQueryContext, getChartBuildQueryRegistry, getChartMetadataRegistry, -} from '@superset-ui/chart'; +} from '@superset-ui/core'; +import { availableDomains } from 'src/utils/hostNamesConfig'; +import { safeStringify } from 'src/utils/safeStringify'; const MAX_URL_LENGTH = 8000; diff --git a/superset-frontend/src/explore/store.js b/superset-frontend/src/explore/store.js index db456f712..3ab2b0716 100644 --- a/superset-frontend/src/explore/store.js +++ b/superset-frontend/src/explore/store.js @@ -17,7 +17,7 @@ * under the License. */ /* eslint camelcase: 0 */ -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry } from '@superset-ui/core'; import { getAllControlsState, getFormDataFromControls } from './controlUtils'; import controls from './controls'; diff --git a/superset-frontend/src/messageToasts/components/Toast.tsx b/superset-frontend/src/messageToasts/components/Toast.tsx index 0da2a4832..c14fc999f 100644 --- a/superset-frontend/src/messageToasts/components/Toast.tsx +++ b/superset-frontend/src/messageToasts/components/Toast.tsx @@ -17,7 +17,7 @@ * under the License. */ import { Alert } from 'react-bootstrap'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import cx from 'classnames'; import Interweave from 'interweave'; import React, { useEffect, useState } from 'react'; diff --git a/superset-frontend/src/messageToasts/components/ToastPresenter.tsx b/superset-frontend/src/messageToasts/components/ToastPresenter.tsx index 545573501..4ce489841 100644 --- a/superset-frontend/src/messageToasts/components/ToastPresenter.tsx +++ b/superset-frontend/src/messageToasts/components/ToastPresenter.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import styled from '@superset-ui/style'; +import { styled } from '@superset-ui/core'; import { ToastType } from 'src/messageToasts/types'; import Toast from './Toast'; diff --git a/superset-frontend/src/middleware/loggerMiddleware.js b/superset-frontend/src/middleware/loggerMiddleware.js index 0d38e9091..93bde7f5e 100644 --- a/superset-frontend/src/middleware/loggerMiddleware.js +++ b/superset-frontend/src/middleware/loggerMiddleware.js @@ -19,7 +19,7 @@ /* eslint-disable camelcase */ /* eslint prefer-const: 2 */ import shortid from 'shortid'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import { safeStringify } from '../utils/safeStringify'; import { LOG_EVENT } from '../logger/actions'; diff --git a/superset-frontend/src/preamble.ts b/superset-frontend/src/preamble.ts index 81e9a788f..797fc4fd0 100644 --- a/superset-frontend/src/preamble.ts +++ b/superset-frontend/src/preamble.ts @@ -19,7 +19,7 @@ import { setConfig as setHotLoaderConfig } from 'react-hot-loader'; import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'; import moment from 'moment'; -import { configure } from '@superset-ui/translation'; +import { configure } from '@superset-ui/core'; import setupClient from './setup/setupClient'; import setupColors from './setup/setupColors'; import setupFormatters from './setup/setupFormatters'; diff --git a/superset-frontend/src/profile/App.tsx b/superset-frontend/src/profile/App.tsx index ea9932b59..8fe5754dd 100644 --- a/superset-frontend/src/profile/App.tsx +++ b/superset-frontend/src/profile/App.tsx @@ -21,7 +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 { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import App from './components/App'; import messageToastReducer from '../messageToasts/reducers'; import { initEnhancer } from '../reduxUtils'; diff --git a/superset-frontend/src/profile/components/App.tsx b/superset-frontend/src/profile/components/App.tsx index 470bf73e9..0d18199c1 100644 --- a/superset-frontend/src/profile/components/App.tsx +++ b/superset-frontend/src/profile/components/App.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { Col, Row, Tabs, Tab, Panel } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Favorites from './Favorites'; import UserInfo from './UserInfo'; diff --git a/superset-frontend/src/profile/components/CreatedContent.tsx b/superset-frontend/src/profile/components/CreatedContent.tsx index 933b3e685..db9a2adca 100644 --- a/superset-frontend/src/profile/components/CreatedContent.tsx +++ b/superset-frontend/src/profile/components/CreatedContent.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import moment from 'moment'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TableLoader from '../../components/TableLoader'; import { Slice } from '../types'; diff --git a/superset-frontend/src/profile/components/Favorites.tsx b/superset-frontend/src/profile/components/Favorites.tsx index ca059f4c6..4d31b0b69 100644 --- a/superset-frontend/src/profile/components/Favorites.tsx +++ b/superset-frontend/src/profile/components/Favorites.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import moment from 'moment'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import TableLoader from '../../components/TableLoader'; import { Slice } from '../types'; diff --git a/superset-frontend/src/profile/components/Security.tsx b/superset-frontend/src/profile/components/Security.tsx index d80662ee8..6912886c3 100644 --- a/superset-frontend/src/profile/components/Security.tsx +++ b/superset-frontend/src/profile/components/Security.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { Badge } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import Label from 'src/components/Label'; import { UserWithPermissionsAndRoles } from '../../types/bootstrapTypes'; diff --git a/superset-frontend/src/profile/components/UserInfo.tsx b/superset-frontend/src/profile/components/UserInfo.tsx index ffc417901..db38fde99 100644 --- a/superset-frontend/src/profile/components/UserInfo.tsx +++ b/superset-frontend/src/profile/components/UserInfo.tsx @@ -20,7 +20,7 @@ import React from 'react'; import Gravatar from 'react-gravatar'; import moment from 'moment'; import { Panel } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { UserWithPermissionsAndRoles } from '../../types/bootstrapTypes'; interface UserInfoProps { diff --git a/superset-frontend/src/setup/setupApp.ts b/superset-frontend/src/setup/setupApp.ts index b9852678a..d97ea1ac1 100644 --- a/superset-frontend/src/setup/setupApp.ts +++ b/superset-frontend/src/setup/setupApp.ts @@ -18,7 +18,7 @@ */ /* eslint global-require: 0 */ import $ from 'jquery'; -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/core'; import getClientErrorObject, { ClientErrorObject, } from '../utils/getClientErrorObject'; diff --git a/superset-frontend/src/setup/setupClient.js b/superset-frontend/src/setup/setupClient.js index 990ae55d7..0f1a039f6 100644 --- a/superset-frontend/src/setup/setupClient.js +++ b/superset-frontend/src/setup/setupClient.js @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; +import { SupersetClient, logging } from '@superset-ui/core'; import parseCookie from 'src/utils/parseCookie'; -import { logging } from '@superset-ui/core'; export default function setupClient() { const csrfNode = document.querySelector('#csrf_token'); diff --git a/superset-frontend/src/setup/setupColors.js b/superset-frontend/src/setup/setupColors.js index 308bdab5f..6a013f2fc 100644 --- a/superset-frontend/src/setup/setupColors.js +++ b/superset-frontend/src/setup/setupColors.js @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -import airbnb from '@superset-ui/color/esm/colorSchemes/categorical/airbnb'; -import categoricalD3 from '@superset-ui/color/esm/colorSchemes/categorical/d3'; -import echarts from '@superset-ui/color/esm/colorSchemes/categorical/echarts'; -import google from '@superset-ui/color/esm/colorSchemes/categorical/google'; -import lyft from '@superset-ui/color/esm/colorSchemes/categorical/lyft'; -import preset from '@superset-ui/color/esm/colorSchemes/categorical/preset'; -import sequentialCommon from '@superset-ui/color/esm/colorSchemes/sequential/common'; -import sequentialD3 from '@superset-ui/color/esm/colorSchemes/sequential/d3'; +import airbnb from '@superset-ui/core/esm/color/colorSchemes/categorical/airbnb'; +import categoricalD3 from '@superset-ui/core/esm/color/colorSchemes/categorical/d3'; +import echarts from '@superset-ui/core/esm/color/colorSchemes/categorical/echarts'; +import google from '@superset-ui/core/esm/color/colorSchemes/categorical/google'; +import lyft from '@superset-ui/core/esm/color/colorSchemes/categorical/lyft'; +import preset from '@superset-ui/core/esm/color/colorSchemes/categorical/preset'; +import sequentialCommon from '@superset-ui/core/esm/color/colorSchemes/sequential/common'; +import sequentialD3 from '@superset-ui/core/esm/color/colorSchemes/sequential/d3'; import { getCategoricalSchemeRegistry, getSequentialSchemeRegistry, -} from '@superset-ui/color'; -import superset from '@superset-ui/color/esm/colorSchemes/categorical/superset'; +} from '@superset-ui/core'; +import superset from '@superset-ui/core/esm/color/colorSchemes/categorical/superset'; export default function setupColors() { // Register color schemes diff --git a/superset-frontend/src/setup/setupFormatters.js b/superset-frontend/src/setup/setupFormatters.js index 7a722b228..bc5efc1ed 100644 --- a/superset-frontend/src/setup/setupFormatters.js +++ b/superset-frontend/src/setup/setupFormatters.js @@ -21,12 +21,10 @@ import { getNumberFormatter, getNumberFormatterRegistry, NumberFormats, -} from '@superset-ui/number-format'; -import { getTimeFormatterRegistry, smartDateFormatter, smartDateVerboseFormatter, -} from '@superset-ui/time-format'; +} from '@superset-ui/core'; export default function setupFormatters() { getNumberFormatterRegistry() diff --git a/superset-frontend/src/setup/setupPlugins.ts b/superset-frontend/src/setup/setupPlugins.ts index d386da596..5c2faff1d 100644 --- a/superset-frontend/src/setup/setupPlugins.ts +++ b/superset-frontend/src/setup/setupPlugins.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry } from '@superset-ui/core'; import MainPreset from '../visualizations/presets/MainPreset'; import setupPluginsExtra from './setupPluginsExtra'; diff --git a/superset-frontend/src/utils/common.js b/superset-frontend/src/utils/common.js index e43def8e3..2c1248875 100644 --- a/superset-frontend/src/utils/common.js +++ b/superset-frontend/src/utils/common.js @@ -16,8 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; -import { getTimeFormatter, TimeFormats } from '@superset-ui/time-format'; +import { + SupersetClient, + getTimeFormatter, + TimeFormats, +} from '@superset-ui/core'; import getClientErrorObject from './getClientErrorObject'; // ATTENTION: If you change any constants, make sure to also change constants.py diff --git a/superset-frontend/src/utils/downloadAsImage.ts b/superset-frontend/src/utils/downloadAsImage.ts index f21eea521..9aaa831c3 100644 --- a/superset-frontend/src/utils/downloadAsImage.ts +++ b/superset-frontend/src/utils/downloadAsImage.ts @@ -19,7 +19,7 @@ import { SyntheticEvent } from 'react'; import domToImage, { Options } from 'dom-to-image'; import kebabCase from 'lodash/kebabCase'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { addWarningToast } from 'src/messageToasts/actions'; /** diff --git a/superset-frontend/src/utils/getClientErrorObject.ts b/superset-frontend/src/utils/getClientErrorObject.ts index 6349496a3..a2aab27b8 100644 --- a/superset-frontend/src/utils/getClientErrorObject.ts +++ b/superset-frontend/src/utils/getClientErrorObject.ts @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClientResponse } from '@superset-ui/connection'; -import { t } from '@superset-ui/translation'; +import { SupersetClientResponse, t } from '@superset-ui/core'; import { SupersetError, ErrorTypeEnum, diff --git a/superset-frontend/src/utils/getControlsForVizType.js b/superset-frontend/src/utils/getControlsForVizType.js index 3be5b7edf..0dac5be08 100644 --- a/superset-frontend/src/utils/getControlsForVizType.js +++ b/superset-frontend/src/utils/getControlsForVizType.js @@ -18,7 +18,7 @@ */ import memoize from 'lodash/memoize'; -import { getChartControlPanelRegistry } from '@superset-ui/chart'; +import { getChartControlPanelRegistry } from '@superset-ui/core'; import controls from '../explore/controls'; const getControlsForVizType = memoize(vizType => { diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx index dff494c1c..10604beef 100644 --- a/superset-frontend/src/views/App.tsx +++ b/superset-frontend/src/views/App.tsx @@ -24,7 +24,7 @@ import { Provider } from 'react-redux'; import { BrowserRouter as Router, Switch, Route } from 'react-router-dom'; import { QueryParamProvider } from 'use-query-params'; import { initFeatureFlags } from 'src/featureFlags'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import ErrorBoundary from 'src/components/ErrorBoundary'; import Menu from 'src/components/Menu/Menu'; import FlashProvider from 'src/components/FlashProvider'; diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx index 5406cfc29..062605992 100644 --- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx +++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; -import { t } from '@superset-ui/translation'; -import { getChartMetadataRegistry } from '@superset-ui/chart'; +import { SupersetClient, getChartMetadataRegistry, t } from '@superset-ui/core'; import React, { useState, useMemo } from 'react'; import rison from 'rison'; import { uniqBy } from 'lodash'; diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx index 29f40b3e5..36873536e 100644 --- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx +++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; -import { t } from '@superset-ui/translation'; +import { SupersetClient, t } from '@superset-ui/core'; import React, { useState, useMemo } from 'react'; import rison from 'rison'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; diff --git a/superset-frontend/src/views/CRUD/data/common.ts b/superset-frontend/src/views/CRUD/data/common.ts index b2c1940e0..e47fd99fe 100644 --- a/superset-frontend/src/views/CRUD/data/common.ts +++ b/superset-frontend/src/views/CRUD/data/common.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; export const commonMenuData = { name: t('Data'), diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx index ebe4fab19..7917cdca5 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; -import styled from '@superset-ui/style'; -import { t } from '@superset-ui/translation'; +import { SupersetClient, t, styled } from '@superset-ui/core'; import React, { useState, useMemo } from 'react'; import { useListViewResource } from 'src/views/CRUD/hooks'; import { createErrorHandler } from 'src/views/CRUD/utils'; diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx index 25137393d..de73614a0 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx @@ -17,8 +17,7 @@ * under the License. */ import React, { FunctionComponent, useState } from 'react'; -import styled from '@superset-ui/style'; -import { t } from '@superset-ui/translation'; +import { styled, t } from '@superset-ui/core'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import Icon from 'src/components/Icon'; import Modal from 'src/common/components/Modal'; diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index 17c518254..a74bf6232 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -17,10 +17,8 @@ * under the License. */ import React, { FunctionComponent, useState } from 'react'; -import styled from '@superset-ui/style'; -import { SupersetClient } from '@superset-ui/connection'; +import { styled, SupersetClient, t } from '@superset-ui/core'; import { isEmpty, isNil } from 'lodash'; -import { t } from '@superset-ui/translation'; import Icon from 'src/components/Icon'; import Modal from 'src/components/Modal'; import TableSelector from 'src/components/TableSelector'; diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index e05413c02..9fd9867fc 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { SupersetClient } from '@superset-ui/connection'; -import { t } from '@superset-ui/translation'; +import { SupersetClient, t } from '@superset-ui/core'; import React, { FunctionComponent, useState, useMemo } from 'react'; import rison from 'rison'; import { diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts index 56e5c5644..4cf05953a 100644 --- a/superset-frontend/src/views/CRUD/hooks.ts +++ b/superset-frontend/src/views/CRUD/hooks.ts @@ -18,8 +18,7 @@ */ import rison from 'rison'; import { useState, useEffect, useCallback, useRef } from 'react'; -import { SupersetClient } from '@superset-ui/connection'; -import { t } from '@superset-ui/translation'; +import { SupersetClient, t } from '@superset-ui/core'; import { createErrorHandler } from 'src/views/CRUD/utils'; import { FetchDataConfig } from 'src/components/ListView'; diff --git a/superset-frontend/src/views/CRUD/utils.tsx b/superset-frontend/src/views/CRUD/utils.tsx index 99c6e9770..213481d17 100644 --- a/superset-frontend/src/views/CRUD/utils.tsx +++ b/superset-frontend/src/views/CRUD/utils.tsx @@ -19,10 +19,10 @@ import { SupersetClient, SupersetClientResponse, -} from '@superset-ui/connection'; + logging, +} from '@superset-ui/core'; import rison from 'rison'; import getClientErrorObject from 'src/utils/getClientErrorObject'; -import { logging } from '@superset-ui/core'; const createFetchResourceMethod = (method: string) => ( resource: string, diff --git a/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx b/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx index 345f8e807..f75d7730a 100644 --- a/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx +++ b/superset-frontend/src/views/CRUD/welcome/DashboardTable.tsx @@ -17,8 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; +import { t, SupersetClient } from '@superset-ui/core'; import { debounce } from 'lodash'; import ListView, { FetchDataConfig } from 'src/components/ListView'; import withToasts from 'src/messageToasts/enhancers/withToasts'; diff --git a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx index 0b53ae60f..68f6d10c6 100644 --- a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx +++ b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx @@ -18,7 +18,7 @@ */ import React, { useState } from 'react'; import { Panel, Row, Col, Tabs, Tab, FormControl } from 'react-bootstrap'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { useQueryParam, StringParam, QueryParamConfig } from 'use-query-params'; import { User } from 'src/types/bootstrapTypes'; import RecentActivity from 'src/profile/components/RecentActivity'; diff --git a/superset-frontend/src/views/menu.tsx b/superset-frontend/src/views/menu.tsx index 3a6c9ddfd..63a920327 100644 --- a/superset-frontend/src/views/menu.tsx +++ b/superset-frontend/src/views/menu.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import ReactDOM from 'react-dom'; -import { supersetTheme, ThemeProvider } from '@superset-ui/style'; +import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import Menu from 'src/components/Menu/Menu'; const container = document.getElementById('app'); diff --git a/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx b/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx index f79943006..79f42ef26 100644 --- a/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx +++ b/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx @@ -22,9 +22,7 @@ import { debounce } from 'lodash'; import { max as d3Max } from 'd3-array'; import { AsyncCreatableSelect, CreatableSelect } from 'src/components/Select'; import Button from 'src/components/Button'; -import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/connection'; -import styled from '@superset-ui/style'; +import { t, styled, SupersetClient } from '@superset-ui/core'; import FormLabel from 'src/components/FormLabel'; diff --git a/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js b/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js index 711ac690d..a9a098269 100644 --- a/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js +++ b/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { ChartMetadata, ChartPlugin } from '@superset-ui/chart'; +import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core'; import transformProps from './transformProps'; import thumbnail from './images/thumbnail.png'; import controlPanel from './controlPanel'; diff --git a/superset-frontend/src/visualizations/FilterBox/controlPanel.jsx b/superset-frontend/src/visualizations/FilterBox/controlPanel.jsx index f0e14dbb6..cfdbecf26 100644 --- a/superset-frontend/src/visualizations/FilterBox/controlPanel.jsx +++ b/superset-frontend/src/visualizations/FilterBox/controlPanel.jsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; export default { controlPanelSections: [ diff --git a/superset-frontend/src/visualizations/TimeTable/FormattedNumber.jsx b/superset-frontend/src/visualizations/TimeTable/FormattedNumber.jsx index 57cc40378..c6564d8a6 100644 --- a/superset-frontend/src/visualizations/TimeTable/FormattedNumber.jsx +++ b/superset-frontend/src/visualizations/TimeTable/FormattedNumber.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { formatNumber } from '@superset-ui/number-format'; +import { formatNumber } from '@superset-ui/core'; const propTypes = { num: PropTypes.number, diff --git a/superset-frontend/src/visualizations/TimeTable/SparklineCell.jsx b/superset-frontend/src/visualizations/TimeTable/SparklineCell.jsx index da73d02a8..fc1e0077e 100644 --- a/superset-frontend/src/visualizations/TimeTable/SparklineCell.jsx +++ b/superset-frontend/src/visualizations/TimeTable/SparklineCell.jsx @@ -26,8 +26,7 @@ import { VerticalReferenceLine, WithTooltip, } from '@data-ui/sparkline'; -import { formatNumber } from '@superset-ui/number-format'; -import { getTextDimension } from '@superset-ui/dimension'; +import { getTextDimension, formatNumber } from '@superset-ui/core'; const propTypes = { className: PropTypes.string, diff --git a/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx b/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx index 4b20de7bf..1c8205b38 100644 --- a/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx +++ b/superset-frontend/src/visualizations/TimeTable/TimeTable.jsx @@ -21,13 +21,12 @@ import PropTypes from 'prop-types'; import Mustache from 'mustache'; import { scaleLinear } from 'd3-scale'; import { Table, Thead, Th, Tr, Td } from 'reactable-arc'; -import { formatNumber } from '@superset-ui/number-format'; -import { formatTime } from '@superset-ui/time-format'; -import moment from 'moment'; +import { formatNumber, formatTime } from '@superset-ui/core'; import { InfoTooltipWithTrigger, MetricOption, } from '@superset-ui/chart-controls'; +import moment from 'moment'; import FormattedNumber from './FormattedNumber'; import SparklineCell from './SparklineCell'; diff --git a/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js b/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js index e8e50c6ac..c8e49a888 100644 --- a/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js +++ b/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.js @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { t } from '@superset-ui/translation'; -import { ChartMetadata, ChartPlugin } from '@superset-ui/chart'; +import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core'; import transformProps from './transformProps'; import thumbnail from './images/thumbnail.png'; diff --git a/superset-frontend/stylesheets/less/cosmo/cosmoTheme.js b/superset-frontend/stylesheets/less/cosmo/cosmoTheme.js index 73e5daee4..c3a578309 100644 --- a/superset-frontend/stylesheets/less/cosmo/cosmoTheme.js +++ b/superset-frontend/stylesheets/less/cosmo/cosmoTheme.js @@ -16,45 +16,49 @@ * specific language governing permissions and limitations * under the License. */ -(function(){ +(function () { $(window).scroll(function () { - var top = $(document).scrollTop(); - $('.splash').css({ - 'background-position': '0px -'+(top/3).toFixed(2)+'px' - }); - if(top > 50) - $('#home > .navbar').removeClass('navbar-transparent'); - else - $('#home > .navbar').addClass('navbar-transparent'); + var top = $(document).scrollTop(); + $('.splash').css({ + 'background-position': '0px -' + (top / 3).toFixed(2) + 'px', + }); + if (top > 50) $('#home > .navbar').removeClass('navbar-transparent'); + else $('#home > .navbar').addClass('navbar-transparent'); }); - $("a[href='#']").click(function(e) { + $("a[href='#']").click(function (e) { e.preventDefault(); }); - var $button = $("
< >
").click(function(){ + var $button = $( + "
< >
", + ).click(function () { var html = $(this).parent().html(); html = cleanSource(html); - $("#source-modal pre").text(html); - $("#source-modal").modal(); + $('#source-modal pre').text(html); + $('#source-modal').modal(); }); $('.bs-component [data-toggle="popover"]').popover(); $('.bs-component [data-toggle="tooltip"]').tooltip(); - $(".bs-component").hover(function(){ - $(this).append($button); - $button.show(); - }, function(){ - $button.hide(); - }); + $('.bs-component').hover( + function () { + $(this).append($button); + $button.show(); + }, + function () { + $button.hide(); + }, + ); function cleanSource(html) { - html = html.replace(/×/g, "×") - .replace(/«/g, "«") - .replace(/»/g, "»") - .replace(/←/g, "←") - .replace(/→/g, "→"); + html = html + .replace(/×/g, '×') + .replace(/«/g, '«') + .replace(/»/g, '»') + .replace(/←/g, '←') + .replace(/→/g, '→'); var lines = html.split(/\n/); @@ -62,9 +66,9 @@ lines.splice(-1, 1); var indentSize = lines[0].length - lines[0].trim().length, - re = new RegExp(" {" + indentSize + "}"); + re = new RegExp(' {' + indentSize + '}'); - lines = lines.map(function(line){ + lines = lines.map(function (line) { if (line.match(re)) { line = line.substring(indentSize); } @@ -72,9 +76,8 @@ return line; }); - lines = lines.join("\n"); + lines = lines.join('\n'); return lines; } - })(); diff --git a/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx b/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx index a0601a118..915ea9b87 100644 --- a/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx +++ b/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import Dialog from 'react-bootstrap-dialog'; -import { t } from '@superset-ui/translation'; +import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; import { exploreChart } from '../../explore/exploreUtils';