Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: introduce react-query on api resource hook #21240

Merged
merged 8 commits into from
Sep 1, 2022
Merged

refactor: introduce react-query on api resource hook #21240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca7d0db
refactor: introduce react-query on api resource hook
justinpark Aug 26, 2022
ff6113a
add specs
justinpark Aug 29, 2022
d834b52
set dbId and schema as arguments
justinpark Aug 29, 2022
c8a7b36
Missing QueryProvider on jsx tests
justinpark Aug 29, 2022
a1066ec
replace to isFetched
justinpark Aug 29, 2022
506548d
update refetch logic
justinpark Aug 30, 2022
9506ff7
add types and hasMore on useQuery
justinpark Aug 31, 2022
0a021db
remove keyword
justinpark Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 96 additions & 0 deletions superset-frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions superset-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
"react-lines-ellipsis": "^0.15.0",
"react-loadable": "^5.5.0",
"react-markdown": "^4.3.1",
"react-query": "^3.39.2",
"react-redux": "^7.2.0",
"react-resize-detector": "^6.7.6",
"react-reverse-portal": "^2.0.1",
Expand Down
7 changes: 7 additions & 0 deletions superset-frontend/spec/helpers/testing-library.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ import { DndProvider } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
import reducerIndex from 'spec/helpers/reducerIndex';
import { QueryParamProvider } from 'use-query-params';
import QueryProvider from 'src/views/QueryProvider';

type Options = Omit<RenderOptions, 'queries'> & {
useRedux?: boolean;
useDnd?: boolean;
useQueryParams?: boolean;
useRouter?: boolean;
useQuery?: boolean;
initialState?: {};
reducers?: {};
store?: Store;
Expand All @@ -50,6 +52,7 @@ function createWrapper(options?: Options) {
useDnd,
useRedux,
useQueryParams,
useQuery = true,
useRouter,
initialState,
reducers,
Expand Down Expand Up @@ -85,6 +88,10 @@ function createWrapper(options?: Options) {
result = <BrowserRouter>{result}</BrowserRouter>;
}

if (useQuery) {
result = <QueryProvider>{result}</QueryProvider>;
}

return result;
};
}
Expand Down
15 changes: 9 additions & 6 deletions superset-frontend/src/SqlLab/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import thunkMiddleware from 'redux-thunk';
import { hot } from 'react-hot-loader/root';
import { ThemeProvider } from '@superset-ui/core';
import { GlobalStyles } from 'src/GlobalStyles';
import QueryProvider from 'src/views/QueryProvider';
import {
initFeatureFlags,
isFeatureEnabled,
Expand Down Expand Up @@ -134,12 +135,14 @@ if (sqlLabMenu) {
}

const Application = () => (
<Provider store={store}>
<ThemeProvider theme={theme}>
<GlobalStyles />
<App />
</ThemeProvider>
</Provider>
<QueryProvider>
<Provider store={store}>
<ThemeProvider theme={theme}>
<GlobalStyles />
<App />
</ThemeProvider>
</Provider>
</QueryProvider>
);

export default hot(Application);
9 changes: 6 additions & 3 deletions superset-frontend/src/SqlLab/components/SqlEditor/SqlEditor.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
import AceEditorWrapper from 'src/SqlLab/components/AceEditorWrapper';
import ConnectedSouthPane from 'src/SqlLab/components/SouthPane/state';
import SqlEditor from 'src/SqlLab/components/SqlEditor';
import QueryProvider from 'src/views/QueryProvider';
import SqlEditorLeftBar from 'src/SqlLab/components/SqlEditorLeftBar';
import { AntdDropdown } from 'src/components';
import {
Expand Down Expand Up @@ -101,9 +102,11 @@ describe('SqlEditor', () => {

const buildWrapper = (props = {}) =>
mount(
<Provider store={store}>
<SqlEditor {...mockedProps} {...props} />
</Provider>,
<QueryProvider>
<Provider store={store}>
<SqlEditor {...mockedProps} {...props} />
</Provider>
</QueryProvider>,
{
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
Expand Down
9 changes: 6 additions & 3 deletions superset-frontend/src/SqlLab/components/TabbedSqlEditors/TabbedSqlEditors.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import TabbedSqlEditors from 'src/SqlLab/components/TabbedSqlEditors';
import SqlEditor from 'src/SqlLab/components/SqlEditor';
import { table, initialState } from 'src/SqlLab/fixtures';
import { newQueryTabName } from 'src/SqlLab/utils/newQueryTabName';
import QueryProvider from 'src/views/QueryProvider';

fetchMock.get('glob:*/api/v1/database/*', {});
fetchMock.get('glob:*/savedqueryviewapi/api/get/*', {});
Expand Down Expand Up @@ -89,9 +90,11 @@ describe('TabbedSqlEditors', () => {
const mountWithAct = async () =>
act(async () => {
mount(
<Provider store={store}>
<TabbedSqlEditors {...mockedProps} />
</Provider>,
<QueryProvider>
<Provider store={store}>
<TabbedSqlEditors {...mockedProps} />
</Provider>
</QueryProvider>,
{
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
Expand Down
9 changes: 6 additions & 3 deletions superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { DatasourceModal } from 'src/components/Datasource';
import DatasourceEditor from 'src/components/Datasource/DatasourceEditor';
import * as featureFlags from 'src/featureFlags';
import mockDatasource from 'spec/fixtures/mockDatasource';
import QueryProvider from 'src/views/QueryProvider';

const mockStore = configureStore([thunk]);
const store = mockStore({});
Expand All @@ -53,9 +54,11 @@ const mockedProps = {

async function mountAndWait(props = mockedProps) {
const mounted = mount(
<Provider store={store}>
<DatasourceModal {...props} />
</Provider>,
<QueryProvider>
<Provider store={store}>
<DatasourceModal {...props} />
</Provider>
</QueryProvider>,
{
wrappingComponent: ThemeProvider,
wrappingComponentProps: { theme: supersetTheme },
Expand Down
Loading