refactor: Use Antd Dropdown instead of react-bootstrap in DatasourceControl #11395
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /** | ||
| * 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 { Tooltip as BaseTooltip } from 'src/common/components'; | ||
| import { TooltipProps } from 'antd/lib/tooltip'; | ||
|
|
||
| const Tooltip = (props: TooltipProps) => ( | ||
| <BaseTooltip overlayStyle={{ fontSize: '12px' }} {...props} /> | ||
| ); | ||
|
|
||
| export default Tooltip; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,21 +18,12 @@ | |
| */ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { Col, Collapse, Row, Well } from 'react-bootstrap'; | ||
| import { t, styled } from '@superset-ui/core'; | ||
| import { ColumnOption, MetricOption } from '@superset-ui/chart-controls'; | ||
|
|
||
| import { Dropdown, Menu } from 'src/common/components'; | ||
| import Tooltip from 'src/common/components/Tooltip'; | ||
| import Icon from 'src/components/Icon'; | ||
| import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal'; | ||
| import DatasourceModal from 'src/datasource/DatasourceModal'; | ||
|
|
@@ -58,7 +49,7 @@ const defaultProps = { | |
| }; | ||
|
|
||
| const Styles = styled.div` | ||
| .ant-dropdown-trigger { | ||
| margin-left: ${({ theme }) => theme.gridUnit}px; | ||
| box-shadow: none; | ||
| &:active { | ||
|
|
@@ -98,6 +89,7 @@ class DatasourceControl extends React.PureComponent { | |
| this.toggleEditDatasourceModal = this.toggleEditDatasourceModal.bind(this); | ||
| this.toggleShowDatasource = this.toggleShowDatasource.bind(this); | ||
| this.renderDatasource = this.renderDatasource.bind(this); | ||
| this.handleMenuItemClick = this.handleMenuItemClick.bind(this); | ||
| } | ||
|
|
||
| onDatasourceSave(datasource) { | ||
|
|
@@ -125,6 +117,15 @@ class DatasourceControl extends React.PureComponent { | |
| })); | ||
| } | ||
|
|
||
| handleMenuItemClick({ key }) { | ||
| if (key === '1') { | ||
| this.toggleChangeDatasourceModal(); | ||
| } | ||
| if (key === '3') { | ||
| this.toggleEditDatasourceModal(); | ||
| } | ||
| } | ||
|
|
||
| renderDatasource() { | ||
| const { datasource } = this.props; | ||
| const { showDatasource } = this.state; | ||
|
|
@@ -176,18 +177,32 @@ class DatasourceControl extends React.PureComponent { | |
| showDatasource, | ||
| } = this.state; | ||
| const { datasource, onChange, value } = this.props; | ||
|
|
||
| const datasourceMenu = ( | ||
| <Menu onClick={this.handleMenuItemClick}> | ||
| <Menu.Item key="1">{t('Change Dataset')}</Menu.Item> | ||
| <Menu.Item key="2"> | ||
| <a | ||
| href={`/superset/sqllab?datasourceKey=${value}`} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| {t('Explore in SQL Lab')} | ||
| </a> | ||
| </Menu.Item> | ||
| {this.props.isEditable && ( | ||
| <Menu.Item key="3" data-test="edit-dataset"> | ||
| {t('Edit Dataset')} | ||
| </Menu.Item> | ||
| )} | ||
| </Menu> | ||
| ); | ||
|
|
||
| return ( | ||
| <Styles className="DatasourceControl"> | ||
| <ControlHeader {...this.props} /> | ||
| <div> | ||
| <Tooltip title={t('Expand/collapse dataset configuration')}> | ||
| <Label | ||
| style={{ textTransform: 'none' }} | ||
| onClick={this.toggleShowDatasource} | ||
|
|
@@ -199,43 +214,17 @@ class DatasourceControl extends React.PureComponent { | |
| }`} | ||
| /> | ||
| </Label> | ||
| </Tooltip> | ||
| <Dropdown | ||
| overlay={datasourceMenu} | ||
| trigger={['click']} | ||
| id="datasource_menu" | ||
|
There was a problem hiding this comment. Maybe we can get rid of There was a problem hiding this comment. Actually there are some styles for that, in DatasourceControl.less. @kgabryje would you mind seeing if those styles are still necessary/relevant? If they are, this may be the right opportunity to bring them into the component with Emotion Theme variables wired in. One less LESS file! There was a problem hiding this comment. Done, 1 less file less 🙂 |
||
| data-test="datasource-menu" | ||
| > | ||
| <Tooltip title={t('More dataset related options')}> | ||
| <Icon data-test="datasource-menu" name="more-horiz" /> | ||
| </Tooltip> | ||
| </Dropdown> | ||
| </div> | ||
| <Collapse in={this.state.showDatasource}> | ||
| {this.renderDatasource()} | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we are already here, can you make these keys more human readable and maybe use constants?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done