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

fix(explore): Restore missing dataset states #22693

Merged
merged 5 commits into from
Jan 13, 2023
Merged

fix(explore): Restore missing dataset states #22693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3706681
Fix how DatasourceControl handles missing datasource.
codyml Jan 11, 2023
4870483
WIP on tests.
codyml Jan 11, 2023
f6e1992
Remove TS errors, console logs.
codyml Jan 11, 2023
55dc687
Update missing datasource check logic.
codyml Jan 12, 2023
3e6d31a
Fix logic.
codyml Jan 12, 2023
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
32 changes: 30 additions & 2 deletions ...set-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
*/

import React from 'react';
import { render, screen, act, waitFor } from 'spec/helpers/testing-library';
import fetchMock from 'fetch-mock';
import userEvent from '@testing-library/user-event';
import { DatasourceType, JsonObject, SupersetClient } from '@superset-ui/core';
import fetchMock from 'fetch-mock';
import { render, screen, act, waitFor } from 'spec/helpers/testing-library';
import { fallbackExploreInitialData } from 'src/explore/fixtures';
import DatasourceControl from '.';

const SupersetClientGet = jest.spyOn(SupersetClient, 'get');
Expand Down Expand Up @@ -395,3 +396,30 @@ test('should not set the temporal column', async () => {
);
});
});

test('should show missing params state', () => {
const props = createProps({ datasource: fallbackExploreInitialData.dataset });
render(<DatasourceControl {...props} />, { useRedux: true });
expect(screen.getByText(/missing dataset/i)).toBeVisible();
expect(screen.getByText(/missing url parameters/i)).toBeVisible();
expect(
screen.getByText(
/the url is missing the dataset_id or slice_id parameters\./i,
),
).toBeVisible();
});

test('should show missing dataset state', () => {
// @ts-ignore
delete window.location;
// @ts-ignore
window.location = { search: '?slice_id=152' };
const props = createProps({ datasource: fallbackExploreInitialData.dataset });
render(<DatasourceControl {...props} />, { useRedux: true });
expect(screen.getAllByText(/missing dataset/i)).toHaveLength(2);
expect(
screen.getByText(
/the dataset linked to this chart may have been deleted\./i,
),
).toBeVisible();
});
12 changes: 8 additions & 4 deletions superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,12 @@ class DatasourceControl extends React.PureComponent {
showSaveDatasetModal,
} = this.state;
const { datasource, onChange, theme } = this.props;
const isMissingDatasource = datasource?.id == null;
const isMissingDatasource = !datasource?.id;
let isMissingParams = false;
if (isMissingDatasource) {
const datasourceId = getUrlParam(URL_PARAMS.datasourceId);
const sliceId = getUrlParam(URL_PARAMS.sliceId);

if (!datasourceId && !sliceId) {
isMissingParams = true;
}
Expand All @@ -288,7 +289,7 @@ class DatasourceControl extends React.PureComponent {

const defaultDatasourceMenu = (
<Menu onClick={this.handleMenuItemClick}>
{this.props.isEditable && (
{this.props.isEditable && !isMissingDatasource && (
<Menu.Item
key={EDIT_DATASET}
data-test="edit-dataset"
Expand All @@ -308,7 +309,7 @@ class DatasourceControl extends React.PureComponent {
</Menu.Item>
)}
<Menu.Item key={CHANGE_DATASET}>{t('Swap dataset')}</Menu.Item>
{datasource && canAccessSqlLab && (
{!isMissingDatasource && canAccessSqlLab && (
<Menu.Item key={VIEW_IN_SQL_LAB}>{t('View in SQL Lab')}</Menu.Item>
)}
</Menu>
Expand Down Expand Up @@ -358,7 +359,10 @@ class DatasourceControl extends React.PureComponent {
}
}

const titleText = getDatasourceTitle(datasource);
const titleText = isMissingDatasource
? t('Missing dataset')
: getDatasourceTitle(datasource);

const tooltip = titleText;

return (
Expand Down