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] 7.9 design improvements #71563

Merged
merged 8 commits into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
import React from 'react';
import { i18n } from '@kbn/i18n';
import { EuiPanel } from '@elastic/eui';
import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry';
// @ts-ignore
import { EMSTMSSource, sourceTitle } from './ems_tms_source';
Expand Down Expand Up @@ -32,7 +33,11 @@ export const emsBaseMapLayerWizardConfig: LayerWizard = {
previewLayers([layerDescriptor]);
};

return <TileServiceSelect onTileSelect={onSourceConfigChange} />;
return (
<EuiPanel>
<TileServiceSelect onTileSelect={onSourceConfigChange} />
</EuiPanel>
);
},
title: sourceTitle,
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import React from 'react';
import { EuiSelect, EuiFormRow, EuiPanel } from '@elastic/eui';
import { EuiSelect, EuiFormRow } from '@elastic/eui';

import { getEmsTmsServices } from '../../../meta';
import { getEmsUnavailableMessage } from '../../../components/ems_unavailable_message';
Expand Down Expand Up @@ -71,25 +71,23 @@ export class TileServiceSelect extends React.Component {
}

return (
<EuiPanel>
<EuiFormRow
label={i18n.translate('xpack.maps.source.emsTile.label', {
defaultMessage: 'Tile service',
})}
helpText={helpText}
display="columnCompressed"
>
<EuiSelect
hasNoInitialSelection={!selectedId}
value={selectedId}
options={this.state.emsTmsOptions}
onChange={this._onChange}
isLoading={!this.state.hasLoaded}
disabled={this.state.hasLoaded && this.state.emsTmsOptions.length === 0}
compressed
/>
</EuiFormRow>
</EuiPanel>
<EuiFormRow
label={i18n.translate('xpack.maps.source.emsTile.label', {
defaultMessage: 'Tile service',
})}
helpText={helpText}
display="columnCompressed"
>
<EuiSelect
hasNoInitialSelection={!selectedId}
value={selectedId}
options={this.state.emsTmsOptions}
onChange={this._onChange}
isLoading={!this.state.hasLoaded}
disabled={this.state.hasLoaded && this.state.emsTmsOptions.length === 0}
compressed
/>
</EuiFormRow>
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ export function UpdateSourceEditor({ onChange, config }) {
/>
</h5>
</EuiTitle>

<EuiSpacer size="m" />

<TileServiceSelect onTileSelect={_onTileSelect} config={config} />
</EuiPanel>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export class ColorMapSelect extends Component {

return (
<Fragment>
<EuiFlexGroup gutterSize={'none'}>
<EuiFlexGroup gutterSize={'xs'}>
{toggle}
<EuiFlexItem>
<EuiColorPalettePicker
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export class LayerWizardSelect extends Component<Props, State> {
});

return (
<EuiFacetGroup layout="horizontal">
<EuiFacetGroup layout="horizontal" gutterSize="s">
<EuiFacetButton
key="all"
isSelected={!this.state.selectedCategory}
Expand Down Expand Up @@ -154,6 +154,7 @@ export class LayerWizardSelect extends Component<Props, State> {
<EuiFlexItem key={layerWizard.title}>
<EuiCard
title={layerWizard.title}
titleSize="xs"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. the smaller titles look much better

icon={icon}
onClick={onClick}
description={layerWizard.description}
Expand All @@ -166,6 +167,7 @@ export class LayerWizardSelect extends Component<Props, State> {
return (
<>
{this._renderCategoryFacets()}

<EuiSpacer size="s" />
<EuiFlexGrid columns={2} gutterSize="m">
{wizardCards}
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function JoinEditor({ joins, layer, onChange, leftJoinFields, layerDispla
<EuiButtonEmpty
onClick={addJoin}
size="xs"
iconType="plusInCircle"
iconType="plusInCircleFilled"
aria-label={i18n.translate('xpack.maps.layerPanel.joinEditor.addJoinAriaLabel', {
defaultMessage: 'Add join',
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: relative;
background: tintOrShade($euiColorLightShade, 85%, 0);
border-radius: $euiBorderRadius;
padding: $euiSizeXS;
padding: $euiSizeS $euiSizeXS;

.mapJoinItem__inner {
@include euiScrollBar;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,15 @@ export class Join extends Component {
</EuiFlexItem>
);
globalFilterCheckbox = (
<GlobalFilterCheckbox
applyGlobalQuery={right.applyGlobalQuery}
setApplyGlobalQuery={this._onApplyGlobalQueryChange}
label={i18n.translate('xpack.maps.layerPanel.join.applyGlobalQueryCheckboxLabel', {
defaultMessage: `Apply global filter to join`,
})}
/>
<EuiFlexItem>
<GlobalFilterCheckbox
applyGlobalQuery={right.applyGlobalQuery}
setApplyGlobalQuery={this._onApplyGlobalQueryChange}
label={i18n.translate('xpack.maps.layerPanel.join.applyGlobalQueryCheckboxLabel', {
defaultMessage: `Apply global filter to join`,
})}
/>
</EuiFlexItem>
);
}

Expand Down