mirror of
https://github.com/apache/superset.git
synced 2026-05-11 19:05:24 +00:00
feat: Results table on Explore view (#11854)
* Upgrade react-split * Implement split on ExploreChartPanel * Implement tabs with collapse * Fix run query button * Fix copy to clipboard button * Move table controls to separate file * Make component more generic to handle samples * Remove samples from DisplayQueryButton * Move data tables to separate file * Make split dynamically controlled * Fix unit test * Fix arrow not centered * fixup! Fix arrow not centered * Change copy button paddings * Use translations * Fix grammar in a comment * Fix imports * Use grid units * Convert new files to typescript * Fix after rebase * Remove forceRender * Fix big_number test * Delay making request until panel is opened * White background in south panel * fixup! White background in south panel * Lint fix * Lint fix * Remove redundant prop types * Remove console log * Delay loading samples until user switches tab * Add debounce to filter input * Use gridUnit for gutter sizes * Change types object to Record<string, any>
This commit is contained in:
committed by
GitHub
parent
66cd565bff
commit
41738df77d
@@ -16,7 +16,7 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
import React, { useState, useMemo } from 'react';
|
||||
import React, { useState } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import PropTypes from 'prop-types';
|
||||
@@ -26,25 +26,19 @@ import markdownSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/mar
|
||||
import sqlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';
|
||||
import jsonSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/json';
|
||||
import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
|
||||
import { DropdownButton, Row, Col, FormControl } from 'react-bootstrap';
|
||||
import { DropdownButton } from 'react-bootstrap';
|
||||
import { styled, t } from '@superset-ui/core';
|
||||
|
||||
import { Menu } from 'src/common/components';
|
||||
import TableView, { EmptyWrapperType } from 'src/components/TableView';
|
||||
import Button from 'src/components/Button';
|
||||
import getClientErrorObject from '../../utils/getClientErrorObject';
|
||||
import CopyToClipboard from '../../components/CopyToClipboard';
|
||||
import { getChartDataRequest } from '../../chart/chartAction';
|
||||
import downloadAsImage from '../../utils/downloadAsImage';
|
||||
import Loading from '../../components/Loading';
|
||||
import ModalTrigger from '../../components/ModalTrigger';
|
||||
import RowCountLabel from './RowCountLabel';
|
||||
import {
|
||||
applyFormattingToTabularData,
|
||||
prepareCopyToClipboardTabularData,
|
||||
} from '../../utils/common';
|
||||
import PropertiesModal from './PropertiesModal';
|
||||
import { sliceUpdated } from '../actions/exploreActions';
|
||||
import { CopyButton } from './DataTableControl';
|
||||
|
||||
SyntaxHighlighter.registerLanguage('markdown', markdownSyntax);
|
||||
SyntaxHighlighter.registerLanguage('html', htmlSyntax);
|
||||
@@ -66,32 +60,9 @@ const MENU_KEYS = {
|
||||
DOWNLOAD_AS_IMAGE: 'download_as_image',
|
||||
};
|
||||
|
||||
const CopyButton = styled(Button)`
|
||||
padding: ${({ theme }) => theme.gridUnit / 2}px
|
||||
${({ theme }) => theme.gridUnit * 2.5}px;
|
||||
font-size: ${({ theme }) => theme.typography.sizes.s}px;
|
||||
|
||||
// needed to override button's first-of-type margin: 0
|
||||
const CopyButtonViewQuery = styled(CopyButton)`
|
||||
&& {
|
||||
margin-left: ${({ theme }) => theme.gridUnit * 2}px;
|
||||
}
|
||||
|
||||
i {
|
||||
padding: 0;
|
||||
}
|
||||
`;
|
||||
|
||||
const CopyButtonViewQuery = styled(Button)`
|
||||
padding: ${({ theme }) => theme.gridUnit / 2}px
|
||||
${({ theme }) => theme.gridUnit * 2.5}px;
|
||||
font-size: ${({ theme }) => theme.typography.sizes.s}px;
|
||||
|
||||
&& {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
i {
|
||||
padding: 0;
|
||||
margin: 0 0 ${({ theme }) => theme.gridUnit}px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -100,36 +71,14 @@ export const DisplayQueryButton = props => {
|
||||
|
||||
const [language, setLanguage] = useState(null);
|
||||
const [query, setQuery] = useState(null);
|
||||
const [data, setData] = useState(null);
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [error, setError] = useState(null);
|
||||
const [filterText, setFilterText] = useState('');
|
||||
const [sqlSupported] = useState(
|
||||
datasource && datasource.split('__')[1] === 'table',
|
||||
);
|
||||
const [isPropertiesModalOpen, setIsPropertiesModalOpen] = useState(false);
|
||||
const [menuVisible, setMenuVisible] = useState(false);
|
||||
|
||||
const tableData = useMemo(() => {
|
||||
if (!data?.length) {
|
||||
return [];
|
||||
}
|
||||
const formattedData = applyFormattingToTabularData(data);
|
||||
return formattedData.filter(row =>
|
||||
Object.values(row).some(value =>
|
||||
value.toString().toLowerCase().includes(filterText.toLowerCase()),
|
||||
),
|
||||
);
|
||||
}, [data, filterText]);
|
||||
|
||||
const columns = useMemo(
|
||||
() =>
|
||||
data?.length
|
||||
? Object.keys(data[0]).map(key => ({ accessor: key, Header: key }))
|
||||
: [],
|
||||
[data],
|
||||
);
|
||||
|
||||
const beforeOpen = resultType => {
|
||||
setIsLoading(true);
|
||||
|
||||
@@ -139,11 +88,10 @@ export const DisplayQueryButton = props => {
|
||||
resultType,
|
||||
})
|
||||
.then(response => {
|
||||
// Currently displaying of only first query is supported
|
||||
// Only displaying the first query is currently supported
|
||||
const result = response.result[0];
|
||||
setLanguage(result.language);
|
||||
setQuery(result.query);
|
||||
setData(result.data);
|
||||
setIsLoading(false);
|
||||
setError(null);
|
||||
})
|
||||
@@ -155,10 +103,6 @@ export const DisplayQueryButton = props => {
|
||||
});
|
||||
};
|
||||
|
||||
const changeFilterText = event => {
|
||||
setFilterText(event.target.value);
|
||||
};
|
||||
|
||||
const openPropertiesModal = () => {
|
||||
setIsPropertiesModalOpen(true);
|
||||
};
|
||||
@@ -206,7 +150,7 @@ export const DisplayQueryButton = props => {
|
||||
text={query}
|
||||
shouldShowText={false}
|
||||
copyNode={
|
||||
<CopyButtonViewQuery>
|
||||
<CopyButtonViewQuery buttonSize="xs">
|
||||
<i className="fa fa-clipboard" />
|
||||
</CopyButtonViewQuery>
|
||||
}
|
||||
@@ -220,76 +164,6 @@ export const DisplayQueryButton = props => {
|
||||
return null;
|
||||
};
|
||||
|
||||
const renderDataTable = () => {
|
||||
return (
|
||||
<div style={{ overflow: 'auto' }}>
|
||||
<Row>
|
||||
<Col md={9}>
|
||||
<RowCountLabel
|
||||
rowcount={data.length}
|
||||
suffix={t('rows retrieved')}
|
||||
/>
|
||||
<CopyToClipboard
|
||||
text={prepareCopyToClipboardTabularData(data)}
|
||||
wrapped={false}
|
||||
copyNode={
|
||||
<CopyButton>
|
||||
<i className="fa fa-clipboard" />
|
||||
</CopyButton>
|
||||
}
|
||||
/>
|
||||
</Col>
|
||||
<Col md={3}>
|
||||
<FormControl
|
||||
placeholder={t('Search')}
|
||||
bsSize="sm"
|
||||
value={filterText}
|
||||
onChange={changeFilterText}
|
||||
style={{ paddingBottom: '5px' }}
|
||||
/>
|
||||
</Col>
|
||||
</Row>
|
||||
<TableView
|
||||
columns={columns}
|
||||
data={tableData}
|
||||
withPagination={false}
|
||||
noDataText={t('No data')}
|
||||
emptyWrapperType={EmptyWrapperType.Small}
|
||||
className="table-condensed"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const renderResultsModalBody = () => {
|
||||
if (isLoading) {
|
||||
return <Loading />;
|
||||
}
|
||||
if (error) {
|
||||
return <pre>{error}</pre>;
|
||||
}
|
||||
if (data) {
|
||||
if (data.length === 0) {
|
||||
return 'No data';
|
||||
}
|
||||
return renderDataTable();
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const renderSamplesModalBody = () => {
|
||||
if (isLoading) {
|
||||
return <Loading />;
|
||||
}
|
||||
if (error) {
|
||||
return <pre>{error}</pre>;
|
||||
}
|
||||
if (data) {
|
||||
return renderDataTable();
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const { slice } = props;
|
||||
return (
|
||||
<DropdownButton
|
||||
@@ -330,24 +204,6 @@ export const DisplayQueryButton = props => {
|
||||
responsive
|
||||
/>
|
||||
</Menu.Item>
|
||||
<Menu.Item>
|
||||
<ModalTrigger
|
||||
triggerNode={<span>{t('View results')}</span>}
|
||||
modalTitle={t('View results')}
|
||||
beforeOpen={() => beforeOpen('results')}
|
||||
modalBody={renderResultsModalBody()}
|
||||
responsive
|
||||
/>
|
||||
</Menu.Item>
|
||||
<Menu.Item>
|
||||
<ModalTrigger
|
||||
triggerNode={<span>{t('View samples')}</span>}
|
||||
modalTitle={t('View samples')}
|
||||
beforeOpen={() => beforeOpen('samples')}
|
||||
modalBody={renderSamplesModalBody()}
|
||||
responsive
|
||||
/>
|
||||
</Menu.Item>
|
||||
{sqlSupported && (
|
||||
<Menu.Item key={MENU_KEYS.RUN_IN_SQL_LAB}>
|
||||
{t('Run in SQL Lab')}
|
||||
|
||||
Reference in New Issue
Block a user