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

feat(explore): Implement data table empty states #18679

Merged
merged 2 commits into from
Feb 14, 2022
Merged

feat(explore): Implement data table empty states #18679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
480439c
feat(explore): Implement explore data table empty states
kgabryje Feb 11, 2022
b0b80ab
Make empty state titles easier to translate
kgabryje Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 16 additions & 3 deletions superset-frontend/src/explore/components/DataTablesPane/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
import Collapse from 'src/components/Collapse';
import Tabs from 'src/components/Tabs';
import Loading from 'src/components/Loading';
import { EmptyStateMedium } from 'src/components/EmptyState';
import TableView, { EmptyWrapperType } from 'src/components/TableView';
import { getChartDataRequest } from 'src/chart/chartAction';
import { getClientErrorObject } from 'src/utils/getClientErrorObject';
Expand Down Expand Up @@ -120,6 +121,7 @@ interface DataTableProps {
isLoading: boolean;
error: string | undefined;
errorMessage: React.ReactElement | undefined;
type: 'results' | 'samples';
}

const DataTable = ({
Expand All @@ -132,6 +134,7 @@ const DataTable = ({
isLoading,
error,
errorMessage,
type,
}: DataTableProps) => {
// this is to preserve the order of the columns, even if there are integer values,
// while also only grabbing the first column's keys
Expand All @@ -152,14 +155,18 @@ const DataTable = ({
}
if (data) {
if (data.length === 0) {
return <span>No data</span>;
const title =
type === 'samples'
? t('No samples were returned for this query')
: t('No results were returned for this query');
return <EmptyStateMedium image="document.svg" title={title} />;
}
return (
<TableView
columns={columns}
data={filteredData}
pageSize={DATA_TABLE_PAGE_SIZE}
noDataText={t('No data')}
noDataText={t('No results')}
emptyWrapperType={EmptyWrapperType.Small}
className="table-condensed"
isPaginationSticky
Expand All @@ -169,7 +176,11 @@ const DataTable = ({
);
}
if (errorMessage) {
return <Error>{errorMessage}</Error>;
const title =
type === 'samples'
? t('Run a query to display samples')
: t('Run a query to display results');
return <EmptyStateMedium image="document.svg" title={title} />;
}
return null;
};
Expand Down Expand Up @@ -420,6 +431,7 @@ export const DataTablesPane = ({
filterText={filterText}
error={error[RESULT_TYPES.results]}
errorMessage={errorMessage}
type={RESULT_TYPES.results}
/>
</Tabs.TabPane>
<Tabs.TabPane
Expand All @@ -436,6 +448,7 @@ export const DataTablesPane = ({
filterText={filterText}
error={error[RESULT_TYPES.samples]}
errorMessage={errorMessage}
type={RESULT_TYPES.samples}
/>
</Tabs.TabPane>
</Tabs>
Expand Down