Skip to content

Commit

Permalink
[Metrics UI] Fix EuiTheme type issue (elastic#69735)
Browse files Browse the repository at this point in the history
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
  • Loading branch information
simianhacker committed Jun 26, 2020
1 parent f34e428 commit 8516b39
Show file tree
Hide file tree
Showing 10 changed files with 152 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ const getEuiIconType = (suggestionType: QuerySuggestionTypes) => {
const getEuiIconColor = (theme: any, suggestionType: QuerySuggestionTypes): string => {
switch (suggestionType) {
case QuerySuggestionTypes.Field:
return theme.eui.euiColorVis7;
return theme?.eui.euiColorVis7;
case QuerySuggestionTypes.Value:
return theme.eui.euiColorVis0;
return theme?.eui.euiColorVis0;
case QuerySuggestionTypes.Operator:
return theme.eui.euiColorVis1;
return theme?.eui.euiColorVis1;
case QuerySuggestionTypes.Conjunction:
return theme.eui.euiColorVis2;
return theme?.eui.euiColorVis2;
case QuerySuggestionTypes.RecentSearch:
default:
return theme.eui.euiColorMediumShade;
return theme?.eui.euiColorMediumShade;
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const goToNextHighlightLabel = i18n.translate(
const ActiveHighlightsIndicator = euiStyled(EuiIcon).attrs(({ theme }) => ({
type: 'checkInCircleFilled',
size: 'm',
color: theme.eui.euiColorAccent,
color: theme?.eui.euiColorAccent,
}))`
padding-left: ${(props) => props.theme.eui.paddingSizes.xs};
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { withTheme, EuiTheme } from '../../../../../../observability/public';
interface Props {
label: string;
onClick: () => void;
theme: EuiTheme;
theme: EuiTheme | undefined;
children: ReactNode;
}

Expand All @@ -21,18 +21,18 @@ export const DropdownButton = withTheme(({ onClick, label, theme, children }: Pr
alignItems="center"
gutterSize="none"
style={{
border: theme.eui.euiFormInputGroupBorder,
boxShadow: `0px 3px 2px ${theme.eui.euiTableActionsBorderColor}, 0px 1px 1px ${theme.eui.euiTableActionsBorderColor}`,
border: theme?.eui.euiFormInputGroupBorder,
boxShadow: `0px 3px 2px ${theme?.eui.euiTableActionsBorderColor}, 0px 1px 1px ${theme?.eui.euiTableActionsBorderColor}`,
}}
>
<EuiFlexItem
grow={false}
style={{
padding: 12,
background: theme.eui.euiFormInputGroupLabelBackground,
background: theme?.eui.euiFormInputGroupLabelBackground,
fontSize: '0.75em',
fontWeight: 600,
color: theme.eui.euiTitleColor,
color: theme?.eui.euiTitleColor,
}}
>
{label}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const AGGREGATION_LABELS = {
};

interface Props {
theme: EuiTheme;
theme: EuiTheme | undefined;
metric?: SnapshotCustomMetricInput;
fields: IFieldType[];
customMetrics: SnapshotCustomMetricInput[];
Expand Down Expand Up @@ -158,8 +158,8 @@ export const CustomMetricForm = withTheme(
</EuiPopoverTitle>
<div
style={{
padding: theme.eui.paddingSizes.m,
borderBottom: `${theme.eui.euiBorderWidthThin} solid ${theme.eui.euiBorderColor}`,
padding: theme?.eui.paddingSizes.m,
borderBottom: `${theme?.eui.euiBorderWidthThin} solid ${theme?.eui.euiBorderColor}`,
}}
>
<EuiFormRow
Expand Down Expand Up @@ -219,11 +219,11 @@ export const CustomMetricForm = withTheme(
/>
</EuiFormRow>
</div>
<div style={{ padding: theme.eui.paddingSizes.m, textAlign: 'right' }}>
<div style={{ padding: theme?.eui.paddingSizes.m, textAlign: 'right' }}>
<EuiButtonEmpty
onClick={onCancel}
size="s"
style={{ paddingRight: theme.eui.paddingSizes.xl }}
style={{ paddingRight: theme?.eui.paddingSizes.xl }}
>
<FormattedMessage
id="xpack.infra.waffle.customMetrics.cancelLabel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from '../../../../../../../../../legacy/common/eui_styled_components';

interface Props {
theme: EuiTheme;
theme: EuiTheme | undefined;
customMetrics: SnapshotCustomMetricInput[];
options: Array<{ text: string; value: string }>;
onEdit: (metric: SnapshotCustomMetricInput) => void;
Expand All @@ -28,7 +28,7 @@ export const MetricsEditMode = withTheme(
<div style={{ width: 256 }}>
{options.map((option) => (
<div key={option.value} style={{ padding: '14px 14px 13px 36px' }}>
<span style={{ color: theme.eui.euiButtonColorDisabled }}>{option.text}</span>
<span style={{ color: theme?.eui.euiButtonColorDisabled }}>{option.text}</span>
</div>
))}
{customMetrics.map((metric) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from '../../../../../../../../../legacy/common/eui_styled_components';

interface Props {
theme: EuiTheme;
theme: EuiTheme | undefined;
onEdit: () => void;
onAdd: () => void;
onSave: () => void;
Expand All @@ -32,7 +32,7 @@ export const ModeSwitcher = withTheme(
return (
<div
style={{
borderTop: `${theme.eui.euiBorderWidthThin} solid ${theme.eui.euiBorderColor}`,
borderTop: `${theme?.eui.euiBorderWidthThin} solid ${theme?.eui.euiBorderColor}`,
padding: 12,
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ const ValueInner = euiStyled.button`
border: none;
&:focus {
outline: none !important;
border: ${(params) => params.theme.eui.euiFocusRingSize} solid
${(params) => params.theme.eui.euiFocusRingColor};
border: ${(params) => params.theme?.eui.euiFocusRingSize} solid
${(params) => params.theme?.eui.euiFocusRingColor};
box-shadow: none;
}
`;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import React, { useCallback, useMemo, useState, ReactNode } from 'react';
import { EuiSwitch, EuiContextMenuPanelDescriptor, EuiPopover, EuiContextMenu } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { EuiTheme, withTheme } from '../../../../../../../observability/public';
import { WaffleSortOption } from '../../hooks/use_waffle_options';
import { DropdownButton } from '../dropdown_button';

interface Props {
sort: WaffleSortOption;
onChange: (sort: WaffleSortOption) => void;
}

const LABELS = {
name: i18n.translate('xpack.infra.waffle.sortNameLabel', { defaultMessage: 'Name' }),
value: i18n.translate('xpack.infra.waffle.sort.valueLabel', { defaultMessage: 'Metric value' }),
};

export const WaffleSortControls = ({ sort, onChange }: Props) => {
const [isOpen, setIsOpen] = useState<boolean>(false);

const showPopover = useCallback(() => {
setIsOpen(true);
}, [setIsOpen]);

const closePopover = useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);

const label = LABELS[sort.by];

const button = (
<DropdownButton
label={i18n.translate('xpack.infra.waffle.sortLabel', { defaultMessage: 'Sort by' })}
onClick={showPopover}
>
{label}
</DropdownButton>
);

const selectName = useCallback(() => {
onChange({ ...sort, by: 'name' });
closePopover();
}, [closePopover, onChange, sort]);

const selectValue = useCallback(() => {
onChange({ ...sort, by: 'value' });
closePopover();
}, [closePopover, onChange, sort]);

const toggleSort = useCallback(() => {
onChange({
...sort,
direction: sort.direction === 'asc' ? 'desc' : 'asc',
});
}, [sort, onChange]);

const panels = useMemo<EuiContextMenuPanelDescriptor[]>(
() => [
{
id: 0,
title: '',
items: [
{
name: LABELS.name,
icon: sort.by === 'name' ? 'check' : 'empty',
onClick: selectName,
},
{
name: LABELS.value,
icon: sort.by === 'value' ? 'check' : 'empty',
onClick: selectValue,
},
],
},
],
[sort.by, selectName, selectValue]
);

return (
<EuiPopover
isOpen={isOpen}
id="sortPopover"
button={button}
anchorPosition="downLeft"
panelPaddingSize="none"
closePopover={closePopover}
>
<EuiContextMenu initialPanelId={0} panels={panels} />
<SwitchContainer>
<EuiSwitch
compressed
label={i18n.translate('xpack.infra.waffle.sortDirectionLabel', {
defaultMessage: 'Reverse direction',
})}
checked={sort.direction === 'desc'}
onChange={toggleSort}
/>
</SwitchContainer>
</EuiPopover>
);
};

interface SwitchContainerProps {
theme: EuiTheme | undefined;
children: ReactNode;
}

const SwitchContainer = withTheme(({ children, theme }: SwitchContainerProps) => {
return (
<div
style={{
padding: theme?.eui.paddingSizes.m,
borderTop: `1px solid ${theme?.eui.euiBorderColor}`,
}}
>
{children}
</div>
);
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { withTheme, EuiTheme } from '../../../../../../../observability/public';
import { useWaffleTimeContext } from '../../hooks/use_waffle_time';

interface Props {
theme: EuiTheme;
theme: EuiTheme | undefined;
}

export const WaffleTimeControls = withTheme(({ theme }: Props) => {
Expand Down Expand Up @@ -56,9 +56,9 @@ export const WaffleTimeControls = withTheme(({ theme }: Props) => {
<EuiFlexItem
grow={false}
style={{
border: theme.eui.euiFormInputGroupBorder,
boxShadow: `0px 3px 2px ${theme.eui.euiTableActionsBorderColor}, 0px 1px 1px ${theme.eui.euiTableActionsBorderColor}`,
marginRight: theme.eui.paddingSizes.m,
border: theme?.eui.euiFormInputGroupBorder,
boxShadow: `0px 3px 2px ${theme?.eui.euiTableActionsBorderColor}, 0px 1px 1px ${theme?.eui.euiTableActionsBorderColor}`,
marginRight: theme?.eui.paddingSizes.m,
}}
data-test-subj="waffleDatePicker"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const DetailPageContent = euiStyled(PageContent)`
`;

interface Props {
theme: EuiTheme;
theme: EuiTheme | undefined;
match: {
params: {
type: string;
Expand Down

0 comments on commit 8516b39

Please sign in to comment.