-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: multiple results pane on explore and dashboard (#20277)
- Loading branch information
1 parent
1e5cacd
commit fd12987
Showing
14 changed files
with
678 additions
and
213 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...rset-frontend/src/explore/components/DataTablesPane/components/ResultsPaneOnDashboard.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import React from 'react'; | ||
| import { t } from '@superset-ui/core'; | ||
| import Tabs from 'src/components/Tabs'; | ||
| import { ResultTypes, ResultsPaneProps } from '../types'; | ||
| import { useResultsPane } from './useResultsPane'; | ||
|
|
||
| export const ResultsPaneOnDashboard = ({ | ||
| isRequest, | ||
| queryFormData, | ||
| queryForce, | ||
| ownState, | ||
| errorMessage, | ||
| actions, | ||
| isVisible, | ||
| dataSize = 50, | ||
| }: ResultsPaneProps) => { | ||
| const resultsPanes = useResultsPane({ | ||
| errorMessage, | ||
| queryFormData, | ||
| queryForce, | ||
| ownState, | ||
| isRequest, | ||
| actions, | ||
| dataSize, | ||
| isVisible, | ||
| }); | ||
| if (resultsPanes.length === 1) { | ||
| return resultsPanes[0]; | ||
| } | ||
|
|
||
| const panes = resultsPanes.map((pane, idx) => { | ||
| if (idx === 0) { | ||
| return ( | ||
| <Tabs.TabPane tab={t('Results')} key={ResultTypes.Results}> | ||
| {pane} | ||
| </Tabs.TabPane> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <Tabs.TabPane | ||
| tab={t('Results %s', idx + 1)} | ||
| key={`${ResultTypes.Results} ${idx + 1}`} | ||
| > | ||
| {pane} | ||
| </Tabs.TabPane> | ||
| ); | ||
| }); | ||
|
|
||
| return <Tabs fullWidth={false}> {panes} </Tabs>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import React, { useState } from 'react'; | ||
| import { t } from '@superset-ui/core'; | ||
| import TableView, { EmptyWrapperType } from 'src/components/TableView'; | ||
| import { | ||
| useFilteredTableData, | ||
| useTableColumns, | ||
| } from 'src/explore/components/DataTableControl'; | ||
| import { TableControls } from './DataTableControls'; | ||
| import { SingleQueryResultPaneProp } from '../types'; | ||
|
|
||
| export const SingleQueryResultPane = ({ | ||
| data, | ||
| colnames, | ||
| coltypes, | ||
| datasourceId, | ||
| dataSize = 50, | ||
| isVisible, | ||
| }: SingleQueryResultPaneProp) => { | ||
| const [filterText, setFilterText] = useState(''); | ||
|
|
||
| // this is to preserve the order of the columns, even if there are integer values, | ||
| // while also only grabbing the first column's keys | ||
| const columns = useTableColumns( | ||
| colnames, | ||
| coltypes, | ||
| data, | ||
| datasourceId, | ||
| isVisible, | ||
| ); | ||
| const filteredData = useFilteredTableData(filterText, data); | ||
|
|
||
| return ( | ||
| <> | ||
| <TableControls | ||
| data={filteredData} | ||
| columnNames={colnames} | ||
| columnTypes={coltypes} | ||
| datasourceId={datasourceId} | ||
| onInputChange={input => setFilterText(input)} | ||
| isLoading={false} | ||
| /> | ||
| <TableView | ||
| columns={columns} | ||
| data={filteredData} | ||
| pageSize={dataSize} | ||
| noDataText={t('No results')} | ||
| emptyWrapperType={EmptyWrapperType.Small} | ||
| className="table-condensed" | ||
| isPaginationSticky | ||
| showRowCount={false} | ||
| small | ||
| /> | ||
| </> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.