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

chore: Show datasets when search input is empty #12391

Merged
merged 10 commits into from
Jan 11, 2021
Merged

chore: Show datasets when search input is empty #12391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c565659
Closes #12389
geido Jan 9, 2021
fc69b89
Merge remote-tracking branch 'upstream/master' into fix/issue_12389_d…
geido Jan 9, 2021
d3ae8ea
Search empty string
geido Jan 9, 2021
1928f94
Remove unused imports
geido Jan 9, 2021
ab53564
Fix tests
geido Jan 9, 2021
5e09c72
Remove unused import
geido Jan 9, 2021
6309a15
Merge remote-tracking branch 'upstream/master' into chore/issue_12389…
geido Jan 11, 2021
1bd8d53
Fix height
geido Jan 11, 2021
b6e336d
Merge remote-tracking branch 'upstream/master' into chore/issue_12389…
geido Jan 11, 2021
9ce5d97
Correct height type
geido Jan 11, 2021
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
7 changes: 6 additions & 1 deletion superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,24 @@ describe('ChangeDatasourceModal', () => {
});

it('fetches datasources', async () => {
expect(fetchMock.calls(/api\/v1\/dataset/)).toHaveLength(6);
expect(fetchMock.calls(/api\/v1\/dataset/)).toHaveLength(3);
});

it('renders confirmation message', async () => {
await waitForComponentToPaint(wrapper, 1000);

act(() => {
wrapper.find('[data-test="datasource-link"]').at(0).props().onClick();
});

await waitForComponentToPaint(wrapper);

expect(wrapper.find('.proceed-btn')).toExist();
});

it('changes the datasource', async () => {
await waitForComponentToPaint(wrapper, 1000);

act(() => {
wrapper.find('[data-test="datasource-link"]').at(0).props().onClick();
});
Expand Down
3 changes: 3 additions & 0 deletions superset-frontend/src/common/components/Modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@ interface ModalProps {
centered?: boolean;
footer?: React.ReactNode;
wrapProps?: object;
height?: string;
}

interface StyledModalProps extends SupersetThemeProps {
maxWidth?: string;
responsive?: boolean;
height?: string;
}

export const StyledModal = styled(BaseModal)<StyledModalProps>`
Expand Down Expand Up @@ -87,6 +89,7 @@ export const StyledModal = styled(BaseModal)<StyledModalProps>`
.ant-modal-body {
padding: ${({ theme }) => theme.gridUnit * 4}px;
overflow: auto;
${({ height }) => height && `height: ${height};`}
}

.ant-modal-footer {
Expand Down
17 changes: 8 additions & 9 deletions superset-frontend/src/datasource/ChangeDatasourceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import React, {
} from 'react';
import { Alert, FormControl, FormControlProps } from 'react-bootstrap';
import { SupersetClient, t, styled } from '@superset-ui/core';
import TableView from 'src/components/TableView';
import TableView, { EmptyWrapperType } from 'src/components/TableView';
import StyledModal from 'src/common/components/Modal';
import Button from 'src/components/Button';
import { useListViewResource } from 'src/views/CRUD/hooks';
Expand Down Expand Up @@ -120,18 +120,18 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({

useDebouncedEffect(
() => {
if (filter) {
fetchData({
...emptyRequest,
fetchData({
...emptyRequest,
...(filter && {
filters: [
{
id: 'table_name',
operator: 'ct',
value: filter,
},
],
});
}
}),
});
},
1000,
[filter],
Expand All @@ -142,9 +142,6 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
if (searchRef && searchRef.current) {
searchRef.current.focus();
}

// Fetch initial datasets for tableview
await fetchData(emptyRequest);
};

if (show) {
Expand Down Expand Up @@ -224,6 +221,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
onHide={onHide}
responsive
title={t('Change Dataset')}
height="350px"
geido marked this conversation as resolved.
Show resolved Hide resolved
footer={
<>
{confirmChange && (
Expand Down Expand Up @@ -268,6 +266,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
data={renderTableView()}
pageSize={20}
className="table-condensed"
emptyWrapperType={EmptyWrapperType.Small}
/>
)}
</>
Expand Down