chore: Moves spec files to the src folder - iteration 7

superset-frontend/.eslintrc.js

@@ -167,6 +167,7 @@ module.exports = {
         'src/**/*.test.tsx',
         'src/**/*.test.js',
         'src/**/*.test.jsx',
+        'src/**/fixtures.*',
       ],
       plugins: ['jest', 'jest-dom', 'no-only-tests', 'testing-library'],
       env: {

superset-frontend/spec/fixtures/mockReportState.js

@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { user } from 'src/SqlLab/fixtures';
 import dashboardInfo from './mockDashboardInfo';
-import { user } from '../javascripts/sqllab/fixtures';
 
 export default {
   active: true,

superset-frontend/spec/fixtures/mockState.js

@@ -22,13 +22,13 @@ import {
   nativeFiltersInfo,
   mockDataMaskInfo,
 } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { user } from 'src/SqlLab/fixtures';
 import chartQueries from './mockChartQueries';
 import { dashboardLayout } from './mockDashboardLayout';
 import dashboardInfo from './mockDashboardInfo';
 import { emptyFilters } from './mockDashboardFilters';
 import dashboardState from './mockDashboardState';
 import { sliceEntitiesForChart } from './mockSliceEntities';
-import { user } from '../javascripts/sqllab/fixtures';
 
 export default {
   datasources,

superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx

@@ -36,7 +36,7 @@ import { sliceId } from 'spec/fixtures/mockChartQueries';
 import dashboardInfo from 'spec/fixtures/mockDashboardInfo';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
 import { sliceEntitiesForChart } from 'spec/fixtures/mockSliceEntities';
-import { initialState } from 'spec/javascripts/sqllab/fixtures';
+import { initialState } from 'src/SqlLab/fixtures';
 import { nativeFiltersInfo } from '../../fixtures/mockNativeFilters';
 
 describe('ChartHolder', () => {

superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx

@@ -36,7 +36,7 @@ import WithPopoverMenu from 'src/dashboard/components/menu/WithPopoverMenu';
 
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
-import { initialState } from 'spec/javascripts/sqllab/fixtures';
+import { initialState } from 'src/SqlLab/fixtures';
 
 describe('Column', () => {
   const columnWithoutChildren = {

superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx

@@ -36,7 +36,7 @@ import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
-import { initialState } from 'spec/javascripts/sqllab/fixtures';
+import { initialState } from 'src/SqlLab/fixtures';
 
 describe('Row', () => {
   const rowWithoutChildren = { ...mockLayout.present.ROW_ID, children: [] };

superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx

@@ -32,7 +32,7 @@ import Tab, {
 } from 'src/dashboard/components/gridComponents/Tab';
 import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
 import { getMockStore } from 'spec/fixtures/mockStore';
-import { initialState } from 'spec/javascripts/sqllab/fixtures';
+import { initialState } from 'src/SqlLab/fixtures';
 
 describe('Tabs', () => {
   const props = {

superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx

@@ -37,7 +37,7 @@ import emptyDashboardLayout from 'src/dashboard/fixtures/emptyDashboardLayout';
 import { dashboardLayoutWithTabs } from 'spec/fixtures/mockDashboardLayout';
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { nativeFilters } from 'spec/fixtures/mockNativeFilters';
-import { initialState } from 'spec/javascripts/sqllab/fixtures';
+import { initialState } from 'src/SqlLab/fixtures';
 
 describe('Tabs', () => {
   fetchMock.post('glob:*/r/shortner/', {});

superset-frontend/src/SqlLab/components/AceEditorWrapper.tsx → superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx

@@ -30,7 +30,7 @@ import {
   AceCompleterKeyword,
   FullSQLEditor as AceEditor,
 } from 'src/components/AsyncAceEditor';
-import { QueryEditor } from '../types';
+import { QueryEditor } from 'src/SqlLab/types';
 
 type HotKey = {
   key: string;

superset-frontend/src/SqlLab/components/App.jsx → superset-frontend/src/SqlLab/components/App/index.jsx

@@ -30,9 +30,9 @@ import {
   LOCALSTORAGE_WARNING_MESSAGE_THROTTLE_MS,
 } from 'src/SqlLab/constants';
 import * as Actions from 'src/SqlLab/actions/sqlLab';
-import TabbedSqlEditors from './TabbedSqlEditors';
-import QueryAutoRefresh from './QueryAutoRefresh';
-import QuerySearch from './QuerySearch';
+import TabbedSqlEditors from '../TabbedSqlEditors';
+import QueryAutoRefresh from '../QueryAutoRefresh';
+import QuerySearch from '../QuerySearch';
 
 class App extends React.PureComponent {
   constructor(props) {

superset-frontend/spec/javascripts/sqllab/ColumnElement_spec.tsx → superset-frontend/src/SqlLab/components/ColumnElement/ColumnElement.test.tsx

@@ -19,8 +19,7 @@
 import React from 'react';
 import { styledMount as mount } from 'spec/helpers/theming';
 import ColumnElement from 'src/SqlLab/components/ColumnElement';
-
-import { mockedActions, table } from './fixtures';
+import { mockedActions, table } from 'src/SqlLab/fixtures';
 
 describe('ColumnElement', () => {
   const mockedProps = {

superset-frontend/src/SqlLab/components/EstimateQueryCostButton.jsx → superset-frontend/src/SqlLab/components/EstimateQueryCostButton/index.jsx

@@ -20,12 +20,11 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import Alert from 'src/components/Alert';
 import { t } from '@superset-ui/core';
-
 import TableView from 'src/components/TableView';
 import Button from 'src/components/Button';
-import Loading from '../../components/Loading';
-import ModalTrigger from '../../components/ModalTrigger';
-import { EmptyWrapperType } from '../../components/TableView/TableView';
+import Loading from 'src/components/Loading';
+import ModalTrigger from 'src/components/ModalTrigger';
+import { EmptyWrapperType } from 'src/components/TableView/TableView';
 
 const propTypes = {
   dbId: PropTypes.number.isRequired,

superset-frontend/src/SqlLab/components/ExploreCtasResultsButton.jsx → superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.jsx

@@ -22,10 +22,9 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { t } from '@superset-ui/core';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
-
 import Button from 'src/components/Button';
 import { exploreChart } from 'src/explore/exploreUtils';
-import * as actions from '../actions/sqlLab';
+import * as actions from 'src/SqlLab/actions/sqlLab';
 
 const propTypes = {
   actions: PropTypes.object.isRequired,

superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx → superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.jsx

@@ -27,8 +27,7 @@ import sqlLabReducer from 'src/SqlLab/reducers/index';
 import ExploreResultsButton from 'src/SqlLab/components/ExploreResultsButton';
 import * as exploreUtils from 'src/explore/exploreUtils';
 import Button from 'src/components/Button';
-
-import { queries, queryWithBadColumns } from './fixtures';
+import { queries, queryWithBadColumns } from 'src/SqlLab/fixtures';
 
 describe('ExploreResultsButton', () => {
   const middlewares = [thunk];

superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx → superset-frontend/src/SqlLab/components/ExploreResultsButton/index.jsx

@@ -25,9 +25,8 @@ import Alert from 'src/components/Alert';
 import { t } from '@superset-ui/core';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import shortid from 'shortid';
-
 import Button from 'src/components/Button';
-import * as actions from '../actions/sqlLab';
+import * as actions from 'src/SqlLab/actions/sqlLab';
 
 const propTypes = {
   actions: PropTypes.object.isRequired,

superset-frontend/src/SqlLab/components/HighlightedSql.tsx → superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx

@@ -21,8 +21,7 @@ import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
 import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import { t } from '@superset-ui/core';
-
-import ModalTrigger from '../../components/ModalTrigger';
+import ModalTrigger from 'src/components/ModalTrigger';
 
 SyntaxHighlighter.registerLanguage('sql', sql);
 

superset-frontend/spec/javascripts/sqllab/QueryAutoRefresh_spec.jsx → superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.jsx

@@ -21,9 +21,8 @@ import { shallow } from 'enzyme';
 import sinon from 'sinon';
 import thunk from 'redux-thunk';
 import configureStore from 'redux-mock-store';
-
 import QueryAutoRefresh from 'src/SqlLab/components/QueryAutoRefresh';
-import { initialState, runningQuery } from './fixtures';
+import { initialState, runningQuery } from 'src/SqlLab/fixtures';
 
 describe('QueryAutoRefresh', () => {
   const middlewares = [thunk];

superset-frontend/src/SqlLab/components/QueryAutoRefresh.jsx → superset-frontend/src/SqlLab/components/QueryAutoRefresh/index.jsx

@@ -21,8 +21,7 @@ import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { SupersetClient } from '@superset-ui/core';
-
-import * as Actions from '../actions/sqlLab';
+import * as Actions from 'src/SqlLab/actions/sqlLab';
 
 const QUERY_UPDATE_FREQ = 2000;
 const QUERY_UPDATE_BUFFER_MS = 5000;

superset-frontend/src/SqlLab/components/QueryHistory.tsx → superset-frontend/src/SqlLab/components/QueryHistory/index.tsx

@@ -19,9 +19,8 @@
 import React from 'react';
 import Alert from 'src/components/Alert';
 import { t } from '@superset-ui/core';
-
-import QueryTable from './QueryTable';
-import { Query } from '../types';
+import { Query } from 'src/SqlLab/types';
+import QueryTable from 'src/SqlLab/components/QueryTable';
 
 interface QueryHistoryProps {
   queries: Query[];

superset-frontend/spec/javascripts/sqllab/QuerySearch_spec.jsx → superset-frontend/src/SqlLab/components/QuerySearch/QuerySearch.test.jsx

@@ -26,7 +26,7 @@ import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 import { fireEvent, render, screen, act } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import userEvent from '@testing-library/user-event';
-import { user } from './fixtures';
+import { user } from 'src/SqlLab/fixtures';
 
 const mockStore = configureStore([thunk]);
 const store = mockStore({

superset-frontend/src/SqlLab/components/QuerySearch.tsx → superset-frontend/src/SqlLab/components/QuerySearch/index.tsx

@@ -21,17 +21,17 @@ import Button from 'src/components/Button';
 import Select from 'src/components/Select';
 import { styled, t, SupersetClient } from '@superset-ui/core';
 import { debounce } from 'lodash';
-import Loading from '../../components/Loading';
-import QueryTable from './QueryTable';
+import Loading from 'src/components/Loading';
 import {
   now,
   epochTimeXHoursAgo,
   epochTimeXDaysAgo,
   epochTimeXYearsAgo,
-} from '../../modules/dates';
-import { STATUS_OPTIONS, TIME_OPTIONS } from '../constants';
-import AsyncSelect from '../../components/AsyncSelect';
-import { Query } from '../types';
+} from 'src/modules/dates';
+import AsyncSelect from 'src/components/AsyncSelect';
+import { Query } from 'src/SqlLab/types';
+import { STATUS_OPTIONS, TIME_OPTIONS } from 'src/SqlLab/constants';
+import QueryTable from '../QueryTable';
 
 interface QuerySearchProps {
   actions: {

superset-frontend/src/SqlLab/components/QueryStateLabel.tsx → superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx

@@ -18,9 +18,8 @@
  */
 import React from 'react';
 import Label from 'src/components/Label';
-
-import { STATE_TYPE_MAP } from '../constants';
-import { Query } from '../types';
+import { STATE_TYPE_MAP } from 'src/SqlLab/constants';
+import { Query } from 'src/SqlLab/types';
 
 interface QueryStateLabelProps {
   query: Query;

superset-frontend/spec/javascripts/sqllab/QueryTable_spec.jsx → superset-frontend/src/SqlLab/components/QueryTable/QueryTable.test.jsx

@@ -24,7 +24,7 @@ import QueryTable from 'src/SqlLab/components/QueryTable';
 import TableView from 'src/components/TableView';
 import { TableCollection } from 'src/components/dataViewCommon';
 import { Provider } from 'react-redux';
-import { queries, user } from './fixtures';
+import { queries, user } from 'src/SqlLab/fixtures';
 
 describe('QueryTable', () => {
   const mockedProps = {

superset-frontend/spec/javascripts/sqllab/ResultSet_spec.jsx → superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.jsx

@@ -41,7 +41,7 @@ import {
   initialState,
   user,
   queryWithNoQueryLimit,
-} from './fixtures';
+} from 'src/SqlLab/fixtures';
 
 const mockStore = configureStore([thunk]);
 const store = mockStore(initialState);

superset-frontend/src/SqlLab/components/ResultSet.tsx → superset-frontend/src/SqlLab/components/ResultSet/index.tsx

@@ -36,17 +36,17 @@ import { debounce } from 'lodash';
 import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
-import Loading from '../../components/Loading';
-import ExploreCtasResultsButton from './ExploreCtasResultsButton';
-import ExploreResultsButton from './ExploreResultsButton';
-import HighlightedSql from './HighlightedSql';
-import FilterableTable from '../../components/FilterableTable/FilterableTable';
-import QueryStateLabel from './QueryStateLabel';
-import CopyToClipboard from '../../components/CopyToClipboard';
-import { prepareCopyToClipboardTabularData } from '../../utils/common';
-import { exploreChart } from '../../explore/exploreUtils';
-import { CtasEnum } from '../actions/sqlLab';
-import { Query } from '../types';
+import Loading from 'src/components/Loading';
+import FilterableTable from 'src/components/FilterableTable/FilterableTable';
+import CopyToClipboard from 'src/components/CopyToClipboard';
+import { prepareCopyToClipboardTabularData } from 'src/utils/common';
+import { exploreChart } from 'src/explore/exploreUtils';
+import { CtasEnum } from 'src/SqlLab/actions/sqlLab';
+import { Query } from 'src/SqlLab/types';
+import ExploreCtasResultsButton from '../ExploreCtasResultsButton';
+import ExploreResultsButton from '../ExploreResultsButton';
+import HighlightedSql from '../HighlightedSql';
+import QueryStateLabel from '../QueryStateLabel';
 
 enum DatasetRadioState {
   SAVE_NEW = 1,

superset-frontend/src/SqlLab/components/ShareSqlLabQuery.tsx → superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx

@@ -24,8 +24,8 @@ import withToasts from 'src/components/MessageToasts/withToasts';
 import CopyToClipboard from 'src/components/CopyToClipboard';
 import { storeQuery } from 'src/utils/common';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
-import { FeatureFlag, isFeatureEnabled } from '../../featureFlags';
-import { QueryEditor } from '../types';
+import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
+import { QueryEditor } from 'src/SqlLab/types';
 
 interface ShareSqlLabQueryPropTypes {
   queryEditor: QueryEditor;

superset-frontend/src/SqlLab/components/ShowSQL.tsx → superset-frontend/src/SqlLab/components/ShowSQL/index.tsx

@@ -20,9 +20,8 @@ import React from 'react';
 import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light';
 import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
-
-import { IconTooltip } from '../../components/IconTooltip';
-import ModalTrigger from '../../components/ModalTrigger';
+import { IconTooltip } from 'src/components/IconTooltip';
+import ModalTrigger from 'src/components/ModalTrigger';
 
 SyntaxHighlighter.registerLanguage('sql', sql);
 

superset-frontend/spec/javascripts/sqllab/SouthPane_spec.jsx → superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.jsx

@@ -24,7 +24,7 @@ import SouthPaneContainer from 'src/SqlLab/components/SouthPane/state';
 import ResultSet from 'src/SqlLab/components/ResultSet';
 import '@testing-library/jest-dom/extend-expect';
 import { STATUS_OPTIONS } from 'src/SqlLab/constants';
-import { initialState } from './fixtures';
+import { initialState } from 'src/SqlLab/fixtures';
 
 const mockedProps = {
   editorQueries: [

superset-frontend/src/SqlLab/components/SouthPane/state.ts

@@ -18,8 +18,8 @@
  */
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
-import * as Actions from '../../actions/sqlLab';
-import SouthPane from './SouthPane';
+import * as Actions from 'src/SqlLab/actions/sqlLab';
+import SouthPane from '.';
 
 function mapStateToProps({ sqlLab }: Record<string, any>) {
   return {

superset-frontend/spec/javascripts/sqllab/SqlEditor_spec.jsx → superset-frontend/src/SqlLab/components/SqlEditor/SqlEditor.test.jsx

@@ -39,7 +39,7 @@ import {
   queryEditorSetSchemaOptions,
 } from 'src/SqlLab/actions/sqlLab';
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
-import { initialState, queries, table } from './fixtures';
+import { initialState, queries, table } from 'src/SqlLab/fixtures';
 
 const MOCKED_SQL_EDITOR_HEIGHT = 500;
 

superset-frontend/src/SqlLab/components/SqlEditor.jsx → superset-frontend/src/SqlLab/components/SqlEditor/index.jsx

@@ -64,15 +64,15 @@ import {
   SQL_TOOLBAR_HEIGHT,
 } from 'src/SqlLab/constants';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
-import TemplateParamsEditor from './TemplateParamsEditor';
-import ConnectedSouthPane from './SouthPane/state';
-import SaveQuery from './SaveQuery';
-import ScheduleQueryButton from './ScheduleQueryButton';
-import EstimateQueryCostButton from './EstimateQueryCostButton';
-import ShareSqlLabQuery from './ShareSqlLabQuery';
-import SqlEditorLeftBar from './SqlEditorLeftBar';
-import AceEditorWrapper from './AceEditorWrapper';
-import RunQueryActionButton from './RunQueryActionButton';
+import TemplateParamsEditor from '../TemplateParamsEditor';
+import ConnectedSouthPane from '../SouthPane/state';
+import SaveQuery from '../SaveQuery';
+import ScheduleQueryButton from '../ScheduleQueryButton';
+import EstimateQueryCostButton from '../EstimateQueryCostButton';
+import ShareSqlLabQuery from '../ShareSqlLabQuery';
+import SqlEditorLeftBar from '../SqlEditorLeftBar';
+import AceEditorWrapper from '../AceEditorWrapper';
+import RunQueryActionButton from '../RunQueryActionButton';
 
 const LIMIT_DROPDOWN = [10, 100, 1000, 10000, 100000];
 const SQL_EDITOR_PADDING = 10;

superset-frontend/spec/javascripts/sqllab/SqlEditorLeftBar_spec.jsx → superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.jsx

@@ -34,7 +34,7 @@ import {
   databases,
   defaultQueryEditor,
   mockedActions,
-} from './fixtures';
+} from 'src/SqlLab/fixtures';
 
 const mockedProps = {
   actions: mockedActions,

superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx → superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.jsx

@@ -22,9 +22,9 @@ import Button from 'src/components/Button';
 import { t, styled, css } from '@superset-ui/core';
 import Collapse from 'src/components/Collapse';
 import Icons from 'src/components/Icons';
-import TableElement from './TableElement';
-import TableSelector from '../../components/TableSelector';
-import { IconTooltip } from '../../components/IconTooltip';
+import TableSelector from 'src/components/TableSelector';
+import { IconTooltip } from 'src/components/IconTooltip';
+import TableElement from '../TableElement';
 
 const propTypes = {
   queryEditor: PropTypes.object.isRequired,