mirror of
https://github.com/apache/superset.git
synced 2024-09-18 19:49:37 -04:00
fix(sqllab): invalid table metadata request (#21304)
This commit is contained in:
parent
65a11b6f45
commit
222f1e7ea8
@ -1137,8 +1137,9 @@ function getTableExtendedMetadata(table, query, dispatch) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function addTable(query, database, tableName, schemaName) {
|
export function addTable(queryEditor, database, tableName, schemaName) {
|
||||||
return function (dispatch) {
|
return function (dispatch, getState) {
|
||||||
|
const query = getUpToDateQuery(getState(), queryEditor, queryEditor.id);
|
||||||
const table = {
|
const table = {
|
||||||
dbId: query.dbId,
|
dbId: query.dbId,
|
||||||
queryEditorId: query.id,
|
queryEditorId: query.id,
|
||||||
|
@ -736,16 +736,20 @@ describe('async actions', () => {
|
|||||||
const database = { disable_data_preview: true };
|
const database = { disable_data_preview: true };
|
||||||
const tableName = 'table';
|
const tableName = 'table';
|
||||||
const schemaName = 'schema';
|
const schemaName = 'schema';
|
||||||
const store = mockStore({});
|
const store = mockStore(initialState);
|
||||||
const expectedActionTypes = [
|
const expectedActionTypes = [
|
||||||
actions.MERGE_TABLE, // addTable
|
actions.MERGE_TABLE, // addTable
|
||||||
actions.MERGE_TABLE, // getTableMetadata
|
actions.MERGE_TABLE, // getTableMetadata
|
||||||
actions.MERGE_TABLE, // getTableExtendedMetadata
|
actions.MERGE_TABLE, // getTableExtendedMetadata
|
||||||
actions.MERGE_TABLE, // addTable
|
actions.MERGE_TABLE, // addTable
|
||||||
];
|
];
|
||||||
return store
|
const request = actions.addTable(
|
||||||
.dispatch(actions.addTable(query, database, tableName, schemaName))
|
query,
|
||||||
.then(() => {
|
database,
|
||||||
|
tableName,
|
||||||
|
schemaName,
|
||||||
|
);
|
||||||
|
return request(store.dispatch, store.getState).then(() => {
|
||||||
expect(store.getActions().map(a => a.type)).toEqual(
|
expect(store.getActions().map(a => a.type)).toEqual(
|
||||||
expectedActionTypes,
|
expectedActionTypes,
|
||||||
);
|
);
|
||||||
@ -761,6 +765,44 @@ describe('async actions', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('fetches table schema state from unsaved change', () => {
|
||||||
|
const database = { disable_data_preview: true };
|
||||||
|
const tableName = 'table';
|
||||||
|
const schemaName = 'schema';
|
||||||
|
const expectedDbId = 473892;
|
||||||
|
const store = mockStore({
|
||||||
|
...initialState,
|
||||||
|
sqlLab: {
|
||||||
|
...initialState.sqlLab,
|
||||||
|
unsavedQueryEditor: {
|
||||||
|
id: query.id,
|
||||||
|
dbId: expectedDbId,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const request = actions.addTable(
|
||||||
|
query,
|
||||||
|
database,
|
||||||
|
tableName,
|
||||||
|
schemaName,
|
||||||
|
);
|
||||||
|
return request(store.dispatch, store.getState).then(() => {
|
||||||
|
expect(
|
||||||
|
fetchMock.calls(
|
||||||
|
`glob:**/api/v1/database/${expectedDbId}/table/*/*/`,
|
||||||
|
),
|
||||||
|
).toHaveLength(1);
|
||||||
|
expect(
|
||||||
|
fetchMock.calls(
|
||||||
|
`glob:**/api/v1/database/${expectedDbId}/table_extra/*/*/`,
|
||||||
|
),
|
||||||
|
).toHaveLength(1);
|
||||||
|
|
||||||
|
// tab state is not updated, since no query was run
|
||||||
|
expect(fetchMock.calls(updateTabStateEndpoint)).toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('updates and runs data preview query when configured', () => {
|
it('updates and runs data preview query when configured', () => {
|
||||||
expect.assertions(5);
|
expect.assertions(5);
|
||||||
|
|
||||||
|
@ -19,14 +19,12 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import configureStore from 'redux-mock-store';
|
import configureStore from 'redux-mock-store';
|
||||||
import fetchMock from 'fetch-mock';
|
import fetchMock from 'fetch-mock';
|
||||||
import { shallow } from 'enzyme';
|
|
||||||
import { render, screen } from 'spec/helpers/testing-library';
|
import { render, screen } from 'spec/helpers/testing-library';
|
||||||
import userEvent from '@testing-library/user-event';
|
import userEvent from '@testing-library/user-event';
|
||||||
import { Provider } from 'react-redux';
|
import { Provider } from 'react-redux';
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
import thunk from 'redux-thunk';
|
import thunk from 'redux-thunk';
|
||||||
import SqlEditorLeftBar from 'src/SqlLab/components/SqlEditorLeftBar';
|
import SqlEditorLeftBar from 'src/SqlLab/components/SqlEditorLeftBar';
|
||||||
import TableElement from 'src/SqlLab/components/TableElement';
|
|
||||||
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
|
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
|
||||||
import {
|
import {
|
||||||
table,
|
table,
|
||||||
@ -46,32 +44,43 @@ const mockedProps = {
|
|||||||
const middlewares = [thunk];
|
const middlewares = [thunk];
|
||||||
const mockStore = configureStore(middlewares);
|
const mockStore = configureStore(middlewares);
|
||||||
const store = mockStore(initialState);
|
const store = mockStore(initialState);
|
||||||
|
|
||||||
fetchMock.get('glob:*/api/v1/database/*/schemas/?*', { result: [] });
|
fetchMock.get('glob:*/api/v1/database/*/schemas/?*', { result: [] });
|
||||||
describe('SqlEditorLeftBar', () => {
|
fetchMock.get('glob:*/superset/tables/**', {
|
||||||
let wrapper;
|
json: {
|
||||||
|
options: [
|
||||||
beforeEach(() => {
|
{
|
||||||
wrapper = shallow(<SqlEditorLeftBar {...mockedProps} />, {
|
label: 'ab_user',
|
||||||
context: { store },
|
value: 'ab_user',
|
||||||
});
|
},
|
||||||
});
|
],
|
||||||
|
tableLength: 1,
|
||||||
afterEach(() => {
|
},
|
||||||
wrapper.unmount();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('is valid', () => {
|
|
||||||
expect(React.isValidElement(<SqlEditorLeftBar {...mockedProps} />)).toBe(
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders a TableElement', () => {
|
|
||||||
expect(wrapper.find(TableElement)).toExist();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Left Panel Expansion', () => {
|
describe('Left Panel Expansion', () => {
|
||||||
|
it('is valid', () => {
|
||||||
|
expect(
|
||||||
|
React.isValidElement(
|
||||||
|
<Provider store={store}>
|
||||||
|
<SqlEditorLeftBar {...mockedProps} />
|
||||||
|
</Provider>,
|
||||||
|
),
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders a TableElement', () => {
|
||||||
|
const { queryAllByTestId } = render(
|
||||||
|
<ThemeProvider theme={supersetTheme}>
|
||||||
|
<Provider store={store}>
|
||||||
|
<SqlEditorLeftBar {...mockedProps} />
|
||||||
|
</Provider>
|
||||||
|
</ThemeProvider>,
|
||||||
|
);
|
||||||
|
expect(queryAllByTestId('table-element').length).toBeGreaterThanOrEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Left Panel Expansion', () => {
|
||||||
it('table should be visible when expanded is true', () => {
|
it('table should be visible when expanded is true', () => {
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<ThemeProvider theme={supersetTheme}>
|
<ThemeProvider theme={supersetTheme}>
|
||||||
@ -116,4 +125,5 @@ describe('Left Panel Expansion', () => {
|
|||||||
userEvent.click(header);
|
userEvent.click(header);
|
||||||
expect(collapseMock).toHaveBeenCalled();
|
expect(collapseMock).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
@ -25,6 +25,7 @@ import React, {
|
|||||||
Dispatch,
|
Dispatch,
|
||||||
SetStateAction,
|
SetStateAction,
|
||||||
} from 'react';
|
} from 'react';
|
||||||
|
import { useSelector } from 'react-redux';
|
||||||
import querystring from 'query-string';
|
import querystring from 'query-string';
|
||||||
import Button from 'src/components/Button';
|
import Button from 'src/components/Button';
|
||||||
import { t, styled, css, SupersetTheme } from '@superset-ui/core';
|
import { t, styled, css, SupersetTheme } from '@superset-ui/core';
|
||||||
@ -32,7 +33,7 @@ import Collapse from 'src/components/Collapse';
|
|||||||
import Icons from 'src/components/Icons';
|
import Icons from 'src/components/Icons';
|
||||||
import { TableSelectorMultiple } from 'src/components/TableSelector';
|
import { TableSelectorMultiple } from 'src/components/TableSelector';
|
||||||
import { IconTooltip } from 'src/components/IconTooltip';
|
import { IconTooltip } from 'src/components/IconTooltip';
|
||||||
import { QueryEditor, SchemaOption } from 'src/SqlLab/types';
|
import { QueryEditor, SchemaOption, SqlLabRootState } from 'src/SqlLab/types';
|
||||||
import { DatabaseObject } from 'src/components/DatabaseSelector';
|
import { DatabaseObject } from 'src/components/DatabaseSelector';
|
||||||
import { EmptyStateSmall } from 'src/components/EmptyState';
|
import { EmptyStateSmall } from 'src/components/EmptyState';
|
||||||
import {
|
import {
|
||||||
@ -116,6 +117,15 @@ export default function SqlEditorLeftBar({
|
|||||||
const [userSelectedDb, setUserSelected] = useState<DatabaseObject | null>(
|
const [userSelectedDb, setUserSelected] = useState<DatabaseObject | null>(
|
||||||
null,
|
null,
|
||||||
);
|
);
|
||||||
|
const schema = useSelector<SqlLabRootState, string>(
|
||||||
|
({ sqlLab: { unsavedQueryEditor } }) => {
|
||||||
|
const updatedQueryEditor = {
|
||||||
|
...queryEditor,
|
||||||
|
...(unsavedQueryEditor.id === queryEditor.id && unsavedQueryEditor),
|
||||||
|
};
|
||||||
|
return updatedQueryEditor.schema;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const bool = querystring.parse(window.location.search).db;
|
const bool = querystring.parse(window.location.search).db;
|
||||||
@ -263,7 +273,7 @@ export default function SqlEditorLeftBar({
|
|||||||
onSchemasLoad={handleSchemasLoad}
|
onSchemasLoad={handleSchemasLoad}
|
||||||
onTableSelectChange={onTablesChange}
|
onTableSelectChange={onTablesChange}
|
||||||
onTablesLoad={handleTablesLoad}
|
onTablesLoad={handleTablesLoad}
|
||||||
schema={queryEditor.schema}
|
schema={schema}
|
||||||
tableValue={selectedTableNames}
|
tableValue={selectedTableNames}
|
||||||
sqlLabMode
|
sqlLabMode
|
||||||
/>
|
/>
|
||||||
|
@ -262,6 +262,9 @@ class TabbedSqlEditors extends React.PureComponent {
|
|||||||
const qeid = this.props.tabHistory[this.props.tabHistory.length - 1];
|
const qeid = this.props.tabHistory[this.props.tabHistory.length - 1];
|
||||||
if (key !== qeid) {
|
if (key !== qeid) {
|
||||||
const queryEditor = this.props.queryEditors.find(qe => qe.id === key);
|
const queryEditor = this.props.queryEditors.find(qe => qe.id === key);
|
||||||
|
if (!queryEditor) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.props.actions.switchQueryEditor(
|
this.props.actions.switchQueryEditor(
|
||||||
queryEditor,
|
queryEditor,
|
||||||
this.props.displayLimit,
|
this.props.displayLimit,
|
||||||
|
@ -270,6 +270,7 @@ const TableElement = ({ table, actions, ...props }: TableElementProps) => {
|
|||||||
|
|
||||||
const metadata = (
|
const metadata = (
|
||||||
<div
|
<div
|
||||||
|
data-test="table-element"
|
||||||
onMouseEnter={() => setHover(true)}
|
onMouseEnter={() => setHover(true)}
|
||||||
onMouseLeave={() => setHover(false)}
|
onMouseLeave={() => setHover(false)}
|
||||||
css={{ paddingTop: 6 }}
|
css={{ paddingTop: 6 }}
|
||||||
|
@ -110,7 +110,12 @@ export default function sqlLabReducer(state = {}, action) {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
[actions.REMOVE_QUERY_EDITOR]() {
|
[actions.REMOVE_QUERY_EDITOR]() {
|
||||||
let newState = removeFromArr(state, 'queryEditors', action.queryEditor);
|
const queryEditor = {
|
||||||
|
...action.queryEditor,
|
||||||
|
...(action.queryEditor.id === state.unsavedQueryEditor.id &&
|
||||||
|
state.unsavedQueryEditor),
|
||||||
|
};
|
||||||
|
let newState = removeFromArr(state, 'queryEditors', queryEditor);
|
||||||
// List of remaining queryEditor ids
|
// List of remaining queryEditor ids
|
||||||
const qeIds = newState.queryEditors.map(qe => qe.id);
|
const qeIds = newState.queryEditors.map(qe => qe.id);
|
||||||
|
|
||||||
@ -127,10 +132,19 @@ export default function sqlLabReducer(state = {}, action) {
|
|||||||
|
|
||||||
// Remove associated table schemas
|
// Remove associated table schemas
|
||||||
const tables = state.tables.filter(
|
const tables = state.tables.filter(
|
||||||
table => table.queryEditorId !== action.queryEditor.id,
|
table => table.queryEditorId !== queryEditor.id,
|
||||||
);
|
);
|
||||||
|
|
||||||
newState = { ...newState, tabHistory, tables, queries };
|
newState = {
|
||||||
|
...newState,
|
||||||
|
tabHistory,
|
||||||
|
tables,
|
||||||
|
queries,
|
||||||
|
unsavedQueryEditor: {
|
||||||
|
...(action.queryEditor.id !== state.unsavedQueryEditor.id &&
|
||||||
|
state.unsavedQueryEditor),
|
||||||
|
},
|
||||||
|
};
|
||||||
return newState;
|
return newState;
|
||||||
},
|
},
|
||||||
[actions.REMOVE_QUERY]() {
|
[actions.REMOVE_QUERY]() {
|
||||||
|
@ -75,6 +75,28 @@ describe('sqlLabReducer', () => {
|
|||||||
initialState.queryEditors.length,
|
initialState.queryEditors.length,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
it('should remove a query editor including unsaved changes', () => {
|
||||||
|
expect(newState.queryEditors).toHaveLength(
|
||||||
|
initialState.queryEditors.length + 1,
|
||||||
|
);
|
||||||
|
let action = {
|
||||||
|
type: actions.QUERY_EDITOR_SETDB,
|
||||||
|
queryEditor: qe,
|
||||||
|
dbId: 123,
|
||||||
|
};
|
||||||
|
newState = sqlLabReducer(newState, action);
|
||||||
|
expect(newState.unsavedQueryEditor.dbId).toEqual(action.dbId);
|
||||||
|
action = {
|
||||||
|
type: actions.REMOVE_QUERY_EDITOR,
|
||||||
|
queryEditor: qe,
|
||||||
|
};
|
||||||
|
newState = sqlLabReducer(newState, action);
|
||||||
|
expect(newState.queryEditors).toHaveLength(
|
||||||
|
initialState.queryEditors.length,
|
||||||
|
);
|
||||||
|
expect(newState.unsavedQueryEditor.dbId).toBeUndefined();
|
||||||
|
expect(newState.unsavedQueryEditor.id).toBeUndefined();
|
||||||
|
});
|
||||||
it('should set q query editor active', () => {
|
it('should set q query editor active', () => {
|
||||||
const expectedTitle = 'new updated title';
|
const expectedTitle = 'new updated title';
|
||||||
const addQueryEditorAction = {
|
const addQueryEditorAction = {
|
||||||
|
Loading…
Reference in New Issue
Block a user