Skip to content

Maps - compressed layer settings styles #11

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

Merged
elizabetdev merged 5 commits into from
Sep 26, 2019
Merged

Maps - compressed layer settings styles #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67c7857
Input with popoper and icons
elizabetdev Sep 25, 2019
9f0e746
Improving layer settings styles
elizabetdev Sep 26, 2019
0e1cdca
Column layout
elizabetdev Sep 26, 2019
989a679
Changing step
elizabetdev Sep 26, 2019
23d0c5e
Removing unecessary css
elizabetdev Sep 26, 2019
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
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/maps/public/connected_components/layer_panel/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import './layer_panel';
@import './filter_editor/filter_editor';
@import './join_editor/resources/join';
@import './join_editor/resources/join';
62 changes: 39 additions & 23 deletions ...acy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export function LayerSettings(props) {
};

const onAlphaChange = alpha => {
props.updateAlpha(props.layerId, alpha);
const alphaDecimal = alpha / 100;

props.updateAlpha(props.layerId, alphaDecimal);
};

const onApplyGlobalQueryChange = event => {
Expand All @@ -47,18 +49,21 @@ export function LayerSettings(props) {
return (
<ValidatedDualRange
label={i18n.translate('xpack.maps.layerPanel.settingsPanel.visibleZoomLabel', {
defaultMessage: 'Zoom range for layer visibility',
defaultMessage: 'Visibility',
})}
formRowDisplay="rowCompressed"
formRowDisplay="columnCompressed"
min={MIN_ZOOM}
max={MAX_ZOOM}
value={[props.minZoom, props.maxZoom]}
showInput
showInput="inputWithPopover"
showRange
showLabels
onChange={onZoomChange}
allowEmptyRange={false}
compressed
prepend={i18n.translate('xpack.maps.layerPanel.settingsPanel.visibleZoom', {
defaultMessage: 'Zoom levels',
})}
/>
);
};
Expand All @@ -67,33 +72,38 @@ export function LayerSettings(props) {
return (
<EuiFormRow
label={i18n.translate('xpack.maps.layerPanel.settingsPanel.layerNameLabel', {
defaultMessage: 'Layer name',
defaultMessage: 'Name',
})}
display="rowCompressed"
display="columnCompressed"
>
<EuiFieldText value={props.label} onChange={onLabelChange} compressed />
</EuiFormRow>
);
};

const renderAlphaSlider = () => {
const alphaPercent = Math.round(props.alpha * 100);

return (
<EuiFormRow
label={i18n.translate('xpack.maps.layerPanel.settingsPanel.layerTransparencyLabel', {
defaultMessage: 'Layer transparency',
defaultMessage: 'Opacity',
})}
display="rowCompressed"
display="columnCompressed"
>
<ValidatedRange
min={0.0}
max={1.0}
step={0.05}
value={props.alpha}
min={0}
max={100}
step={1}
value={alphaPercent}
onChange={onAlphaChange}
showLabels
showInput
showRange
compressed
append={i18n.translate('xpack.maps.layerPanel.settingsPanel.percentageLabel', {
defaultMessage: '%',
description: 'Percentage',
})}
/>
</EuiFormRow>
);
Expand All @@ -103,15 +113,23 @@ export function LayerSettings(props) {
const layerSupportsGlobalQuery = props.layer.getIndexPatternIds().length;

const applyGlobalQueryCheckbox = (
<EuiSwitch
label={i18n.translate('xpack.maps.layerPanel.applyGlobalQueryCheckboxLabel', {
defaultMessage: `Apply global filter to layer`,
<EuiFormRow
label={i18n.translate('xpack.maps.layerPanel.settingsPanel.layerGlobalFilterLabel', {
defaultMessage: 'Global filter',
})}
checked={layerSupportsGlobalQuery ? props.applyGlobalQuery : false}
onChange={onApplyGlobalQueryChange}
disabled={!layerSupportsGlobalQuery}
data-test-subj="mapLayerPanelApplyGlobalQueryCheckbox"
/>
display="columnCompressedSwitch"
>
<EuiSwitch
label={i18n.translate('xpack.maps.layerPanel.applyGlobalQueryCheckboxLabel', {
defaultMessage: `Apply to layer`,
})}
checked={layerSupportsGlobalQuery ? props.applyGlobalQuery : false}
onChange={onApplyGlobalQueryChange}
disabled={!layerSupportsGlobalQuery}
data-test-subj="mapLayerPanelApplyGlobalQueryCheckbox"
compressed
/>
</EuiFormRow>
);

if (layerSupportsGlobalQuery) {
Expand Down Expand Up @@ -146,8 +164,6 @@ export function LayerSettings(props) {
{renderLabel()}
{renderZoomSliders()}
{renderAlphaSlider()}

<EuiSpacer size="m" />
{renderApplyGlobalQueryCheckbox()}
</EuiPanel>

Expand Down