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

Jump to bottom

[Metrics UI] Fix EuiTheme type issue #69735

Merged
merged 2 commits into from
Jun 26, 2020
Merged

[Metrics UI] Fix EuiTheme type issue #69735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed6fa0
[Metrics UI] Fix EuiTheme type issue
simianhacker Jun 23, 2020
75ad58e
Merge branch 'master' into eui-type-issue
elasticmachine Jun 25, 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
10 changes: 5 additions & 5 deletions x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
View file
Open in desktop
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;
}
};
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions ...blic/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...ublic/pages/metrics/inventory_view/components/waffle/metric_control/metrics_edit_mode.tsx
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...ra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...gins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@ export const WaffleSortControls = ({ sort, onChange }: Props) => {
};

interface SwitchContainerProps {
theme: EuiTheme;
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}`,
padding: theme?.eui.paddingSizes.m,
borderTop: `1px solid ${theme?.eui.euiBorderColor}`,
}}
>
{children}
Expand Down
8 changes: 4 additions & 4 deletions ...gins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
View file
Open in desktop
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