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

style: improve "Datasource & Chart Type" <Label>s #10971

Merged
merged 3 commits into from
Sep 28, 2020
Merged

style: improve "Datasource & Chart Type" <Label>s #10971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e02f5e1
style: improve default <Label>
mistercrunch Sep 20, 2020
cdcbca0
fix name-shifting icon
mistercrunch Sep 25, 2020
dcbffd2
adding some styles to remove the inner drop shadow from the 'more' bu…
rusackas Sep 26, 2020
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
81 changes: 51 additions & 30 deletions superset-frontend/src/explore/components/controls/DatasourceControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ import {
Tooltip,
Well,
} from 'react-bootstrap';
import { t } from '@superset-ui/core';
import { t, styled } from '@superset-ui/core';
import { ColumnOption, MetricOption } from '@superset-ui/chart-controls';

import Label from 'src/components/Label';
import TooltipWrapper from 'src/components/TooltipWrapper';

import DatasourceModal from 'src/datasource/DatasourceModal';
import Icon from 'src/components/Icon';
import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal';
import DatasourceModal from 'src/datasource/DatasourceModal';
import Label from 'src/components/Label';

import ControlHeader from '../ControlHeader';
import './DatasourceControl.less';
Expand All @@ -56,6 +57,22 @@ const defaultProps = {
isEditable: true,
};

const Styles = styled.div`
#datasource_menu {
margin-left: ${({ theme }) => theme.gridUnit}px;
box-shadow: none;
&:active {
box-shadow: none;
}
}
.btn-group .open .dropdown-toggle {
box-shadow: none;
&.button-default {
background: none;
}
}
`;

class DatasourceControl extends React.PureComponent {
constructor(props) {
super(props);
Expand Down Expand Up @@ -132,20 +149,44 @@ class DatasourceControl extends React.PureComponent {
}

render() {
const { showChangeDatasourceModal, showEditDatasourceModal } = this.state;
const {
showChangeDatasourceModal,
showEditDatasourceModal,
showDatasource,
} = this.state;
const { datasource, onChange, value } = this.props;
return (
<div>
<Styles className="DatasourceControl">
<ControlHeader {...this.props} />
<div className="btn-group label-dropdown">
<div>
<OverlayTrigger
placement="top"
overlay={
<Tooltip id="toggle-datasource-tooltip">
{t('Expand/collapse datasource configuration')}
</Tooltip>
}
>
<Label
style={{ textTransform: 'none' }}
onClick={this.toggleShowDatasource}
>
{datasource.name}{' '}
<i
className={`angle fa fa-angle-${
showDatasource ? 'up' : 'down'
}`}
/>
</Label>
</OverlayTrigger>
<TooltipWrapper
label="change-datasource"
tooltip={t('Click to change the datasource')}
tooltip={t('more dataset related options')}
trigger={['hover']}
>
<DropdownButton
title={datasource.name}
className="label label-default label-btn m-r-5"
title={<Icon name="more-horiz" />}
className=""
bsSize="sm"
id="datasource_menu"
>
Expand All @@ -169,26 +210,6 @@ class DatasourceControl extends React.PureComponent {
)}
</DropdownButton>
</TooltipWrapper>
<OverlayTrigger
placement="right"
overlay={
<Tooltip id="toggle-datasource-tooltip">
{t('Expand/collapse datasource configuration')}
</Tooltip>
}
>
<a href="#">
<i
role="button"
aria-label="Toggle datasource visibility"
tabIndex={0}
className={`fa fa-${
this.state.showDatasource ? 'minus' : 'plus'
}-square m-r-5 m-l-5 m-t-4`}
onClick={this.toggleShowDatasource}
/>
</a>
</OverlayTrigger>
</div>
<Collapse in={this.state.showDatasource}>
{this.renderDatasource()}
Expand All @@ -205,7 +226,7 @@ class DatasourceControl extends React.PureComponent {
show={showChangeDatasourceModal}
onChange={onChange}
/>
</div>
</Styles>
);
}
}
Expand Down
19 changes: 15 additions & 4 deletions superset-frontend/src/explore/components/controls/DatasourceControl.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#datasource_menu {
border-radius: @border-radius-normal;
padding-left: 8px;
padding-right: 8px;
padding: 0px;
border: none;
}

#datasource_menu .caret {
Expand All @@ -32,6 +32,17 @@
top: -8px;
}

#datasource_menu + ul {
margin-top: 26px;
#datasource_menu .caret {
display: none;
}
#datasource_menu:hover {
background-color: transparent;
}
.DatasourceControl svg {
vertical-align: middle;
color: @brand-primary;
cursor: pointer;
}
.DatasourceControl .angle {
color: @brand-primary;
}
2 changes: 1 addition & 1 deletion superset-frontend/src/explore/components/controls/VizTypeControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
Label,
Row,
Col,
FormControl,
Expand All @@ -29,6 +28,7 @@ import {
} from 'react-bootstrap';
import { t, getChartMetadataRegistry } from '@superset-ui/core';

import Label from 'src/components/Label';
import ControlHeader from '../ControlHeader';
import './VizTypeControl.less';

Expand Down