diff --git a/superset/assets/package.json b/superset/assets/package.json index 581af12433..8c15bfaeec 100644 --- a/superset/assets/package.json +++ b/superset/assets/package.json @@ -51,8 +51,8 @@ "@data-ui/sparkline": "^0.0.54", "@data-ui/theme": "^0.0.62", "@data-ui/xy-chart": "^0.0.61", - "@superset-ui/core": "^0.0.7", - "@superset-ui/translation": "^0.2.1", + "@superset-ui/connection": "^0.3.0", + "@superset-ui/translation": "^0.3.0", "@vx/legend": "^0.0.170", "@vx/responsive": "0.0.172", "@vx/scale": "^0.0.165", diff --git a/superset/assets/spec/helpers/setupSupersetClient.js b/superset/assets/spec/helpers/setupSupersetClient.js index dd6367cbc2..cd91d119ce 100644 --- a/superset/assets/spec/helpers/setupSupersetClient.js +++ b/superset/assets/spec/helpers/setupSupersetClient.js @@ -1,5 +1,5 @@ import fetchMock from 'fetch-mock'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; export default function setupSupersetClient() { // The following is needed to mock out SupersetClient requests diff --git a/superset/assets/src/SqlLab/actions.js b/superset/assets/src/SqlLab/actions.js index 6acf4383a3..aac81d6369 100644 --- a/superset/assets/src/SqlLab/actions.js +++ b/superset/assets/src/SqlLab/actions.js @@ -1,7 +1,7 @@ import shortid from 'shortid'; import JSONbig from 'json-bigint'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { now } from '../modules/dates'; import { diff --git a/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx b/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx index ea6e780919..2937e159b3 100644 --- a/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx +++ b/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import * as Actions from '../actions'; diff --git a/superset/assets/src/SqlLab/components/QuerySearch.jsx b/superset/assets/src/SqlLab/components/QuerySearch.jsx index 06c9e252f1..5f2f1c602a 100644 --- a/superset/assets/src/SqlLab/components/QuerySearch.jsx +++ b/superset/assets/src/SqlLab/components/QuerySearch.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { Button } from 'react-bootstrap'; import Select from 'react-select'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import Loading from '../../components/Loading'; import QueryTable from './QueryTable'; diff --git a/superset/assets/src/SqlLab/components/SqlEditorLeftBar.jsx b/superset/assets/src/SqlLab/components/SqlEditorLeftBar.jsx index f0b4d1a19f..fc38c37be6 100644 --- a/superset/assets/src/SqlLab/components/SqlEditorLeftBar.jsx +++ b/superset/assets/src/SqlLab/components/SqlEditorLeftBar.jsx @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import Select from 'react-virtualized-select'; import createFilterOptions from 'react-select-fast-filter-options'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import TableElement from './TableElement'; import AsyncSelect from '../../components/AsyncSelect'; diff --git a/superset/assets/src/chart/chartAction.js b/superset/assets/src/chart/chartAction.js index 0aa2c5f17d..771f1590fd 100644 --- a/superset/assets/src/chart/chartAction.js +++ b/superset/assets/src/chart/chartAction.js @@ -1,7 +1,7 @@ /* global window, AbortController */ /* eslint no-undef: 'error' */ import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { getExploreUrlAndPayload, getAnnotationJsonUrl } from '../explore/exploreUtils'; import { requiresQuery, ANNOTATION_SOURCE_TYPES } from '../modules/AnnotationTypes'; import { addDangerToast } from '../messageToasts/actions'; diff --git a/superset/assets/src/components/AsyncSelect.jsx b/superset/assets/src/components/AsyncSelect.jsx index 5f812cf3f8..0784d2d6e6 100644 --- a/superset/assets/src/components/AsyncSelect.jsx +++ b/superset/assets/src/components/AsyncSelect.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Select from 'react-select'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from '../utils/getClientErrorObject'; const propTypes = { diff --git a/superset/assets/src/components/TableLoader.jsx b/superset/assets/src/components/TableLoader.jsx index 0d31934417..2d64403ecc 100644 --- a/superset/assets/src/components/TableLoader.jsx +++ b/superset/assets/src/components/TableLoader.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Table, Tr, Td } from 'reactable'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import withToasts from '../messageToasts/enhancers/withToasts'; import Loading from '../components/Loading'; diff --git a/superset/assets/src/dashboard/actions/dashboardState.js b/superset/assets/src/dashboard/actions/dashboardState.js index 6fed016c15..f2c330c00a 100644 --- a/superset/assets/src/dashboard/actions/dashboardState.js +++ b/superset/assets/src/dashboard/actions/dashboardState.js @@ -1,7 +1,7 @@ /* eslint camelcase: 0 */ import { ActionCreators as UndoActionCreators } from 'redux-undo'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { addChart, removeChart, refreshChart } from '../../chart/chartAction'; import { chart as initChart } from '../../chart/chartReducer'; diff --git a/superset/assets/src/dashboard/actions/datasources.js b/superset/assets/src/dashboard/actions/datasources.js index f5e8a48da9..45702d343e 100644 --- a/superset/assets/src/dashboard/actions/datasources.js +++ b/superset/assets/src/dashboard/actions/datasources.js @@ -1,4 +1,4 @@ -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from '../../utils/getClientErrorObject'; export const SET_DATASOURCE = 'SET_DATASOURCE'; diff --git a/superset/assets/src/dashboard/actions/sliceEntities.js b/superset/assets/src/dashboard/actions/sliceEntities.js index 6194327a8c..7601daaf3b 100644 --- a/superset/assets/src/dashboard/actions/sliceEntities.js +++ b/superset/assets/src/dashboard/actions/sliceEntities.js @@ -1,6 +1,6 @@ /* eslint camelcase: 0 */ import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { addDangerToast } from '../../messageToasts/actions'; import { getDatasourceParameter } from '../../modules/utils'; diff --git a/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx b/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx index f97d4c1441..247995c8e4 100644 --- a/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx +++ b/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { DropdownButton, MenuItem } from 'react-bootstrap'; import { t } from '@superset-ui/translation'; diff --git a/superset/assets/src/datasource/DatasourceEditor.jsx b/superset/assets/src/datasource/DatasourceEditor.jsx index c7ff27df71..f16c1e5349 100644 --- a/superset/assets/src/datasource/DatasourceEditor.jsx +++ b/superset/assets/src/datasource/DatasourceEditor.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { Alert, Badge, Col, Label, Tabs, Tab, Well } from 'react-bootstrap'; import shortid from 'shortid'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from '../utils/getClientErrorObject'; import Button from '../components/Button'; diff --git a/superset/assets/src/datasource/DatasourceModal.jsx b/superset/assets/src/datasource/DatasourceModal.jsx index 40e42a7141..947d12399c 100644 --- a/superset/assets/src/datasource/DatasourceModal.jsx +++ b/superset/assets/src/datasource/DatasourceModal.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { Alert, Button, Modal } from 'react-bootstrap'; import Dialog from 'react-bootstrap-dialog'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from '../utils/getClientErrorObject'; import DatasourceEditor from '../datasource/DatasourceEditor'; diff --git a/superset/assets/src/explore/actions/exploreActions.js b/superset/assets/src/explore/actions/exploreActions.js index df792b22cd..c489afa95d 100644 --- a/superset/assets/src/explore/actions/exploreActions.js +++ b/superset/assets/src/explore/actions/exploreActions.js @@ -1,6 +1,6 @@ /* eslint camelcase: 0 */ import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { addDangerToast } from '../../messageToasts/actions'; const FAVESTAR_BASE_URL = '/superset/favstar/slice'; diff --git a/superset/assets/src/explore/actions/saveModalActions.js b/superset/assets/src/explore/actions/saveModalActions.js index b9f76c1bf7..1993a382a9 100644 --- a/superset/assets/src/explore/actions/saveModalActions.js +++ b/superset/assets/src/explore/actions/saveModalActions.js @@ -1,4 +1,4 @@ -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { getExploreUrlAndPayload } from '../exploreUtils'; export const FETCH_DASHBOARDS_SUCCEEDED = 'FETCH_DASHBOARDS_SUCCEEDED'; diff --git a/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx b/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx index 5ddbe4a9c6..3eeb67fee7 100644 --- a/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx +++ b/superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { FormGroup } from 'react-bootstrap'; import VirtualizedSelect from 'react-virtualized-select'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import AdhocFilter, { EXPRESSION_TYPES, CLAUSES } from '../AdhocFilter'; import adhocMetricType from '../propTypes/adhocMetricType'; diff --git a/superset/assets/src/explore/components/DisplayQueryButton.jsx b/superset/assets/src/explore/components/DisplayQueryButton.jsx index 24f4610c1d..042ca24d83 100644 --- a/superset/assets/src/explore/components/DisplayQueryButton.jsx +++ b/superset/assets/src/explore/components/DisplayQueryButton.jsx @@ -9,7 +9,7 @@ import github from 'react-syntax-highlighter/styles/hljs/github'; import { DropdownButton, MenuItem, Row, Col, FormControl } from 'react-bootstrap'; import { Table } from 'reactable'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from '../../utils/getClientErrorObject'; import CopyToClipboard from './../../components/CopyToClipboard'; diff --git a/superset/assets/src/explore/components/controls/AnnotationLayer.jsx b/superset/assets/src/explore/components/controls/AnnotationLayer.jsx index c2e6c27550..a8783451f2 100644 --- a/superset/assets/src/explore/components/controls/AnnotationLayer.jsx +++ b/superset/assets/src/explore/components/controls/AnnotationLayer.jsx @@ -4,7 +4,7 @@ import { CompactPicker } from 'react-color'; import { Button } from 'react-bootstrap'; import mathjs from 'mathjs'; import { t } from '@superset-ui/translation'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import SelectControl from './SelectControl'; import TextControl from './TextControl'; diff --git a/superset/assets/src/logger.js b/superset/assets/src/logger.js index abc6339a11..3f45477636 100644 --- a/superset/assets/src/logger.js +++ b/superset/assets/src/logger.js @@ -1,5 +1,5 @@ /* eslint no-console: 0 */ -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; // This creates an association between an eventName and the ActionLog instance so that // Logger.append calls do not have to know about the appropriate ActionLog instance diff --git a/superset/assets/src/setup/setupApp.js b/superset/assets/src/setup/setupApp.js index 7d2fda2dc8..517bd8505f 100644 --- a/superset/assets/src/setup/setupApp.js +++ b/superset/assets/src/setup/setupApp.js @@ -1,6 +1,6 @@ /* eslint global-require: 0 */ import $ from 'jquery'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from '../utils/getClientErrorObject'; function showApiMessage(resp) { diff --git a/superset/assets/src/setup/setupClient.js b/superset/assets/src/setup/setupClient.js index 1165b01d86..4d2db47617 100644 --- a/superset/assets/src/setup/setupClient.js +++ b/superset/assets/src/setup/setupClient.js @@ -1,5 +1,5 @@ /* eslint no-console: 0 */ -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; export default function setupClient() { const csrfNode = document.querySelector('#csrf_token'); diff --git a/superset/assets/src/utils/common.js b/superset/assets/src/utils/common.js index 011346bb83..4d8574df8a 100644 --- a/superset/assets/src/utils/common.js +++ b/superset/assets/src/utils/common.js @@ -1,5 +1,5 @@ import d3 from 'd3'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import getClientErrorObject from './getClientErrorObject'; export const EARTH_CIRCUMFERENCE_KM = 40075.16; diff --git a/superset/assets/src/visualizations/deckgl/Multi/Multi.jsx b/superset/assets/src/visualizations/deckgl/Multi/Multi.jsx index 9bfc84fc4f..50dfa4bbab 100644 --- a/superset/assets/src/visualizations/deckgl/Multi/Multi.jsx +++ b/superset/assets/src/visualizations/deckgl/Multi/Multi.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import DeckGLContainer from '../DeckGLContainer'; import { getExploreLongUrl } from '../../../explore/exploreUtils'; diff --git a/superset/assets/src/welcome/DashboardTable.jsx b/superset/assets/src/welcome/DashboardTable.jsx index c03e34c534..2acfd5a54a 100644 --- a/superset/assets/src/welcome/DashboardTable.jsx +++ b/superset/assets/src/welcome/DashboardTable.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Table, Tr, Td, unsafe } from 'reactable'; -import { SupersetClient } from '@superset-ui/core'; +import { SupersetClient } from '@superset-ui/connection'; import { t } from '@superset-ui/translation'; import withToasts from '../messageToasts/enhancers/withToasts'; diff --git a/superset/assets/yarn.lock b/superset/assets/yarn.lock index a59ef5e26e..9785972818 100644 --- a/superset/assets/yarn.lock +++ b/superset/assets/yarn.lock @@ -399,18 +399,17 @@ dependencies: array-from "^2.1.1" -"@superset-ui/core@^0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@superset-ui/core/-/core-0.0.7.tgz#e91374d10c96de504225a24d7d1d76e73cdb06cd" +"@superset-ui/connection@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@superset-ui/connection/-/connection-0.3.0.tgz#f659d8b74e88b64e7463c09e1a08fb89ac29c2b9" dependencies: "@babel/runtime" "^7.1.2" whatwg-fetch "^2.0.4" -"@superset-ui/translation@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@superset-ui/translation/-/translation-0.2.1.tgz#252025d566918782bafc25cb9fe2aa31f9917093" +"@superset-ui/translation@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@superset-ui/translation/-/translation-0.3.0.tgz#e0c1737739f61bcdaf5c5b15a80ceecc38a50e52" dependencies: - "@babel/runtime" "^7.1.2" jed "^1.1.1" "@types/blob-util@1.3.3":