Skip to content

Commit aee20c0

Browse files
committed
Removing obsolete code removed in previous PR
1 parent 50c1246 commit aee20c0

File tree

5 files changed

+3
-115
lines changed

5 files changed

+3
-115
lines changed

x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/group_by.tsx

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { i18n } from '@kbn/i18n';
1010
import React, { useCallback } from 'react';
1111
import { IFieldType } from 'src/plugins/data/public';
1212
import { MetricsExplorerOptions } from '../hooks/use_metrics_explorer_options';
13-
import { isDisplayable } from '../../../../utils/is_displayable';
1413

1514
interface Props {
1615
options: MetricsExplorerOptions;
@@ -27,18 +26,6 @@ export const MetricsExplorerGroupBy = ({ options, onChange, fields }: Props) =>
2726
[onChange]
2827
);
2928

30-
const metricPrefixes = options.metrics
31-
.map(
32-
metric =>
33-
(metric.field &&
34-
metric.field
35-
.split(/\./)
36-
.slice(0, 2)
37-
.join('.')) ||
38-
null
39-
)
40-
.filter(metric => metric) as string[];
41-
4229
return (
4330
<EuiComboBox
4431
placeholder={i18n.translate('xpack.infra.metricsExplorer.groupByLabel', {
@@ -51,7 +38,7 @@ export const MetricsExplorerGroupBy = ({ options, onChange, fields }: Props) =>
5138
singleSelection={true}
5239
selectedOptions={(options.groupBy && [{ label: options.groupBy }]) || []}
5340
options={fields
54-
.filter(f => isDisplayable(f, metricPrefixes) && f.aggregatable && f.type === 'string')
41+
.filter(f => f.aggregatable && f.type === 'string')
5542
.map(f => ({ label: f.name }))}
5643
onChange={handleChange}
5744
isClearable={true}

x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n';
99
import React, { useEffect, useState } from 'react';
1010
import { WithKueryAutocompletion } from '../../../../containers/with_kuery_autocompletion';
1111
import { AutocompleteField } from '../../../../components/autocomplete_field';
12-
import { isDisplayable } from '../../../../utils/is_displayable';
1312
import { esKuery, IIndexPattern } from '../../../../../../../../src/plugins/data/public';
1413

1514
interface Props {
@@ -51,7 +50,7 @@ export const MetricsExplorerKueryBar = ({
5150

5251
const filteredDerivedIndexPattern = {
5352
...derivedIndexPattern,
54-
fields: derivedIndexPattern.fields.filter(field => isDisplayable(field)),
53+
fields: derivedIndexPattern.fields,
5554
};
5655

5756
const defaultPlaceholder = i18n.translate(

x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/metrics.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { IFieldType } from 'src/plugins/data/public';
1212
import { colorTransformer, MetricsExplorerColor } from '../../../../../common/color_palette';
1313
import { MetricsExplorerMetric } from '../../../../../common/http_api/metrics_explorer';
1414
import { MetricsExplorerOptions } from '../hooks/use_metrics_explorer_options';
15-
import { isDisplayable } from '../../../../utils/is_displayable';
1615

1716
interface Props {
1817
autoFocus?: boolean;
@@ -54,9 +53,7 @@ export const MetricsExplorerMetrics = ({ options, onChange, fields, autoFocus =
5453
[onChange, options.aggregation, colors]
5554
);
5655

57-
const comboOptions = fields
58-
.filter(field => isDisplayable(field))
59-
.map(field => ({ label: field.name, value: field.name }));
56+
const comboOptions = fields.map(field => ({ label: field.name, value: field.name }));
6057
const selectedOptions = options.metrics
6158
.filter(m => m.aggregation !== 'count')
6259
.map(metric => ({

x-pack/plugins/infra/public/utils/is_displayable.test.ts

Lines changed: 0 additions & 65 deletions
This file was deleted.

x-pack/plugins/infra/public/utils/is_displayable.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)