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.

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

[Maps] add indicator when layer is filtered by search bar #43283

Merged
merged 4 commits into from
Aug 16, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 22 additions & 9 deletions x-pack/legacy/plugins/maps/public/components/layer_toc_actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,30 @@ export class LayerTocActions extends Component {
};

_renderPopoverToggleButton() {
const { icon, tooltipContent, areResultsTrimmed } = this.props.layer.getIconAndTooltipContent(this.props.zoom);
const infoButton = areResultsTrimmed ? (<EuiIcon
color="subdued"
type="iInCircle"
/>) : null;
const tooltip = <Fragment>{infoButton} {tooltipContent}</Fragment>;
const {
icon,
tooltipContent,
footnotes,
} = this.props.layer.getIconAndTooltipContent(this.props.zoom, this.props.isUsingSearch);

const footnoteIcons = footnotes.map((footnote, index) => {
return <Fragment key={index}>{''}{footnote.icon}</Fragment>;
});
const footnoteTooltipContent = footnotes.map((footnote, index) => {
return <div key={index}>{footnote.icon}{' '}{footnote.message}</div>;
});

return (
<EuiToolTip
anchorClassName="mapLayTocActions__tooltipAnchor"
position="top"
title={this.props.displayName}
content={tooltip}
content={
<Fragment>
{tooltipContent}
{footnoteTooltipContent}
</Fragment>
}
>
<EuiButtonEmpty
className="mapTocEntry__layerName eui-textLeft"
Expand All @@ -73,9 +85,10 @@ export class LayerTocActions extends Component {
data-test-subj={`layerTocActionsPanelToggleButton${this.props.escapedDisplayName}`}
>
<span className="mapTocEntry__layerNameIcon">{icon}</span>
{this.props.displayName}{infoButton}
{this.props.displayName}
{' '}
{footnoteIcons}
</EuiButtonEmpty>

</EuiToolTip>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ let supportsFitToBounds;
const layerMock = {
supportsFitToBounds: () => { return supportsFitToBounds; },
isVisible: () => { return true; },
getIconAndTooltipContent: (zoom) => {
getIconAndTooltipContent: (zoom, isUsingSearch) => {
return {
icon: (<span>mockIcon</span>),
icon: <span>mockIcon</span>,
tooltipContent: `simulated tooltip content at zoom: ${zoom}`,
areResultsTrimmed: false
footnotes: [{
icon: <span>mockFootnoteIcon</span>,
message: `simulated footnote at isUsingSearch: ${isUsingSearch}`
}],
};
}
};
Expand All @@ -27,6 +30,7 @@ const defaultProps = {
escapedDisplayName: 'layer1',
zoom: 0,
layer: layerMock,
isUsingSearch: true,
};

describe('LayerTocActions', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
cloneLayer,
} from '../../../../../actions/map_actions';

import { hasDirtyState, getSelectedLayer } from '../../../../../selectors/map_selectors';
import { hasDirtyState, getSelectedLayer, isUsingSearch } from '../../../../../selectors/map_selectors';

function mapStateToProps(state = {}, ownProps) {
return {
Expand All @@ -31,6 +31,7 @@ function mapStateToProps(state = {}, ownProps) {
selectedLayer: getSelectedLayer(state),
hasDirtyStateSelector: hasDirtyState(state),
isLegendDetailsOpen: getOpenTOCDetails(state).includes(ownProps.layer.getId()),
isUsingSearch: isUsingSearch(state),
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ export class TOCEntry extends React.Component {
layer,
zoom,
toggleVisible,
fitToBounds
fitToBounds,
isUsingSearch
} = this.props;

return (
Expand All @@ -195,6 +196,7 @@ export class TOCEntry extends React.Component {
>
<LayerTocActions
layer={layer}
isUsingSearch={isUsingSearch}
fitToBounds={() => {
fitToBounds(layer.getId());
}}
Expand Down
25 changes: 20 additions & 5 deletions x-pack/legacy/plugins/maps/public/layers/layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ export class AbstractLayer {
};
}

getIconAndTooltipContent(zoomLevel) {
getIconAndTooltipContent(zoomLevel, isUsingSearch) {
let icon;
let tooltipContent = null;
let areResultsTrimmed = false;
const footnotes = [];
if (this.hasErrors()) {
icon = (
<EuiIcon
Expand Down Expand Up @@ -161,15 +161,30 @@ export class AbstractLayer {
const customIconAndTooltipContent = this.getCustomIconAndTooltipContent();
if (customIconAndTooltipContent) {
icon = customIconAndTooltipContent.icon;
tooltipContent = customIconAndTooltipContent.tooltipContent;
areResultsTrimmed = customIconAndTooltipContent.areResultsTrimmed;
if (!customIconAndTooltipContent.areResultsTrimmed) {
tooltipContent = customIconAndTooltipContent.tooltipContent;
} else {
footnotes.push({
icon: <EuiIcon color="subdued" type="iInCircle" />,
message: customIconAndTooltipContent.tooltipContent
});
}
}

if (isUsingSearch && this.getQueryableIndexPatternIds().length) {
footnotes.push({
icon: <EuiIcon color="subdued" type="filter" size="s" />,
message: i18n.translate('xpack.maps.layer.isUsingSearchMsg', {
defaultMessage: 'Results narrowed by search bar'
})
});
}
}

return {
icon,
tooltipContent,
areResultsTrimmed
footnotes,
};
}

Expand Down
6 changes: 6 additions & 0 deletions x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ export const getQuery = ({ map }) => map.mapState.query;

export const getFilters = ({ map }) => map.mapState.filters;

export const isUsingSearch = (state) => {
const filters = getFilters(state).filter(filter => !filter.meta.disabled);
const queryString = _.get(getQuery(state), 'query', '');
return filters.length || queryString.length;
};

export const getDrawState = ({ map }) => map.mapState.drawState;

export const getRefreshConfig = ({ map }) => {
Expand Down