From c0ad9686b1b12478401cbd76969e577e5d2a5513 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Tue, 25 May 2021 13:05:09 -0500 Subject: [PATCH 01/53] [ML] Add index visualizer --- .../file_data_visualizer/common/constants.ts | 4 + .../common/types/field_request_config.ts | 20 + .../common/{types.ts => types/index.ts} | 9 +- .../common/types/job_field_type.ts | 9 + .../plugins/file_data_visualizer/kibana.json | 3 +- .../document_count_chart.tsx | 98 +++ .../document_count_chart/index.ts | 8 + .../document_count_content.tsx | 48 + .../document_count_content/index.ts | 8 + .../total_count_header.tsx | 34 + .../expanded_row/index_based_expanded_row.tsx | 84 ++ .../components/expanded_row/types.ts | 0 .../field_count_panel/field_count_panel.tsx | 51 ++ .../components/field_count_panel/index.ts | 8 + .../field_data_row/action_menu/actions.ts | 48 + .../field_data_row/action_menu/index.ts | 8 + .../field_data_row/action_menu/lens_utils.ts | 288 ++++++ .../index_datavisualizer_view/index.ts | 0 .../index_datavisualizer_view.tsx | 820 ++++++++++++++++++ .../components/loading_indicator/index.ts | 8 + .../loading_indicator/loading_indicator.tsx | 32 + .../components/not_in_docs_content/index.ts | 8 + .../not_in_docs_context.tsx | 28 + .../stats_table/types/field_vis_config.ts | 1 + .../constants/index_data_visualizer_viewer.ts | 8 + .../application/data_loader/data_loader.ts | 168 ++++ .../public/application/kibana_context.ts | 1 + .../application/types/combined_query.ts | 18 + .../types/index_data_visualizer_state.ts | 28 + .../public/application/types/overall_stats.ts | 26 + .../public/application/util/index_utils.ts | 17 + .../file_data_visualizer/public/plugin.ts | 2 + .../ml/common/constants/field_histograms.ts | 1 + .../ml/common/constants/field_types.ts | 1 + .../plugins/ml/common/types/datavisualizer.ts | 1 + .../ml/common/types/ml_url_generator.ts | 1 + .../index_based/common/combined_query.ts | 1 + .../content_types/document_count_content.tsx | 1 + .../document_count_chart.tsx | 1 + .../ml/public/application/util/index_utils.ts | 1 + 40 files changed, 1896 insertions(+), 5 deletions(-) create mode 100644 x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts rename x-pack/plugins/file_data_visualizer/common/{types.ts => types/index.ts} (65%) create mode 100644 x-pack/plugins/file_data_visualizer/common/types/job_field_type.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_content.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/types.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/constants/index_data_visualizer_viewer.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/types/overall_stats.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/common/constants.ts b/x-pack/plugins/file_data_visualizer/common/constants.ts index 819549a7eb4e6..7d3f49b3edda0 100644 --- a/x-pack/plugins/file_data_visualizer/common/constants.ts +++ b/x-pack/plugins/file_data_visualizer/common/constants.ts @@ -29,3 +29,7 @@ export const JOB_FIELD_TYPES = { TEXT: 'text', UNKNOWN: 'unknown', } as const; + +// Default sampler shard size used for field histograms +export const DEFAULT_SAMPLER_SHARD_SIZE = 5000; +export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score']; diff --git a/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts b/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts new file mode 100644 index 0000000000000..5b39ac0354408 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { KBN_FIELD_TYPES } from '../../../../../src/plugins/data/common'; +import type { JobFieldType } from './index'; + +export interface FieldRequestConfig { + fieldName?: string; + type: JobFieldType; + cardinality: number; +} + +export interface FieldHistogramRequestConfig { + fieldName: string; + type?: KBN_FIELD_TYPES; +} diff --git a/x-pack/plugins/file_data_visualizer/common/types.ts b/x-pack/plugins/file_data_visualizer/common/types/index.ts similarity index 65% rename from x-pack/plugins/file_data_visualizer/common/types.ts rename to x-pack/plugins/file_data_visualizer/common/types/index.ts index edfe8b3575c8d..bdb8fbcac4070 100644 --- a/x-pack/plugins/file_data_visualizer/common/types.ts +++ b/x-pack/plugins/file_data_visualizer/common/types/index.ts @@ -5,12 +5,11 @@ * 2.0. */ -import { JOB_FIELD_TYPES } from './constants'; - +import type { SimpleSavedObject } from 'kibana/public'; +export type { JobFieldType } from './job_field_type'; +export type { FieldRequestConfig, FieldHistogramRequestConfig } from './field_request_config'; export type InputData = any[]; -export type JobFieldType = typeof JOB_FIELD_TYPES[keyof typeof JOB_FIELD_TYPES]; - export interface DataVisualizerTableState { pageSize: number; pageIndex: number; @@ -20,3 +19,5 @@ export interface DataVisualizerTableState { visibleFieldNames: string[]; showDistributions: boolean; } + +export type SavedSearchSavedObject = SimpleSavedObject; diff --git a/x-pack/plugins/file_data_visualizer/common/types/job_field_type.ts b/x-pack/plugins/file_data_visualizer/common/types/job_field_type.ts new file mode 100644 index 0000000000000..ecb6ade035695 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/types/job_field_type.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { JOB_FIELD_TYPES } from '../constants'; +export type JobFieldType = typeof JOB_FIELD_TYPES[keyof typeof JOB_FIELD_TYPES]; diff --git a/x-pack/plugins/file_data_visualizer/kibana.json b/x-pack/plugins/file_data_visualizer/kibana.json index 721352cff7c95..9933b4bb7099b 100644 --- a/x-pack/plugins/file_data_visualizer/kibana.json +++ b/x-pack/plugins/file_data_visualizer/kibana.json @@ -14,7 +14,8 @@ ], "optionalPlugins": [ "security", - "maps" + "maps", + "lens" ], "requiredBundles": [ "kibanaReact", diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx new file mode 100644 index 0000000000000..4c8740cc76b6f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useMemo } from 'react'; + +import { i18n } from '@kbn/i18n'; + +import { + Axis, + BarSeries, + Chart, + niceTimeFormatter, + Position, + ScaleType, + Settings, +} from '@elastic/charts'; + +export interface DocumentCountChartPoint { + time: number | string; + value: number; +} + +interface Props { + width?: number; + chartPoints: DocumentCountChartPoint[]; + timeRangeEarliest: number; + timeRangeLatest: number; + interval?: number; +} + +const SPEC_ID = 'document_count'; + +export const DocumentCountChart: FC = ({ + width, + chartPoints, + timeRangeEarliest, + timeRangeLatest, + interval, +}) => { + const seriesName = i18n.translate('xpack.ml.fieldDataCard.documentCountChart.seriesLabel', { + defaultMessage: 'document count', + }); + + const xDomain = { + min: timeRangeEarliest, + max: timeRangeLatest, + }; + + const dateFormatter = niceTimeFormatter([timeRangeEarliest, timeRangeLatest]); + + const adjustedChartPoints = useMemo(() => { + // Display empty chart when no data in range + if (chartPoints.length < 1) return [{ time: timeRangeEarliest, value: 0 }]; + + // If chart has only one bucket + // it won't show up correctly unless we add an extra data point + if (chartPoints.length === 1) { + return [ + ...chartPoints, + { time: interval ? Number(chartPoints[0].time) + interval : timeRangeEarliest, value: 0 }, + ]; + } + return chartPoints; + }, [chartPoints, timeRangeEarliest, timeRangeLatest, interval]); + + return ( +
+ + + + + + +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/index.ts new file mode 100644 index 0000000000000..97b42053b34e6 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { DocumentCountChart, DocumentCountChartPoint } from './document_count_chart'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_content.tsx new file mode 100644 index 0000000000000..d49dbdc7cb446 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_content.tsx @@ -0,0 +1,48 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import { DocumentCountChart, DocumentCountChartPoint } from './document_count_chart'; +import { FieldVisConfig, FileBasedFieldVisConfig } from '../stats_table/types'; +import { TotalCountHeader } from './total_count_header'; + +export interface Props { + config?: FieldVisConfig | FileBasedFieldVisConfig; + totalCount: number; +} + +export const DocumentCountContent: FC = ({ config, totalCount }) => { + if (config?.stats === undefined) { + return totalCount !== undefined ? : null; + } + + const { documentCounts, timeRangeEarliest, timeRangeLatest } = config.stats; + if ( + documentCounts === undefined || + timeRangeEarliest === undefined || + timeRangeLatest === undefined + ) + return null; + + let chartPoints: DocumentCountChartPoint[] = []; + if (documentCounts.buckets !== undefined) { + const buckets: Record = documentCounts?.buckets; + chartPoints = Object.entries(buckets).map(([time, value]) => ({ time: +time, value })); + } + + return ( + <> + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/index.ts new file mode 100644 index 0000000000000..696bc71274441 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { DocumentCountContent } from './document_count_content'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx new file mode 100644 index 0000000000000..24a89ec070fe7 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexItem, EuiText } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import React from 'react'; + +export const TotalCountHeader = ({ totalCount }: { totalCount: number }) => { + return ( + + + + + + ), + }} + /> + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx new file mode 100644 index 0000000000000..bd15ea09a1dd5 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx @@ -0,0 +1,84 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { GeoPointContent } from './geo_point_content'; +import { JOB_FIELD_TYPES } from '../../../../common'; +import { + BooleanContent, + DateContent, + IpContent, + KeywordContent, + NumberContent, + OtherContent, +} from '../stats_table/components/field_data_expanded_row'; +import { NotInDocsContent } from '../not_in_docs_content'; +import { FieldVisConfig } from '../stats_table/types'; +import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { CombinedQuery } from '../../types/combined_query'; +import { LoadingIndicator } from '../loading_indicator'; + +export const IndexBasedDataVisualizerExpandedRow = ({ + item, + indexPattern, + combinedQuery, +}: { + item: FieldVisConfig; + indexPattern: IndexPattern | undefined; + combinedQuery: CombinedQuery; +}) => { + const config = item; + const { loading, type, existsInDocs, fieldName } = config; + + function getCardContent() { + if (existsInDocs === false) { + return ; + } + + switch (type) { + case JOB_FIELD_TYPES.NUMBER: + return ; + + case JOB_FIELD_TYPES.BOOLEAN: + return ; + + case JOB_FIELD_TYPES.DATE: + return ; + + case JOB_FIELD_TYPES.GEO_POINT: + case JOB_FIELD_TYPES.GEO_SHAPE: + return ( + + ); + + case JOB_FIELD_TYPES.IP: + return ; + + case JOB_FIELD_TYPES.KEYWORD: + return ; + + case JOB_FIELD_TYPES.TEXT: + return ; + + default: + return ; + } + } + + return ( +
+ {loading === true ? : getCardContent()} +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/types.ts b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/types.ts new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx new file mode 100644 index 0000000000000..e5942a5f230a7 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx @@ -0,0 +1,51 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiSwitch } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import React, { FC } from 'react'; +import type { + MetricFieldsCountProps, + TotalFieldsCountProps, +} from '../stats_table/components/field_count_stats'; +import { MetricFieldsCount, TotalFieldsCount } from '../stats_table/components/field_count_stats'; + +interface Props extends TotalFieldsCountProps, MetricFieldsCountProps { + showEmptyFields: boolean; + toggleShowEmptyFields: () => void; +} +export const FieldCountPanel: FC = ({ + metricsStats, + fieldsCountStats, + showEmptyFields, + toggleShowEmptyFields, +}) => { + return ( + + + + + + } + checked={showEmptyFields} + onChange={toggleShowEmptyFields} + /> + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/index.ts new file mode 100644 index 0000000000000..79fa6704662e0 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FieldCountPanel } from './field_count_panel'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts new file mode 100644 index 0000000000000..b8189403531d1 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts @@ -0,0 +1,48 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { i18n } from '@kbn/i18n'; +import { Action } from '@elastic/eui/src/components/basic_table/action_types'; +import { getCompatibleLensDataType, getLensAttributes } from './lens_utils'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { CombinedQuery } from '../../../types/combined_query'; +import { FieldVisConfig } from '../../stats_table/types'; +import { LensPublicStart } from '../../../../../../lens/public'; +export function getActions( + indexPattern: IndexPattern, + lensPlugin: LensPublicStart, + combinedQuery: CombinedQuery +): Array> { + const canUseLensEditor = lensPlugin.canUseEditor(); + return [ + { + name: i18n.translate('xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle', { + defaultMessage: 'Explore in Lens', + }), + description: i18n.translate( + 'xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription', + { + defaultMessage: 'Explore in Lens', + } + ), + type: 'icon', + icon: 'lensApp', + available: (item: FieldVisConfig) => + getCompatibleLensDataType(item.type) !== undefined && canUseLensEditor, + onClick: (item: FieldVisConfig) => { + const lensAttributes = getLensAttributes(indexPattern, combinedQuery, item); + if (lensAttributes) { + lensPlugin.navigateToPrefilledEditor({ + id: `ml-dataVisualizer-${item.fieldName}`, + attributes: lensAttributes, + }); + } + }, + 'data-test-subj': 'mlActionButtonViewInLens', + }, + ]; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/index.ts new file mode 100644 index 0000000000000..df36cc89ce911 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { getActions } from './actions'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts new file mode 100644 index 0000000000000..9690fd1b6c473 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts @@ -0,0 +1,288 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { i18n } from '@kbn/i18n'; +import { ML_JOB_FIELD_TYPES } from '../../../../../../../common/constants/field_types'; +import type { TypedLensByValueInput } from '../../../../../../../../lens/public'; +import type { FieldVisConfig } from '../../../../stats_table/types'; +import type { IndexPatternColumn, XYLayerConfig } from '../../../../../../../../lens/public'; +import type { CombinedQuery } from '../../../common'; +import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns'; +interface ColumnsAndLayer { + columns: Record; + layer: XYLayerConfig; +} + +const TOP_VALUES_LABEL = i18n.translate('xpack.ml.dataVisualizer.lensChart.topValuesLabel', { + defaultMessage: 'Top values', +}); +const COUNT = i18n.translate('xpack.ml.dataVisualizer.lensChart.countLabel', { + defaultMessage: 'Count', +}); + +export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IIndexPattern) { + // if index has no timestamp field + if (defaultIndexPattern.timeFieldName === undefined) { + const columns: Record = { + col1: { + label: item.fieldName!, + dataType: 'number', + isBucketed: true, + operationType: 'range', + params: { + type: 'histogram', + maxBars: 'auto', + ranges: [], + }, + sourceField: item.fieldName!, + }, + col2: { + label: COUNT, + dataType: 'number', + isBucketed: false, + sourceField: 'Records', + operationType: 'count', + }, + }; + + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'bar', + xAccessor: 'col1', + }; + return { columns, layer }; + } + + const columns: Record = { + col2: { + dataType: 'number', + isBucketed: false, + label: i18n.translate('xpack.ml.dataVisualizer.lensChart.averageOfLabel', { + defaultMessage: 'Average of {fieldName}', + values: { fieldName: item.fieldName }, + }), + operationType: 'average', + sourceField: item.fieldName!, + }, + col1: { + dataType: 'date', + isBucketed: true, + label: defaultIndexPattern.timeFieldName!, + operationType: 'date_histogram', + params: { interval: 'auto' }, + scale: 'interval', + sourceField: defaultIndexPattern.timeFieldName!, + }, + }; + + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'line', + xAccessor: 'col1', + }; + + return { columns, layer }; +} +export function getDateSettings(item: FieldVisConfig) { + const columns: Record = { + col2: { + dataType: 'number', + isBucketed: false, + label: COUNT, + operationType: 'count', + scale: 'ratio', + sourceField: 'Records', + }, + col1: { + dataType: 'date', + isBucketed: true, + label: item.fieldName!, + operationType: 'date_histogram', + params: { interval: 'auto' }, + scale: 'interval', + sourceField: item.fieldName!, + }, + }; + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'line', + xAccessor: 'col1', + }; + + return { columns, layer }; +} + +export function getKeywordSettings(item: FieldVisConfig) { + const columns: Record = { + col1: { + label: TOP_VALUES_LABEL, + dataType: 'string', + isBucketed: true, + operationType: 'terms', + params: { + orderBy: { type: 'column', columnId: 'col2' }, + size: 10, + orderDirection: 'desc', + }, + sourceField: item.fieldName!, + }, + col2: { + label: COUNT, + dataType: 'number', + isBucketed: false, + sourceField: 'Records', + operationType: 'count', + }, + }; + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'bar', + xAccessor: 'col1', + }; + + return { columns, layer }; +} + +export function getBooleanSettings(item: FieldVisConfig) { + const columns: Record = { + col1: { + label: TOP_VALUES_LABEL, + dataType: 'string', + isBucketed: true, + operationType: 'terms', + params: { + orderBy: { type: 'alphabetical' }, + size: 2, + orderDirection: 'desc', + }, + sourceField: item.fieldName!, + }, + col2: { + label: COUNT, + dataType: 'number', + isBucketed: false, + sourceField: 'Records', + operationType: 'count', + }, + }; + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'bar', + xAccessor: 'col1', + }; + + return { columns, layer }; +} + +export function getCompatibleLensDataType(type: FieldVisConfig['type']): string | undefined { + let lensType: string | undefined; + switch (type) { + case ML_JOB_FIELD_TYPES.KEYWORD: + lensType = 'string'; + break; + case ML_JOB_FIELD_TYPES.DATE: + lensType = 'date'; + break; + case ML_JOB_FIELD_TYPES.NUMBER: + lensType = 'number'; + break; + case ML_JOB_FIELD_TYPES.IP: + lensType = 'ip'; + break; + case ML_JOB_FIELD_TYPES.BOOLEAN: + lensType = 'string'; + break; + default: + lensType = undefined; + } + return lensType; +} + +function getColumnsAndLayer( + fieldType: FieldVisConfig['type'], + item: FieldVisConfig, + defaultIndexPattern: IIndexPattern +): ColumnsAndLayer | undefined { + if (item.fieldName === undefined) return; + + if (fieldType === ML_JOB_FIELD_TYPES.DATE) { + return getDateSettings(item); + } + if (fieldType === ML_JOB_FIELD_TYPES.NUMBER) { + return getNumberSettings(item, defaultIndexPattern); + } + if (fieldType === ML_JOB_FIELD_TYPES.IP || fieldType === ML_JOB_FIELD_TYPES.KEYWORD) { + return getKeywordSettings(item); + } + if (fieldType === ML_JOB_FIELD_TYPES.BOOLEAN) { + return getBooleanSettings(item); + } +} +// Get formatted Lens visualization format depending on field type +// currently only supports the following types: +// 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip' +export function getLensAttributes( + defaultIndexPattern: IIndexPattern | undefined, + combinedQuery: CombinedQuery, + item: FieldVisConfig +): TypedLensByValueInput['attributes'] | undefined { + if (defaultIndexPattern === undefined || item.type === undefined || item.fieldName === undefined) + return; + + const presets = getColumnsAndLayer(item.type, item, defaultIndexPattern); + + if (!presets) return; + + return { + visualizationType: 'lnsXY', + title: i18n.translate('xpack.ml.dataVisualizer.lensChart.chartTitle', { + defaultMessage: 'Lens for {fieldName}', + values: { fieldName: item.fieldName }, + }), + references: [ + { + id: defaultIndexPattern.id!, + name: 'indexpattern-datasource-current-indexpattern', + type: 'index-pattern', + }, + { + id: defaultIndexPattern.id!, + name: 'indexpattern-datasource-layer-layer1', + type: 'index-pattern', + }, + ], + state: { + datasourceStates: { + indexpattern: { + layers: { + layer1: { + columnOrder: ['col1', 'col2'], + columns: presets.columns, + }, + }, + }, + }, + filters: [], + query: { language: combinedQuery.searchQueryLanguage, query: combinedQuery.searchString }, + visualization: { + axisTitlesVisibilitySettings: { x: true, yLeft: true, yRight: true }, + fittingFunction: 'None', + gridlinesVisibilitySettings: { x: true, yLeft: true, yRight: true }, + layers: [presets.layer], + legend: { isVisible: true, position: 'right' }, + preferredSeriesType: 'line', + tickLabelsVisibilitySettings: { x: true, yLeft: true, yRight: true }, + valueLabels: 'hide', + }, + }, + }; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx new file mode 100644 index 0000000000000..945dd5bc4649f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx @@ -0,0 +1,820 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, Fragment, useEffect, useMemo, useState, useCallback } from 'react'; +import { merge } from 'rxjs'; +import { + EuiFlexGroup, + EuiFlexItem, + EuiPage, + EuiPageBody, + EuiPageContentBody, + EuiPageContentHeader, + EuiPageContentHeaderSection, + EuiPanel, + EuiSpacer, + EuiTitle, +} from '@elastic/eui'; +import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { Required } from 'utility-types'; +import { + IndexPatternField, + KBN_FIELD_TYPES, + esQuery, + esKuery, + UI_SETTINGS, + Query, +} from '../../../../../../../src/plugins/data/public'; +import { NavigationMenu } from '../../components/navigation_menu'; +import { DatePickerWrapper } from '../../components/navigation_menu/date_picker_wrapper'; +import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; +import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; +import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; +import { useMlContext } from '../../contexts/ml'; +import { kbnTypeToMLJobType } from '../../util/field_types_utils'; +import { useNotifications, useTimefilter } from '../../contexts/kibana'; +import { getQueryFromSavedSearch } from '../../util/index_utils'; +import { getTimeBucketsFromCache } from '../../util/time_buckets'; +import { usePageUrlState, useUrlState } from '../../util/url_state'; +import { ActionsPanel } from './components/actions_panel'; +import { SearchPanel } from './components/search_panel'; +import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; +import { DataLoader } from './data_loader'; +import { FieldVisConfig } from '../stats_table/types'; +import type { + MetricFieldsStats, + TotalFieldsStats, +} from '../stats_table/components/field_count_stats'; +import { OverallStats } from '../../types/overall_stats'; +import { getActions } from '../field_data_row/action_menu'; +import { IndexBasedDataVisualizerExpandedRow } from '../expanded_row/index_based_expanded_row'; +import { DATA_VISUALIZER_INDEX_VIEWER } from '../../constants/index_data_visualizer_viewer'; +import { DataVisualizerIndexBasedAppState } from '../../types/index_data_visualizer_state'; +import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../types/combined_query'; +import { FieldRequestConfig, JobFieldType, SavedSearchSavedObject } from '../../../../common/types'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { FieldCountPanel } from '../field_count_panel'; +import { DocumentCountContent } from '../document_count_content'; + +interface DataVisualizerPageState { + overallStats: OverallStats; + metricConfigs: FieldVisConfig[]; + totalMetricFieldCount: number; + populatedMetricFieldCount: number; + metricsLoaded: boolean; + nonMetricConfigs: FieldVisConfig[]; + nonMetricsLoaded: boolean; + documentCountStats?: FieldVisConfig; +} + +const defaultSearchQuery = { + match_all: {}, +}; + +function getDefaultPageState(): DataVisualizerPageState { + return { + overallStats: { + totalCount: 0, + aggregatableExistsFields: [], + aggregatableNotExistsFields: [], + nonAggregatableExistsFields: [], + nonAggregatableNotExistsFields: [], + }, + metricConfigs: [], + totalMetricFieldCount: 0, + populatedMetricFieldCount: 0, + metricsLoaded: false, + nonMetricConfigs: [], + nonMetricsLoaded: false, + documentCountStats: undefined, + }; +} +export const getDefaultDataVisualizerListState = (): Required => ({ + pageIndex: 0, + pageSize: 10, + sortField: 'fieldName', + sortDirection: 'asc', + visibleFieldTypes: [], + visibleFieldNames: [], + samplerShardSize: 5000, + searchString: '', + searchQuery: defaultSearchQuery, + searchQueryLanguage: SEARCH_QUERY_LANGUAGE.KUERY, + showDistributions: true, + showAllFields: false, + showEmptyFields: false, +}); + +export const IndexDataVisualizerView: FC = () => { + const mlContext = useMlContext(); + const restorableDefaults = getDefaultDataVisualizerListState(); + const { + services: { lens: lensPlugin, docLinks }, + } = useFileDataVisualizerKibana(); + + const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState( + DATA_VISUALIZER_INDEX_VIEWER, + restorableDefaults + ); + const [currentSavedSearch, setCurrentSavedSearch] = useState(mlContext.currentSavedSearch); + + const { combinedQuery, currentIndexPattern, kibanaConfig } = mlContext; + const timefilter = useTimefilter({ + timeRangeSelector: currentIndexPattern.timeFieldName !== undefined, + autoRefreshSelector: true, + }); + + const { toasts } = useNotifications(); + const dataLoader = useMemo(() => new DataLoader(currentIndexPattern, toasts), [ + currentIndexPattern, + ]); + + const [globalState, setGlobalState] = useUrlState('_g'); + useEffect(() => { + if (globalState?.time !== undefined) { + timefilter.setTime({ + from: globalState.time.from, + to: globalState.time.to, + }); + } + }, [globalState?.time?.from, globalState?.time?.to]); + useEffect(() => { + if (globalState?.refreshInterval !== undefined) { + timefilter.setRefreshInterval(globalState.refreshInterval); + } + }, [globalState?.refreshInterval?.pause, globalState?.refreshInterval?.value]); + + const [lastRefresh, setLastRefresh] = useState(0); + + useEffect(() => { + if (!currentIndexPattern.isTimeBased()) { + // toastNotifications.addWarning({ + // title: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle', { + // defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', + // values: { indexPatternTitle: currentIndexPattern.title }, + // }), + // text: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription', { + // defaultMessage: 'Anomaly detection only runs over time-based indices', + // }), + // + // }) + } + }, [currentIndexPattern]); + + // Obtain the list of non metric field types which appear in the index pattern. + let indexedFieldTypes: JobFieldType[] = []; + const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields; + indexPatternFields.forEach((field) => { + if (field.scripted !== true) { + const dataVisualizerType: JobFieldType | undefined = kbnTypeToMLJobType(field); + if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) { + indexedFieldTypes.push(dataVisualizerType); + } + } + }); + indexedFieldTypes = indexedFieldTypes.sort(); + + const defaults = getDefaultPageState(); + + const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => { + const searchData = extractSearchData(currentSavedSearch); + if (searchData === undefined || dataVisualizerListState.searchString !== '') { + return { + searchQuery: dataVisualizerListState.searchQuery, + searchString: dataVisualizerListState.searchString, + searchQueryLanguage: dataVisualizerListState.searchQueryLanguage, + }; + } else { + return { + searchQuery: searchData.searchQuery, + searchString: searchData.searchString, + searchQueryLanguage: searchData.queryLanguage, + }; + } + }, [currentSavedSearch, dataVisualizerListState]); + + const setSearchParams = (searchParams: { + searchQuery: Query['query']; + searchString: Query['query']; + queryLanguage: SearchQueryLanguage; + }) => { + // When the user loads saved search and then clear or modify the query + // we should remove the saved search and replace it with the index pattern id + if (currentSavedSearch !== null) { + setCurrentSavedSearch(null); + } + + setDataVisualizerListState({ + ...dataVisualizerListState, + searchQuery: searchParams.searchQuery, + searchString: searchParams.searchString, + searchQueryLanguage: searchParams.queryLanguage, + }); + }; + + const samplerShardSize = + dataVisualizerListState.samplerShardSize ?? restorableDefaults.samplerShardSize; + const setSamplerShardSize = (value: number) => { + setDataVisualizerListState({ ...dataVisualizerListState, samplerShardSize: value }); + }; + + const visibleFieldTypes = + dataVisualizerListState.visibleFieldTypes ?? restorableDefaults.visibleFieldTypes; + const setVisibleFieldTypes = (values: string[]) => { + setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldTypes: values }); + }; + + const visibleFieldNames = + dataVisualizerListState.visibleFieldNames ?? restorableDefaults.visibleFieldNames; + const setVisibleFieldNames = (values: string[]) => { + setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldNames: values }); + }; + + const showEmptyFields = + dataVisualizerListState.showEmptyFields ?? restorableDefaults.showEmptyFields; + const toggleShowEmptyFields = () => { + setDataVisualizerListState({ + ...dataVisualizerListState, + showEmptyFields: !dataVisualizerListState.showEmptyFields, + }); + }; + + const [overallStats, setOverallStats] = useState(defaults.overallStats); + + const [documentCountStats, setDocumentCountStats] = useState(defaults.documentCountStats); + const [metricConfigs, setMetricConfigs] = useState(defaults.metricConfigs); + const [metricsLoaded, setMetricsLoaded] = useState(defaults.metricsLoaded); + const [metricsStats, setMetricsStats] = useState(); + + const [nonMetricConfigs, setNonMetricConfigs] = useState(defaults.nonMetricConfigs); + const [nonMetricsLoaded, setNonMetricsLoaded] = useState(defaults.nonMetricsLoaded); + + useEffect(() => { + const timeUpdateSubscription = merge( + timefilter.getTimeUpdate$(), + mlTimefilterRefresh$ + ).subscribe(() => { + setGlobalState({ + time: timefilter.getTime(), + refreshInterval: timefilter.getRefreshInterval(), + }); + setLastRefresh(Date.now()); + }); + return () => { + timeUpdateSubscription.unsubscribe(); + }; + }); + + useEffect(() => { + loadOverallStats(); + }, [searchQuery, samplerShardSize, lastRefresh]); + + useEffect(() => { + createMetricCards(); + createNonMetricCards(); + }, [overallStats, showEmptyFields]); + + useEffect(() => { + loadMetricFieldStats(); + }, [metricConfigs]); + + useEffect(() => { + loadNonMetricFieldStats(); + }, [nonMetricConfigs]); + + useEffect(() => { + createMetricCards(); + }, [metricsLoaded]); + + useEffect(() => { + createNonMetricCards(); + }, [nonMetricsLoaded]); + + /** + * Extract query data from the saved search object. + */ + function extractSearchData(savedSearch: SavedSearchSavedObject | null) { + if (!savedSearch) { + return undefined; + } + + const { query } = getQueryFromSavedSearch(savedSearch); + const queryLanguage = query.language as SearchQueryLanguage; + const qryString = query.query; + let qry; + if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { + const ast = esKuery.fromKueryExpression(qryString); + qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); + } else { + qry = esQuery.luceneStringToDsl(qryString); + esQuery.decorateQuery(qry, kibanaConfig.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); + } + + return { + searchQuery: qry, + searchString: qryString, + queryLanguage, + }; + } + + async function loadOverallStats() { + const tf = timefilter as any; + let earliest; + let latest; + + const activeBounds = tf.getActiveBounds(); + + if (currentIndexPattern.timeFieldName !== undefined && activeBounds === undefined) { + return; + } + + if (currentIndexPattern.timeFieldName !== undefined) { + earliest = activeBounds.min.valueOf(); + latest = activeBounds.max.valueOf(); + } + + try { + const allStats = await dataLoader.loadOverallData( + searchQuery, + samplerShardSize, + earliest, + latest + ); + setOverallStats(allStats); + } catch (err) { + dataLoader.displayError(err); + } + } + + async function loadMetricFieldStats() { + // Only request data for fields that exist in documents. + if (metricConfigs.length === 0) { + return; + } + + const configsToLoad = metricConfigs.filter( + (config) => config.existsInDocs === true && config.loading === true + ); + if (configsToLoad.length === 0) { + return; + } + + // Pass the field name, type and cardinality in the request. + // Top values will be obtained on a sample if cardinality > 100000. + const existMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => { + const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 }; + if (config.stats !== undefined && config.stats.cardinality !== undefined) { + props.cardinality = config.stats.cardinality; + } + return props; + }); + + // Obtain the interval to use for date histogram aggregations + // (such as the document count chart). Aim for 75 bars. + const buckets = getTimeBucketsFromCache(); + + const tf = timefilter as any; + let earliest: number | undefined; + let latest: number | undefined; + if (currentIndexPattern.timeFieldName !== undefined) { + earliest = tf.getActiveBounds().min.valueOf(); + latest = tf.getActiveBounds().max.valueOf(); + } + + const bounds = tf.getActiveBounds(); + const BAR_TARGET = 75; + buckets.setInterval('auto'); + buckets.setBounds(bounds); + buckets.setBarTarget(BAR_TARGET); + const aggInterval = buckets.getInterval(); + + try { + const metricFieldStats = await dataLoader.loadFieldStats( + searchQuery, + samplerShardSize, + earliest, + latest, + existMetricFields, + aggInterval.asMilliseconds() + ); + + // Add the metric stats to the existing stats in the corresponding config. + const configs: FieldVisConfig[] = []; + metricConfigs.forEach((config) => { + const configWithStats = { ...config }; + if (config.fieldName !== undefined) { + configWithStats.stats = { + ...configWithStats.stats, + ...metricFieldStats.find( + (fieldStats: any) => fieldStats.fieldName === config.fieldName + ), + }; + configWithStats.loading = false; + configs.push(configWithStats); + } else { + // Document count card. + configWithStats.stats = metricFieldStats.find( + (fieldStats: any) => fieldStats.fieldName === undefined + ); + + if (configWithStats.stats !== undefined) { + // Add earliest / latest of timefilter for setting x axis domain. + configWithStats.stats.timeRangeEarliest = earliest; + configWithStats.stats.timeRangeLatest = latest; + } + setDocumentCountStats(configWithStats); + } + }); + + setMetricConfigs(configs); + } catch (err) { + dataLoader.displayError(err); + } + } + + async function loadNonMetricFieldStats() { + // Only request data for fields that exist in documents. + if (nonMetricConfigs.length === 0) { + return; + } + + const configsToLoad = nonMetricConfigs.filter( + (config) => config.existsInDocs === true && config.loading === true + ); + if (configsToLoad.length === 0) { + return; + } + + // Pass the field name, type and cardinality in the request. + // Top values will be obtained on a sample if cardinality > 100000. + const existNonMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => { + const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 }; + if (config.stats !== undefined && config.stats.cardinality !== undefined) { + props.cardinality = config.stats.cardinality; + } + return props; + }); + + const tf = timefilter as any; + let earliest; + let latest; + if (currentIndexPattern.timeFieldName !== undefined) { + earliest = tf.getActiveBounds().min.valueOf(); + latest = tf.getActiveBounds().max.valueOf(); + } + + try { + const nonMetricFieldStats = await dataLoader.loadFieldStats( + searchQuery, + samplerShardSize, + earliest, + latest, + existNonMetricFields + ); + + // Add the field stats to the existing stats in the corresponding config. + const configs: FieldVisConfig[] = []; + nonMetricConfigs.forEach((config) => { + const configWithStats = { ...config }; + if (config.fieldName !== undefined) { + configWithStats.stats = { + ...configWithStats.stats, + ...nonMetricFieldStats.find( + (fieldStats: any) => fieldStats.fieldName === config.fieldName + ), + }; + } + configWithStats.loading = false; + configs.push(configWithStats); + }); + + setNonMetricConfigs(configs); + } catch (err) { + dataLoader.displayError(err); + } + } + + function createMetricCards() { + const configs: FieldVisConfig[] = []; + const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; + + const allMetricFields = indexPatternFields.filter((f) => { + return ( + f.type === KBN_FIELD_TYPES.NUMBER && + f.displayName !== undefined && + dataLoader.isDisplayField(f.displayName) === true + ); + }); + const metricExistsFields = allMetricFields.filter((f) => { + return aggregatableExistsFields.find((existsF) => { + return existsF.fieldName === f.displayName; + }); + }); + + // Add a config for 'document count', identified by no field name if indexpattern is time based. + if (currentIndexPattern.timeFieldName !== undefined) { + configs.push({ + type: ML_JOB_FIELD_TYPES.NUMBER, + existsInDocs: true, + loading: true, + aggregatable: true, + }); + } + + if (metricsLoaded === false) { + setMetricsLoaded(true); + return; + } + + let aggregatableFields: any[] = overallStats.aggregatableExistsFields; + if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) { + aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields); + } + + const metricFieldsToShow = + metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields; + + metricFieldsToShow.forEach((field) => { + const fieldData = aggregatableFields.find((f) => { + return f.fieldName === field.displayName; + }); + + const metricConfig: FieldVisConfig = { + ...(fieldData ? fieldData : {}), + fieldFormat: currentIndexPattern.getFormatterForField(field), + type: ML_JOB_FIELD_TYPES.NUMBER, + loading: true, + aggregatable: true, + }; + + configs.push(metricConfig); + }); + + setMetricsStats({ + totalMetricFieldsCount: allMetricFields.length, + visibleMetricsCount: metricFieldsToShow.length, + }); + setMetricConfigs(configs); + } + + function createNonMetricCards() { + const allNonMetricFields = indexPatternFields.filter((f) => { + return ( + f.type !== KBN_FIELD_TYPES.NUMBER && + f.displayName !== undefined && + dataLoader.isDisplayField(f.displayName) === true + ); + }); + // Obtain the list of all non-metric fields which appear in documents + // (aggregatable or not aggregatable). + const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. + let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. + const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; + const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; + + allNonMetricFields.forEach((f) => { + const checkAggregatableField = aggregatableExistsFields.find( + (existsField) => existsField.fieldName === f.displayName + ); + + if (checkAggregatableField !== undefined) { + populatedNonMetricFields.push(f); + nonMetricFieldData.push(checkAggregatableField); + } else { + const checkNonAggregatableField = nonAggregatableExistsFields.find( + (existsField) => existsField.fieldName === f.displayName + ); + + if (checkNonAggregatableField !== undefined) { + populatedNonMetricFields.push(f); + nonMetricFieldData.push(checkNonAggregatableField); + } + } + }); + + if (nonMetricsLoaded === false) { + setNonMetricsLoaded(true); + return; + } + + if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) { + // Combine the field data obtained from Elasticsearch into a single array. + nonMetricFieldData = nonMetricFieldData.concat( + overallStats.aggregatableNotExistsFields, + overallStats.nonAggregatableNotExistsFields + ); + } + + const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields; + + const configs: FieldVisConfig[] = []; + + nonMetricFieldsToShow.forEach((field) => { + const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName); + + const nonMetricConfig = { + ...fieldData, + fieldFormat: currentIndexPattern.getFormatterForField(field), + aggregatable: field.aggregatable, + scripted: field.scripted, + loading: fieldData.existsInDocs, + }; + + // Map the field type from the Kibana index pattern to the field type + // used in the data visualizer. + const dataVisualizerType = kbnTypeToMLJobType(field); + if (dataVisualizerType !== undefined) { + nonMetricConfig.type = dataVisualizerType; + } else { + // Add a flag to indicate that this is one of the 'other' Kibana + // field types that do not yet have a specific card type. + nonMetricConfig.type = field.type; + nonMetricConfig.isUnsupportedType = true; + } + + configs.push(nonMetricConfig); + }); + + setNonMetricConfigs(configs); + } + + const wizardPanelWidth = '280px'; + + const configs = useMemo(() => { + let combinedConfigs = [...nonMetricConfigs, ...metricConfigs]; + if (visibleFieldTypes && visibleFieldTypes.length > 0) { + combinedConfigs = combinedConfigs.filter( + (config) => visibleFieldTypes.findIndex((field) => field === config.type) > -1 + ); + } + if (visibleFieldNames && visibleFieldNames.length > 0) { + combinedConfigs = combinedConfigs.filter( + (config) => visibleFieldNames.findIndex((field) => field === config.fieldName) > -1 + ); + } + + return combinedConfigs; + }, [nonMetricConfigs, metricConfigs, visibleFieldTypes, visibleFieldNames]); + + const fieldsCountStats: TotalFieldsStats | undefined = useMemo(() => { + let _visibleFieldsCount = 0; + let _totalFieldsCount = 0; + Object.keys(overallStats).forEach((key) => { + const fieldsGroup = overallStats[key as keyof OverallStats]; + if (Array.isArray(fieldsGroup) && fieldsGroup.length > 0) { + _totalFieldsCount += fieldsGroup.length; + } + }); + + if (showEmptyFields === true) { + _visibleFieldsCount = _totalFieldsCount; + } else { + _visibleFieldsCount = + overallStats.aggregatableExistsFields.length + + overallStats.nonAggregatableExistsFields.length; + } + return { visibleFieldsCount: _visibleFieldsCount, totalFieldsCount: _totalFieldsCount }; + }, [overallStats, showEmptyFields]); + + const getItemIdToExpandedRowMap = useCallback( + function (itemIds: string[], items: FieldVisConfig[]): ItemIdToExpandedRowMap { + return itemIds.reduce((m: ItemIdToExpandedRowMap, fieldName: string) => { + const item = items.find((fieldVisConfig) => fieldVisConfig.fieldName === fieldName); + if (item !== undefined) { + m[fieldName] = ( + + ); + } + return m; + }, {} as ItemIdToExpandedRowMap); + }, + [currentIndexPattern, searchQuery] + ); + + // Inject custom action column for the index based visualizer + const extendedColumns = useMemo(() => { + if (lensPlugin === undefined) { + // eslint-disable-next-line no-console + console.error('Lens plugin not available'); + return; + } + const actionColumn: EuiTableActionsColumnType = { + name: ( + + ), + actions: getActions(currentIndexPattern, lensPlugin, { searchQueryLanguage, searchString }), + width: '100px', + }; + + return [actionColumn]; + }, [currentIndexPattern, lensPlugin, searchQueryLanguage, searchString]); + + const helpLink = docLinks.links.ml.guide; + return ( + + + + + + + + + +

{currentIndexPattern.title}

+ + + + + {currentIndexPattern.timeFieldName !== undefined && ( + + + + )} + + + + + + + + + + + + + + {overallStats?.totalCount !== undefined && ( + + + + )} + + + + + + + + items={configs} + pageState={dataVisualizerListState} + updatePageState={setDataVisualizerListState} + getItemIdToExpandedRowMap={getItemIdToExpandedRowMap} + extendedColumns={extendedColumns} + /> + + + + + + + + + + + {/* @todo */} + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/index.ts new file mode 100644 index 0000000000000..b4c0c890b0978 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { LoadingIndicator } from './loading_indicator'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx new file mode 100644 index 0000000000000..d6f06be38cd39 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, Fragment } from 'react'; + +import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; + +// @remove + +export const LoadingIndicator: FC = () => ( + + + + + + + + + + + + + + + +); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/index.ts new file mode 100644 index 0000000000000..0c5e54b846bb8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { NotInDocsContent } from './not_in_docs_context'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx new file mode 100644 index 0000000000000..e3bb4323ce6a8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, Fragment } from 'react'; +import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; + +export const NotInDocsContent: FC = () => ( + + + + + + + + + + + +); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts index e9ef0cd75e286..0629c42a42119 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts @@ -39,6 +39,7 @@ export interface FieldVisStats { latest?: number; documentCounts?: { buckets?: DocumentCountBuckets; + interval?: number; }; avg?: number; distribution?: { diff --git a/x-pack/plugins/file_data_visualizer/public/application/constants/index_data_visualizer_viewer.ts b/x-pack/plugins/file_data_visualizer/public/application/constants/index_data_visualizer_viewer.ts new file mode 100644 index 0000000000000..cd12706d0bc9b --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/constants/index_data_visualizer_viewer.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export const DATA_VISUALIZER_INDEX_VIEWER = 'DATA_VISUALIZER_INDEX_VIEWER'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts b/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts new file mode 100644 index 0000000000000..2475116f83f62 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts @@ -0,0 +1,168 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +// Maximum number of examples to obtain for text type fields. +import { CoreSetup } from 'kibana/public'; +import { i18n } from '@kbn/i18n'; +import { IndexPattern } from '../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { RuntimeMappings } from '../../../../ml/common'; +import { IndexPatternTitle } from '../../../../ml/common/types/kibana'; +import { + ToastNotificationService, + toastNotificationServiceProvider, +} from '../../../../ml/public/application/services/toast_notification_service'; +import { SavedSearchQuery } from '../../../../ml/public/application/contexts/ml'; +import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common'; +import { ml } from '../../../../ml/public/application/services/ml_api_service'; +import { + DEFAULT_SAMPLER_SHARD_SIZE, + FieldHistogramRequestConfig, + FieldRequestConfig, + OMIT_FIELDS, +} from '../../../common'; + +const MAX_EXAMPLES_DEFAULT: number = 10; + +export class DataLoader { + private _indexPattern: IndexPattern; + private _runtimeMappings: RuntimeMappings; + private _indexPatternTitle: IndexPatternTitle = ''; + private _maxExamples: number = MAX_EXAMPLES_DEFAULT; + private _toastNotificationsService: ToastNotificationService; + + constructor( + indexPattern: IndexPattern, + toastNotifications: CoreSetup['notifications']['toasts'] + ) { + this._indexPattern = indexPattern; + this._runtimeMappings = this._indexPattern.getComputedFields().runtimeFields as RuntimeMappings; + this._indexPatternTitle = indexPattern.title; + this._toastNotificationsService = toastNotificationServiceProvider(toastNotifications); + } + + async loadOverallData( + query: string | SavedSearchQuery, + samplerShardSize: number, + earliest: number | undefined, + latest: number | undefined + ): Promise { + const aggregatableFields: string[] = []; + const nonAggregatableFields: string[] = []; + this._indexPattern.fields.forEach((field) => { + const fieldName = field.displayName !== undefined ? field.displayName : field.name; + if (this.isDisplayField(fieldName) === true) { + if (field.aggregatable === true && field.type !== KBN_FIELD_TYPES.GEO_SHAPE) { + aggregatableFields.push(fieldName); + } else { + nonAggregatableFields.push(fieldName); + } + } + }); + + // Need to find: + // 1. List of aggregatable fields that do exist in docs + // 2. List of aggregatable fields that do not exist in docs + // 3. List of non-aggregatable fields that do exist in docs. + // 4. List of non-aggregatable fields that do not exist in docs. + const stats = await ml.getVisualizerOverallStats({ + indexPatternTitle: this._indexPatternTitle, + query, + timeFieldName: this._indexPattern.timeFieldName, + samplerShardSize, + earliest, + latest, + aggregatableFields, + nonAggregatableFields, + runtimeMappings: this._runtimeMappings, + }); + + return stats; + } + + async loadFieldStats( + query: string | SavedSearchQuery, + samplerShardSize: number, + earliest: number | undefined, + latest: number | undefined, + fields: FieldRequestConfig[], + interval?: number + ): Promise { + const stats = await ml.getVisualizerFieldStats({ + indexPatternTitle: this._indexPatternTitle, + query, + timeFieldName: this._indexPattern.timeFieldName, + earliest, + latest, + samplerShardSize, + interval, + fields, + maxExamples: this._maxExamples, + runtimeMappings: this._runtimeMappings, + }); + + return stats; + } + + async loadFieldHistograms( + fields: FieldHistogramRequestConfig[], + query: string | SavedSearchQuery, + samplerShardSize = DEFAULT_SAMPLER_SHARD_SIZE, + editorRuntimeMappings?: RuntimeMappings + ): Promise { + const stats = await ml.getVisualizerFieldHistograms({ + indexPatternTitle: this._indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings: editorRuntimeMappings || this._runtimeMappings, + }); + + return stats; + } + + displayError(err: any) { + if (err.statusCode === 500) { + this._toastNotificationsService.displayErrorToast( + err, + i18n.translate('xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage', { + defaultMessage: + 'Error loading data in index {index}. {message}. ' + + 'The request may have timed out. Try using a smaller sample size or narrowing the time range.', + values: { + index: this._indexPattern.title, + message: err.message, + }, + }) + ); + } else { + this._toastNotificationsService.displayErrorToast( + err, + i18n.translate('xpack.ml.datavisualizer.page.errorLoadingDataMessage', { + defaultMessage: 'Error loading data in index {index}. {message}', + values: { + index: this._indexPattern.title, + message: err.message, + }, + }) + ); + } + } + + public set maxExamples(max: number) { + this._maxExamples = max; + } + + public get maxExamples(): number { + return this._maxExamples; + } + + // Returns whether the field with the specified name should be displayed, + // as certain fields such as _id and _source should be omitted from the view. + public isDisplayField(fieldName: string): boolean { + return !OMIT_FIELDS.includes(fieldName); + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts index 6752c322d42e3..a5aa688eadbba 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts @@ -10,4 +10,5 @@ import { useKibana } from '../../../../../src/plugins/kibana_react/public'; import type { FileDataVisualizerStartDependencies } from '../plugin'; export type StartServices = CoreStart & FileDataVisualizerStartDependencies; +// @todo: rename export const useFileDataVisualizerKibana = () => useKibana(); diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts b/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts new file mode 100644 index 0000000000000..4266249902c4a --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export const SEARCH_QUERY_LANGUAGE = { + KUERY: 'kuery', + LUCENE: 'lucene', +} as const; + +export type SearchQueryLanguage = typeof SEARCH_QUERY_LANGUAGE[keyof typeof SEARCH_QUERY_LANGUAGE]; + +export interface CombinedQuery { + searchString: string | { [key: string]: any }; + searchQueryLanguage: string; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts b/x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts new file mode 100644 index 0000000000000..40903f7af4976 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Query } from '../../../../../../src/plugins/data/common/query'; +import { SearchQueryLanguage } from './combined_query'; + +export interface ListingPageUrlState { + pageSize: number; + pageIndex: number; + sortField: string; + sortDirection: string; + queryText?: string; +} +export interface DataVisualizerIndexBasedAppState extends Omit { + searchString?: Query['query']; + searchQuery?: Query['query']; + searchQueryLanguage?: SearchQueryLanguage; + visibleFieldTypes?: string[]; + visibleFieldNames?: string[]; + samplerShardSize?: number; + showDistributions?: boolean; + showAllFields?: boolean; + showEmptyFields?: boolean; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/overall_stats.ts b/x-pack/plugins/file_data_visualizer/public/application/types/overall_stats.ts new file mode 100644 index 0000000000000..2672dc69ac29a --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/types/overall_stats.ts @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface AggregatableField { + fieldName: string; + stats: { + cardinality?: number; + count?: number; + sampleCount?: number; + }; + existsInDocs: boolean; +} + +export type NonAggregatableField = Omit; + +export interface OverallStats { + totalCount: number; + aggregatableExistsFields: AggregatableField[]; + aggregatableNotExistsFields: NonAggregatableField[]; + nonAggregatableExistsFields: AggregatableField[]; + nonAggregatableNotExistsFields: NonAggregatableField[]; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts new file mode 100644 index 0000000000000..13ad14b273a86 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Query } from '../../../../../../src/plugins/data/common/query'; +import { SavedSearchSavedObject } from '../../../common/types'; + +export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) { + const search = savedSearch.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string }; + return JSON.parse(search.searchSourceJSON) as { + query: Query; + filter: any[]; + }; +} diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/file_data_visualizer/public/plugin.ts index a94c0fce45cd4..9447f1e7e8b35 100644 --- a/x-pack/plugins/file_data_visualizer/public/plugin.ts +++ b/x-pack/plugins/file_data_visualizer/public/plugin.ts @@ -15,6 +15,7 @@ import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; import type { FileUploadPluginStart } from '../../file_upload/public'; import type { MapsStartApi } from '../../maps/public'; import type { SecurityPluginSetup } from '../../security/public'; +import type { LensPublicStart } from '../../lens/public'; import { getFileDataVisualizerComponent } from './api'; import { getMaxBytesFormatted } from './application/util/get_max_bytes'; @@ -27,6 +28,7 @@ export interface FileDataVisualizerStartDependencies { embeddable: EmbeddableStart; security?: SecurityPluginSetup; share: SharePluginStart; + lens: LensPublicStart; } export type FileDataVisualizerPluginSetup = ReturnType; diff --git a/x-pack/plugins/ml/common/constants/field_histograms.ts b/x-pack/plugins/ml/common/constants/field_histograms.ts index d87ed96a04e8b..c35c421d6fac4 100644 --- a/x-pack/plugins/ml/common/constants/field_histograms.ts +++ b/x-pack/plugins/ml/common/constants/field_histograms.ts @@ -5,5 +5,6 @@ * 2.0. */ +// @remove // Default sampler shard size used for field histograms export const DEFAULT_SAMPLER_SHARD_SIZE = 5000; diff --git a/x-pack/plugins/ml/common/constants/field_types.ts b/x-pack/plugins/ml/common/constants/field_types.ts index 04e1100e9f776..fa631d7a8d42e 100644 --- a/x-pack/plugins/ml/common/constants/field_types.ts +++ b/x-pack/plugins/ml/common/constants/field_types.ts @@ -30,5 +30,6 @@ export const DOC_COUNT = 'doc_count'; */ export const _DOC_COUNT = '_doc_count'; +// @remove // List of system fields we don't want to display. export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score']; diff --git a/x-pack/plugins/ml/common/types/datavisualizer.ts b/x-pack/plugins/ml/common/types/datavisualizer.ts index b2c1409471658..ae1a07644480b 100644 --- a/x-pack/plugins/ml/common/types/datavisualizer.ts +++ b/x-pack/plugins/ml/common/types/datavisualizer.ts @@ -5,6 +5,7 @@ * 2.0. */ +// @remove export interface AggregatableField { fieldName: string; stats: { diff --git a/x-pack/plugins/ml/common/types/ml_url_generator.ts b/x-pack/plugins/ml/common/types/ml_url_generator.ts index c7c3f3ae9b280..5dd6902097607 100644 --- a/x-pack/plugins/ml/common/types/ml_url_generator.ts +++ b/x-pack/plugins/ml/common/types/ml_url_generator.ts @@ -44,6 +44,7 @@ export interface MlGenericUrlPageState extends MlIndexBasedSearchState { [key: string]: any; } +// @remove export interface DataVisualizerIndexBasedAppState extends Omit { searchString?: Query['query']; searchQuery?: Query['query']; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts index 7723277959b1f..0257e4513cb84 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts @@ -5,6 +5,7 @@ * 2.0. */ +// @remove export interface CombinedQuery { searchString: string | { [key: string]: any }; searchQueryLanguage: string; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx index 588d85f24a023..bb79248b8dd59 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx @@ -15,6 +15,7 @@ export interface Props { totalCount: number; } +// @remove export const DocumentCountContent: FC = ({ config, totalCount }) => { if (config?.stats === undefined) { return totalCount !== undefined ? : null; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx index 4c8740cc76b6f..f0b6c7e93e5ed 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx @@ -34,6 +34,7 @@ interface Props { const SPEC_ID = 'document_count'; +// @remove export const DocumentCountChart: FC = ({ width, chartPoints, diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts index 9d705c8cd725f..558f48ff1f5cf 100644 --- a/x-pack/plugins/ml/public/application/util/index_utils.ts +++ b/x-pack/plugins/ml/public/application/util/index_utils.ts @@ -122,6 +122,7 @@ export function getSavedSearchById(id: string): SavedSearchSavedObject | undefin return savedSearchesCache.find((s) => s.id === id); } +// @remove /** * Returns true if the index passed in is time based * an optional flag will trigger the display a notification at the top of the page From cb3408d163681d1ca038340fa225cdb1971f2dd0 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Tue, 25 May 2021 17:02:41 -0500 Subject: [PATCH 02/53] [ML] Readd support for global state --- .../common/types/indices.ts | 14 ++ .../common/types/time_field_request.ts | 12 + .../file_data_visualizer/public/api/index.ts | 145 ++++++++++++ .../actions_panel/actions_panel.tsx | 138 ++++++++++++ .../components/actions_panel/index.ts | 8 + .../date_picker_wrapper.test.tsx | 110 +++++++++ .../date_picker_wrapper.tsx | 167 ++++++++++++++ .../components/date_picker_wrapper/index.ts | 8 + .../field_data_row/action_menu/lens_utils.ts | 39 ++-- .../full_time_range_selector.tsx | 54 +++++ .../full_time_range_selector_service.ts | 62 +++++ .../full_time_range_selector/index.tsx | 9 + .../components/help_menu/help_menu.tsx | 37 +++ .../components/help_menu/index.tsx | 8 + .../index_datavisualizer_view/index.ts | 8 + .../index_datavisualizer_view.tsx | 130 +++++++---- .../application/components/link_card/index.ts | 8 + .../components/link_card/link_card.tsx | 81 +++++++ .../search_panel/field_name_filter.tsx | 63 ++++++ .../search_panel/field_type_filter.tsx | 73 ++++++ .../components/search_panel/index.ts | 8 + .../components/search_panel/search_panel.tsx | 158 +++++++++++++ .../search_panel/shard_size_select.tsx | 66 ++++++ .../components/utils/object_utils.ts | 36 +++ .../application/data_loader/data_loader.ts | 60 +++-- .../application/hooks/kibana_services.ts | 42 ++++ .../application/index_data_visualizer.tsx | 28 +++ .../services/timefilter_refresh_service.ts | 12 + .../application/types/combined_query.ts | 5 + .../application/util/field_types_utils.ts | 38 ++++ .../application/util/url_state.test.tsx | 89 ++++++++ .../public/application/util/url_state.tsx | 213 ++++++++++++++++++ .../services/ml_api_service/index.ts | 5 + 33 files changed, 1843 insertions(+), 91 deletions(-) create mode 100644 x-pack/plugins/file_data_visualizer/common/types/indices.ts create mode 100644 x-pack/plugins/file_data_visualizer/common/types/time_field_request.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/index.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/help_menu/index.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/link_card/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/link_card/link_card.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/search_panel/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/search_panel/shard_size_select.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/utils/object_utils.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx diff --git a/x-pack/plugins/file_data_visualizer/common/types/indices.ts b/x-pack/plugins/file_data_visualizer/common/types/indices.ts new file mode 100644 index 0000000000000..c80b89b4e84c7 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/types/indices.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; + +export interface IndicesOptions { + allow_no_indices?: boolean; + expand_wildcards?: estypes.ExpandWildcards; + ignore_unavailable?: boolean; +} diff --git a/x-pack/plugins/file_data_visualizer/common/types/time_field_request.ts b/x-pack/plugins/file_data_visualizer/common/types/time_field_request.ts new file mode 100644 index 0000000000000..efc5a58138ae9 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/types/time_field_request.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface GetTimeFieldRangeResponse { + success: boolean; + start: { epoch: number; string: string }; + end: { epoch: number; string: string }; +} diff --git a/x-pack/plugins/file_data_visualizer/public/api/index.ts b/x-pack/plugins/file_data_visualizer/public/api/index.ts index 13efd80133349..d0eb761d9addd 100644 --- a/x-pack/plugins/file_data_visualizer/public/api/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/api/index.ts @@ -5,10 +5,155 @@ * 2.0. */ +import { estypes } from '@elastic/elasticsearch'; import { lazyLoadModules } from '../lazy_load_bundle'; import { FileDataVisualizer } from '../application'; +import { FieldHistogramRequestConfig, FieldRequestConfig } from '../../common/types'; +import { GetTimeFieldRangeResponse } from '../../common/types/time_field_request'; +import { IndicesOptions } from '../../common/types/indices'; export async function getFileDataVisualizerComponent(): Promise { const modules = await lazyLoadModules(); return modules.FileDataVisualizer; } + +export function basePath() { + return '/api/ml'; +} + +export async function getVisualizerOverallStats({ + indexPatternTitle, + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + aggregatableFields, + nonAggregatableFields, + runtimeMappings, +}: { + indexPatternTitle: string; + query: any; + timeFieldName?: string; + earliest?: number; + latest?: number; + samplerShardSize?: number; + aggregatableFields: string[]; + nonAggregatableFields: string[]; + runtimeMappings?: estypes.RuntimeFields; +}) { + const body = JSON.stringify({ + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + aggregatableFields, + nonAggregatableFields, + runtimeMappings, + }); + + const fileUploadModules = await lazyLoadModules(); + // @todo: update + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`, + method: 'POST', + body, + }); +} + +export async function getVisualizerFieldStats({ + indexPatternTitle, + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + interval, + fields, + maxExamples, + runtimeMappings, +}: { + indexPatternTitle: string; + query: any; + timeFieldName?: string; + earliest?: number; + latest?: number; + samplerShardSize?: number; + interval?: number; + fields?: FieldRequestConfig[]; + maxExamples?: number; + runtimeMappings?: estypes.RuntimeFields; +}) { + const body = JSON.stringify({ + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + interval, + fields, + maxExamples, + runtimeMappings, + }); + + const fileUploadModules = await lazyLoadModules(); + // @todo: update + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`, + method: 'POST', + body, + }); +} + +export async function getVisualizerFieldHistograms({ + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings, +}: { + indexPatternTitle: string; + query: any; + fields: FieldHistogramRequestConfig[]; + samplerShardSize?: number; + runtimeMappings?: estypes.RuntimeFields; +}) { + const body = JSON.stringify({ + query, + fields, + samplerShardSize, + runtimeMappings, + }); + + const fileUploadModules = await lazyLoadModules(); + // @todo: update type + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/data_visualizer/get_field_histograms/${indexPatternTitle}`, + method: 'POST', + body, + }); +} + +export async function getTimeFieldRange({ + index, + timeFieldName, + query, + runtimeMappings, + indicesOptions, +}: { + index: string; + timeFieldName?: string; + query: any; + runtimeMappings?: estypes.RuntimeFields; + indicesOptions?: IndicesOptions; +}) { + const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings, indicesOptions }); + const fileUploadModules = await lazyLoadModules(); + + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/fields_service/time_field_range`, + method: 'POST', + body, + }); +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx new file mode 100644 index 0000000000000..0f4c250e4b652 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx @@ -0,0 +1,138 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useState, useEffect } from 'react'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@kbn/i18n'; +import { EuiSpacer, EuiTitle } from '@elastic/eui'; +import { + DISCOVER_APP_URL_GENERATOR, + DiscoverUrlGeneratorState, +} from '../../../../../../../src/plugins/discover/public'; +import type { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useUrlState } from '../../util/url_state'; +import { LinkCard } from '../link_card'; + +interface Props { + indexPattern: IndexPattern; + searchString?: string | { [key: string]: any }; + searchQueryLanguage?: string; +} + +// @todo: add back create job card +export const ActionsPanel: FC = ({ indexPattern, searchString, searchQueryLanguage }) => { + // const [recognizerResultsCount, setRecognizerResultsCount] = useState(0); + const [globalState] = useUrlState('_g'); + + const [discoverLink, setDiscoverLink] = useState(''); + const { + services: { + application: { capabilities }, + share: { + urlGenerators: { getUrlGenerator }, + }, + }, + } = useFileDataVisualizerKibana(); + + // const recognizerResults = { + // count: 0, + // onChange() { + // setRecognizerResultsCount(recognizerResults.count); + // }, + // }; + + useEffect(() => { + let unmounted = false; + + const indexPatternId = indexPattern.id; + const getDiscoverUrl = async (): Promise => { + const isDiscoverAvailable = capabilities.discover?.show ?? false; + if (!isDiscoverAvailable) { + return; + } + + const state: DiscoverUrlGeneratorState = { + indexPatternId, + }; + if (searchString && searchQueryLanguage !== undefined) { + state.query = { query: searchString, language: searchQueryLanguage }; + } + if (globalState?.time) { + state.timeRange = globalState.time; + } + if (globalState?.refreshInterval) { + state.refreshInterval = globalState.refreshInterval; + } + + let discoverUrlGenerator; + try { + discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR); + } catch (error) { + // ignore error thrown when url generator is not available + return; + } + + const discoverUrl = await discoverUrlGenerator.createUrl(state); + if (!unmounted) { + setDiscoverLink(discoverUrl); + } + + // let mlUrlGenerator; + // try { + // discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR); + // } catch (error) { + // // ignore error thrown when url generator is not available + // return; + // } + }; + + getDiscoverUrl(); + return () => { + unmounted = true; + }; + }, [indexPattern, searchString, searchQueryLanguage, globalState]); + + // Note we use display:none for the DataRecognizer section as it needs to be + // passed the recognizerResults object, and then run the recognizer check which + // controls whether the recognizer section is ultimately displayed. + return ( +
+ {discoverLink && ( + <> + +

+ +

+ + + + } + data-test-subj="mlDataVisualizerViewInDiscoverCard" + /> + + )} +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/index.ts new file mode 100644 index 0000000000000..48d0c26d6636a --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { ActionsPanel } from './actions_panel'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx new file mode 100644 index 0000000000000..cc7c4cbd15a0b --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx @@ -0,0 +1,110 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { mount } from 'enzyme'; +import { render } from '@testing-library/react'; +import React from 'react'; + +import { EuiSuperDatePicker } from '@elastic/eui'; + +import { useUrlState } from '../../../util/url_state'; +import { mlTimefilterRefresh$ } from '../../../services/timefilter_refresh_service'; + +import { DatePickerWrapper } from './date_picker_wrapper'; + +jest.mock('@elastic/eui', () => { + const EuiSuperDatePickerMock = jest.fn(() => { + return null; + }); + return { EuiSuperDatePicker: EuiSuperDatePickerMock }; +}); + +jest.mock('../../../util/url_state', () => { + return { + useUrlState: jest.fn(() => { + return [{ refreshInterval: { value: 0, pause: true } }, jest.fn()]; + }), + }; +}); + +jest.mock('../../../contexts/kibana', () => ({ + useMlKibana: () => { + return { + services: { + uiSettings: { + get: jest.fn().mockReturnValue([ + { + from: 'now/d', + to: 'now/d', + display: 'Today', + }, + { + from: 'now/w', + to: 'now/w', + display: 'This week', + }, + ]), + }, + data: { + query: { + timefilter: { + timefilter: { + getRefreshInterval: jest.fn(), + setRefreshInterval: jest.fn(), + getTime: jest.fn(() => { + return { from: '', to: '' }; + }), + isAutoRefreshSelectorEnabled: jest.fn(() => true), + isTimeRangeSelectorEnabled: jest.fn(() => true), + getRefreshIntervalUpdate$: jest.fn(), + getTimeUpdate$: jest.fn(), + getEnabledUpdated$: jest.fn(), + }, + history: { get: jest.fn() }, + }, + }, + }, + }, + }; + }, +})); + +const MockedEuiSuperDatePicker = EuiSuperDatePicker as jest.MockedClass; + +describe('Navigation Menu: ', () => { + beforeEach(() => { + jest.useFakeTimers(); + MockedEuiSuperDatePicker.mockClear(); + }); + + afterEach(() => { + jest.useRealTimers(); + }); + + test('Minimal initialization.', () => { + const refreshListener = jest.fn(); + const refreshSubscription = mlTimefilterRefresh$.subscribe(refreshListener); + + const wrapper = mount(); + expect(wrapper.find(DatePickerWrapper)).toHaveLength(1); + expect(refreshListener).toBeCalledTimes(0); + + refreshSubscription.unsubscribe(); + }); + + test('should not allow disabled pause with 0 refresh interval', () => { + // arrange + (useUrlState as jest.Mock).mockReturnValue([{ refreshInterval: { pause: false, value: 0 } }]); + + // act + render(); + + // assert + const calledWith = MockedEuiSuperDatePicker.mock.calls[0][0]; + expect(calledWith.isPaused).toBe(true); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx new file mode 100644 index 0000000000000..b1127041ee9ea --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx @@ -0,0 +1,167 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; +import { Subscription } from 'rxjs'; +import { debounce } from 'lodash'; + +import { EuiSuperDatePicker, OnRefreshProps } from '@elastic/eui'; +import { TimeHistoryContract, TimeRange, UI_SETTINGS } from 'src/plugins/data/public'; + +import { useUrlState } from '../../util/url_state'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; + +interface TimePickerQuickRange { + from: string; + to: string; + display: string; +} + +interface Duration { + start: string; + end: string; +} + +interface RefreshInterval { + pause: boolean; + value: number; +} + +function getRecentlyUsedRangesFactory(timeHistory: TimeHistoryContract) { + return function (): Duration[] { + return ( + timeHistory.get()?.map(({ from, to }: TimeRange) => { + return { + start: from, + end: to, + }; + }) ?? [] + ); + }; +} + +function updateLastRefresh(timeRange: OnRefreshProps) { + mlTimefilterRefresh$.next({ lastRefresh: Date.now(), timeRange }); +} + +export const DatePickerWrapper: FC = () => { + const { services } = useFileDataVisualizerKibana(); + const config = services.uiSettings; + const { timefilter, history } = services.data.query.timefilter; + + const [globalState, setGlobalState] = useUrlState('_g'); + const getRecentlyUsedRanges = getRecentlyUsedRangesFactory(history); + + const refreshInterval: RefreshInterval = + globalState?.refreshInterval ?? timefilter.getRefreshInterval(); + + const setRefreshInterval = useCallback( + debounce((refreshIntervalUpdate: RefreshInterval) => { + setGlobalState('refreshInterval', refreshIntervalUpdate, true); + }, 200), + [setGlobalState] + ); + + const [time, setTime] = useState(timefilter.getTime()); + const [recentlyUsedRanges, setRecentlyUsedRanges] = useState(getRecentlyUsedRanges()); + const [isAutoRefreshSelectorEnabled, setIsAutoRefreshSelectorEnabled] = useState( + timefilter.isAutoRefreshSelectorEnabled() + ); + const [isTimeRangeSelectorEnabled, setIsTimeRangeSelectorEnabled] = useState( + timefilter.isTimeRangeSelectorEnabled() + ); + + const dateFormat = config.get('dateFormat'); + const timePickerQuickRanges = config.get( + UI_SETTINGS.TIMEPICKER_QUICK_RANGES + ); + + const commonlyUsedRanges = useMemo( + () => + timePickerQuickRanges.map(({ from, to, display }) => ({ + start: from, + end: to, + label: display, + })), + [timePickerQuickRanges] + ); + + useEffect(() => { + const subscriptions = new Subscription(); + const refreshIntervalUpdate$ = timefilter.getRefreshIntervalUpdate$(); + if (refreshIntervalUpdate$ !== undefined) { + subscriptions.add( + refreshIntervalUpdate$.subscribe((r) => { + setRefreshInterval(timefilter.getRefreshInterval()); + }) + ); + } + const timeUpdate$ = timefilter.getTimeUpdate$(); + if (timeUpdate$ !== undefined) { + subscriptions.add( + timeUpdate$.subscribe((v) => { + setTime(timefilter.getTime()); + }) + ); + } + const enabledUpdated$ = timefilter.getEnabledUpdated$(); + if (enabledUpdated$ !== undefined) { + subscriptions.add( + enabledUpdated$.subscribe((w) => { + setIsAutoRefreshSelectorEnabled(timefilter.isAutoRefreshSelectorEnabled()); + setIsTimeRangeSelectorEnabled(timefilter.isTimeRangeSelectorEnabled()); + }) + ); + } + + return function cleanup() { + subscriptions.unsubscribe(); + }; + }, []); + + function updateFilter({ start, end }: Duration) { + const newTime = { from: start, to: end }; + // Update timefilter for controllers listening for changes + timefilter.setTime(newTime); + setTime(newTime); + setRecentlyUsedRanges(getRecentlyUsedRanges()); + } + + function updateInterval({ + isPaused: pause, + refreshInterval: value, + }: { + isPaused: boolean; + refreshInterval: number; + }) { + setRefreshInterval({ pause, value }); + } + + /** + * Enforce pause when it's set to false with 0 refresh interval. + */ + const isPaused = refreshInterval.pause || (!refreshInterval.pause && !refreshInterval.value); + + return isAutoRefreshSelectorEnabled || isTimeRangeSelectorEnabled ? ( +
+ +
+ ) : null; +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/index.ts new file mode 100644 index 0000000000000..232f6c65d2b64 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { DatePickerWrapper } from './date_picker_wrapper'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts index 9690fd1b6c473..760ab55ac1026 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts @@ -6,12 +6,15 @@ */ import { i18n } from '@kbn/i18n'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../../common/constants/field_types'; -import type { TypedLensByValueInput } from '../../../../../../../../lens/public'; -import type { FieldVisConfig } from '../../../../stats_table/types'; -import type { IndexPatternColumn, XYLayerConfig } from '../../../../../../../../lens/public'; -import type { CombinedQuery } from '../../../common'; -import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns'; +import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import type { CombinedQuery } from '../../../types/combined_query'; +import type { + IndexPatternColumn, + TypedLensByValueInput, + XYLayerConfig, +} from '../../../../../../lens/public'; +import { FieldVisConfig } from '../../stats_table/types'; +import { JOB_FIELD_TYPES } from '../../../../../common'; interface ColumnsAndLayer { columns: Record; layer: XYLayerConfig; @@ -24,7 +27,7 @@ const COUNT = i18n.translate('xpack.ml.dataVisualizer.lensChart.countLabel', { defaultMessage: 'Count', }); -export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IIndexPattern) { +export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IndexPattern) { // if index has no timestamp field if (defaultIndexPattern.timeFieldName === undefined) { const columns: Record = { @@ -186,19 +189,19 @@ export function getBooleanSettings(item: FieldVisConfig) { export function getCompatibleLensDataType(type: FieldVisConfig['type']): string | undefined { let lensType: string | undefined; switch (type) { - case ML_JOB_FIELD_TYPES.KEYWORD: + case JOB_FIELD_TYPES.KEYWORD: lensType = 'string'; break; - case ML_JOB_FIELD_TYPES.DATE: + case JOB_FIELD_TYPES.DATE: lensType = 'date'; break; - case ML_JOB_FIELD_TYPES.NUMBER: + case JOB_FIELD_TYPES.NUMBER: lensType = 'number'; break; - case ML_JOB_FIELD_TYPES.IP: + case JOB_FIELD_TYPES.IP: lensType = 'ip'; break; - case ML_JOB_FIELD_TYPES.BOOLEAN: + case JOB_FIELD_TYPES.BOOLEAN: lensType = 'string'; break; default: @@ -210,20 +213,20 @@ export function getCompatibleLensDataType(type: FieldVisConfig['type']): string function getColumnsAndLayer( fieldType: FieldVisConfig['type'], item: FieldVisConfig, - defaultIndexPattern: IIndexPattern + defaultIndexPattern: IndexPattern ): ColumnsAndLayer | undefined { if (item.fieldName === undefined) return; - if (fieldType === ML_JOB_FIELD_TYPES.DATE) { + if (fieldType === JOB_FIELD_TYPES.DATE) { return getDateSettings(item); } - if (fieldType === ML_JOB_FIELD_TYPES.NUMBER) { + if (fieldType === JOB_FIELD_TYPES.NUMBER) { return getNumberSettings(item, defaultIndexPattern); } - if (fieldType === ML_JOB_FIELD_TYPES.IP || fieldType === ML_JOB_FIELD_TYPES.KEYWORD) { + if (fieldType === JOB_FIELD_TYPES.IP || fieldType === JOB_FIELD_TYPES.KEYWORD) { return getKeywordSettings(item); } - if (fieldType === ML_JOB_FIELD_TYPES.BOOLEAN) { + if (fieldType === JOB_FIELD_TYPES.BOOLEAN) { return getBooleanSettings(item); } } @@ -231,7 +234,7 @@ function getColumnsAndLayer( // currently only supports the following types: // 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip' export function getLensAttributes( - defaultIndexPattern: IIndexPattern | undefined, + defaultIndexPattern: IndexPattern | undefined, combinedQuery: CombinedQuery, item: FieldVisConfig ): TypedLensByValueInput['attributes'] | undefined { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector.tsx new file mode 100644 index 0000000000000..ffcd423cfc50f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector.tsx @@ -0,0 +1,54 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { Query, IndexPattern, TimefilterContract } from 'src/plugins/data/public'; +import { EuiButton } from '@elastic/eui'; +import { setFullTimeRange } from './full_time_range_selector_service'; + +interface Props { + timefilter: TimefilterContract; + indexPattern: IndexPattern; + query: Query; + disabled: boolean; + callback?: (a: any) => void; +} + +// Component for rendering a button which automatically sets the range of the time filter +// to the time range of data in the index(es) mapped to the supplied Kibana index pattern or query. +export const FullTimeRangeSelector: FC = ({ + timefilter, + indexPattern, + query, + disabled, + callback, +}) => { + // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop + async function setRange(i: IndexPattern, q: Query) { + const fullTimeRange = await setFullTimeRange(timefilter, i, q); + if (typeof callback === 'function') { + callback(fullTimeRange); + } + } + return ( + setRange(indexPattern, query)} + data-test-subj="mlButtonUseFullData" + > + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts new file mode 100644 index 0000000000000..b704eba3bb105 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import moment from 'moment'; +import { estypes } from '@elastic/elasticsearch'; +import { Query, TimefilterContract } from 'src/plugins/data/public'; +import dateMath from '@elastic/datemath'; +import { IndexPattern } from '../../../../../../../src/plugins/data/public'; +import { isPopulatedObject } from '../utils/object_utils'; +import { getTimeFieldRange } from '../../../api'; + +export interface TimeRange { + from: number; + to: number; +} + +export async function setFullTimeRange( + timefilter: TimefilterContract, + indexPattern: IndexPattern, + query: Query + // @todo: fix any +): Promise { + try { + const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields; + const resp = await getTimeFieldRange({ + index: indexPattern.title, + timeFieldName: indexPattern.timeFieldName, + query, + ...(isPopulatedObject(runtimeMappings) ? { runtimeMappings } : {}), + }); + timefilter.setTime({ + from: moment(resp.start.epoch).toISOString(), + to: moment(resp.end.epoch).toISOString(), + }); + return resp; + } catch (resp) { + // @todo + // const toastNotifications = getToastNotifications(); + // toastNotifications.addDanger( + // i18n.translate('xpack.ml.fullTimeRangeSelector.errorSettingTimeRangeNotification', { + // defaultMessage: 'An error occurred setting the time range.', + // }) + // ); + // return resp; + } +} + +export function getTimeFilterRange(timefilter: TimefilterContract): TimeRange { + const fromMoment = dateMath.parse(timefilter.getTime().from); + const toMoment = dateMath.parse(timefilter.getTime().to); + const from = fromMoment !== undefined ? fromMoment.valueOf() : 0; + const to = toMoment !== undefined ? toMoment.valueOf() : 0; + + return { + to, + from, + }; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/index.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/index.tsx new file mode 100644 index 0000000000000..c79df59ee3f69 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/index.tsx @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FullTimeRangeSelector } from './full_time_range_selector'; +export { getTimeFilterRange, TimeRange } from './full_time_range_selector_service'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx new file mode 100644 index 0000000000000..2362834508e7c --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useEffect } from 'react'; +import { i18n } from '@kbn/i18n'; +import { useMlKibana } from '../../contexts/kibana'; + +interface HelpMenuProps { + docLink: string; +} + +// Component for adding a documentation link to the help menu +export const HelpMenu: FC = React.memo(({ docLink }) => { + const { chrome } = useMlKibana().services; + + useEffect(() => { + chrome.setHelpExtension({ + appName: i18n.translate('xpack.ml.chrome.help.appName', { + defaultMessage: 'Machine Learning', + }), + links: [ + { + href: docLink, + linkType: 'documentation', + }, + ], + }); + }, []); + + return null; +}); + +HelpMenu.displayName = 'HelpMenu'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/index.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/index.tsx new file mode 100644 index 0000000000000..dd4339173ffd4 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/index.tsx @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { HelpMenu } from './help_menu'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts index e69de29bb2d1d..d1d9d988737e3 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { IndexDataVisualizerViewProps, IndexDataVisualizerView } from './index_datavisualizer_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx index 945dd5bc4649f..9e02fb1e06eb0 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx @@ -22,6 +22,7 @@ import { import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types'; import { FormattedMessage } from '@kbn/i18n/react'; import { Required } from 'utility-types'; +import { i18n } from '@kbn/i18n'; import { IndexPatternField, KBN_FIELD_TYPES, @@ -29,22 +30,13 @@ import { esKuery, UI_SETTINGS, Query, + IndexPattern, + IndexPatternsContract, } from '../../../../../../../src/plugins/data/public'; -import { NavigationMenu } from '../../components/navigation_menu'; -import { DatePickerWrapper } from '../../components/navigation_menu/date_picker_wrapper'; -import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; -import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; -import { useMlContext } from '../../contexts/ml'; -import { kbnTypeToMLJobType } from '../../util/field_types_utils'; -import { useNotifications, useTimefilter } from '../../contexts/kibana'; import { getQueryFromSavedSearch } from '../../util/index_utils'; -import { getTimeBucketsFromCache } from '../../util/time_buckets'; import { usePageUrlState, useUrlState } from '../../util/url_state'; -import { ActionsPanel } from './components/actions_panel'; -import { SearchPanel } from './components/search_panel'; import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; -import { DataLoader } from './data_loader'; import { FieldVisConfig } from '../stats_table/types'; import type { MetricFieldsStats, @@ -60,6 +52,20 @@ import { FieldRequestConfig, JobFieldType, SavedSearchSavedObject } from '../../ import { useFileDataVisualizerKibana } from '../../kibana_context'; import { FieldCountPanel } from '../field_count_panel'; import { DocumentCountContent } from '../document_count_content'; +import { DataLoader } from '../../data_loader/data_loader'; +import { JOB_FIELD_TYPES } from '../../../../common'; +import { useTimefilter } from '../../hooks/kibana_services'; +import { kbnTypeToJobType } from '../../util/field_types_utils'; +import { SearchPanel } from '../search_panel'; +import { ActionsPanel } from '../actions_panel'; +import { DatePickerWrapper } from '../date_picker_wrapper'; +import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; +import { HelpMenu } from '../help_menu'; + +export interface Refresh { + lastRefresh: number; + timeRange?: { start: string; end: string }; +} interface DataVisualizerPageState { overallStats: OverallStats; @@ -110,28 +116,49 @@ export const getDefaultDataVisualizerListState = (): Required { - const mlContext = useMlContext(); +export interface IndexDataVisualizerViewProps { + combinedQuery: any; + currentIndexPattern: IndexPattern; // TODO this should be IndexPattern or null + currentSavedSearch: SavedSearchSavedObject | null; + indexPatterns: IndexPatternsContract; + kibanaConfig: any; // IUiSettingsClient; +} + +export const IndexDataVisualizerView: FC = (dataVisualizerProps) => { const restorableDefaults = getDefaultDataVisualizerListState(); + const { - services: { lens: lensPlugin, docLinks }, + services: { lens: lensPlugin, docLinks, notifications, uiSettings }, } = useFileDataVisualizerKibana(); + const { toasts } = notifications; const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState( DATA_VISUALIZER_INDEX_VIEWER, restorableDefaults ); - const [currentSavedSearch, setCurrentSavedSearch] = useState(mlContext.currentSavedSearch); + const [currentSavedSearch, setCurrentSavedSearch] = useState( + dataVisualizerProps.currentSavedSearch + ); + + const { combinedQuery, currentIndexPattern, kibanaConfig } = dataVisualizerProps; + + const getTimeBuckets = useCallback(() => { + return new TimeBuckets({ + [UI_SETTINGS.HISTOGRAM_MAX_BARS]: uiSettings.get(UI_SETTINGS.HISTOGRAM_MAX_BARS), + [UI_SETTINGS.HISTOGRAM_BAR_TARGET]: uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET), + dateFormat: uiSettings.get('dateFormat'), + 'dateFormat:scaled': uiSettings.get('dateFormat:scaled'), + }); + }, [uiSettings]); - const { combinedQuery, currentIndexPattern, kibanaConfig } = mlContext; const timefilter = useTimefilter({ timeRangeSelector: currentIndexPattern.timeFieldName !== undefined, autoRefreshSelector: true, }); - const { toasts } = useNotifications(); const dataLoader = useMemo(() => new DataLoader(currentIndexPattern, toasts), [ currentIndexPattern, + toasts, ]); const [globalState, setGlobalState] = useUrlState('_g'); @@ -142,36 +169,41 @@ export const IndexDataVisualizerView: FC = () => { to: globalState.time.to, }); } - }, [globalState?.time?.from, globalState?.time?.to]); + }, [globalState.time, globalState.time.from, globalState.time.to, timefilter]); + useEffect(() => { if (globalState?.refreshInterval !== undefined) { timefilter.setRefreshInterval(globalState.refreshInterval); } - }, [globalState?.refreshInterval?.pause, globalState?.refreshInterval?.value]); + }, [ + globalState?.refreshInterval?.pause, + globalState?.refreshInterval?.value, + globalState.refreshInterval, + timefilter, + ]); const [lastRefresh, setLastRefresh] = useState(0); useEffect(() => { if (!currentIndexPattern.isTimeBased()) { - // toastNotifications.addWarning({ - // title: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle', { - // defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', - // values: { indexPatternTitle: currentIndexPattern.title }, - // }), - // text: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription', { - // defaultMessage: 'Anomaly detection only runs over time-based indices', - // }), - // - // }) + toasts.addWarning({ + title: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle', { + defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', + values: { indexPatternTitle: currentIndexPattern.title }, + }), + text: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription', { + defaultMessage: 'Anomaly detection only runs over time-based indices', + }), + }); } - }, [currentIndexPattern]); + }, [currentIndexPattern, toasts]); // Obtain the list of non metric field types which appear in the index pattern. let indexedFieldTypes: JobFieldType[] = []; const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields; indexPatternFields.forEach((field) => { if (field.scripted !== true) { - const dataVisualizerType: JobFieldType | undefined = kbnTypeToMLJobType(field); + const dataVisualizerType: JobFieldType | undefined = kbnTypeToJobType(field); if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) { indexedFieldTypes.push(dataVisualizerType); } @@ -376,7 +408,7 @@ export const IndexDataVisualizerView: FC = () => { // Obtain the interval to use for date histogram aggregations // (such as the document count chart). Aim for 75 bars. - const buckets = getTimeBucketsFromCache(); + const buckets = getTimeBuckets(); const tf = timefilter as any; let earliest: number | undefined; @@ -499,7 +531,7 @@ export const IndexDataVisualizerView: FC = () => { } } - function createMetricCards() { + const createMetricCards = useCallback(() => { const configs: FieldVisConfig[] = []; const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; @@ -519,7 +551,7 @@ export const IndexDataVisualizerView: FC = () => { // Add a config for 'document count', identified by no field name if indexpattern is time based. if (currentIndexPattern.timeFieldName !== undefined) { configs.push({ - type: ML_JOB_FIELD_TYPES.NUMBER, + type: JOB_FIELD_TYPES.NUMBER, existsInDocs: true, loading: true, aggregatable: true, @@ -547,7 +579,7 @@ export const IndexDataVisualizerView: FC = () => { const metricConfig: FieldVisConfig = { ...(fieldData ? fieldData : {}), fieldFormat: currentIndexPattern.getFormatterForField(field), - type: ML_JOB_FIELD_TYPES.NUMBER, + type: JOB_FIELD_TYPES.NUMBER, loading: true, aggregatable: true, }; @@ -560,9 +592,16 @@ export const IndexDataVisualizerView: FC = () => { visibleMetricsCount: metricFieldsToShow.length, }); setMetricConfigs(configs); - } + }, [ + currentIndexPattern, + dataLoader, + indexPatternFields, + metricsLoaded, + overallStats, + showEmptyFields, + ]); - function createNonMetricCards() { + const createNonMetricCards = useCallback(() => { const allNonMetricFields = indexPatternFields.filter((f) => { return ( f.type !== KBN_FIELD_TYPES.NUMBER && @@ -627,7 +666,7 @@ export const IndexDataVisualizerView: FC = () => { // Map the field type from the Kibana index pattern to the field type // used in the data visualizer. - const dataVisualizerType = kbnTypeToMLJobType(field); + const dataVisualizerType = kbnTypeToJobType(field); if (dataVisualizerType !== undefined) { nonMetricConfig.type = dataVisualizerType; } else { @@ -641,7 +680,14 @@ export const IndexDataVisualizerView: FC = () => { }); setNonMetricConfigs(configs); - } + }, [ + currentIndexPattern, + dataLoader, + indexPatternFields, + nonMetricsLoaded, + overallStats, + showEmptyFields, + ]); const wizardPanelWidth = '280px'; @@ -697,7 +743,7 @@ export const IndexDataVisualizerView: FC = () => { return m; }, {} as ItemIdToExpandedRowMap); }, - [currentIndexPattern, searchQuery] + [currentIndexPattern, searchQueryLanguage, searchString] ); // Inject custom action column for the index based visualizer @@ -724,7 +770,6 @@ export const IndexDataVisualizerView: FC = () => { const helpLink = docLinks.links.ml.guide; return ( - @@ -743,6 +788,7 @@ export const IndexDataVisualizerView: FC = () => { indexPattern={currentIndexPattern} query={combinedQuery} disabled={false} + timefilter={timefilter} /> )} @@ -814,7 +860,7 @@ export const IndexDataVisualizerView: FC = () => { - {/* @todo */} + ); }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/link_card/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/link_card/index.ts new file mode 100644 index 0000000000000..3a046defde582 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/link_card/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { LinkCard } from './link_card'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/link_card/link_card.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/link_card/link_card.tsx new file mode 100644 index 0000000000000..4076169b9e1fe --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/link_card/link_card.tsx @@ -0,0 +1,81 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, ReactElement } from 'react'; + +import { + EuiIcon, + IconType, + EuiText, + EuiTitle, + EuiFlexItem, + EuiFlexGroup, + EuiPanel, + EuiLink, +} from '@elastic/eui'; + +interface Props { + icon: IconType | ReactElement; + iconAreaLabel?: string; + title: any; + description: any; + href?: string; + onClick?: () => void; + isDisabled?: boolean; + 'data-test-subj'?: string; +} + +// Component for rendering a card which links to the Create Job page, displaying an +// icon, card title, description and link. +export const LinkCard: FC = ({ + icon, + iconAreaLabel, + title, + description, + onClick, + href, + isDisabled, + 'data-test-subj': dateTestSubj, +}) => { + const linkHrefAndOnClickProps = { + ...(href ? { href } : {}), + ...(onClick ? { onClick } : {}), + }; + return ( + + + + + {typeof icon === 'string' ? ( + + ) : ( + icon + )} + + + +

{title}

+ + +

{description}

+ + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx new file mode 100644 index 0000000000000..d3f4ac5d5f327 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useMemo } from 'react'; +import { i18n } from '@kbn/i18n'; +import { Option, MultiSelectPicker } from '../multi_select_picker'; +import { OverallStats } from '../../types/overall_stats'; + +interface Props { + overallStats: OverallStats; + setVisibleFieldNames(q: string[]): void; + visibleFieldNames: string[]; + showEmptyFields: boolean; +} + +export const DataVisualizerFieldNamesFilter: FC = ({ + overallStats, + setVisibleFieldNames, + visibleFieldNames, + showEmptyFields, +}) => { + const items: Option[] = useMemo(() => { + const options: Option[] = []; + if (overallStats) { + Object.keys(overallStats).forEach((key) => { + const fieldsGroup = overallStats[key as keyof OverallStats]; + if (Array.isArray(fieldsGroup) && fieldsGroup.length > 0) { + fieldsGroup.forEach((field) => { + if ( + (field.existsInDocs === true || showEmptyFields === true) && + field.fieldName !== undefined + ) { + options.push({ value: field.fieldName }); + } + }); + } + }); + } + return options; + }, [overallStats, showEmptyFields]); + + const fieldNameTitle = useMemo( + () => + i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldNameSelect', { + defaultMessage: 'Field name', + }), + [] + ); + + return ( + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx new file mode 100644 index 0000000000000..15ddf00c4e1d3 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx @@ -0,0 +1,73 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useMemo } from 'react'; +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { Option, MultiSelectPicker } from '../../../../components/multi_select_picker'; +import { FieldTypeIcon } from '../../../../components/field_type_icon'; +import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; +import type { MlJobFieldType } from '../../../../../../common/types/field_types'; + +const ML_JOB_FIELD_TYPES_OPTIONS = { + [ML_JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, + [ML_JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' }, + [ML_JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' }, + [ML_JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' }, + [ML_JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' }, + [ML_JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' }, + [ML_JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' }, + [ML_JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' }, + [ML_JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' }, +}; + +export const DatavisualizerFieldTypeFilter: FC<{ + indexedFieldTypes: MlJobFieldType[]; + setVisibleFieldTypes(q: string[]): void; + visibleFieldTypes: string[]; +}> = ({ indexedFieldTypes, setVisibleFieldTypes, visibleFieldTypes }) => { + const options: Option[] = useMemo(() => { + return indexedFieldTypes.map((indexedFieldName) => { + const item = ML_JOB_FIELD_TYPES_OPTIONS[indexedFieldName]; + + return { + value: indexedFieldName, + name: ( + + {item.name} + {indexedFieldName && ( + + + + )} + + ), + }; + }); + }, [indexedFieldTypes]); + const fieldTypeTitle = useMemo( + () => + i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldTypeSelect', { + defaultMessage: 'Field type', + }), + [] + ); + return ( + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/index.ts new file mode 100644 index 0000000000000..291eeb7d50646 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { SearchPanel } from './search_panel'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx new file mode 100644 index 0000000000000..85d09018deb09 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx @@ -0,0 +1,158 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useState } from 'react'; +import { EuiCode, EuiFlexItem, EuiFlexGroup, EuiInputPopover } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { + esKuery, + esQuery, + Query, + QueryStringInput, +} from '../../../../../../../src/plugins/data/public'; +import { ShardSizeFilter } from './shard_size_select'; +import { DataVisualizerFieldNamesFilter } from './field_name_filter'; +import { DatavisualizerFieldTypeFilter } from './field_type_filter'; +import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { JobFieldType } from '../../../../common/types'; +import { + ErrorMessage, + SEARCH_QUERY_LANGUAGE, + SearchQueryLanguage, +} from '../../types/combined_query'; + +interface Props { + indexPattern: IndexPattern; + searchString: Query['query']; + searchQuery: Query['query']; + searchQueryLanguage: SearchQueryLanguage; + samplerShardSize: number; + setSamplerShardSize(s: number): void; + overallStats: any; + indexedFieldTypes: JobFieldType[]; + setVisibleFieldTypes(q: string[]): void; + visibleFieldTypes: string[]; + setVisibleFieldNames(q: string[]): void; + visibleFieldNames: string[]; + setSearchParams({ + searchQuery, + searchString, + queryLanguage, + }: { + searchQuery: Query['query']; + searchString: Query['query']; + queryLanguage: SearchQueryLanguage; + }): void; + showEmptyFields: boolean; +} + +export const SearchPanel: FC = ({ + indexPattern, + searchString, + searchQueryLanguage, + samplerShardSize, + setSamplerShardSize, + overallStats, + indexedFieldTypes, + setVisibleFieldTypes, + visibleFieldTypes, + setVisibleFieldNames, + visibleFieldNames, + setSearchParams, + showEmptyFields, +}) => { + // The internal state of the input query bar updated on every key stroke. + const [searchInput, setSearchInput] = useState({ + query: searchString || '', + language: searchQueryLanguage, + }); + const [errorMessage, setErrorMessage] = useState(undefined); + + const searchHandler = (query: Query) => { + let filterQuery; + try { + if (query.language === SEARCH_QUERY_LANGUAGE.KUERY) { + filterQuery = esKuery.toElasticsearchQuery( + esKuery.fromKueryExpression(query.query), + indexPattern + ); + } else if (query.language === SEARCH_QUERY_LANGUAGE.LUCENE) { + filterQuery = esQuery.luceneStringToDsl(query.query); + } else { + filterQuery = {}; + } + setSearchParams({ + searchQuery: filterQuery, + searchString: query.query, + queryLanguage: query.language as SearchQueryLanguage, + }); + } catch (e) { + console.log('Invalid syntax', JSON.stringify(e, null, 2)); // eslint-disable-line no-console + setErrorMessage({ query: query.query as string, message: e.message }); + } + }; + const searchChangeHandler = (query: Query) => setSearchInput(query); + + return ( + + + setErrorMessage(undefined)} + input={ + + } + isOpen={errorMessage?.query === searchInput.query && errorMessage?.message !== ''} + > + + {i18n.translate( + 'xpack.ml.datavisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar', + { + defaultMessage: 'Invalid query', + } + )} + {': '} + {errorMessage?.message.split('\n')[0]} + + + + + + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/shard_size_select.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/shard_size_select.tsx new file mode 100644 index 0000000000000..5351d3467020f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/shard_size_select.tsx @@ -0,0 +1,66 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiSuperSelect } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React, { FC } from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; + +interface Props { + samplerShardSize: number; + setSamplerShardSize(s: number): void; +} + +const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { + return { + value: String(v), + inputDisplay: + v > 0 ? ( + + {v} }} + /> + + ) : ( + + + + ), + }; +}); + +export const ShardSizeFilter: FC = ({ samplerShardSize, setSamplerShardSize }) => { + return ( + + + setSamplerShardSize(+value)} + aria-label={i18n.translate('xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel', { + defaultMessage: 'Select number of documents to sample', + })} + data-test-subj="mlDataVisualizerShardSizeSelect" + /> + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/object_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/object_utils.ts new file mode 100644 index 0000000000000..537ee9202b4de --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/object_utils.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +/* + * A type guard to check record like object structures. + * + * Examples: + * - `isPopulatedObject({...})` + * Limits type to Record + * + * - `isPopulatedObject({...}, ['attribute'])` + * Limits type to Record<'attribute', unknown> + * + * - `isPopulatedObject({...})` + * Limits type to a record with keys of the given interface. + * Note that you might want to add keys from the interface to the + * array of requiredAttributes to satisfy runtime requirements. + * Otherwise you'd just satisfy TS requirements but might still + * run into runtime issues. + */ +export const isPopulatedObject = ( + arg: unknown, + requiredAttributes: U[] = [] +): arg is Record => { + return ( + typeof arg === 'object' && + arg !== null && + Object.keys(arg).length > 0 && + (requiredAttributes.length === 0 || + requiredAttributes.every((d) => ({}.hasOwnProperty.call(arg, d)))) + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts b/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts index 2475116f83f62..62bcc9b1efa6f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts @@ -7,41 +7,41 @@ // Maximum number of examples to obtain for text type fields. import { CoreSetup } from 'kibana/public'; +import { estypes } from '@elastic/elasticsearch'; import { i18n } from '@kbn/i18n'; import { IndexPattern } from '../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { RuntimeMappings } from '../../../../ml/common'; -import { IndexPatternTitle } from '../../../../ml/common/types/kibana'; -import { - ToastNotificationService, - toastNotificationServiceProvider, -} from '../../../../ml/public/application/services/toast_notification_service'; -import { SavedSearchQuery } from '../../../../ml/public/application/contexts/ml'; import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common'; -import { ml } from '../../../../ml/public/application/services/ml_api_service'; +import { DEFAULT_SAMPLER_SHARD_SIZE, OMIT_FIELDS } from '../../../common/constants'; +import { FieldHistogramRequestConfig, FieldRequestConfig } from '../../../common/types'; import { - DEFAULT_SAMPLER_SHARD_SIZE, - FieldHistogramRequestConfig, - FieldRequestConfig, - OMIT_FIELDS, -} from '../../../common'; + getVisualizerFieldHistograms, + getVisualizerFieldStats, + getVisualizerOverallStats, +} from '../../api'; + +type IndexPatternTitle = string; +type SavedSearchQuery = Record | null | undefined; const MAX_EXAMPLES_DEFAULT: number = 10; export class DataLoader { private _indexPattern: IndexPattern; - private _runtimeMappings: RuntimeMappings; + private _runtimeMappings: estypes.RuntimeFields; private _indexPatternTitle: IndexPatternTitle = ''; private _maxExamples: number = MAX_EXAMPLES_DEFAULT; - private _toastNotificationsService: ToastNotificationService; + private _toastNotifications: CoreSetup['notifications']['toasts']; + // private _toastNotificationsService: ToastNotificationService; constructor( indexPattern: IndexPattern, toastNotifications: CoreSetup['notifications']['toasts'] ) { this._indexPattern = indexPattern; - this._runtimeMappings = this._indexPattern.getComputedFields().runtimeFields as RuntimeMappings; + this._runtimeMappings = this._indexPattern.getComputedFields() + .runtimeFields as estypes.RuntimeFields; this._indexPatternTitle = indexPattern.title; - this._toastNotificationsService = toastNotificationServiceProvider(toastNotifications); + this._toastNotifications = toastNotifications; + // this._toastNotificationsService = toastNotificationServiceProvider(toastNotifications); } async loadOverallData( @@ -68,7 +68,7 @@ export class DataLoader { // 2. List of aggregatable fields that do not exist in docs // 3. List of non-aggregatable fields that do exist in docs. // 4. List of non-aggregatable fields that do not exist in docs. - const stats = await ml.getVisualizerOverallStats({ + const stats = await getVisualizerOverallStats({ indexPatternTitle: this._indexPatternTitle, query, timeFieldName: this._indexPattern.timeFieldName, @@ -91,7 +91,7 @@ export class DataLoader { fields: FieldRequestConfig[], interval?: number ): Promise { - const stats = await ml.getVisualizerFieldStats({ + const stats = await getVisualizerFieldStats({ indexPatternTitle: this._indexPatternTitle, query, timeFieldName: this._indexPattern.timeFieldName, @@ -111,9 +111,9 @@ export class DataLoader { fields: FieldHistogramRequestConfig[], query: string | SavedSearchQuery, samplerShardSize = DEFAULT_SAMPLER_SHARD_SIZE, - editorRuntimeMappings?: RuntimeMappings + editorRuntimeMappings?: estypes.RuntimeFields ): Promise { - const stats = await ml.getVisualizerFieldHistograms({ + const stats = await getVisualizerFieldHistograms({ indexPatternTitle: this._indexPatternTitle, query, fields, @@ -126,9 +126,8 @@ export class DataLoader { displayError(err: any) { if (err.statusCode === 500) { - this._toastNotificationsService.displayErrorToast( - err, - i18n.translate('xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage', { + this._toastNotifications.addError(err, { + title: i18n.translate('datavisualizer.dataLoader.internalServerErrorMessage', { defaultMessage: 'Error loading data in index {index}. {message}. ' + 'The request may have timed out. Try using a smaller sample size or narrowing the time range.', @@ -136,19 +135,18 @@ export class DataLoader { index: this._indexPattern.title, message: err.message, }, - }) - ); + }), + }); } else { - this._toastNotificationsService.displayErrorToast( - err, - i18n.translate('xpack.ml.datavisualizer.page.errorLoadingDataMessage', { + this._toastNotifications.addError(err, { + title: i18n.translate('datavisualizer.page.errorLoadingDataMessage', { defaultMessage: 'Error loading data in index {index}. {message}', values: { index: this._indexPattern.title, message: err.message, }, - }) - ); + }), + }); } } diff --git a/x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts b/x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts new file mode 100644 index 0000000000000..5b07325b64a87 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { useEffect } from 'react'; +import { useFileDataVisualizerKibana } from '../kibana_context'; + +export const useNotifications = () => { + return useFileDataVisualizerKibana().services.notifications; +}; + +interface UseTimefilterOptions { + timeRangeSelector?: boolean; + autoRefreshSelector?: boolean; +} + +export const useTimefilter = ({ + timeRangeSelector, + autoRefreshSelector, +}: UseTimefilterOptions = {}) => { + const { services } = useFileDataVisualizerKibana(); + const { timefilter } = services.data.query.timefilter; + + useEffect(() => { + if (timeRangeSelector === true) { + timefilter.enableTimeRangeSelector(); + } else if (timeRangeSelector === false) { + timefilter.disableTimeRangeSelector(); + } + + if (autoRefreshSelector === true) { + timefilter.enableAutoRefreshSelector(); + } else if (autoRefreshSelector === false) { + timefilter.disableAutoRefreshSelector(); + } + }, [timeRangeSelector, autoRefreshSelector, timefilter]); + + return timefilter; +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx new file mode 100644 index 0000000000000..577c231c56e8c --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import './_index.scss'; +import React, { FC } from 'react'; +import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; +import { getCoreStart, getPluginsStart } from '../kibana_services'; +import { + IndexDataVisualizerViewProps, + IndexDataVisualizerView, +} from './components/index_datavisualizer_view'; + +export const FileDataVisualizer: FC> = ( + props +) => { + const coreStart = getCoreStart(); + const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); + const services = { data, maps, embeddable, share, security, fileUpload, ...coreStart }; + + return ( + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts b/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts new file mode 100644 index 0000000000000..489b45592bc92 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Subject } from 'rxjs'; +import { Required } from 'utility-types'; +import { Refresh } from '../components/index_datavisualizer_view/index_datavisualizer_view'; + +export const mlTimefilterRefresh$ = new Subject>(); diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts b/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts index 4266249902c4a..734a47d7f01b0 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts @@ -16,3 +16,8 @@ export interface CombinedQuery { searchString: string | { [key: string]: any }; searchQueryLanguage: string; } + +export interface ErrorMessage { + query: string; + message: string; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts index 76a5f6ac20117..a0c38b562ef09 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts @@ -7,6 +7,8 @@ import { i18n } from '@kbn/i18n'; import { JOB_FIELD_TYPES } from '../../../common'; +import type { IndexPatternField } from '../../../../../../src/plugins/data/common/index_patterns/fields'; +import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common'; export const jobTypeAriaLabels = { BOOLEAN: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.booleanTypeAriaLabel', { @@ -47,3 +49,39 @@ export const getJobTypeAriaLabel = (type: string) => { } return jobTypeAriaLabels[requestedFieldType as keyof typeof jobTypeAriaLabels]; }; + +// convert kibana types to ML Job types +// this is needed because kibana types only have string and not text and keyword. +// and we can't use ES_FIELD_TYPES because it has no NUMBER type +export function kbnTypeToJobType(field: IndexPatternField) { + // Return undefined if not one of the supported data visualizer field types. + let type; + switch (field.type) { + case KBN_FIELD_TYPES.STRING: + type = field.aggregatable ? JOB_FIELD_TYPES.KEYWORD : JOB_FIELD_TYPES.TEXT; + break; + case KBN_FIELD_TYPES.NUMBER: + type = JOB_FIELD_TYPES.NUMBER; + break; + case KBN_FIELD_TYPES.DATE: + type = JOB_FIELD_TYPES.DATE; + break; + case KBN_FIELD_TYPES.IP: + type = JOB_FIELD_TYPES.IP; + break; + case KBN_FIELD_TYPES.BOOLEAN: + type = JOB_FIELD_TYPES.BOOLEAN; + break; + case KBN_FIELD_TYPES.GEO_POINT: + type = JOB_FIELD_TYPES.GEO_POINT; + break; + case KBN_FIELD_TYPES.GEO_SHAPE: + type = JOB_FIELD_TYPES.GEO_SHAPE; + break; + + default: + break; + } + + return type; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx new file mode 100644 index 0000000000000..734c730dd91ba --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx @@ -0,0 +1,89 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import { render, act } from '@testing-library/react'; +import { parseUrlState, useUrlState, UrlStateProvider } from './url_state'; + +const mockHistoryPush = jest.fn(); + +jest.mock('react-router-dom', () => ({ + useHistory: () => ({ + push: mockHistoryPush, + }), + useLocation: () => ({ + search: + "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d", + }), +})); + +describe('getUrlState', () => { + test('properly decode url with _g and _a', () => { + expect( + parseUrlState( + "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!t,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d" + ) + ).toEqual({ + _a: { + mlExplorerFilter: {}, + mlExplorerSwimlane: { + viewByFieldName: 'action', + }, + query: { + query_string: { + analyze_wildcard: true, + query: '*', + }, + }, + }, + _g: { + ml: { + jobIds: ['dec-2'], + }, + refreshInterval: { + display: 'Off', + pause: true, + value: 0, + }, + time: { + from: '2019-01-01T00:03:40.000Z', + mode: 'absolute', + to: '2019-08-30T11:55:07.000Z', + }, + }, + savedSearchId: '571aaf70-4c88-11e8-b3d7-01146121b73d', + }); + }); +}); + +describe('useUrlState', () => { + beforeEach(() => { + mockHistoryPush.mockClear(); + }); + + test('pushes a properly encoded search string to history', () => { + const TestComponent: FC = () => { + const [, setUrlState] = useUrlState('_a'); + return ; + }; + + const { getByText } = render( + + + + ); + + act(() => { + getByText('ButtonText').click(); + }); + + expect(mockHistoryPush).toHaveBeenCalledWith({ + search: + '_a=%28mlExplorerFilter%3A%28%29%2CmlExplorerSwimlane%3A%28viewByFieldName%3Aaction%29%2Cquery%3A%28%29%29&_g=%28ml%3A%28jobIds%3A%21%28dec-2%29%29%2CrefreshInterval%3A%28display%3AOff%2Cpause%3A%21f%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272019-01-01T00%3A03%3A40.000Z%27%2Cmode%3Aabsolute%2Cto%3A%272019-08-30T11%3A55%3A07.000Z%27%29%29&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d', + }); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx new file mode 100644 index 0000000000000..ba17051aa7719 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx @@ -0,0 +1,213 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { parse, stringify } from 'query-string'; +import React, { createContext, useCallback, useContext, useMemo, FC } from 'react'; +import { isEqual } from 'lodash'; +// @ts-ignore +import { decode, encode } from 'rison-node'; +import { useHistory, useLocation } from 'react-router-dom'; + +interface Dictionary { + [id: string]: TValue; +} + +// duplicate of ml/object_utils +const getNestedProperty = (obj: Record, accessor: string, defaultValue?: any) => { + const value = accessor.split('.').reduce((o, i) => o?.[i], obj); + + if (value === undefined) return defaultValue; + + return value; +}; + +type Accessor = '_a' | '_g'; +export type SetUrlState = ( + accessor: Accessor, + attribute: string | Dictionary, + value?: any, + replaceState?: boolean +) => void; +export interface UrlState { + searchString: string; + setUrlState: SetUrlState; +} + +/** + * Set of URL query parameters that require the rison serialization. + */ +const risonSerializedParams = new Set(['_a', '_g']); + +/** + * Checks if the URL query parameter requires rison serialization. + * @param queryParam + */ +function isRisonSerializationRequired(queryParam: string): boolean { + return risonSerializedParams.has(queryParam); +} + +export function parseUrlState(search: string): Dictionary { + const urlState: Dictionary = {}; + const parsedQueryString = parse(search, { sort: false }); + + try { + Object.keys(parsedQueryString).forEach((a) => { + if (isRisonSerializationRequired(a)) { + urlState[a] = decode(parsedQueryString[a] as string); + } else { + urlState[a] = parsedQueryString[a]; + } + }); + } catch (error) { + // eslint-disable-next-line no-console + console.error('Could not read url state', error); + } + + return urlState; +} + +// Compared to the original appState/globalState, +// this no longer makes use of fetch/save methods. +// - Reading from `location.search` is the successor of `fetch`. +// - `history.push()` is the successor of `save`. +// - The exposed state and set call make use of the above and make sure that +// different urlStates(e.g. `_a` / `_g`) don't overwrite each other. +// This uses a context to be able to maintain only one instance +// of the url state. It gets passed down with `UrlStateProvider` +// and can be used via `useUrlState`. +export const urlStateStore = createContext({ + searchString: '', + setUrlState: () => {}, +}); + +const { Provider } = urlStateStore; + +export const UrlStateProvider: FC = ({ children }) => { + const history = useHistory(); + const { search: searchString } = useLocation(); + + const setUrlState: SetUrlState = useCallback( + ( + accessor: Accessor, + attribute: string | Dictionary, + value?: any, + replaceState?: boolean + ) => { + const prevSearchString = searchString; + const urlState = parseUrlState(prevSearchString); + const parsedQueryString = parse(prevSearchString, { sort: false }); + + if (!Object.prototype.hasOwnProperty.call(urlState, accessor)) { + urlState[accessor] = {}; + } + + if (typeof attribute === 'string') { + if (isEqual(getNestedProperty(urlState, `${accessor}.${attribute}`), value)) { + return prevSearchString; + } + + urlState[accessor][attribute] = value; + } else { + const attributes = attribute; + Object.keys(attributes).forEach((a) => { + urlState[accessor][a] = attributes[a]; + }); + } + + try { + const oldLocationSearchString = stringify(parsedQueryString, { + sort: false, + encode: false, + }); + + Object.keys(urlState).forEach((a) => { + if (isRisonSerializationRequired(a)) { + parsedQueryString[a] = encode(urlState[a]); + } else { + parsedQueryString[a] = urlState[a]; + } + }); + const newLocationSearchString = stringify(parsedQueryString, { + sort: false, + encode: false, + }); + + if (oldLocationSearchString !== newLocationSearchString) { + const newSearchString = stringify(parsedQueryString, { sort: false }); + if (replaceState) { + history.replace({ search: newSearchString }); + } else { + history.push({ search: newSearchString }); + } + } + } catch (error) { + // eslint-disable-next-line no-console + console.error('Could not save url state', error); + } + }, + [searchString] + ); + + return {children}; +}; + +export const useUrlState = (accessor: Accessor) => { + const { searchString, setUrlState: setUrlStateContext } = useContext(urlStateStore); + + const urlState = useMemo(() => { + const fullUrlState = parseUrlState(searchString); + if (typeof fullUrlState === 'object') { + return fullUrlState[accessor]; + } + }, [searchString]); + + const setUrlState = useCallback( + (attribute: string | Dictionary, value?: any, replaceState?: boolean) => { + setUrlStateContext(accessor, attribute, value, replaceState); + }, + [accessor, setUrlStateContext] + ); + return [urlState, setUrlState]; +}; + +export type AppStateKey = 'DATA_VISUALIZER_INDEX_VIEWER'; + +/** + * Hook for managing the URL state of the page. + */ +export const usePageUrlState = ( + pageKey: AppStateKey, + defaultState?: PageUrlState +): [PageUrlState, (update: Partial, replaceState?: boolean) => void] => { + const [appState, setAppState] = useUrlState('_a'); + const pageState = appState?.[pageKey]; + + const resultPageState: PageUrlState = useMemo(() => { + return { + ...(defaultState ?? {}), + ...(pageState ?? {}), + }; + }, [pageState]); + + const onStateUpdate = useCallback( + (update: Partial, replaceState?: boolean) => { + setAppState( + pageKey, + { + ...resultPageState, + ...update, + }, + replaceState + ); + }, + [pageKey, resultPageState, setAppState] + ); + + return useMemo(() => { + return [resultPageState, onStateUpdate]; + }, [resultPageState, onStateUpdate]); +}; diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts index bf6b752faa8da..bf41b2aa1e940 100644 --- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts +++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts @@ -107,6 +107,11 @@ export type MlApiServices = ReturnType; export const ml = mlApiServicesProvider(new HttpService(proxyHttpStart)); +// @remove +// ml.getVisualizerOverallStats +// ml.getVisualizerFieldStats; +// ml.getVisualizerFieldHistograms; +// getTimeFieldRange export function mlApiServicesProvider(httpService: HttpService) { return { getJobs(obj?: { jobId?: string }) { From ed3e3dc3d12de78a316ada803ccb3ca33474d808 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 26 May 2021 15:59:49 -0500 Subject: [PATCH 03/53] [ML] Add time buckets & fix dependencies --- .../file_data_visualizer/public/api/index.ts | 14 +- .../date_picker_wrapper.test.tsx | 110 ---- .../date_picker_wrapper.tsx | 9 +- .../components/help_menu/help_menu.tsx | 6 +- .../index_datavisualizer_view.tsx | 410 +++++++------- .../search_panel/field_type_filter.tsx | 27 +- .../application/file_datavisualizer.tsx | 1 + .../public/application/index.ts | 3 +- .../application/index_data_visualizer.tsx | 106 +++- .../application/services/time_buckets.d.ts | 45 ++ .../application/services/time_buckets.js | 515 ++++++++++++++++++ .../application/util/parse_interval.test.ts | 45 ++ .../public/application/util/parse_interval.ts | 65 +++ .../public/application/util/url_state.tsx | 98 +--- .../file_data_visualizer/public/index.ts | 2 + .../public/lazy_load_bundle/index.ts | 5 +- .../public/lazy_load_bundle/lazy/index.ts | 7 +- .../file_data_visualizer/public/plugin.ts | 8 +- .../file_data_visualizer/tsconfig.json | 3 +- .../index_based/index_data_visualizer.tsx | 53 ++ .../routes/datavisualizer/index_based.tsx | 2 +- 21 files changed, 1099 insertions(+), 435 deletions(-) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.d.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js create mode 100644 x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.test.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.ts create mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/api/index.ts b/x-pack/plugins/file_data_visualizer/public/api/index.ts index d0eb761d9addd..74825d1847105 100644 --- a/x-pack/plugins/file_data_visualizer/public/api/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/api/index.ts @@ -7,15 +7,19 @@ import { estypes } from '@elastic/elasticsearch'; import { lazyLoadModules } from '../lazy_load_bundle'; -import { FileDataVisualizer } from '../application'; -import { FieldHistogramRequestConfig, FieldRequestConfig } from '../../common/types'; -import { GetTimeFieldRangeResponse } from '../../common/types/time_field_request'; -import { IndicesOptions } from '../../common/types/indices'; +import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application'; +import type { FieldHistogramRequestConfig, FieldRequestConfig } from '../../common/types'; +import type { GetTimeFieldRangeResponse } from '../../common/types/time_field_request'; +import type { IndicesOptions } from '../../common/types/indices'; -export async function getFileDataVisualizerComponent(): Promise { +export async function getFileDataVisualizerComponent(): Promise { const modules = await lazyLoadModules(); return modules.FileDataVisualizer; } +export async function getIndexDataVisualizerComponent(): Promise { + const modules = await lazyLoadModules(); + return modules.IndexDataVisualizer; +} export function basePath() { return '/api/ml'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx deleted file mode 100644 index cc7c4cbd15a0b..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.test.tsx +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { mount } from 'enzyme'; -import { render } from '@testing-library/react'; -import React from 'react'; - -import { EuiSuperDatePicker } from '@elastic/eui'; - -import { useUrlState } from '../../../util/url_state'; -import { mlTimefilterRefresh$ } from '../../../services/timefilter_refresh_service'; - -import { DatePickerWrapper } from './date_picker_wrapper'; - -jest.mock('@elastic/eui', () => { - const EuiSuperDatePickerMock = jest.fn(() => { - return null; - }); - return { EuiSuperDatePicker: EuiSuperDatePickerMock }; -}); - -jest.mock('../../../util/url_state', () => { - return { - useUrlState: jest.fn(() => { - return [{ refreshInterval: { value: 0, pause: true } }, jest.fn()]; - }), - }; -}); - -jest.mock('../../../contexts/kibana', () => ({ - useMlKibana: () => { - return { - services: { - uiSettings: { - get: jest.fn().mockReturnValue([ - { - from: 'now/d', - to: 'now/d', - display: 'Today', - }, - { - from: 'now/w', - to: 'now/w', - display: 'This week', - }, - ]), - }, - data: { - query: { - timefilter: { - timefilter: { - getRefreshInterval: jest.fn(), - setRefreshInterval: jest.fn(), - getTime: jest.fn(() => { - return { from: '', to: '' }; - }), - isAutoRefreshSelectorEnabled: jest.fn(() => true), - isTimeRangeSelectorEnabled: jest.fn(() => true), - getRefreshIntervalUpdate$: jest.fn(), - getTimeUpdate$: jest.fn(), - getEnabledUpdated$: jest.fn(), - }, - history: { get: jest.fn() }, - }, - }, - }, - }, - }; - }, -})); - -const MockedEuiSuperDatePicker = EuiSuperDatePicker as jest.MockedClass; - -describe('Navigation Menu: ', () => { - beforeEach(() => { - jest.useFakeTimers(); - MockedEuiSuperDatePicker.mockClear(); - }); - - afterEach(() => { - jest.useRealTimers(); - }); - - test('Minimal initialization.', () => { - const refreshListener = jest.fn(); - const refreshSubscription = mlTimefilterRefresh$.subscribe(refreshListener); - - const wrapper = mount(); - expect(wrapper.find(DatePickerWrapper)).toHaveLength(1); - expect(refreshListener).toBeCalledTimes(0); - - refreshSubscription.unsubscribe(); - }); - - test('should not allow disabled pause with 0 refresh interval', () => { - // arrange - (useUrlState as jest.Mock).mockReturnValue([{ refreshInterval: { pause: false, value: 0 } }]); - - // act - render(); - - // assert - const calledWith = MockedEuiSuperDatePicker.mock.calls[0][0]; - expect(calledWith.isPaused).toBe(true); - }); -}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx index b1127041ee9ea..1037bf8a91482 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx @@ -10,7 +10,11 @@ import { Subscription } from 'rxjs'; import { debounce } from 'lodash'; import { EuiSuperDatePicker, OnRefreshProps } from '@elastic/eui'; -import { TimeHistoryContract, TimeRange, UI_SETTINGS } from 'src/plugins/data/public'; +import { + TimeHistoryContract, + TimeRange, + UI_SETTINGS, +} from '../../../../../../../src/plugins/data/public'; import { useUrlState } from '../../util/url_state'; import { useFileDataVisualizerKibana } from '../../kibana_context'; @@ -60,6 +64,7 @@ export const DatePickerWrapper: FC = () => { const refreshInterval: RefreshInterval = globalState?.refreshInterval ?? timefilter.getRefreshInterval(); + // eslint-disable-next-line react-hooks/exhaustive-deps const setRefreshInterval = useCallback( debounce((refreshIntervalUpdate: RefreshInterval) => { setGlobalState('refreshInterval', refreshIntervalUpdate, true); @@ -122,7 +127,7 @@ export const DatePickerWrapper: FC = () => { return function cleanup() { subscriptions.unsubscribe(); }; - }, []); + }, [setRefreshInterval, timefilter]); function updateFilter({ start, end }: Duration) { const newTime = { from: start, to: end }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx index 2362834508e7c..5a8d6aa66e180 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx @@ -7,7 +7,7 @@ import React, { FC, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; -import { useMlKibana } from '../../contexts/kibana'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; interface HelpMenuProps { docLink: string; @@ -15,7 +15,7 @@ interface HelpMenuProps { // Component for adding a documentation link to the help menu export const HelpMenu: FC = React.memo(({ docLink }) => { - const { chrome } = useMlKibana().services; + const { chrome } = useFileDataVisualizerKibana().services; useEffect(() => { chrome.setHelpExtension({ @@ -29,7 +29,7 @@ export const HelpMenu: FC = React.memo(({ docLink }) => { }, ], }); - }, []); + }, [chrome, docLink]); return null; }); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx index 9e02fb1e06eb0..1cf8d4d73877f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx @@ -31,9 +31,8 @@ import { UI_SETTINGS, Query, IndexPattern, - IndexPatternsContract, } from '../../../../../../../src/plugins/data/public'; -import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; +import { FullTimeRangeSelector } from '../full_time_range_selector'; import { getQueryFromSavedSearch } from '../../util/index_utils'; import { usePageUrlState, useUrlState } from '../../util/url_state'; import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; @@ -61,7 +60,7 @@ import { ActionsPanel } from '../actions_panel'; import { DatePickerWrapper } from '../date_picker_wrapper'; import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; import { HelpMenu } from '../help_menu'; - +import { TimeBuckets } from '../../services/time_buckets'; export interface Refresh { lastRefresh: number; timeRange?: { start: string; end: string }; @@ -117,11 +116,9 @@ export const getDefaultDataVisualizerListState = (): Required = (dataVisualizerProps) => { @@ -140,7 +137,7 @@ export const IndexDataVisualizerView: FC = (dataVi dataVisualizerProps.currentSavedSearch ); - const { combinedQuery, currentIndexPattern, kibanaConfig } = dataVisualizerProps; + const { combinedQuery, currentIndexPattern } = dataVisualizerProps; const getTimeBuckets = useCallback(() => { return new TimeBuckets({ @@ -169,18 +166,13 @@ export const IndexDataVisualizerView: FC = (dataVi to: globalState.time.to, }); } - }, [globalState.time, globalState.time.from, globalState.time.to, timefilter]); + }, [globalState, timefilter]); useEffect(() => { if (globalState?.refreshInterval !== undefined) { timefilter.setRefreshInterval(globalState.refreshInterval); } - }, [ - globalState?.refreshInterval?.pause, - globalState?.refreshInterval?.value, - globalState.refreshInterval, - timefilter, - ]); + }, [globalState, timefilter]); const [lastRefresh, setLastRefresh] = useState(0); @@ -198,6 +190,36 @@ export const IndexDataVisualizerView: FC = (dataVi } }, [currentIndexPattern, toasts]); + /** + * Extract query data from the saved search object. + */ + const extractSearchData = useCallback( + (savedSearch: SavedSearchSavedObject | null) => { + if (!savedSearch) { + return undefined; + } + + const { query } = getQueryFromSavedSearch(savedSearch); + const queryLanguage = query.language as SearchQueryLanguage; + const qryString = query.query; + let qry; + if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { + const ast = esKuery.fromKueryExpression(qryString); + qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); + } else { + qry = esQuery.luceneStringToDsl(qryString); + esQuery.decorateQuery(qry, uiSettings.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); + } + + return { + searchQuery: qry, + searchString: qryString, + queryLanguage, + }; + }, + [currentIndexPattern, uiSettings] + ); + // Obtain the list of non metric field types which appear in the index pattern. let indexedFieldTypes: JobFieldType[] = []; const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields; @@ -228,7 +250,7 @@ export const IndexDataVisualizerView: FC = (dataVi searchQueryLanguage: searchData.queryLanguage, }; } - }, [currentSavedSearch, dataVisualizerListState]); + }, [currentSavedSearch, dataVisualizerListState, extractSearchData]); const setSearchParams = (searchParams: { searchQuery: Query['query']; @@ -286,6 +308,164 @@ export const IndexDataVisualizerView: FC = (dataVi const [nonMetricConfigs, setNonMetricConfigs] = useState(defaults.nonMetricConfigs); const [nonMetricsLoaded, setNonMetricsLoaded] = useState(defaults.nonMetricsLoaded); + const createMetricCards = useCallback(() => { + const configs: FieldVisConfig[] = []; + const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; + + const allMetricFields = indexPatternFields.filter((f) => { + return ( + f.type === KBN_FIELD_TYPES.NUMBER && + f.displayName !== undefined && + dataLoader.isDisplayField(f.displayName) === true + ); + }); + const metricExistsFields = allMetricFields.filter((f) => { + return aggregatableExistsFields.find((existsF) => { + return existsF.fieldName === f.displayName; + }); + }); + + // Add a config for 'document count', identified by no field name if indexpattern is time based. + if (currentIndexPattern.timeFieldName !== undefined) { + configs.push({ + type: JOB_FIELD_TYPES.NUMBER, + existsInDocs: true, + loading: true, + aggregatable: true, + }); + } + + if (metricsLoaded === false) { + setMetricsLoaded(true); + return; + } + + let aggregatableFields: any[] = overallStats.aggregatableExistsFields; + if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) { + aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields); + } + + const metricFieldsToShow = + metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields; + + metricFieldsToShow.forEach((field) => { + const fieldData = aggregatableFields.find((f) => { + return f.fieldName === field.displayName; + }); + + const metricConfig: FieldVisConfig = { + ...(fieldData ? fieldData : {}), + fieldFormat: currentIndexPattern.getFormatterForField(field), + type: JOB_FIELD_TYPES.NUMBER, + loading: true, + aggregatable: true, + }; + + configs.push(metricConfig); + }); + + setMetricsStats({ + totalMetricFieldsCount: allMetricFields.length, + visibleMetricsCount: metricFieldsToShow.length, + }); + setMetricConfigs(configs); + }, [ + currentIndexPattern, + dataLoader, + indexPatternFields, + metricsLoaded, + overallStats, + showEmptyFields, + ]); + + const createNonMetricCards = useCallback(() => { + const allNonMetricFields = indexPatternFields.filter((f) => { + return ( + f.type !== KBN_FIELD_TYPES.NUMBER && + f.displayName !== undefined && + dataLoader.isDisplayField(f.displayName) === true + ); + }); + // Obtain the list of all non-metric fields which appear in documents + // (aggregatable or not aggregatable). + const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. + let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. + const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; + const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; + + allNonMetricFields.forEach((f) => { + const checkAggregatableField = aggregatableExistsFields.find( + (existsField) => existsField.fieldName === f.displayName + ); + + if (checkAggregatableField !== undefined) { + populatedNonMetricFields.push(f); + nonMetricFieldData.push(checkAggregatableField); + } else { + const checkNonAggregatableField = nonAggregatableExistsFields.find( + (existsField) => existsField.fieldName === f.displayName + ); + + if (checkNonAggregatableField !== undefined) { + populatedNonMetricFields.push(f); + nonMetricFieldData.push(checkNonAggregatableField); + } + } + }); + + if (nonMetricsLoaded === false) { + setNonMetricsLoaded(true); + return; + } + + if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) { + // Combine the field data obtained from Elasticsearch into a single array. + nonMetricFieldData = nonMetricFieldData.concat( + overallStats.aggregatableNotExistsFields, + overallStats.nonAggregatableNotExistsFields + ); + } + + const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields; + + const configs: FieldVisConfig[] = []; + + nonMetricFieldsToShow.forEach((field) => { + const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName); + + const nonMetricConfig = { + ...fieldData, + fieldFormat: currentIndexPattern.getFormatterForField(field), + aggregatable: field.aggregatable, + scripted: field.scripted, + loading: fieldData.existsInDocs, + }; + + // Map the field type from the Kibana index pattern to the field type + // used in the data visualizer. + const dataVisualizerType = kbnTypeToJobType(field); + if (dataVisualizerType !== undefined) { + nonMetricConfig.type = dataVisualizerType; + } else { + // Add a flag to indicate that this is one of the 'other' Kibana + // field types that do not yet have a specific card type. + nonMetricConfig.type = field.type; + nonMetricConfig.isUnsupportedType = true; + } + + configs.push(nonMetricConfig); + }); + + setNonMetricConfigs(configs); + }, [ + currentIndexPattern, + dataLoader, + indexPatternFields, + nonMetricsLoaded, + overallStats, + showEmptyFields, + ]); + useEffect(() => { const timeUpdateSubscription = merge( timefilter.getTimeUpdate$(), @@ -304,57 +484,33 @@ export const IndexDataVisualizerView: FC = (dataVi useEffect(() => { loadOverallStats(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [searchQuery, samplerShardSize, lastRefresh]); useEffect(() => { createMetricCards(); createNonMetricCards(); - }, [overallStats, showEmptyFields]); + }, [createMetricCards, createNonMetricCards, overallStats, showEmptyFields]); useEffect(() => { loadMetricFieldStats(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [metricConfigs]); useEffect(() => { loadNonMetricFieldStats(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [nonMetricConfigs]); useEffect(() => { createMetricCards(); - }, [metricsLoaded]); + }, [createMetricCards, metricsLoaded]); useEffect(() => { createNonMetricCards(); - }, [nonMetricsLoaded]); - - /** - * Extract query data from the saved search object. - */ - function extractSearchData(savedSearch: SavedSearchSavedObject | null) { - if (!savedSearch) { - return undefined; - } - - const { query } = getQueryFromSavedSearch(savedSearch); - const queryLanguage = query.language as SearchQueryLanguage; - const qryString = query.query; - let qry; - if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { - const ast = esKuery.fromKueryExpression(qryString); - qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); - } else { - qry = esQuery.luceneStringToDsl(qryString); - esQuery.decorateQuery(qry, kibanaConfig.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); - } - - return { - searchQuery: qry, - searchString: qryString, - queryLanguage, - }; - } + }, [createNonMetricCards, nonMetricsLoaded]); - async function loadOverallStats() { + const loadOverallStats = useCallback(async () => { const tf = timefilter as any; let earliest; let latest; @@ -381,7 +537,7 @@ export const IndexDataVisualizerView: FC = (dataVi } catch (err) { dataLoader.displayError(err); } - } + }, [currentIndexPattern, dataLoader, samplerShardSize, searchQuery, timefilter]); async function loadMetricFieldStats() { // Only request data for fields that exist in documents. @@ -531,164 +687,6 @@ export const IndexDataVisualizerView: FC = (dataVi } } - const createMetricCards = useCallback(() => { - const configs: FieldVisConfig[] = []; - const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; - - const allMetricFields = indexPatternFields.filter((f) => { - return ( - f.type === KBN_FIELD_TYPES.NUMBER && - f.displayName !== undefined && - dataLoader.isDisplayField(f.displayName) === true - ); - }); - const metricExistsFields = allMetricFields.filter((f) => { - return aggregatableExistsFields.find((existsF) => { - return existsF.fieldName === f.displayName; - }); - }); - - // Add a config for 'document count', identified by no field name if indexpattern is time based. - if (currentIndexPattern.timeFieldName !== undefined) { - configs.push({ - type: JOB_FIELD_TYPES.NUMBER, - existsInDocs: true, - loading: true, - aggregatable: true, - }); - } - - if (metricsLoaded === false) { - setMetricsLoaded(true); - return; - } - - let aggregatableFields: any[] = overallStats.aggregatableExistsFields; - if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) { - aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields); - } - - const metricFieldsToShow = - metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields; - - metricFieldsToShow.forEach((field) => { - const fieldData = aggregatableFields.find((f) => { - return f.fieldName === field.displayName; - }); - - const metricConfig: FieldVisConfig = { - ...(fieldData ? fieldData : {}), - fieldFormat: currentIndexPattern.getFormatterForField(field), - type: JOB_FIELD_TYPES.NUMBER, - loading: true, - aggregatable: true, - }; - - configs.push(metricConfig); - }); - - setMetricsStats({ - totalMetricFieldsCount: allMetricFields.length, - visibleMetricsCount: metricFieldsToShow.length, - }); - setMetricConfigs(configs); - }, [ - currentIndexPattern, - dataLoader, - indexPatternFields, - metricsLoaded, - overallStats, - showEmptyFields, - ]); - - const createNonMetricCards = useCallback(() => { - const allNonMetricFields = indexPatternFields.filter((f) => { - return ( - f.type !== KBN_FIELD_TYPES.NUMBER && - f.displayName !== undefined && - dataLoader.isDisplayField(f.displayName) === true - ); - }); - // Obtain the list of all non-metric fields which appear in documents - // (aggregatable or not aggregatable). - const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. - let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. - const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; - const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; - - allNonMetricFields.forEach((f) => { - const checkAggregatableField = aggregatableExistsFields.find( - (existsField) => existsField.fieldName === f.displayName - ); - - if (checkAggregatableField !== undefined) { - populatedNonMetricFields.push(f); - nonMetricFieldData.push(checkAggregatableField); - } else { - const checkNonAggregatableField = nonAggregatableExistsFields.find( - (existsField) => existsField.fieldName === f.displayName - ); - - if (checkNonAggregatableField !== undefined) { - populatedNonMetricFields.push(f); - nonMetricFieldData.push(checkNonAggregatableField); - } - } - }); - - if (nonMetricsLoaded === false) { - setNonMetricsLoaded(true); - return; - } - - if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) { - // Combine the field data obtained from Elasticsearch into a single array. - nonMetricFieldData = nonMetricFieldData.concat( - overallStats.aggregatableNotExistsFields, - overallStats.nonAggregatableNotExistsFields - ); - } - - const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields; - - const configs: FieldVisConfig[] = []; - - nonMetricFieldsToShow.forEach((field) => { - const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName); - - const nonMetricConfig = { - ...fieldData, - fieldFormat: currentIndexPattern.getFormatterForField(field), - aggregatable: field.aggregatable, - scripted: field.scripted, - loading: fieldData.existsInDocs, - }; - - // Map the field type from the Kibana index pattern to the field type - // used in the data visualizer. - const dataVisualizerType = kbnTypeToJobType(field); - if (dataVisualizerType !== undefined) { - nonMetricConfig.type = dataVisualizerType; - } else { - // Add a flag to indicate that this is one of the 'other' Kibana - // field types that do not yet have a specific card type. - nonMetricConfig.type = field.type; - nonMetricConfig.isUnsupportedType = true; - } - - configs.push(nonMetricConfig); - }); - - setNonMetricConfigs(configs); - }, [ - currentIndexPattern, - dataLoader, - indexPatternFields, - nonMetricsLoaded, - overallStats, - showEmptyFields, - ]); - const wizardPanelWidth = '280px'; const configs = useMemo(() => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx index 15ddf00c4e1d3..0fc16ebf64c2b 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx @@ -8,25 +8,24 @@ import React, { FC, useMemo } from 'react'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { Option, MultiSelectPicker } from '../../../../components/multi_select_picker'; -import { FieldTypeIcon } from '../../../../components/field_type_icon'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import type { MlJobFieldType } from '../../../../../../common/types/field_types'; +import { JOB_FIELD_TYPES, JobFieldType } from '../../../../common'; +import { FieldTypeIcon } from '../field_type_icon'; +import { MultiSelectPicker, Option } from '../multi_select_picker'; const ML_JOB_FIELD_TYPES_OPTIONS = { - [ML_JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, - [ML_JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' }, - [ML_JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' }, - [ML_JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' }, - [ML_JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' }, - [ML_JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' }, - [ML_JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' }, - [ML_JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' }, - [ML_JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' }, + [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, + [JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' }, + [JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' }, + [JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' }, + [JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' }, + [JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' }, + [JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' }, + [JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' }, + [JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' }, }; export const DatavisualizerFieldTypeFilter: FC<{ - indexedFieldTypes: MlJobFieldType[]; + indexedFieldTypes: JobFieldType[]; setVisibleFieldTypes(q: string[]): void; visibleFieldTypes: string[]; }> = ({ indexedFieldTypes, setVisibleFieldTypes, visibleFieldTypes }) => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx index f291076557bb8..b02fcd36d4c5f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx @@ -12,6 +12,7 @@ import { getCoreStart, getPluginsStart } from '../kibana_services'; // @ts-ignore import { FileDataVisualizerView } from './components/file_datavisualizer_view/index'; +export type FileDataVisualizerSpec = typeof FileDataVisualizer; export const FileDataVisualizer: FC = () => { const coreStart = getCoreStart(); const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index.ts index dba820519af94..e017106793efa 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index.ts @@ -5,4 +5,5 @@ * 2.0. */ -export { FileDataVisualizer } from './file_datavisualizer'; +export { FileDataVisualizer, FileDataVisualizerSpec } from './file_datavisualizer'; +export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx index 577c231c56e8c..e2747ecdba4cb 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx @@ -5,24 +5,120 @@ * 2.0. */ import './_index.scss'; -import React, { FC } from 'react'; +import React, { FC, useCallback } from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; +import { parse, stringify } from 'query-string'; +import { isEqual } from 'lodash'; +// @ts-ignore +import { encode } from 'rison-node'; import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; import { getCoreStart, getPluginsStart } from '../kibana_services'; import { IndexDataVisualizerViewProps, IndexDataVisualizerView, } from './components/index_datavisualizer_view'; +import { + Accessor, + Provider as UrlStateContextProvider, + Dictionary, + parseUrlState, + SetUrlState, + getNestedProperty, + isRisonSerializationRequired, +} from '../application/util/url_state'; + +export type IndexDataVisualizerSpec = typeof IndexDataVisualizer; + +export interface DataVisualizerUrlStateContextProviderProps extends IndexDataVisualizerViewProps { + IndexDataVisualizerComponent: FC; +} +export const DataVisualizerUrlStateContextProvider: FC = ({ + IndexDataVisualizerComponent, + ...restProps +}) => { + const history = useHistory(); + const { search: searchString } = useLocation(); + + const setUrlState: SetUrlState = useCallback( + ( + accessor: Accessor, + attribute: string | Dictionary, + value?: any, + replaceState?: boolean + ) => { + const prevSearchString = searchString; + const urlState = parseUrlState(prevSearchString); + const parsedQueryString = parse(prevSearchString, { sort: false }); + + if (!Object.prototype.hasOwnProperty.call(urlState, accessor)) { + urlState[accessor] = {}; + } + + if (typeof attribute === 'string') { + if (isEqual(getNestedProperty(urlState, `${accessor}.${attribute}`), value)) { + return prevSearchString; + } + + urlState[accessor][attribute] = value; + } else { + const attributes = attribute; + Object.keys(attributes).forEach((a) => { + urlState[accessor][a] = attributes[a]; + }); + } + + try { + const oldLocationSearchString = stringify(parsedQueryString, { + sort: false, + encode: false, + }); + + Object.keys(urlState).forEach((a) => { + if (isRisonSerializationRequired(a)) { + parsedQueryString[a] = encode(urlState[a]); + } else { + parsedQueryString[a] = urlState[a]; + } + }); + const newLocationSearchString = stringify(parsedQueryString, { + sort: false, + encode: false, + }); + + if (oldLocationSearchString !== newLocationSearchString) { + const newSearchString = stringify(parsedQueryString, { sort: false }); + if (replaceState) { + history.replace({ search: newSearchString }); + } else { + history.push({ search: newSearchString }); + } + } + } catch (error) { + // eslint-disable-next-line no-console + console.error('Could not save url state', error); + } + }, + [history, searchString] + ); + + return ( + + + + ); +}; -export const FileDataVisualizer: FC> = ( - props -) => { +export const IndexDataVisualizer: FC = (props) => { const coreStart = getCoreStart(); const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); const services = { data, maps, embeddable, share, security, fileUpload, ...coreStart }; return ( - + ); }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.d.ts b/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.d.ts new file mode 100644 index 0000000000000..9a5410918a099 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.d.ts @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Moment } from 'moment'; + +export interface TimeRangeBounds { + min?: Moment; + max?: Moment; +} + +export declare interface TimeBucketsInterval { + asMilliseconds: () => number; + asSeconds: () => number; + expression: string; +} + +export interface TimeBucketsConfig { + 'histogram:maxBars': number; + 'histogram:barTarget': number; + dateFormat: string; + 'dateFormat:scaled': string[][]; +} + +export declare class TimeBuckets { + constructor(timeBucketsConfig: TimeBucketsConfig); + public setBarTarget(barTarget: number): void; + public setMaxBars(maxBars: number): void; + public setInterval(interval: string): void; + public setBounds(bounds: TimeRangeBounds): void; + public getBounds(): { min: any; max: any }; + public getInterval(): TimeBucketsInterval; + public getScaledDateFormat(): string; +} + +export declare function getTimeBucketsFromCache(): InstanceType; + +export declare function getBoundsRoundedToInterval( + bounds: TimeRangeBounds, + interval: TimeBucketsInterval, + inclusiveEnd?: boolean +): Required; diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js b/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js new file mode 100644 index 0000000000000..816a14e885b90 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js @@ -0,0 +1,515 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../../src/plugins/data/common'; +import { ary, assign, isPlainObject, isString, sortBy } from 'lodash'; +import moment from 'moment'; +import dateMath from '@elastic/datemath'; +import { parseInterval } from '../util/parse_interval'; + +const { duration: d } = moment; + +export function timeBucketsCalcAutoIntervalProvider() { + // Note there is a current issue with Kibana (Kibana issue #9184) + // which means we can't round to, for example, 2 week or 3 week buckets, + // so there is a large gap between the 1 week and 1 month rule. + const roundingRules = [ + [d(500, 'ms'), d(100, 'ms')], + [d(5, 'second'), d(1, 'second')], + [d(10, 'second'), d(5, 'second')], + [d(15, 'second'), d(10, 'second')], + [d(30, 'second'), d(15, 'second')], + [d(1, 'minute'), d(30, 'second')], + [d(5, 'minute'), d(1, 'minute')], + [d(10, 'minute'), d(5, 'minute')], + [d(15, 'minute'), d(10, 'minute')], + [d(30, 'minute'), d(10, 'minute')], + [d(1, 'hour'), d(30, 'minute')], + [d(2, 'hour'), d(1, 'hour')], + [d(4, 'hour'), d(2, 'hour')], + [d(6, 'hour'), d(4, 'hour')], + [d(8, 'hour'), d(6, 'hour')], + [d(12, 'hour'), d(8, 'hour')], + [d(24, 'hour'), d(12, 'hour')], + [d(2, 'd'), d(1, 'd')], + [d(4, 'd'), d(2, 'd')], + [d(1, 'week'), d(4, 'd')], + //[ d(2, 'week'), d(1, 'week') ], + //[ d(1, 'month'), d(2, 'week') ], + [d(1, 'month'), d(1, 'week')], + [d(1, 'year'), d(1, 'month')], + [Infinity, d(1, 'year')], + ]; + + const revRoundingRules = roundingRules.slice(0).reverse(); + + function find(rules, check, last) { + function pick(buckets, duration) { + const target = duration / buckets; + let lastResp; + + for (let i = 0; i < rules.length; i++) { + const rule = rules[i]; + const resp = check(rule[0], rule[1], target); + + if (resp == null) { + if (!last) { + continue; + } + if (lastResp) { + return lastResp; + } + break; + } + + if (!last) { + return resp; + } + lastResp = resp; + } + + // fallback to just a number of milliseconds, ensure ms is >= 1 + const ms = Math.max(Math.floor(target), 1); + return moment.duration(ms, 'ms'); + } + + return function (buckets, duration) { + const interval = pick(buckets, duration); + if (interval) { + return moment.duration(interval._data); + } + }; + } + + return { + near: find( + revRoundingRules, + function near(upperBound, lowerBound, target) { + // upperBound - first duration in rule + // lowerBound - second duration in rule + // target - target interval in milliseconds. + if (upperBound > target) { + if (upperBound === Infinity) { + return lowerBound; + } + + const boundMs = upperBound.asMilliseconds(); + const intervalMs = lowerBound.asMilliseconds(); + const retInterval = + Math.abs(boundMs - target) <= Math.abs(intervalMs) ? upperBound : lowerBound; + return retInterval; + } + }, + true + ), + + lessThan: find(revRoundingRules, function (upperBound, lowerBound, target) { + // upperBound - first duration in rule + // lowerBound - second duration in rule + // target - target interval in milliseconds. Must not return intervals less than this duration. + if (lowerBound < target) { + return upperBound !== Infinity ? upperBound : lowerBound; + } + }), + + atLeast: find(revRoundingRules, function atLeast(upperBound, lowerBound, target) { + // Unmodified from Kibana ui/time_buckets/calc_auto_interval.js. + if (lowerBound <= target) { + return lowerBound; + } + }), + }; +} + +const unitsDesc = dateMath.unitsDesc; + +// Index of the list of time interval units at which larger units (i.e. weeks, months, years) need +// need to be converted to multiples of the largest unit supported in ES aggregation intervals (i.e. days). +// Note that similarly the largest interval supported for ML bucket spans is 'd'. +const timeUnitsMaxSupportedIndex = unitsDesc.indexOf('w'); + +const calcAuto = timeBucketsCalcAutoIntervalProvider(); + +/** + * Helper object for wrapping the concept of an "Interval", which + * describes a timespan that will separate buckets of time, + * for example the interval between points on a time series chart. + */ +export function TimeBuckets(timeBucketsConfig, fieldFormats) { + this._timeBucketsConfig = timeBucketsConfig; + this._fieldFormats = fieldFormats; + this.barTarget = this._timeBucketsConfig[UI_SETTINGS.HISTOGRAM_BAR_TARGET]; + this.maxBars = this._timeBucketsConfig[UI_SETTINGS.HISTOGRAM_MAX_BARS]; +} + +/** + * Set the target number of bars. + * + * @param {number} bt - target number of bars (buckets). + * + * @returns {undefined} + */ +TimeBuckets.prototype.setBarTarget = function (bt) { + this.barTarget = bt; +}; + +/** + * Set the maximum number of bars. + * + * @param {number} mb - maximum number of bars (buckets). + * + * @returns {undefined} + */ +TimeBuckets.prototype.setMaxBars = function (mb) { + this.maxBars = mb; +}; + +/** + * Set the bounds that these buckets are expected to cover. + * This is required to support interval "auto" as well + * as interval scaling. + * + * @param {object} input - an object with properties min and max, + * representing the edges for the time span + * we should cover + * + * @returns {undefined} + */ +TimeBuckets.prototype.setBounds = function (input) { + if (!input) return this.clearBounds(); + + let bounds; + if (isPlainObject(input)) { + // accept the response from timefilter.getActiveBounds() + bounds = [input.min, input.max]; + } else { + bounds = Array.isArray(input) ? input : []; + } + + const moments = sortBy(bounds.map(ary(moment, 1)), Number); + + const valid = moments.length === 2 && moments.every(isValidMoment); + if (!valid) { + this.clearBounds(); + throw new Error('invalid bounds set: ' + input); + } + + this._lb = moments.shift(); + this._ub = moments.pop(); + if (this.getDuration().asSeconds() < 0) { + throw new TypeError('Intervals must be positive'); + } +}; + +/** + * Clear the stored bounds + * + * @return {undefined} + */ +TimeBuckets.prototype.clearBounds = function () { + this._lb = this._ub = null; +}; + +/** + * Check to see if we have received bounds yet + * + * @return {Boolean} + */ +TimeBuckets.prototype.hasBounds = function () { + return isValidMoment(this._ub) && isValidMoment(this._lb); +}; + +/** + * Return the current bounds, if we have any. + * + * Note that this does not clone the bounds, so editing them may have unexpected side-effects. + * Always call bounds.min.clone() before editing. + * + * @return {object|undefined} - If bounds are not defined, this + * returns undefined, else it returns the bounds + * for these buckets. This object has two props, + * min and max. Each property will be a moment() + * object + */ +TimeBuckets.prototype.getBounds = function () { + if (!this.hasBounds()) return; + return { + min: this._lb, + max: this._ub, + }; +}; + +/** + * Get a moment duration object representing + * the distance between the bounds, if the bounds + * are set. + * + * @return {moment.duration|undefined} + */ +TimeBuckets.prototype.getDuration = function () { + if (!this.hasBounds()) return; + return moment.duration(this._ub - this._lb, 'ms'); +}; + +/** + * Update the interval at which buckets should be + * generated. + * + * Input can be one of the following: + * - "auto" + * - an interval String, such as 7d, 1h or 30m which can be parsed to a moment duration using ml/common/util/parse_interval + * - a moment.duration object. + * + * @param {string|moment.duration} input - see desc + */ +TimeBuckets.prototype.setInterval = function (input) { + // Preserve the original units because they're lost when the interval is converted to a + // moment duration object. + this.originalInterval = input; + + let interval = input; + + if (!interval || interval === 'auto') { + this._i = 'auto'; + return; + } + + if (isString(interval)) { + input = interval; + interval = parseInterval(interval); + if (+interval === 0) { + interval = null; + } + } + + // If the value wasn't converted to a duration, and isn't already a duration, we have a problem + if (!moment.isDuration(interval)) { + throw new TypeError('"' + input + '" is not a valid interval.'); + } + + this._i = interval; +}; + +/** + * Get the interval for the buckets. If the + * number of buckets created by the interval set + * is larger than config:histogram:maxBars then the + * interval will be scaled up. If the number of buckets + * created is less than one, the interval is scaled back. + * + * The interval object returned is a moment.duration + * object that has been decorated with the following + * properties. + * + * interval.description: a text description of the interval. + * designed to be used list "field per {{ desc }}". + * - "minute" + * - "10 days" + * - "3 years" + * + * interval.expr: the elasticsearch expression that creates this + * interval. If the interval does not properly form an elasticsearch + * expression it will be forced into one. + * + * interval.scaled: the interval was adjusted to + * accommodate the maxBars setting. + * + * interval.scale: the number that y-values should be + * multiplied by + * + * interval.scaleDescription: a description that reflects + * the values which will be produced by using the + * interval.scale. + * + * + * @return {[type]} [description] + */ +TimeBuckets.prototype.getInterval = function () { + const self = this; + const duration = self.getDuration(); + return decorateInterval(maybeScaleInterval(readInterval()), duration); + + // either pull the interval from state or calculate the auto-interval + function readInterval() { + const interval = self._i; + if (moment.isDuration(interval)) return interval; + return calcAuto.near(self.barTarget, duration); + } + + // check to see if the interval should be scaled, and scale it if so + function maybeScaleInterval(interval) { + if (!self.hasBounds()) return interval; + + const maxLength = self.maxBars; + const approxLen = duration / interval; + let scaled; + + // If the number of buckets we got back from using the barTarget is less than + // maxBars, than use the lessThan rule to try and get closer to maxBars. + if (approxLen > maxLength) { + scaled = calcAuto.lessThan(maxLength, duration); + } else { + return interval; + } + + if (+scaled === +interval) return interval; + + decorateInterval(interval, duration); + return assign(scaled, { + preScaled: interval, + scale: interval / scaled, + scaled: true, + }); + } +}; + +/** + * Returns an interval which in the last step of calculation is rounded to + * the closest multiple of the supplied divisor (in seconds). + * + * @return {moment.duration|undefined} + */ +TimeBuckets.prototype.getIntervalToNearestMultiple = function (divisorSecs) { + const interval = this.getInterval(); + const intervalSecs = interval.asSeconds(); + + const remainder = intervalSecs % divisorSecs; + if (remainder === 0) { + return interval; + } + + // Create a new interval which is a multiple of the supplied divisor (not zero). + let nearestMultiple = + remainder > divisorSecs / 2 ? intervalSecs + divisorSecs - remainder : intervalSecs - remainder; + nearestMultiple = nearestMultiple === 0 ? divisorSecs : nearestMultiple; + const nearestMultipleInt = moment.duration(nearestMultiple, 'seconds'); + decorateInterval(nearestMultipleInt, this.getDuration()); + + // Check to see if the new interval is scaled compared to the original. + const preScaled = interval.preScaled; + if (preScaled !== undefined && preScaled < nearestMultipleInt) { + nearestMultipleInt.preScaled = preScaled; + nearestMultipleInt.scale = preScaled / nearestMultipleInt; + nearestMultipleInt.scaled = true; + } + + return nearestMultipleInt; +}; + +/** + * Get a date format string that will represent dates that + * progress at our interval. + * + * Since our interval can be as small as 1ms, the default + * date format is usually way too much. with `dateFormat:scaled` + * users can modify how dates are formatted within series + * produced by TimeBuckets + * + * @return {string} + */ +TimeBuckets.prototype.getScaledDateFormat = function () { + const interval = this.getInterval(); + const rules = this._timeBucketsConfig['dateFormat:scaled']; + + for (let i = rules.length - 1; i >= 0; i--) { + const rule = rules[i]; + if (!rule[0] || interval >= moment.duration(rule[0])) { + return rule[1]; + } + } + + return this._timeBucketsConfig.dateFormat; +}; + +TimeBuckets.prototype.getScaledDateFormatter = function () { + const fieldFormats = this._fieldFormats; + const DateFieldFormat = fieldFormats.getType(FIELD_FORMAT_IDS.DATE); + return new DateFieldFormat( + { + pattern: this.getScaledDateFormat(), + }, + // getConfig + this._timeBucketsConfig + ); +}; + +// Appends some TimeBuckets specific properties to the moment.js duration interval. +// Uses the originalDuration from which the time bucket was created to calculate the overflow +// property (i.e. difference between the supplied duration and the calculated bucket interval). +function decorateInterval(interval, originalDuration) { + const esInterval = calcEsInterval(interval); + interval.esValue = esInterval.value; + interval.esUnit = esInterval.unit; + interval.expression = esInterval.expression; + interval.overflow = + originalDuration > interval ? moment.duration(interval - originalDuration) : false; + + const prettyUnits = moment.normalizeUnits(esInterval.unit); + if (esInterval.value === 1) { + interval.description = prettyUnits; + } else { + interval.description = `${esInterval.value} ${prettyUnits}s`; + } + + return interval; +} + +function isValidMoment(m) { + return m && 'isValid' in m && m.isValid(); +} + +export function getBoundsRoundedToInterval(bounds, interval, inclusiveEnd = false) { + // Returns new bounds, created by flooring the min of the provided bounds to the start of + // the specified interval (a moment duration), and rounded upwards (Math.ceil) to 1ms before + // the start of the next interval (Kibana dashboards search >= bounds min, and <= bounds max, + // so we subtract 1ms off the max to avoid querying start of the new Elasticsearch aggregation bucket). + const intervalMs = interval.asMilliseconds(); + const adjustedMinMs = Math.floor(bounds.min.valueOf() / intervalMs) * intervalMs; + let adjustedMaxMs = Math.ceil(bounds.max.valueOf() / intervalMs) * intervalMs; + + // Don't include the start ms of the next bucket unless specified.. + if (inclusiveEnd === false) { + adjustedMaxMs = adjustedMaxMs - 1; + } + return { min: moment(adjustedMinMs), max: moment(adjustedMaxMs) }; +} + +export function calcEsInterval(duration) { + // Converts a moment.duration into an Elasticsearch compatible interval expression, + // and provides associated metadata. + + // Note this was a copy of Kibana's original ui/time_buckets/calc_es_interval, + // but with the definition of a 'large' unit changed from 'M' to 'w', + // bringing it into line with the time units supported by Elasticsearch + for (let i = 0; i < unitsDesc.length; i++) { + const unit = unitsDesc[i]; + const val = duration.as(unit); + // find a unit that rounds neatly + if (val >= 1 && Math.floor(val) === val) { + // Apart from for date histograms, ES only supports time units up to 'd', + // meaning we can't for example use 'w' for job bucket spans. + // See https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units + // So keep going until we get out of the "large" units. + if (i <= timeUnitsMaxSupportedIndex) { + continue; + } + + return { + value: val, + unit: unit, + expression: val + unit, + }; + } + } + + const ms = duration.as('ms'); + return { + value: ms, + unit: 'ms', + expression: ms + 'ms', + }; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.test.ts b/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.test.ts new file mode 100644 index 0000000000000..a1608960a91bc --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.test.ts @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { parseInterval } from './parse_interval'; + +describe('ML parse interval util', () => { + test('should correctly parse an interval containing a valid unit and value', () => { + expect(parseInterval('1d')!.as('d')).toBe(1); + expect(parseInterval('2y')!.as('y')).toBe(2); + expect(parseInterval('5M')!.as('M')).toBe(5); + expect(parseInterval('5m')!.as('m')).toBe(5); + expect(parseInterval('250ms')!.as('ms')).toBe(250); + expect(parseInterval('100s')!.as('s')).toBe(100); + expect(parseInterval('23d')!.as('d')).toBe(23); + expect(parseInterval('52w')!.as('w')).toBe(52); + expect(parseInterval('0s')!.as('s')).toBe(0); + expect(parseInterval('0s')!.as('h')).toBe(0); + }); + + test('should correctly handle zero value intervals', () => { + expect(parseInterval('0h')!.as('h')).toBe(0); + expect(parseInterval('0d')).toBe(null); + }); + + test('should return null for an invalid interval', () => { + expect(parseInterval('')).toBe(null); + expect(parseInterval('234asdf')).toBe(null); + expect(parseInterval('m')).toBe(null); + expect(parseInterval('1.5h')).toBe(null); + }); + + test('should correctly check for whether the interval units are valid Elasticsearch time units', () => { + expect(parseInterval('100s', true)!.as('s')).toBe(100); + expect(parseInterval('5m', true)!.as('m')).toBe(5); + expect(parseInterval('24h', true)!.as('h')).toBe(24); + expect(parseInterval('7d', true)!.as('d')).toBe(7); + expect(parseInterval('1w', true)).toBe(null); + expect(parseInterval('1M', true)).toBe(null); + expect(parseInterval('1y', true)).toBe(null); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.ts b/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.ts new file mode 100644 index 0000000000000..6ca280dc12ebd --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.ts @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { duration, Duration, unitOfTime } from 'moment'; +import dateMath from '@elastic/datemath'; + +type SupportedUnits = unitOfTime.Base; + +// Assume interval is in the form (value)(unit), such as "1h" +const INTERVAL_STRING_RE = new RegExp('^([0-9]*)\\s*(' + dateMath.units.join('|') + ')$'); + +// moment.js is only designed to allow fractional values between 0 and 1 +// for units of hour or less. +const SUPPORT_ZERO_DURATION_UNITS: SupportedUnits[] = ['ms', 's', 'm', 'h']; + +// List of time units which are supported for use in Elasticsearch durations +// (such as anomaly detection job bucket spans) +// See https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units +const SUPPORT_ES_DURATION_UNITS: SupportedUnits[] = ['ms', 's', 'm', 'h', 'd']; + +// Parses an interval String, such as 7d, 1h or 30m to a moment duration. +// Optionally carries out an additional check that the interval is supported as a +// time unit by Elasticsearch, as units greater than 'd' for example cannot be used +// for anomaly detection job bucket spans. +// Differs from the Kibana ui/utils/parse_interval in the following ways: +// 1. A value-less interval such as 'm' is not allowed - in line with the ML back-end +// not accepting such interval Strings for the bucket span of a job. +// 2. Zero length durations 0ms, 0s, 0m and 0h are accepted as-is. +// Note that when adding or subtracting fractional durations, moment is only designed +// to work with units less than 'day'. +// 3. Fractional intervals e.g. 1.5h or 4.5d are not allowed, in line with the behaviour +// of the Elasticsearch date histogram aggregation. +export function parseInterval( + interval: string | number, + checkValidEsUnit = false +): Duration | null { + const matches = String(interval).trim().match(INTERVAL_STRING_RE); + if (!Array.isArray(matches) || matches.length < 3) { + return null; + } + + try { + const value = parseInt(matches[1], 10); + const unit = matches[2] as SupportedUnits; + + // In line with moment.js, only allow zero value intervals when the unit is less than 'day'. + // And check for isNaN as e.g. valueless 'm' will pass the regex test, + // plus an optional check that the unit is not w/M/y which are not fully supported by ES. + if ( + isNaN(value) || + (value < 1 && SUPPORT_ZERO_DURATION_UNITS.indexOf(unit) === -1) || + (checkValidEsUnit === true && SUPPORT_ES_DURATION_UNITS.indexOf(unit) === -1) + ) { + return null; + } + + return duration(value, unit); + } catch (e) { + return null; + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx index ba17051aa7719..51dd7e18c9a41 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx @@ -5,19 +5,21 @@ * 2.0. */ -import { parse, stringify } from 'query-string'; -import React, { createContext, useCallback, useContext, useMemo, FC } from 'react'; -import { isEqual } from 'lodash'; +import { parse } from 'query-string'; +import { createContext, useCallback, useContext, useMemo } from 'react'; // @ts-ignore -import { decode, encode } from 'rison-node'; -import { useHistory, useLocation } from 'react-router-dom'; +import { decode } from 'rison-node'; -interface Dictionary { +export interface Dictionary { [id: string]: TValue; } // duplicate of ml/object_utils -const getNestedProperty = (obj: Record, accessor: string, defaultValue?: any) => { +export const getNestedProperty = ( + obj: Record, + accessor: string, + defaultValue?: any +) => { const value = accessor.split('.').reduce((o, i) => o?.[i], obj); if (value === undefined) return defaultValue; @@ -25,7 +27,7 @@ const getNestedProperty = (obj: Record, accessor: string, defaultVa return value; }; -type Accessor = '_a' | '_g'; +export type Accessor = '_a' | '_g'; export type SetUrlState = ( accessor: Accessor, attribute: string | Dictionary, @@ -46,7 +48,7 @@ const risonSerializedParams = new Set(['_a', '_g']); * Checks if the URL query parameter requires rison serialization. * @param queryParam */ -function isRisonSerializationRequired(queryParam: string): boolean { +export function isRisonSerializationRequired(queryParam: string): boolean { return risonSerializedParams.has(queryParam); } @@ -79,90 +81,22 @@ export function parseUrlState(search: string): Dictionary { // This uses a context to be able to maintain only one instance // of the url state. It gets passed down with `UrlStateProvider` // and can be used via `useUrlState`. -export const urlStateStore = createContext({ +export const dataVisualizerUrlStateStore = createContext({ searchString: '', setUrlState: () => {}, }); -const { Provider } = urlStateStore; - -export const UrlStateProvider: FC = ({ children }) => { - const history = useHistory(); - const { search: searchString } = useLocation(); - - const setUrlState: SetUrlState = useCallback( - ( - accessor: Accessor, - attribute: string | Dictionary, - value?: any, - replaceState?: boolean - ) => { - const prevSearchString = searchString; - const urlState = parseUrlState(prevSearchString); - const parsedQueryString = parse(prevSearchString, { sort: false }); - - if (!Object.prototype.hasOwnProperty.call(urlState, accessor)) { - urlState[accessor] = {}; - } - - if (typeof attribute === 'string') { - if (isEqual(getNestedProperty(urlState, `${accessor}.${attribute}`), value)) { - return prevSearchString; - } - - urlState[accessor][attribute] = value; - } else { - const attributes = attribute; - Object.keys(attributes).forEach((a) => { - urlState[accessor][a] = attributes[a]; - }); - } - - try { - const oldLocationSearchString = stringify(parsedQueryString, { - sort: false, - encode: false, - }); - - Object.keys(urlState).forEach((a) => { - if (isRisonSerializationRequired(a)) { - parsedQueryString[a] = encode(urlState[a]); - } else { - parsedQueryString[a] = urlState[a]; - } - }); - const newLocationSearchString = stringify(parsedQueryString, { - sort: false, - encode: false, - }); - - if (oldLocationSearchString !== newLocationSearchString) { - const newSearchString = stringify(parsedQueryString, { sort: false }); - if (replaceState) { - history.replace({ search: newSearchString }); - } else { - history.push({ search: newSearchString }); - } - } - } catch (error) { - // eslint-disable-next-line no-console - console.error('Could not save url state', error); - } - }, - [searchString] - ); - - return {children}; -}; +export const { Provider } = dataVisualizerUrlStateStore; export const useUrlState = (accessor: Accessor) => { - const { searchString, setUrlState: setUrlStateContext } = useContext(urlStateStore); + const { searchString, setUrlState: setUrlStateContext } = useContext(dataVisualizerUrlStateStore); const urlState = useMemo(() => { const fullUrlState = parseUrlState(searchString); if (typeof fullUrlState === 'object') { return fullUrlState[accessor]; } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [searchString]); const setUrlState = useCallback( @@ -191,7 +125,7 @@ export const usePageUrlState = ( ...(defaultState ?? {}), ...(pageState ?? {}), }; - }, [pageState]); + }, [defaultState, pageState]); const onStateUpdate = useCallback( (update: Partial, replaceState?: boolean) => { diff --git a/x-pack/plugins/file_data_visualizer/public/index.ts b/x-pack/plugins/file_data_visualizer/public/index.ts index 64a81936dbbde..774f0872880d0 100644 --- a/x-pack/plugins/file_data_visualizer/public/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/index.ts @@ -7,6 +7,8 @@ import { FileDataVisualizerPlugin } from './plugin'; +export type { IndexDataVisualizerViewProps } from './application/components/index_datavisualizer_view'; + export function plugin() { return new FileDataVisualizerPlugin(); } diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts index 99dbb6d3746ce..57f0872d62589 100644 --- a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts @@ -6,13 +6,14 @@ */ import { HttpSetup } from 'src/core/public'; -import { FileDataVisualizer } from '../application'; +import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application'; import { getCoreStart } from '../kibana_services'; let loadModulesPromise: Promise; interface LazyLoadedModules { - FileDataVisualizer: typeof FileDataVisualizer; + FileDataVisualizer: FileDataVisualizerSpec; + IndexDataVisualizer: IndexDataVisualizerSpec; getHttp: () => HttpSetup; } diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts index 4229b95f3aaad..a895a0eb98385 100644 --- a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts @@ -5,4 +5,9 @@ * 2.0. */ -export { FileDataVisualizer } from '../../application'; +export { + FileDataVisualizer, + IndexDataVisualizer, + FileDataVisualizerSpec, + IndexDataVisualizerSpec, +} from '../../application'; diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/file_data_visualizer/public/plugin.ts index 9447f1e7e8b35..630b475fe0172 100644 --- a/x-pack/plugins/file_data_visualizer/public/plugin.ts +++ b/x-pack/plugins/file_data_visualizer/public/plugin.ts @@ -16,7 +16,7 @@ import type { FileUploadPluginStart } from '../../file_upload/public'; import type { MapsStartApi } from '../../maps/public'; import type { SecurityPluginSetup } from '../../security/public'; import type { LensPublicStart } from '../../lens/public'; -import { getFileDataVisualizerComponent } from './api'; +import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api'; import { getMaxBytesFormatted } from './application/util/get_max_bytes'; // eslint-disable-next-line @typescript-eslint/no-empty-interface @@ -46,6 +46,10 @@ export class FileDataVisualizerPlugin public start(core: CoreStart, plugins: FileDataVisualizerStartDependencies) { setStartServices(core, plugins); - return { getFileDataVisualizerComponent, getMaxBytesFormatted }; + return { + getFileDataVisualizerComponent, + getIndexDataVisualizerComponent, + getMaxBytesFormatted, + }; } } diff --git a/x-pack/plugins/file_data_visualizer/tsconfig.json b/x-pack/plugins/file_data_visualizer/tsconfig.json index 2d668bcaa2045..7c60002c3c630 100644 --- a/x-pack/plugins/file_data_visualizer/tsconfig.json +++ b/x-pack/plugins/file_data_visualizer/tsconfig.json @@ -14,7 +14,8 @@ { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, { "path": "../security/tsconfig.json" }, { "path": "../file_upload/tsconfig.json" }, + { "path": "../lens/tsconfig.json" }, { "path": "../maps/tsconfig.json" }, - { "path": "../../../src/plugins/embeddable/tsconfig.json" }, + { "path": "../../../src/plugins/embeddable/tsconfig.json" } ] } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx new file mode 100644 index 0000000000000..c50d851d9218a --- /dev/null +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, Fragment, useEffect, useState } from 'react'; +import { useMlKibana, useTimefilter } from '../../contexts/kibana'; +import { NavigationMenu } from '../../components/navigation_menu'; +import { HelpMenu } from '../../components/help_menu'; +import { useMlContext } from '../../contexts/ml'; +import { IndexDataVisualizerViewProps } from '../../../../../file_data_visualizer/public'; +export const IndexDataVisualizerPage: FC = () => { + const mlContext = useMlContext(); + const { combinedQuery, currentIndexPattern, kibanaConfig, currentSavedSearch } = mlContext; + + useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); + const { + services: { docLinks, fileDataVisualizer: dataVisualizer }, + } = useMlKibana(); + const [ + IndexDataVisualizer, + setIndexDataVisualizer, + ] = useState | null>(null); + + useEffect(() => { + if (dataVisualizer !== undefined) { + const { getIndexDataVisualizerComponent } = dataVisualizer; + getIndexDataVisualizerComponent().then(setIndexDataVisualizer); + } + }, []); + return IndexDataVisualizer ? ( + + + { + // Need to inject required props from ml context + // @ts-ignore FC IndexDataVisualizer does have props type + React.Children.map(IndexDataVisualizer.props.children, (child) => { + return React.cloneElement(child, { + combinedQuery, + currentIndexPattern, + kibanaConfig, + currentSavedSearch, + }); + }) + } + + + ) : ( +
Error boundary
+ ); +}; diff --git a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx index 7911014291f15..27676820c0472 100644 --- a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx +++ b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx @@ -14,7 +14,7 @@ import { NavigateToPath } from '../../../contexts/kibana'; import { MlRoute, PageLoader, PageProps } from '../../router'; import { useResolver } from '../../use_resolver'; -import { Page } from '../../../datavisualizer/index_based'; +import { IndexDataVisualizerPage as Page } from '../../../datavisualizer/index_based/index_data_visualizer'; import { checkBasicLicense } from '../../../license'; import { checkGetJobsCapabilitiesResolver } from '../../../capabilities/check_capabilities'; From 593d86215b30800f394f3d07d20fb4b03f47a50d Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 26 May 2021 16:05:51 -0500 Subject: [PATCH 04/53] [ML] Working ver --- .../index_datavisualizer_view.tsx | 395 +++++++++--------- 1 file changed, 196 insertions(+), 199 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx index 1cf8d4d73877f..5e5937e2a7ef1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx @@ -31,8 +31,9 @@ import { UI_SETTINGS, Query, IndexPattern, + IndexPatternsContract, } from '../../../../../../../src/plugins/data/public'; -import { FullTimeRangeSelector } from '../full_time_range_selector'; +import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; import { getQueryFromSavedSearch } from '../../util/index_utils'; import { usePageUrlState, useUrlState } from '../../util/url_state'; import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; @@ -61,6 +62,7 @@ import { DatePickerWrapper } from '../date_picker_wrapper'; import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; import { HelpMenu } from '../help_menu'; import { TimeBuckets } from '../../services/time_buckets'; + export interface Refresh { lastRefresh: number; timeRange?: { start: string; end: string }; @@ -117,8 +119,9 @@ export const getDefaultDataVisualizerListState = (): Required = (dataVisualizerProps) => { @@ -190,36 +193,6 @@ export const IndexDataVisualizerView: FC = (dataVi } }, [currentIndexPattern, toasts]); - /** - * Extract query data from the saved search object. - */ - const extractSearchData = useCallback( - (savedSearch: SavedSearchSavedObject | null) => { - if (!savedSearch) { - return undefined; - } - - const { query } = getQueryFromSavedSearch(savedSearch); - const queryLanguage = query.language as SearchQueryLanguage; - const qryString = query.query; - let qry; - if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { - const ast = esKuery.fromKueryExpression(qryString); - qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); - } else { - qry = esQuery.luceneStringToDsl(qryString); - esQuery.decorateQuery(qry, uiSettings.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); - } - - return { - searchQuery: qry, - searchString: qryString, - queryLanguage, - }; - }, - [currentIndexPattern, uiSettings] - ); - // Obtain the list of non metric field types which appear in the index pattern. let indexedFieldTypes: JobFieldType[] = []; const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields; @@ -250,7 +223,7 @@ export const IndexDataVisualizerView: FC = (dataVi searchQueryLanguage: searchData.queryLanguage, }; } - }, [currentSavedSearch, dataVisualizerListState, extractSearchData]); + }, [currentSavedSearch, dataVisualizerListState]); const setSearchParams = (searchParams: { searchQuery: Query['query']; @@ -308,164 +281,6 @@ export const IndexDataVisualizerView: FC = (dataVi const [nonMetricConfigs, setNonMetricConfigs] = useState(defaults.nonMetricConfigs); const [nonMetricsLoaded, setNonMetricsLoaded] = useState(defaults.nonMetricsLoaded); - const createMetricCards = useCallback(() => { - const configs: FieldVisConfig[] = []; - const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; - - const allMetricFields = indexPatternFields.filter((f) => { - return ( - f.type === KBN_FIELD_TYPES.NUMBER && - f.displayName !== undefined && - dataLoader.isDisplayField(f.displayName) === true - ); - }); - const metricExistsFields = allMetricFields.filter((f) => { - return aggregatableExistsFields.find((existsF) => { - return existsF.fieldName === f.displayName; - }); - }); - - // Add a config for 'document count', identified by no field name if indexpattern is time based. - if (currentIndexPattern.timeFieldName !== undefined) { - configs.push({ - type: JOB_FIELD_TYPES.NUMBER, - existsInDocs: true, - loading: true, - aggregatable: true, - }); - } - - if (metricsLoaded === false) { - setMetricsLoaded(true); - return; - } - - let aggregatableFields: any[] = overallStats.aggregatableExistsFields; - if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) { - aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields); - } - - const metricFieldsToShow = - metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields; - - metricFieldsToShow.forEach((field) => { - const fieldData = aggregatableFields.find((f) => { - return f.fieldName === field.displayName; - }); - - const metricConfig: FieldVisConfig = { - ...(fieldData ? fieldData : {}), - fieldFormat: currentIndexPattern.getFormatterForField(field), - type: JOB_FIELD_TYPES.NUMBER, - loading: true, - aggregatable: true, - }; - - configs.push(metricConfig); - }); - - setMetricsStats({ - totalMetricFieldsCount: allMetricFields.length, - visibleMetricsCount: metricFieldsToShow.length, - }); - setMetricConfigs(configs); - }, [ - currentIndexPattern, - dataLoader, - indexPatternFields, - metricsLoaded, - overallStats, - showEmptyFields, - ]); - - const createNonMetricCards = useCallback(() => { - const allNonMetricFields = indexPatternFields.filter((f) => { - return ( - f.type !== KBN_FIELD_TYPES.NUMBER && - f.displayName !== undefined && - dataLoader.isDisplayField(f.displayName) === true - ); - }); - // Obtain the list of all non-metric fields which appear in documents - // (aggregatable or not aggregatable). - const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. - let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. - const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; - const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; - - allNonMetricFields.forEach((f) => { - const checkAggregatableField = aggregatableExistsFields.find( - (existsField) => existsField.fieldName === f.displayName - ); - - if (checkAggregatableField !== undefined) { - populatedNonMetricFields.push(f); - nonMetricFieldData.push(checkAggregatableField); - } else { - const checkNonAggregatableField = nonAggregatableExistsFields.find( - (existsField) => existsField.fieldName === f.displayName - ); - - if (checkNonAggregatableField !== undefined) { - populatedNonMetricFields.push(f); - nonMetricFieldData.push(checkNonAggregatableField); - } - } - }); - - if (nonMetricsLoaded === false) { - setNonMetricsLoaded(true); - return; - } - - if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) { - // Combine the field data obtained from Elasticsearch into a single array. - nonMetricFieldData = nonMetricFieldData.concat( - overallStats.aggregatableNotExistsFields, - overallStats.nonAggregatableNotExistsFields - ); - } - - const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields; - - const configs: FieldVisConfig[] = []; - - nonMetricFieldsToShow.forEach((field) => { - const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName); - - const nonMetricConfig = { - ...fieldData, - fieldFormat: currentIndexPattern.getFormatterForField(field), - aggregatable: field.aggregatable, - scripted: field.scripted, - loading: fieldData.existsInDocs, - }; - - // Map the field type from the Kibana index pattern to the field type - // used in the data visualizer. - const dataVisualizerType = kbnTypeToJobType(field); - if (dataVisualizerType !== undefined) { - nonMetricConfig.type = dataVisualizerType; - } else { - // Add a flag to indicate that this is one of the 'other' Kibana - // field types that do not yet have a specific card type. - nonMetricConfig.type = field.type; - nonMetricConfig.isUnsupportedType = true; - } - - configs.push(nonMetricConfig); - }); - - setNonMetricConfigs(configs); - }, [ - currentIndexPattern, - dataLoader, - indexPatternFields, - nonMetricsLoaded, - overallStats, - showEmptyFields, - ]); - useEffect(() => { const timeUpdateSubscription = merge( timefilter.getTimeUpdate$(), @@ -484,33 +299,57 @@ export const IndexDataVisualizerView: FC = (dataVi useEffect(() => { loadOverallStats(); - // eslint-disable-next-line react-hooks/exhaustive-deps }, [searchQuery, samplerShardSize, lastRefresh]); useEffect(() => { createMetricCards(); createNonMetricCards(); - }, [createMetricCards, createNonMetricCards, overallStats, showEmptyFields]); + }, [overallStats, showEmptyFields]); useEffect(() => { loadMetricFieldStats(); - // eslint-disable-next-line react-hooks/exhaustive-deps }, [metricConfigs]); useEffect(() => { loadNonMetricFieldStats(); - // eslint-disable-next-line react-hooks/exhaustive-deps }, [nonMetricConfigs]); useEffect(() => { createMetricCards(); - }, [createMetricCards, metricsLoaded]); + }, [metricsLoaded]); useEffect(() => { createNonMetricCards(); - }, [createNonMetricCards, nonMetricsLoaded]); + }, [nonMetricsLoaded]); + + /** + * Extract query data from the saved search object. + */ + function extractSearchData(savedSearch: SavedSearchSavedObject | null) { + if (!savedSearch) { + return undefined; + } + + const { query } = getQueryFromSavedSearch(savedSearch); + const queryLanguage = query.language as SearchQueryLanguage; + const qryString = query.query; + let qry; + if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { + const ast = esKuery.fromKueryExpression(qryString); + qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); + } else { + qry = esQuery.luceneStringToDsl(qryString); + esQuery.decorateQuery(qry, uiSettings.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); + } + + return { + searchQuery: qry, + searchString: qryString, + queryLanguage, + }; + } - const loadOverallStats = useCallback(async () => { + async function loadOverallStats() { const tf = timefilter as any; let earliest; let latest; @@ -537,7 +376,7 @@ export const IndexDataVisualizerView: FC = (dataVi } catch (err) { dataLoader.displayError(err); } - }, [currentIndexPattern, dataLoader, samplerShardSize, searchQuery, timefilter]); + } async function loadMetricFieldStats() { // Only request data for fields that exist in documents. @@ -687,6 +526,164 @@ export const IndexDataVisualizerView: FC = (dataVi } } + const createMetricCards = useCallback(() => { + const configs: FieldVisConfig[] = []; + const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; + + const allMetricFields = indexPatternFields.filter((f) => { + return ( + f.type === KBN_FIELD_TYPES.NUMBER && + f.displayName !== undefined && + dataLoader.isDisplayField(f.displayName) === true + ); + }); + const metricExistsFields = allMetricFields.filter((f) => { + return aggregatableExistsFields.find((existsF) => { + return existsF.fieldName === f.displayName; + }); + }); + + // Add a config for 'document count', identified by no field name if indexpattern is time based. + if (currentIndexPattern.timeFieldName !== undefined) { + configs.push({ + type: JOB_FIELD_TYPES.NUMBER, + existsInDocs: true, + loading: true, + aggregatable: true, + }); + } + + if (metricsLoaded === false) { + setMetricsLoaded(true); + return; + } + + let aggregatableFields: any[] = overallStats.aggregatableExistsFields; + if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) { + aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields); + } + + const metricFieldsToShow = + metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields; + + metricFieldsToShow.forEach((field) => { + const fieldData = aggregatableFields.find((f) => { + return f.fieldName === field.displayName; + }); + + const metricConfig: FieldVisConfig = { + ...(fieldData ? fieldData : {}), + fieldFormat: currentIndexPattern.getFormatterForField(field), + type: JOB_FIELD_TYPES.NUMBER, + loading: true, + aggregatable: true, + }; + + configs.push(metricConfig); + }); + + setMetricsStats({ + totalMetricFieldsCount: allMetricFields.length, + visibleMetricsCount: metricFieldsToShow.length, + }); + setMetricConfigs(configs); + }, [ + currentIndexPattern, + dataLoader, + indexPatternFields, + metricsLoaded, + overallStats, + showEmptyFields, + ]); + + const createNonMetricCards = useCallback(() => { + const allNonMetricFields = indexPatternFields.filter((f) => { + return ( + f.type !== KBN_FIELD_TYPES.NUMBER && + f.displayName !== undefined && + dataLoader.isDisplayField(f.displayName) === true + ); + }); + // Obtain the list of all non-metric fields which appear in documents + // (aggregatable or not aggregatable). + const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. + let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. + const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; + const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; + + allNonMetricFields.forEach((f) => { + const checkAggregatableField = aggregatableExistsFields.find( + (existsField) => existsField.fieldName === f.displayName + ); + + if (checkAggregatableField !== undefined) { + populatedNonMetricFields.push(f); + nonMetricFieldData.push(checkAggregatableField); + } else { + const checkNonAggregatableField = nonAggregatableExistsFields.find( + (existsField) => existsField.fieldName === f.displayName + ); + + if (checkNonAggregatableField !== undefined) { + populatedNonMetricFields.push(f); + nonMetricFieldData.push(checkNonAggregatableField); + } + } + }); + + if (nonMetricsLoaded === false) { + setNonMetricsLoaded(true); + return; + } + + if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) { + // Combine the field data obtained from Elasticsearch into a single array. + nonMetricFieldData = nonMetricFieldData.concat( + overallStats.aggregatableNotExistsFields, + overallStats.nonAggregatableNotExistsFields + ); + } + + const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields; + + const configs: FieldVisConfig[] = []; + + nonMetricFieldsToShow.forEach((field) => { + const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName); + + const nonMetricConfig = { + ...fieldData, + fieldFormat: currentIndexPattern.getFormatterForField(field), + aggregatable: field.aggregatable, + scripted: field.scripted, + loading: fieldData.existsInDocs, + }; + + // Map the field type from the Kibana index pattern to the field type + // used in the data visualizer. + const dataVisualizerType = kbnTypeToJobType(field); + if (dataVisualizerType !== undefined) { + nonMetricConfig.type = dataVisualizerType; + } else { + // Add a flag to indicate that this is one of the 'other' Kibana + // field types that do not yet have a specific card type. + nonMetricConfig.type = field.type; + nonMetricConfig.isUnsupportedType = true; + } + + configs.push(nonMetricConfig); + }); + + setNonMetricConfigs(configs); + }, [ + currentIndexPattern, + dataLoader, + indexPatternFields, + nonMetricsLoaded, + overallStats, + showEmptyFields, + ]); + const wizardPanelWidth = '280px'; const configs = useMemo(() => { From 751512bf948ce921c661295e9c24c95716705c9e Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 26 May 2021 17:27:10 -0500 Subject: [PATCH 05/53] [ML] Add back and boolean support --- .../geo_point_content_with_map.tsx | 75 +++++++++++++++++++ .../geo_point_content_with_map/index.ts | 8 ++ .../expanded_row/index_based_expanded_row.tsx | 5 +- .../boolean_content_preview.tsx | 31 ++++---- .../index_based/index_data_visualizer.tsx | 4 +- 5 files changed, 103 insertions(+), 20 deletions(-) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx new file mode 100644 index 0000000000000..b6136aa1e89d3 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useEffect, useState } from 'react'; +import { EuiFlexItem } from '@elastic/eui'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { CombinedQuery } from '../../../types/combined_query'; +import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content'; +import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats'; +import { ExamplesList } from '../../examples_list'; +import { FieldVisConfig } from '../../stats_table/types'; +import { LayerDescriptor } from '../../../../../../maps/common/descriptor_types'; +import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { JOB_FIELD_TYPES } from '../../../../../common'; +import { ES_GEO_FIELD_TYPE } from '../../../../../../maps/common'; +import { EmbeddedMapComponent } from '../../embedded_map'; + +export const GeoPointContentWithMap: FC<{ + config: FieldVisConfig; + indexPattern: IndexPattern | undefined; + combinedQuery: CombinedQuery; +}> = ({ config, indexPattern, combinedQuery }) => { + const { stats } = config; + const [layerList, setLayerList] = useState([]); + const { + services: { maps: mapsPlugin }, + } = useFileDataVisualizerKibana(); + + // Update the layer list with updated geo points upon refresh + useEffect(() => { + async function updateIndexPatternSearchLayer() { + if ( + indexPattern?.id !== undefined && + config !== undefined && + config.fieldName !== undefined && + (config.type === JOB_FIELD_TYPES.GEO_POINT || config.type === JOB_FIELD_TYPES.GEO_SHAPE) + ) { + const params = { + indexPatternId: indexPattern.id, + geoFieldName: config.fieldName, + geoFieldType: config.type as ES_GEO_FIELD_TYPE, + query: { + query: combinedQuery.searchString, + language: combinedQuery.searchQueryLanguage, + }, + }; + const searchLayerDescriptor = mapsPlugin + ? await mapsPlugin.createLayerDescriptors.createESSearchSourceLayerDescriptor(params) + : null; + if (searchLayerDescriptor) { + setLayerList([...layerList, searchLayerDescriptor]); + } + } + } + updateIndexPatternSearchLayer(); + }, [indexPattern, combinedQuery, config, mapsPlugin, layerList]); + + if (stats?.examples === undefined) return null; + return ( + + + + + + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/index.ts new file mode 100644 index 0000000000000..c40fcfa38fb17 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { GeoPointContentWithMap } from './geo_point_content_with_map'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx index bd15ea09a1dd5..7508f83b47356 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import { GeoPointContent } from './geo_point_content'; +import { GeoPointContentWithMap } from './geo_point_content_with_map'; import { JOB_FIELD_TYPES } from '../../../../common'; import { BooleanContent, @@ -15,6 +15,7 @@ import { KeywordContent, NumberContent, OtherContent, + TextContent, } from '../stats_table/components/field_data_expanded_row'; import { NotInDocsContent } from '../not_in_docs_content'; import { FieldVisConfig } from '../stats_table/types'; @@ -52,7 +53,7 @@ export const IndexBasedDataVisualizerExpandedRow = ({ case JOB_FIELD_TYPES.GEO_POINT: case JOB_FIELD_TYPES.GEO_SHAPE: return ( - = ({ config }) => { const chartData = useMemo(() => { @@ -25,19 +25,18 @@ export const BooleanContentPreview: FC = ({ config }) => { }, [config]); if (!chartData || config.fieldName === undefined) return null; - // const columnType: EuiDataGridColumn = { - // id: config.fieldName, - // schema: undefined, - // }; - // const dataTestSubj = `mlDataGridChart-${config.fieldName}`; + const columnType: EuiDataGridColumn = { + id: config.fieldName, + schema: undefined, + }; + const dataTestSubj = `mlDataGridChart-${config.fieldName}`; return ( - <> - // + ); }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx index c50d851d9218a..5cac4472553b8 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx @@ -13,7 +13,7 @@ import { useMlContext } from '../../contexts/ml'; import { IndexDataVisualizerViewProps } from '../../../../../file_data_visualizer/public'; export const IndexDataVisualizerPage: FC = () => { const mlContext = useMlContext(); - const { combinedQuery, currentIndexPattern, kibanaConfig, currentSavedSearch } = mlContext; + const { currentIndexPattern, kibanaConfig, currentSavedSearch } = mlContext; useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); const { @@ -38,7 +38,7 @@ export const IndexDataVisualizerPage: FC = () => { // @ts-ignore FC IndexDataVisualizer does have props type React.Children.map(IndexDataVisualizer.props.children, (child) => { return React.cloneElement(child, { - combinedQuery, + // combinedQuery, currentIndexPattern, kibanaConfig, currentSavedSearch, From 101f26b86a8dbe3cd1d61dcde264d9498ea88edc Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 26 May 2021 18:24:32 -0500 Subject: [PATCH 06/53] [ML] Remove old files inside ml --- .../index_datavisualizer_view.tsx | 25 +- .../public/application/util/url_state.tsx | 3 +- .../plugins/ml/public/application/_index.scss | 1 - .../application/datavisualizer/_index.scss | 2 - .../datavisualizer/index_based/_index.scss | 1 - .../index_based/common/combined_query.ts | 12 - .../index_based/common/index.ts | 9 - .../index_based/common/request.ts | 20 - .../actions_panel/actions_panel.tsx | 215 ----- .../components/actions_panel/index.ts | 8 - .../components/expanded_row/expanded_row.tsx | 86 -- .../expanded_row/geo_point_content.tsx | 77 -- .../components/expanded_row/index.ts | 8 - .../field_count_panel/field_count_panel.tsx | 54 -- .../components/field_count_panel/index.ts | 8 - .../components/field_data_row/_index.scss | 1 - .../field_data_row/action_menu/actions.ts | 49 -- .../field_data_row/action_menu/index.ts | 8 - .../field_data_row/action_menu/lens_utils.ts | 288 ------- .../choropleth_map/choropleth_map.tsx | 126 --- .../field_data_row/choropleth_map/index.ts | 8 - .../content_types/document_count_content.tsx | 49 -- .../field_data_row/content_types/index.ts | 9 - .../content_types/not_in_docs_content.tsx | 28 - .../document_count_chart.tsx | 99 --- .../document_count_chart/index.ts | 8 - .../examples_list/examples_list.tsx | 59 -- .../field_data_row/examples_list/index.ts | 8 - .../field_data_row/loading_indicator/index.ts | 8 - .../loading_indicator/loading_indicator.tsx | 30 - .../top_values/_top_values.scss | 19 - .../field_data_row/top_values/index.ts | 8 - .../field_data_row/top_values/top_values.tsx | 113 --- .../search_panel/field_name_filter.tsx | 63 -- .../search_panel/field_type_filter.tsx | 73 -- .../components/search_panel/index.ts | 8 - .../components/search_panel/search_panel.tsx | 163 ---- .../search_panel/shard_size_select.tsx | 66 -- .../components/total_count_header/index.ts | 8 - .../total_count_header/total_count_header.tsx | 34 - .../datavisualizer/index_based/index.ts | 2 +- .../index_based/index_data_visualizer.tsx | 7 +- .../datavisualizer/index_based/page.tsx | 810 ------------------ .../stats_table/_field_data_row.scss | 86 -- .../datavisualizer/stats_table/_index.scss | 56 -- .../expanded_row_field_header.tsx | 15 - .../expanded_row_field_header/index.ts | 8 - .../components/field_count_stats/_index.scss | 3 - .../components/field_count_stats/index.ts | 13 - .../field_count_stats/metric_fields_count.tsx | 68 -- .../field_count_stats/total_fields_count.tsx | 67 -- .../field_data_expanded_row/_index.scss | 7 - .../_number_content.scss | 4 - .../boolean_content.tsx | 145 ---- .../field_data_expanded_row/date_content.tsx | 87 -- .../document_stats.tsx | 93 -- .../expanded_row_content.tsx | 25 - .../field_data_expanded_row/index.ts | 14 - .../field_data_expanded_row/ip_content.tsx | 27 - .../keyword_content.tsx | 54 -- .../number_content.tsx | 154 ---- .../field_data_expanded_row/other_content.tsx | 28 - .../field_data_expanded_row/text_content.tsx | 66 -- .../components/field_data_row/_index.scss | 3 - .../boolean_content_preview.tsx | 42 - .../field_data_row/distinct_values.tsx | 24 - .../field_data_row/document_stats.tsx | 33 - .../components/field_data_row/index.ts | 8 - .../field_data_row/number_content_preview.tsx | 81 -- .../field_data_row/top_values_preview.tsx | 44 - .../metric_distribution_chart/index.ts | 9 - .../metric_distribution_chart.tsx | 101 --- ...metric_distribution_chart_data_builder.tsx | 156 ---- ...tric_distribution_chart_tooltip_header.tsx | 54 -- .../data_visualizer_stats_table.tsx | 270 ------ .../datavisualizer/stats_table/hooks/index.ts | 8 - .../hooks/use_data_viz_chart_theme.ts | 55 -- .../datavisualizer/stats_table/index.ts | 8 - .../stats_table/types/field_data_row.ts | 12 - .../stats_table/types/field_vis_config.ts | 99 --- .../datavisualizer/stats_table/types/index.ts | 16 - .../datavisualizer/stats_table/utils.ts | 38 - 82 files changed, 21 insertions(+), 4741 deletions(-) delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts delete mode 100644 x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx index 5e5937e2a7ef1..0bf4959e97933 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx @@ -31,7 +31,6 @@ import { UI_SETTINGS, Query, IndexPattern, - IndexPatternsContract, } from '../../../../../../../src/plugins/data/public'; import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; import { getQueryFromSavedSearch } from '../../util/index_utils'; @@ -118,15 +117,13 @@ export const getDefaultDataVisualizerListState = (): Required = (dataVisualizerProps) => { - const restorableDefaults = getDefaultDataVisualizerListState(); - const { services: { lens: lensPlugin, docLinks, notifications, uiSettings }, } = useFileDataVisualizerKibana(); @@ -140,7 +137,7 @@ export const IndexDataVisualizerView: FC = (dataVi dataVisualizerProps.currentSavedSearch ); - const { combinedQuery, currentIndexPattern } = dataVisualizerProps; + const { query, currentIndexPattern } = dataVisualizerProps; const getTimeBuckets = useCallback(() => { return new TimeBuckets({ @@ -210,6 +207,7 @@ export const IndexDataVisualizerView: FC = (dataVi const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => { const searchData = extractSearchData(currentSavedSearch); + if (searchData === undefined || dataVisualizerListState.searchString !== '') { return { searchQuery: dataVisualizerListState.searchQuery, @@ -223,6 +221,7 @@ export const IndexDataVisualizerView: FC = (dataVi searchQueryLanguage: searchData.queryLanguage, }; } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [currentSavedSearch, dataVisualizerListState]); const setSearchParams = (searchParams: { @@ -299,27 +298,33 @@ export const IndexDataVisualizerView: FC = (dataVi useEffect(() => { loadOverallStats(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [searchQuery, samplerShardSize, lastRefresh]); useEffect(() => { createMetricCards(); createNonMetricCards(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [overallStats, showEmptyFields]); useEffect(() => { loadMetricFieldStats(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [metricConfigs]); useEffect(() => { loadNonMetricFieldStats(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [nonMetricConfigs]); useEffect(() => { createMetricCards(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [metricsLoaded]); useEffect(() => { createNonMetricCards(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [nonMetricsLoaded]); /** @@ -330,9 +335,9 @@ export const IndexDataVisualizerView: FC = (dataVi return undefined; } - const { query } = getQueryFromSavedSearch(savedSearch); - const queryLanguage = query.language as SearchQueryLanguage; - const qryString = query.query; + const { query: extractedQuery } = getQueryFromSavedSearch(savedSearch); + const queryLanguage = extractedQuery.language as SearchQueryLanguage; + const qryString = extractedQuery.query; let qry; if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { const ast = esKuery.fromKueryExpression(qryString); @@ -781,7 +786,7 @@ export const IndexDataVisualizerView: FC = (dataVi diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx index 51dd7e18c9a41..8ee517e60e6d8 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx @@ -125,7 +125,8 @@ export const usePageUrlState = ( ...(defaultState ?? {}), ...(pageState ?? {}), }; - }, [defaultState, pageState]); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [pageState]); const onStateUpdate = useCallback( (update: Partial, replaceState?: boolean) => { diff --git a/x-pack/plugins/ml/public/application/_index.scss b/x-pack/plugins/ml/public/application/_index.scss index da1c226a665f6..5023a8e597fb7 100644 --- a/x-pack/plugins/ml/public/application/_index.scss +++ b/x-pack/plugins/ml/public/application/_index.scss @@ -9,7 +9,6 @@ // Sub applications @import 'data_frame_analytics/index'; - @import 'datavisualizer/index'; @import 'explorer/index'; // SASSTODO: This file needs to be rewritten @import 'jobs/index'; // SASSTODO: This collection of sass files has multiple problems @import 'overview/index'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/_index.scss deleted file mode 100644 index c02883c573ead..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/_index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import 'index_based/index'; -@import 'stats_table/index'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss deleted file mode 100644 index 95a523753dfca..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'components/field_data_row/index'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts deleted file mode 100644 index 0257e4513cb84..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -// @remove -export interface CombinedQuery { - searchString: string | { [key: string]: any }; - searchQueryLanguage: string; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts deleted file mode 100644 index fe99a63432793..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { FieldHistogramRequestConfig, FieldRequestConfig } from './request'; -export type { CombinedQuery } from './combined_query'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts deleted file mode 100644 index 40a8c3a7d8b1b..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { KBN_FIELD_TYPES } from '../../../../../../../../src/plugins/data/public'; -import { MlJobFieldType } from '../../../../../common/types/field_types'; - -export interface FieldRequestConfig { - fieldName?: string; - type: MlJobFieldType; - cardinality: number; -} - -export interface FieldHistogramRequestConfig { - fieldName: string; - type?: KBN_FIELD_TYPES; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx deleted file mode 100644 index ca393c2d8ce72..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useState, useEffect } from 'react'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import { EuiSpacer, EuiTitle, EuiFlexGroup } from '@elastic/eui'; -import { LinkCard } from '../../../../components/link_card'; -import { DataRecognizer } from '../../../../components/data_recognizer'; -import { ML_PAGES } from '../../../../../../common/constants/ml_url_generator'; -import { - DISCOVER_APP_URL_GENERATOR, - DiscoverUrlGeneratorState, -} from '../../../../../../../../../src/plugins/discover/public'; -import { useMlKibana, useMlLink } from '../../../../contexts/kibana'; -import { isFullLicense } from '../../../../license'; -import { checkPermission } from '../../../../capabilities/check_capabilities'; -import { mlNodesAvailable } from '../../../../ml_nodes_check'; -import { useUrlState } from '../../../../util/url_state'; -import type { IIndexPattern } from '../../../../../../../../../src/plugins/data/common'; - -interface Props { - indexPattern: IIndexPattern; - searchString?: string | { [key: string]: any }; - searchQueryLanguage?: string; -} - -export const ActionsPanel: FC = ({ indexPattern, searchString, searchQueryLanguage }) => { - const [recognizerResultsCount, setRecognizerResultsCount] = useState(0); - const [discoverLink, setDiscoverLink] = useState(''); - const { - services: { - application: { capabilities }, - share: { - urlGenerators: { getUrlGenerator }, - }, - }, - } = useMlKibana(); - const [globalState] = useUrlState('_g'); - - const recognizerResults = { - count: 0, - onChange() { - setRecognizerResultsCount(recognizerResults.count); - }, - }; - const mlAvailable = isFullLicense() && checkPermission('canCreateJob') && mlNodesAvailable(); - const showCreateAnomalyDetectionJob = mlAvailable && indexPattern.timeFieldName !== undefined; - - const createJobLink = useMlLink({ - page: ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_ADVANCED, - pageState: { index: indexPattern.id }, - }); - - const createDataFrameAnalyticsLink = useMlLink({ - page: ML_PAGES.DATA_FRAME_ANALYTICS_CREATE_JOB, - pageState: { index: indexPattern.id }, - }); - - useEffect(() => { - let unmounted = false; - - const indexPatternId = indexPattern.id; - const getDiscoverUrl = async (): Promise => { - const isDiscoverAvailable = capabilities.discover?.show ?? false; - if (!isDiscoverAvailable) { - return; - } - - const state: DiscoverUrlGeneratorState = { - indexPatternId, - }; - if (searchString && searchQueryLanguage !== undefined) { - state.query = { query: searchString, language: searchQueryLanguage }; - } - if (globalState?.time) { - state.timeRange = globalState.time; - } - if (globalState?.refreshInterval) { - state.refreshInterval = globalState.refreshInterval; - } - - let discoverUrlGenerator; - try { - discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR); - } catch (error) { - // ignore error thrown when url generator is not available - return; - } - - const discoverUrl = await discoverUrlGenerator.createUrl(state); - if (!unmounted) { - setDiscoverLink(discoverUrl); - } - }; - - getDiscoverUrl(); - return () => { - unmounted = true; - }; - }, [indexPattern, searchString, searchQueryLanguage, globalState]); - - // Note we use display:none for the DataRecognizer section as it needs to be - // passed the recognizerResults object, and then run the recognizer check which - // controls whether the recognizer section is ultimately displayed. - return ( -
- {mlAvailable && ( - <> - -

- -

- - - {showCreateAnomalyDetectionJob && ( - <> - - - - - - )} - - )} - {mlAvailable && indexPattern.id !== undefined && createDataFrameAnalyticsLink && ( - <> - - - } - data-test-subj="mlDataVisualizerCreateDataFrameAnalyticsCard" - /> - - - )} - - {discoverLink && ( - <> - -

- -

- - - - } - data-test-subj="mlDataVisualizerViewInDiscoverCard" - /> - - )} -
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/index.ts deleted file mode 100644 index 48d0c26d6636a..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { ActionsPanel } from './actions_panel'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx deleted file mode 100644 index bd8eb09128d1d..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React from 'react'; - -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import { LoadingIndicator } from '../field_data_row/loading_indicator'; -import { NotInDocsContent } from '../field_data_row/content_types'; -import { - BooleanContent, - DateContent, - IpContent, - KeywordContent, - NumberContent, - OtherContent, - TextContent, -} from '../../../stats_table/components/field_data_expanded_row'; -import { GeoPointContent } from './geo_point_content'; -import type { CombinedQuery } from '../../common'; -import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import type { FieldVisConfig } from '../../../stats_table/types'; - -export const IndexBasedDataVisualizerExpandedRow = ({ - item, - indexPattern, - combinedQuery, -}: { - item: FieldVisConfig; - indexPattern: IndexPattern | undefined; - combinedQuery: CombinedQuery; -}) => { - const config = item; - const { loading, type, existsInDocs, fieldName } = config; - - function getCardContent() { - if (existsInDocs === false) { - return ; - } - - switch (type) { - case ML_JOB_FIELD_TYPES.NUMBER: - return ; - - case ML_JOB_FIELD_TYPES.BOOLEAN: - return ; - - case ML_JOB_FIELD_TYPES.DATE: - return ; - - case ML_JOB_FIELD_TYPES.GEO_POINT: - case ML_JOB_FIELD_TYPES.GEO_SHAPE: - return ( - - ); - - case ML_JOB_FIELD_TYPES.IP: - return ; - - case ML_JOB_FIELD_TYPES.KEYWORD: - return ; - - case ML_JOB_FIELD_TYPES.TEXT: - return ; - - default: - return ; - } - } - - return ( -
- {loading === true ? : getCardContent()} -
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx deleted file mode 100644 index 646a81b127bcc..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useEffect, useState } from 'react'; - -import { EuiFlexItem } from '@elastic/eui'; -import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list'; -import { MlEmbeddedMapComponent } from '../../../../components/ml_embedded_map'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common/constants'; -import { useMlKibana } from '../../../../contexts/kibana'; -import { DocumentStatsTable } from '../../../stats_table/components/field_data_expanded_row/document_stats'; -import { ExpandedRowContent } from '../../../stats_table/components/field_data_expanded_row/expanded_row_content'; -import type { CombinedQuery } from '../../common'; -import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import type { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types'; -import type { FieldVisConfig } from '../../../stats_table/types'; - -export const GeoPointContent: FC<{ - config: FieldVisConfig; - indexPattern: IndexPattern | undefined; - combinedQuery: CombinedQuery; -}> = ({ config, indexPattern, combinedQuery }) => { - const { stats } = config; - const [layerList, setLayerList] = useState([]); - const { - services: { maps: mapsPlugin }, - } = useMlKibana(); - - // Update the layer list with updated geo points upon refresh - useEffect(() => { - async function updateIndexPatternSearchLayer() { - if ( - indexPattern?.id !== undefined && - config !== undefined && - config.fieldName !== undefined && - (config.type === ML_JOB_FIELD_TYPES.GEO_POINT || - config.type === ML_JOB_FIELD_TYPES.GEO_SHAPE) - ) { - const params = { - indexPatternId: indexPattern.id, - geoFieldName: config.fieldName, - geoFieldType: config.type as ES_GEO_FIELD_TYPE, - query: { - query: combinedQuery.searchString, - language: combinedQuery.searchQueryLanguage, - }, - }; - const searchLayerDescriptor = mapsPlugin - ? await mapsPlugin.createLayerDescriptors.createESSearchSourceLayerDescriptor(params) - : null; - if (searchLayerDescriptor) { - setLayerList([...layerList, searchLayerDescriptor]); - } - } - } - updateIndexPatternSearchLayer(); - }, [indexPattern, config.fieldName, combinedQuery]); - - if (stats?.examples === undefined) return null; - return ( - - - - - - - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts deleted file mode 100644 index d251dc7b6d333..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { IndexBasedDataVisualizerExpandedRow } from './expanded_row'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx deleted file mode 100644 index 9ff3d81fc3918..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiSwitch } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React, { FC } from 'react'; -import { - MetricFieldsCount, - TotalFieldsCount, -} from '../../../stats_table/components/field_count_stats'; -import type { - TotalFieldsCountProps, - MetricFieldsCountProps, -} from '../../../stats_table/components/field_count_stats'; - -interface Props extends TotalFieldsCountProps, MetricFieldsCountProps { - showEmptyFields: boolean; - toggleShowEmptyFields: () => void; -} -export const FieldCountPanel: FC = ({ - metricsStats, - fieldsCountStats, - showEmptyFields, - toggleShowEmptyFields, -}) => { - return ( - - - - - - } - checked={showEmptyFields} - onChange={toggleShowEmptyFields} - /> - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/index.ts deleted file mode 100644 index 79fa6704662e0..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { FieldCountPanel } from './field_count_panel'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss deleted file mode 100644 index 38327dc51bd97..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'top_values/top_values'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts deleted file mode 100644 index 57675927ce816..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { i18n } from '@kbn/i18n'; -import { Action } from '@elastic/eui/src/components/basic_table/action_types'; -import { getCompatibleLensDataType, getLensAttributes } from './lens_utils'; -import type { CombinedQuery } from '../../../common'; -import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns'; -import type { LensPublicStart } from '../../../../../../../../lens/public'; -import type { FieldVisConfig } from '../../../../stats_table/types'; - -export function getActions( - indexPattern: IIndexPattern, - lensPlugin: LensPublicStart, - combinedQuery: CombinedQuery -): Array> { - const canUseLensEditor = lensPlugin.canUseEditor(); - return [ - { - name: i18n.translate('xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle', { - defaultMessage: 'Explore in Lens', - }), - description: i18n.translate( - 'xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription', - { - defaultMessage: 'Explore in Lens', - } - ), - type: 'icon', - icon: 'lensApp', - available: (item: FieldVisConfig) => - getCompatibleLensDataType(item.type) !== undefined && canUseLensEditor, - onClick: (item: FieldVisConfig) => { - const lensAttributes = getLensAttributes(indexPattern, combinedQuery, item); - if (lensAttributes) { - lensPlugin.navigateToPrefilledEditor({ - id: `ml-dataVisualizer-${item.fieldName}`, - attributes: lensAttributes, - }); - } - }, - 'data-test-subj': 'mlActionButtonViewInLens', - }, - ]; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts deleted file mode 100644 index df36cc89ce911..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { getActions } from './actions'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts deleted file mode 100644 index 9690fd1b6c473..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts +++ /dev/null @@ -1,288 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { i18n } from '@kbn/i18n'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../../common/constants/field_types'; -import type { TypedLensByValueInput } from '../../../../../../../../lens/public'; -import type { FieldVisConfig } from '../../../../stats_table/types'; -import type { IndexPatternColumn, XYLayerConfig } from '../../../../../../../../lens/public'; -import type { CombinedQuery } from '../../../common'; -import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns'; -interface ColumnsAndLayer { - columns: Record; - layer: XYLayerConfig; -} - -const TOP_VALUES_LABEL = i18n.translate('xpack.ml.dataVisualizer.lensChart.topValuesLabel', { - defaultMessage: 'Top values', -}); -const COUNT = i18n.translate('xpack.ml.dataVisualizer.lensChart.countLabel', { - defaultMessage: 'Count', -}); - -export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IIndexPattern) { - // if index has no timestamp field - if (defaultIndexPattern.timeFieldName === undefined) { - const columns: Record = { - col1: { - label: item.fieldName!, - dataType: 'number', - isBucketed: true, - operationType: 'range', - params: { - type: 'histogram', - maxBars: 'auto', - ranges: [], - }, - sourceField: item.fieldName!, - }, - col2: { - label: COUNT, - dataType: 'number', - isBucketed: false, - sourceField: 'Records', - operationType: 'count', - }, - }; - - const layer: XYLayerConfig = { - accessors: ['col2'], - layerId: 'layer1', - seriesType: 'bar', - xAccessor: 'col1', - }; - return { columns, layer }; - } - - const columns: Record = { - col2: { - dataType: 'number', - isBucketed: false, - label: i18n.translate('xpack.ml.dataVisualizer.lensChart.averageOfLabel', { - defaultMessage: 'Average of {fieldName}', - values: { fieldName: item.fieldName }, - }), - operationType: 'average', - sourceField: item.fieldName!, - }, - col1: { - dataType: 'date', - isBucketed: true, - label: defaultIndexPattern.timeFieldName!, - operationType: 'date_histogram', - params: { interval: 'auto' }, - scale: 'interval', - sourceField: defaultIndexPattern.timeFieldName!, - }, - }; - - const layer: XYLayerConfig = { - accessors: ['col2'], - layerId: 'layer1', - seriesType: 'line', - xAccessor: 'col1', - }; - - return { columns, layer }; -} -export function getDateSettings(item: FieldVisConfig) { - const columns: Record = { - col2: { - dataType: 'number', - isBucketed: false, - label: COUNT, - operationType: 'count', - scale: 'ratio', - sourceField: 'Records', - }, - col1: { - dataType: 'date', - isBucketed: true, - label: item.fieldName!, - operationType: 'date_histogram', - params: { interval: 'auto' }, - scale: 'interval', - sourceField: item.fieldName!, - }, - }; - const layer: XYLayerConfig = { - accessors: ['col2'], - layerId: 'layer1', - seriesType: 'line', - xAccessor: 'col1', - }; - - return { columns, layer }; -} - -export function getKeywordSettings(item: FieldVisConfig) { - const columns: Record = { - col1: { - label: TOP_VALUES_LABEL, - dataType: 'string', - isBucketed: true, - operationType: 'terms', - params: { - orderBy: { type: 'column', columnId: 'col2' }, - size: 10, - orderDirection: 'desc', - }, - sourceField: item.fieldName!, - }, - col2: { - label: COUNT, - dataType: 'number', - isBucketed: false, - sourceField: 'Records', - operationType: 'count', - }, - }; - const layer: XYLayerConfig = { - accessors: ['col2'], - layerId: 'layer1', - seriesType: 'bar', - xAccessor: 'col1', - }; - - return { columns, layer }; -} - -export function getBooleanSettings(item: FieldVisConfig) { - const columns: Record = { - col1: { - label: TOP_VALUES_LABEL, - dataType: 'string', - isBucketed: true, - operationType: 'terms', - params: { - orderBy: { type: 'alphabetical' }, - size: 2, - orderDirection: 'desc', - }, - sourceField: item.fieldName!, - }, - col2: { - label: COUNT, - dataType: 'number', - isBucketed: false, - sourceField: 'Records', - operationType: 'count', - }, - }; - const layer: XYLayerConfig = { - accessors: ['col2'], - layerId: 'layer1', - seriesType: 'bar', - xAccessor: 'col1', - }; - - return { columns, layer }; -} - -export function getCompatibleLensDataType(type: FieldVisConfig['type']): string | undefined { - let lensType: string | undefined; - switch (type) { - case ML_JOB_FIELD_TYPES.KEYWORD: - lensType = 'string'; - break; - case ML_JOB_FIELD_TYPES.DATE: - lensType = 'date'; - break; - case ML_JOB_FIELD_TYPES.NUMBER: - lensType = 'number'; - break; - case ML_JOB_FIELD_TYPES.IP: - lensType = 'ip'; - break; - case ML_JOB_FIELD_TYPES.BOOLEAN: - lensType = 'string'; - break; - default: - lensType = undefined; - } - return lensType; -} - -function getColumnsAndLayer( - fieldType: FieldVisConfig['type'], - item: FieldVisConfig, - defaultIndexPattern: IIndexPattern -): ColumnsAndLayer | undefined { - if (item.fieldName === undefined) return; - - if (fieldType === ML_JOB_FIELD_TYPES.DATE) { - return getDateSettings(item); - } - if (fieldType === ML_JOB_FIELD_TYPES.NUMBER) { - return getNumberSettings(item, defaultIndexPattern); - } - if (fieldType === ML_JOB_FIELD_TYPES.IP || fieldType === ML_JOB_FIELD_TYPES.KEYWORD) { - return getKeywordSettings(item); - } - if (fieldType === ML_JOB_FIELD_TYPES.BOOLEAN) { - return getBooleanSettings(item); - } -} -// Get formatted Lens visualization format depending on field type -// currently only supports the following types: -// 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip' -export function getLensAttributes( - defaultIndexPattern: IIndexPattern | undefined, - combinedQuery: CombinedQuery, - item: FieldVisConfig -): TypedLensByValueInput['attributes'] | undefined { - if (defaultIndexPattern === undefined || item.type === undefined || item.fieldName === undefined) - return; - - const presets = getColumnsAndLayer(item.type, item, defaultIndexPattern); - - if (!presets) return; - - return { - visualizationType: 'lnsXY', - title: i18n.translate('xpack.ml.dataVisualizer.lensChart.chartTitle', { - defaultMessage: 'Lens for {fieldName}', - values: { fieldName: item.fieldName }, - }), - references: [ - { - id: defaultIndexPattern.id!, - name: 'indexpattern-datasource-current-indexpattern', - type: 'index-pattern', - }, - { - id: defaultIndexPattern.id!, - name: 'indexpattern-datasource-layer-layer1', - type: 'index-pattern', - }, - ], - state: { - datasourceStates: { - indexpattern: { - layers: { - layer1: { - columnOrder: ['col1', 'col2'], - columns: presets.columns, - }, - }, - }, - }, - filters: [], - query: { language: combinedQuery.searchQueryLanguage, query: combinedQuery.searchString }, - visualization: { - axisTitlesVisibilitySettings: { x: true, yLeft: true, yRight: true }, - fittingFunction: 'None', - gridlinesVisibilitySettings: { x: true, yLeft: true, yRight: true }, - layers: [presets.layer], - legend: { isVisible: true, position: 'right' }, - preferredSeriesType: 'line', - tickLabelsVisibilitySettings: { x: true, yLeft: true, yRight: true }, - valueLabels: 'hide', - }, - }, - }; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx deleted file mode 100644 index 8b7cbf83f7996..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useMemo } from 'react'; -import { EuiFlexItem, EuiSpacer, EuiText, htmlIdGenerator } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { - FIELD_ORIGIN, - SOURCE_TYPES, - STYLE_TYPE, - COLOR_MAP_TYPE, -} from '../../../../../../../../maps/common/constants'; -import { EMSTermJoinConfig } from '../../../../../../../../maps/public'; -import { FieldVisStats } from '../../../../stats_table/types'; -import { VectorLayerDescriptor } from '../../../../../../../../maps/common/descriptor_types'; -import { MlEmbeddedMapComponent } from '../../../../../components/ml_embedded_map'; - -export const getChoroplethTopValuesLayer = ( - fieldName: string, - topValues: Array<{ key: any; doc_count: number }>, - { layerId, field }: EMSTermJoinConfig -): VectorLayerDescriptor => { - return { - id: htmlIdGenerator()(), - label: i18n.translate('xpack.ml.dataviz.choroplethMap.topValuesCount', { - defaultMessage: 'Top values count for {fieldName}', - values: { fieldName }, - }), - joins: [ - { - // Left join is the id from the type of field (e.g. world_countries) - leftField: field, - right: { - id: 'anomaly_count', - type: SOURCE_TYPES.TABLE_SOURCE, - __rows: topValues, - __columns: [ - { - name: 'key', - type: 'string', - }, - { - name: 'doc_count', - type: 'number', - }, - ], - // Right join/term is the field in the doc you’re trying to join it to (foreign key - e.g. US) - term: 'key', - }, - }, - ], - sourceDescriptor: { - type: 'EMS_FILE', - id: layerId, - }, - style: { - type: 'VECTOR', - // @ts-ignore missing style properties. Remove once 'VectorLayerDescriptor' type is updated - properties: { - icon: { type: STYLE_TYPE.STATIC, options: { value: 'marker' } }, - fillColor: { - type: STYLE_TYPE.DYNAMIC, - options: { - color: 'Blue to Red', - colorCategory: 'palette_0', - fieldMetaOptions: { isEnabled: true, sigma: 3 }, - type: COLOR_MAP_TYPE.ORDINAL, - field: { - name: 'doc_count', - origin: FIELD_ORIGIN.JOIN, - }, - useCustomColorRamp: false, - }, - }, - lineColor: { - type: STYLE_TYPE.DYNAMIC, - options: { fieldMetaOptions: { isEnabled: true } }, - }, - lineWidth: { type: STYLE_TYPE.STATIC, options: { size: 1 } }, - }, - isTimeAware: true, - }, - type: 'VECTOR', - }; -}; - -interface Props { - stats: FieldVisStats | undefined; - suggestion: EMSTermJoinConfig; -} - -export const ChoroplethMap: FC = ({ stats, suggestion }) => { - const { fieldName, isTopValuesSampled, topValues, topValuesSamplerShardSize } = stats!; - - const layerList: VectorLayerDescriptor[] = useMemo( - () => [getChoroplethTopValuesLayer(fieldName || '', topValues || [], suggestion)], - [suggestion, stats] - ); - - return ( - -
- -
- {isTopValuesSampled === true && ( - <> - - - - - - )} - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts deleted file mode 100644 index 6159b5e2ad9bb..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { ChoroplethMap } from './choropleth_map'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx deleted file mode 100644 index bb79248b8dd59..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; -import { DocumentCountChart, DocumentCountChartPoint } from '../document_count_chart'; -import { TotalCountHeader } from '../../total_count_header'; -import { FieldVisConfig, FileBasedFieldVisConfig } from '../../../../stats_table/types'; - -export interface Props { - config?: FieldVisConfig | FileBasedFieldVisConfig; - totalCount: number; -} - -// @remove -export const DocumentCountContent: FC = ({ config, totalCount }) => { - if (config?.stats === undefined) { - return totalCount !== undefined ? : null; - } - - const { documentCounts, timeRangeEarliest, timeRangeLatest } = config.stats; - if ( - documentCounts === undefined || - timeRangeEarliest === undefined || - timeRangeLatest === undefined - ) - return null; - - let chartPoints: DocumentCountChartPoint[] = []; - if (documentCounts.buckets !== undefined) { - const buckets: Record = documentCounts?.buckets; - chartPoints = Object.entries(buckets).map(([time, value]) => ({ time: +time, value })); - } - - return ( - <> - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts deleted file mode 100644 index e827e4390705c..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { DocumentCountContent } from './document_count_content'; -export { NotInDocsContent } from './not_in_docs_content'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.tsx deleted file mode 100644 index e3bb4323ce6a8..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.tsx +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, Fragment } from 'react'; -import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -export const NotInDocsContent: FC = () => ( - - - - - - - - - - - -); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx deleted file mode 100644 index f0b6c7e93e5ed..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useMemo } from 'react'; - -import { i18n } from '@kbn/i18n'; - -import { - Axis, - BarSeries, - Chart, - niceTimeFormatter, - Position, - ScaleType, - Settings, -} from '@elastic/charts'; - -export interface DocumentCountChartPoint { - time: number | string; - value: number; -} - -interface Props { - width?: number; - chartPoints: DocumentCountChartPoint[]; - timeRangeEarliest: number; - timeRangeLatest: number; - interval?: number; -} - -const SPEC_ID = 'document_count'; - -// @remove -export const DocumentCountChart: FC = ({ - width, - chartPoints, - timeRangeEarliest, - timeRangeLatest, - interval, -}) => { - const seriesName = i18n.translate('xpack.ml.fieldDataCard.documentCountChart.seriesLabel', { - defaultMessage: 'document count', - }); - - const xDomain = { - min: timeRangeEarliest, - max: timeRangeLatest, - }; - - const dateFormatter = niceTimeFormatter([timeRangeEarliest, timeRangeLatest]); - - const adjustedChartPoints = useMemo(() => { - // Display empty chart when no data in range - if (chartPoints.length < 1) return [{ time: timeRangeEarliest, value: 0 }]; - - // If chart has only one bucket - // it won't show up correctly unless we add an extra data point - if (chartPoints.length === 1) { - return [ - ...chartPoints, - { time: interval ? Number(chartPoints[0].time) + interval : timeRangeEarliest, value: 0 }, - ]; - } - return chartPoints; - }, [chartPoints, timeRangeEarliest, timeRangeLatest, interval]); - - return ( -
- - - - - - -
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/index.ts deleted file mode 100644 index 97b42053b34e6..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { DocumentCountChart, DocumentCountChartPoint } from './document_count_chart'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx deleted file mode 100644 index 7804c4bddf266..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; - -import { EuiListGroup, EuiListGroupItem } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { ExpandedRowFieldHeader } from '../../../../stats_table/components/expanded_row_field_header'; -interface Props { - examples: Array; -} - -export const ExamplesList: FC = ({ examples }) => { - if (examples === undefined || examples === null || !Array.isArray(examples)) { - return null; - } - let examplesContent; - if (examples.length === 0) { - examplesContent = ( - - ); - } else { - examplesContent = examples.map((example, i) => { - return ( - - ); - }); - } - - return ( -
- - - - - {examplesContent} - -
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts deleted file mode 100644 index 966c844987002..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { ExamplesList } from './examples_list'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/index.ts deleted file mode 100644 index b4c0c890b0978..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { LoadingIndicator } from './loading_indicator'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx deleted file mode 100644 index 846bb518b6656..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, Fragment } from 'react'; - -import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -export const LoadingIndicator: FC = () => ( - - - - - - - - - - - - - - - -); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss deleted file mode 100644 index 75ee6aef1b7eb..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss +++ /dev/null @@ -1,19 +0,0 @@ -.mlFieldDataTopValuesContainer { - padding-top: $euiSizeXS; -} - -.mlTopValuesValueLabelContainer { - margin-right: $euiSizeM; - &.mlTopValuesValueLabelContainer--small { - width:70px; - } - - &.mlTopValuesValueLabelContainer--large { - width: 200px; - } -} - -.mlTopValuesPercentLabelContainer { - margin-left: $euiSizeM; - width:70px; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts deleted file mode 100644 index c006b37fe2794..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { TopValues } from './top_values'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx deleted file mode 100644 index 2d423b9dbb751..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, Fragment } from 'react'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiProgress, - EuiSpacer, - EuiText, - EuiToolTip, -} from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -import classNames from 'classnames'; -import { kibanaFieldFormat } from '../../../../../formatters/kibana_field_format'; -import { roundToDecimalPlace } from '../../../../../formatters/round_to_decimal_place'; -import { ExpandedRowFieldHeader } from '../../../../stats_table/components/expanded_row_field_header'; -import { FieldVisStats } from '../../../../stats_table/types'; - -interface Props { - stats: FieldVisStats | undefined; - fieldFormat?: any; - barColor?: 'primary' | 'secondary' | 'danger' | 'subdued' | 'accent'; - compressed?: boolean; -} - -function getPercentLabel(docCount: number, topValuesSampleSize: number): string { - const percent = (100 * docCount) / topValuesSampleSize; - if (percent >= 0.1) { - return `${roundToDecimalPlace(percent, 1)}%`; - } else { - return '< 0.1%'; - } -} - -export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed }) => { - if (stats === undefined) return null; - const { - topValues, - topValuesSampleSize, - topValuesSamplerShardSize, - count, - isTopValuesSampled, - } = stats; - const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count; - return ( - - - - - -
- {Array.isArray(topValues) && - topValues.map((value) => ( - - - - - {kibanaFieldFormat(value.key, fieldFormat)} - - - - - - - {progressBarMax !== undefined && ( - - - {getPercentLabel(value.doc_count, progressBarMax)} - - - )} - - ))} - {isTopValuesSampled === true && ( - - - - - - - )} -
- - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx deleted file mode 100644 index ab8f36761a116..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useMemo } from 'react'; -import { i18n } from '@kbn/i18n'; -import { Option, MultiSelectPicker } from '../../../../components/multi_select_picker'; -import type { OverallStats } from '../../../../../../common/types/datavisualizer'; - -interface Props { - overallStats: OverallStats; - setVisibleFieldNames(q: string[]): void; - visibleFieldNames: string[]; - showEmptyFields: boolean; -} - -export const DataVisualizerFieldNamesFilter: FC = ({ - overallStats, - setVisibleFieldNames, - visibleFieldNames, - showEmptyFields, -}) => { - const items: Option[] = useMemo(() => { - const options: Option[] = []; - if (overallStats) { - Object.keys(overallStats).forEach((key) => { - const fieldsGroup = overallStats[key as keyof OverallStats]; - if (Array.isArray(fieldsGroup) && fieldsGroup.length > 0) { - fieldsGroup.forEach((field) => { - if ( - (field.existsInDocs === true || showEmptyFields === true) && - field.fieldName !== undefined - ) { - options.push({ value: field.fieldName }); - } - }); - } - }); - } - return options; - }, [overallStats]); - - const fieldNameTitle = useMemo( - () => - i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldNameSelect', { - defaultMessage: 'Field name', - }), - [] - ); - - return ( - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx deleted file mode 100644 index 15ddf00c4e1d3..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useMemo } from 'react'; -import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { Option, MultiSelectPicker } from '../../../../components/multi_select_picker'; -import { FieldTypeIcon } from '../../../../components/field_type_icon'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import type { MlJobFieldType } from '../../../../../../common/types/field_types'; - -const ML_JOB_FIELD_TYPES_OPTIONS = { - [ML_JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, - [ML_JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' }, - [ML_JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' }, - [ML_JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' }, - [ML_JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' }, - [ML_JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' }, - [ML_JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' }, - [ML_JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' }, - [ML_JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' }, -}; - -export const DatavisualizerFieldTypeFilter: FC<{ - indexedFieldTypes: MlJobFieldType[]; - setVisibleFieldTypes(q: string[]): void; - visibleFieldTypes: string[]; -}> = ({ indexedFieldTypes, setVisibleFieldTypes, visibleFieldTypes }) => { - const options: Option[] = useMemo(() => { - return indexedFieldTypes.map((indexedFieldName) => { - const item = ML_JOB_FIELD_TYPES_OPTIONS[indexedFieldName]; - - return { - value: indexedFieldName, - name: ( - - {item.name} - {indexedFieldName && ( - - - - )} - - ), - }; - }); - }, [indexedFieldTypes]); - const fieldTypeTitle = useMemo( - () => - i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldTypeSelect', { - defaultMessage: 'Field type', - }), - [] - ); - return ( - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/index.ts deleted file mode 100644 index 291eeb7d50646..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { SearchPanel } from './search_panel'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx deleted file mode 100644 index 1988ac39d0a90..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useState } from 'react'; - -import { EuiCode, EuiFlexItem, EuiFlexGroup, EuiInputPopover } from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; - -import { IndexPattern } from '../../../../../../../../../src/plugins/data/public'; - -import { - SEARCH_QUERY_LANGUAGE, - ErrorMessage, - SearchQueryLanguage, -} from '../../../../../../common/constants/search'; - -import { - esKuery, - esQuery, - Query, - QueryStringInput, -} from '../../../../../../../../../src/plugins/data/public'; -import { ShardSizeFilter } from './shard_size_select'; -import { DataVisualizerFieldNamesFilter } from './field_name_filter'; -import { DatavisualizerFieldTypeFilter } from './field_type_filter'; -import { MlJobFieldType } from '../../../../../../common/types/field_types'; - -interface Props { - indexPattern: IndexPattern; - searchString: Query['query']; - searchQuery: Query['query']; - searchQueryLanguage: SearchQueryLanguage; - samplerShardSize: number; - setSamplerShardSize(s: number): void; - overallStats: any; - indexedFieldTypes: MlJobFieldType[]; - setVisibleFieldTypes(q: string[]): void; - visibleFieldTypes: string[]; - setVisibleFieldNames(q: string[]): void; - visibleFieldNames: string[]; - setSearchParams({ - searchQuery, - searchString, - queryLanguage, - }: { - searchQuery: Query['query']; - searchString: Query['query']; - queryLanguage: SearchQueryLanguage; - }): void; - showEmptyFields: boolean; -} - -export const SearchPanel: FC = ({ - indexPattern, - searchString, - searchQueryLanguage, - samplerShardSize, - setSamplerShardSize, - overallStats, - indexedFieldTypes, - setVisibleFieldTypes, - visibleFieldTypes, - setVisibleFieldNames, - visibleFieldNames, - setSearchParams, - showEmptyFields, -}) => { - // The internal state of the input query bar updated on every key stroke. - const [searchInput, setSearchInput] = useState({ - query: searchString || '', - language: searchQueryLanguage, - }); - const [errorMessage, setErrorMessage] = useState(undefined); - - const searchHandler = (query: Query) => { - let filterQuery; - try { - if (query.language === SEARCH_QUERY_LANGUAGE.KUERY) { - filterQuery = esKuery.toElasticsearchQuery( - esKuery.fromKueryExpression(query.query), - indexPattern - ); - } else if (query.language === SEARCH_QUERY_LANGUAGE.LUCENE) { - filterQuery = esQuery.luceneStringToDsl(query.query); - } else { - filterQuery = {}; - } - setSearchParams({ - searchQuery: filterQuery, - searchString: query.query, - queryLanguage: query.language as SearchQueryLanguage, - }); - } catch (e) { - console.log('Invalid syntax', JSON.stringify(e, null, 2)); // eslint-disable-line no-console - setErrorMessage({ query: query.query as string, message: e.message }); - } - }; - const searchChangeHandler = (query: Query) => setSearchInput(query); - - return ( - - - setErrorMessage(undefined)} - input={ - - } - isOpen={errorMessage?.query === searchInput.query && errorMessage?.message !== ''} - > - - {i18n.translate( - 'xpack.ml.datavisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar', - { - defaultMessage: 'Invalid query', - } - )} - {': '} - {errorMessage?.message.split('\n')[0]} - - - - - - - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx deleted file mode 100644 index 5351d3467020f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiSuperSelect } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React, { FC } from 'react'; -import { FormattedMessage } from '@kbn/i18n/react'; - -interface Props { - samplerShardSize: number; - setSamplerShardSize(s: number): void; -} - -const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { - return { - value: String(v), - inputDisplay: - v > 0 ? ( - - {v} }} - /> - - ) : ( - - - - ), - }; -}); - -export const ShardSizeFilter: FC = ({ samplerShardSize, setSamplerShardSize }) => { - return ( - - - setSamplerShardSize(+value)} - aria-label={i18n.translate('xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel', { - defaultMessage: 'Select number of documents to sample', - })} - data-test-subj="mlDataVisualizerShardSizeSelect" - /> - - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts deleted file mode 100644 index 167988782ba51..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { TotalCountHeader } from './total_count_header'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx deleted file mode 100644 index 24a89ec070fe7..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexItem, EuiText } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React from 'react'; - -export const TotalCountHeader = ({ totalCount }: { totalCount: number }) => { - return ( - - - - - - ), - }} - /> - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts index 99a826236c34f..1216e3f7f4c17 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts @@ -5,4 +5,4 @@ * 2.0. */ -export { Page } from './page'; +export { IndexDataVisualizerPage } from './index_data_visualizer'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx index 5cac4472553b8..6ad84b979d290 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx @@ -13,7 +13,7 @@ import { useMlContext } from '../../contexts/ml'; import { IndexDataVisualizerViewProps } from '../../../../../file_data_visualizer/public'; export const IndexDataVisualizerPage: FC = () => { const mlContext = useMlContext(); - const { currentIndexPattern, kibanaConfig, currentSavedSearch } = mlContext; + const { currentIndexPattern, combinedQuery, currentSavedSearch } = mlContext; useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); const { @@ -38,9 +38,8 @@ export const IndexDataVisualizerPage: FC = () => { // @ts-ignore FC IndexDataVisualizer does have props type React.Children.map(IndexDataVisualizer.props.children, (child) => { return React.cloneElement(child, { - // combinedQuery, + query: combinedQuery, currentIndexPattern, - kibanaConfig, currentSavedSearch, }); }) @@ -48,6 +47,6 @@ export const IndexDataVisualizerPage: FC = () => { ) : ( -
Error boundary
+ ); }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx deleted file mode 100644 index 19a4cb7b87c0f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx +++ /dev/null @@ -1,810 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, Fragment, useEffect, useMemo, useState, useCallback } from 'react'; -import { merge } from 'rxjs'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiPage, - EuiPageBody, - EuiPageContentBody, - EuiPageContentHeader, - EuiPageContentHeaderSection, - EuiPanel, - EuiSpacer, - EuiTitle, -} from '@elastic/eui'; -import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { - IFieldType, - KBN_FIELD_TYPES, - esQuery, - esKuery, - UI_SETTINGS, - Query, -} from '../../../../../../../src/plugins/data/public'; -import { SavedSearchSavedObject } from '../../../../common/types/kibana'; -import { NavigationMenu } from '../../components/navigation_menu'; -import { DatePickerWrapper } from '../../components/navigation_menu/date_picker_wrapper'; -import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; -import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../../../common/constants/search'; -import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; -import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; -import { useMlContext } from '../../contexts/ml'; -import { kbnTypeToMLJobType } from '../../util/field_types_utils'; -import { useNotifications, useTimefilter } from '../../contexts/kibana'; -import { timeBasedIndexCheck, getQueryFromSavedSearch } from '../../util/index_utils'; -import { getTimeBucketsFromCache } from '../../util/time_buckets'; -import { usePageUrlState, useUrlState } from '../../util/url_state'; -import { ActionsPanel } from './components/actions_panel'; -import { SearchPanel } from './components/search_panel'; -import { DocumentCountContent } from './components/field_data_row/content_types/document_count_content'; -import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; -import { FieldCountPanel } from './components/field_count_panel'; -import { ML_PAGES } from '../../../../common/constants/ml_url_generator'; -import { DataLoader } from './data_loader'; -import type { FieldRequestConfig } from './common'; -import type { DataVisualizerIndexBasedAppState } from '../../../../common/types/ml_url_generator'; -import type { OverallStats } from '../../../../common/types/datavisualizer'; -import { MlJobFieldType } from '../../../../common/types/field_types'; -import { HelpMenu } from '../../components/help_menu'; -import { useMlKibana } from '../../contexts/kibana'; -import { IndexBasedDataVisualizerExpandedRow } from './components/expanded_row'; -import { FieldVisConfig } from '../stats_table/types'; -import type { - MetricFieldsStats, - TotalFieldsStats, -} from '../stats_table/components/field_count_stats'; -import { getActions } from './components/field_data_row/action_menu/actions'; - -interface DataVisualizerPageState { - overallStats: OverallStats; - metricConfigs: FieldVisConfig[]; - totalMetricFieldCount: number; - populatedMetricFieldCount: number; - metricsLoaded: boolean; - nonMetricConfigs: FieldVisConfig[]; - nonMetricsLoaded: boolean; - documentCountStats?: FieldVisConfig; -} - -const defaultSearchQuery = { - match_all: {}, -}; - -function getDefaultPageState(): DataVisualizerPageState { - return { - overallStats: { - totalCount: 0, - aggregatableExistsFields: [], - aggregatableNotExistsFields: [], - nonAggregatableExistsFields: [], - nonAggregatableNotExistsFields: [], - }, - metricConfigs: [], - totalMetricFieldCount: 0, - populatedMetricFieldCount: 0, - metricsLoaded: false, - nonMetricConfigs: [], - nonMetricsLoaded: false, - documentCountStats: undefined, - }; -} -export const getDefaultDataVisualizerListState = (): Required => ({ - pageIndex: 0, - pageSize: 10, - sortField: 'fieldName', - sortDirection: 'asc', - visibleFieldTypes: [], - visibleFieldNames: [], - samplerShardSize: 5000, - searchString: '', - searchQuery: defaultSearchQuery, - searchQueryLanguage: SEARCH_QUERY_LANGUAGE.KUERY, - showDistributions: true, - showAllFields: false, - showEmptyFields: false, -}); - -export const Page: FC = () => { - const mlContext = useMlContext(); - const restorableDefaults = getDefaultDataVisualizerListState(); - const { - services: { lens: lensPlugin, docLinks }, - } = useMlKibana(); - - const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState( - ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER, - restorableDefaults - ); - const [currentSavedSearch, setCurrentSavedSearch] = useState(mlContext.currentSavedSearch); - - const { combinedQuery, currentIndexPattern, kibanaConfig } = mlContext; - const timefilter = useTimefilter({ - timeRangeSelector: currentIndexPattern.timeFieldName !== undefined, - autoRefreshSelector: true, - }); - - const { toasts } = useNotifications(); - const dataLoader = useMemo(() => new DataLoader(currentIndexPattern, toasts), [ - currentIndexPattern, - ]); - - const [globalState, setGlobalState] = useUrlState('_g'); - useEffect(() => { - if (globalState?.time !== undefined) { - timefilter.setTime({ - from: globalState.time.from, - to: globalState.time.to, - }); - } - }, [globalState?.time?.from, globalState?.time?.to]); - useEffect(() => { - if (globalState?.refreshInterval !== undefined) { - timefilter.setRefreshInterval(globalState.refreshInterval); - } - }, [globalState?.refreshInterval?.pause, globalState?.refreshInterval?.value]); - - const [lastRefresh, setLastRefresh] = useState(0); - - useEffect(() => { - timeBasedIndexCheck(currentIndexPattern, true); - }, []); - - // Obtain the list of non metric field types which appear in the index pattern. - let indexedFieldTypes: MlJobFieldType[] = []; - const indexPatternFields: IFieldType[] = currentIndexPattern.fields; - indexPatternFields.forEach((field) => { - if (field.scripted !== true) { - const dataVisualizerType: MlJobFieldType | undefined = kbnTypeToMLJobType(field); - if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) { - indexedFieldTypes.push(dataVisualizerType); - } - } - }); - indexedFieldTypes = indexedFieldTypes.sort(); - - const defaults = getDefaultPageState(); - - const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => { - const searchData = extractSearchData(currentSavedSearch); - if (searchData === undefined || dataVisualizerListState.searchString !== '') { - return { - searchQuery: dataVisualizerListState.searchQuery, - searchString: dataVisualizerListState.searchString, - searchQueryLanguage: dataVisualizerListState.searchQueryLanguage, - }; - } else { - return { - searchQuery: searchData.searchQuery, - searchString: searchData.searchString, - searchQueryLanguage: searchData.queryLanguage, - }; - } - }, [currentSavedSearch, dataVisualizerListState]); - - const setSearchParams = (searchParams: { - searchQuery: Query['query']; - searchString: Query['query']; - queryLanguage: SearchQueryLanguage; - }) => { - // When the user loads saved search and then clear or modify the query - // we should remove the saved search and replace it with the index pattern id - if (currentSavedSearch !== null) { - setCurrentSavedSearch(null); - } - - setDataVisualizerListState({ - ...dataVisualizerListState, - searchQuery: searchParams.searchQuery, - searchString: searchParams.searchString, - searchQueryLanguage: searchParams.queryLanguage, - }); - }; - - const samplerShardSize = - dataVisualizerListState.samplerShardSize ?? restorableDefaults.samplerShardSize; - const setSamplerShardSize = (value: number) => { - setDataVisualizerListState({ ...dataVisualizerListState, samplerShardSize: value }); - }; - - const visibleFieldTypes = - dataVisualizerListState.visibleFieldTypes ?? restorableDefaults.visibleFieldTypes; - const setVisibleFieldTypes = (values: string[]) => { - setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldTypes: values }); - }; - - const visibleFieldNames = - dataVisualizerListState.visibleFieldNames ?? restorableDefaults.visibleFieldNames; - const setVisibleFieldNames = (values: string[]) => { - setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldNames: values }); - }; - - const showEmptyFields = - dataVisualizerListState.showEmptyFields ?? restorableDefaults.showEmptyFields; - const toggleShowEmptyFields = () => { - setDataVisualizerListState({ - ...dataVisualizerListState, - showEmptyFields: !dataVisualizerListState.showEmptyFields, - }); - }; - - const [overallStats, setOverallStats] = useState(defaults.overallStats); - - const [documentCountStats, setDocumentCountStats] = useState(defaults.documentCountStats); - const [metricConfigs, setMetricConfigs] = useState(defaults.metricConfigs); - const [metricsLoaded, setMetricsLoaded] = useState(defaults.metricsLoaded); - const [metricsStats, setMetricsStats] = useState(); - - const [nonMetricConfigs, setNonMetricConfigs] = useState(defaults.nonMetricConfigs); - const [nonMetricsLoaded, setNonMetricsLoaded] = useState(defaults.nonMetricsLoaded); - - useEffect(() => { - const timeUpdateSubscription = merge( - timefilter.getTimeUpdate$(), - mlTimefilterRefresh$ - ).subscribe(() => { - setGlobalState({ - time: timefilter.getTime(), - refreshInterval: timefilter.getRefreshInterval(), - }); - setLastRefresh(Date.now()); - }); - return () => { - timeUpdateSubscription.unsubscribe(); - }; - }); - - useEffect(() => { - loadOverallStats(); - }, [searchQuery, samplerShardSize, lastRefresh]); - - useEffect(() => { - createMetricCards(); - createNonMetricCards(); - }, [overallStats, showEmptyFields]); - - useEffect(() => { - loadMetricFieldStats(); - }, [metricConfigs]); - - useEffect(() => { - loadNonMetricFieldStats(); - }, [nonMetricConfigs]); - - useEffect(() => { - createMetricCards(); - }, [metricsLoaded]); - - useEffect(() => { - createNonMetricCards(); - }, [nonMetricsLoaded]); - - /** - * Extract query data from the saved search object. - */ - function extractSearchData(savedSearch: SavedSearchSavedObject | null) { - if (!savedSearch) { - return undefined; - } - - const { query } = getQueryFromSavedSearch(savedSearch); - const queryLanguage = query.language as SearchQueryLanguage; - const qryString = query.query; - let qry; - if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { - const ast = esKuery.fromKueryExpression(qryString); - qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); - } else { - qry = esQuery.luceneStringToDsl(qryString); - esQuery.decorateQuery(qry, kibanaConfig.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); - } - - return { - searchQuery: qry, - searchString: qryString, - queryLanguage, - }; - } - - async function loadOverallStats() { - const tf = timefilter as any; - let earliest; - let latest; - - const activeBounds = tf.getActiveBounds(); - - if (currentIndexPattern.timeFieldName !== undefined && activeBounds === undefined) { - return; - } - - if (currentIndexPattern.timeFieldName !== undefined) { - earliest = activeBounds.min.valueOf(); - latest = activeBounds.max.valueOf(); - } - - try { - const allStats = await dataLoader.loadOverallData( - searchQuery, - samplerShardSize, - earliest, - latest - ); - setOverallStats(allStats); - } catch (err) { - dataLoader.displayError(err); - } - } - - async function loadMetricFieldStats() { - // Only request data for fields that exist in documents. - if (metricConfigs.length === 0) { - return; - } - - const configsToLoad = metricConfigs.filter( - (config) => config.existsInDocs === true && config.loading === true - ); - if (configsToLoad.length === 0) { - return; - } - - // Pass the field name, type and cardinality in the request. - // Top values will be obtained on a sample if cardinality > 100000. - const existMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => { - const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 }; - if (config.stats !== undefined && config.stats.cardinality !== undefined) { - props.cardinality = config.stats.cardinality; - } - return props; - }); - - // Obtain the interval to use for date histogram aggregations - // (such as the document count chart). Aim for 75 bars. - const buckets = getTimeBucketsFromCache(); - - const tf = timefilter as any; - let earliest: number | undefined; - let latest: number | undefined; - if (currentIndexPattern.timeFieldName !== undefined) { - earliest = tf.getActiveBounds().min.valueOf(); - latest = tf.getActiveBounds().max.valueOf(); - } - - const bounds = tf.getActiveBounds(); - const BAR_TARGET = 75; - buckets.setInterval('auto'); - buckets.setBounds(bounds); - buckets.setBarTarget(BAR_TARGET); - const aggInterval = buckets.getInterval(); - - try { - const metricFieldStats = await dataLoader.loadFieldStats( - searchQuery, - samplerShardSize, - earliest, - latest, - existMetricFields, - aggInterval.asMilliseconds() - ); - - // Add the metric stats to the existing stats in the corresponding config. - const configs: FieldVisConfig[] = []; - metricConfigs.forEach((config) => { - const configWithStats = { ...config }; - if (config.fieldName !== undefined) { - configWithStats.stats = { - ...configWithStats.stats, - ...metricFieldStats.find( - (fieldStats: any) => fieldStats.fieldName === config.fieldName - ), - }; - configWithStats.loading = false; - configs.push(configWithStats); - } else { - // Document count card. - configWithStats.stats = metricFieldStats.find( - (fieldStats: any) => fieldStats.fieldName === undefined - ); - - if (configWithStats.stats !== undefined) { - // Add earliest / latest of timefilter for setting x axis domain. - configWithStats.stats.timeRangeEarliest = earliest; - configWithStats.stats.timeRangeLatest = latest; - } - setDocumentCountStats(configWithStats); - } - }); - - setMetricConfigs(configs); - } catch (err) { - dataLoader.displayError(err); - } - } - - async function loadNonMetricFieldStats() { - // Only request data for fields that exist in documents. - if (nonMetricConfigs.length === 0) { - return; - } - - const configsToLoad = nonMetricConfigs.filter( - (config) => config.existsInDocs === true && config.loading === true - ); - if (configsToLoad.length === 0) { - return; - } - - // Pass the field name, type and cardinality in the request. - // Top values will be obtained on a sample if cardinality > 100000. - const existNonMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => { - const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 }; - if (config.stats !== undefined && config.stats.cardinality !== undefined) { - props.cardinality = config.stats.cardinality; - } - return props; - }); - - const tf = timefilter as any; - let earliest; - let latest; - if (currentIndexPattern.timeFieldName !== undefined) { - earliest = tf.getActiveBounds().min.valueOf(); - latest = tf.getActiveBounds().max.valueOf(); - } - - try { - const nonMetricFieldStats = await dataLoader.loadFieldStats( - searchQuery, - samplerShardSize, - earliest, - latest, - existNonMetricFields - ); - - // Add the field stats to the existing stats in the corresponding config. - const configs: FieldVisConfig[] = []; - nonMetricConfigs.forEach((config) => { - const configWithStats = { ...config }; - if (config.fieldName !== undefined) { - configWithStats.stats = { - ...configWithStats.stats, - ...nonMetricFieldStats.find( - (fieldStats: any) => fieldStats.fieldName === config.fieldName - ), - }; - } - configWithStats.loading = false; - configs.push(configWithStats); - }); - - setNonMetricConfigs(configs); - } catch (err) { - dataLoader.displayError(err); - } - } - - function createMetricCards() { - const configs: FieldVisConfig[] = []; - const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; - - const allMetricFields = indexPatternFields.filter((f) => { - return ( - f.type === KBN_FIELD_TYPES.NUMBER && - f.displayName !== undefined && - dataLoader.isDisplayField(f.displayName) === true - ); - }); - const metricExistsFields = allMetricFields.filter((f) => { - return aggregatableExistsFields.find((existsF) => { - return existsF.fieldName === f.displayName; - }); - }); - - // Add a config for 'document count', identified by no field name if indexpattern is time based. - if (currentIndexPattern.timeFieldName !== undefined) { - configs.push({ - type: ML_JOB_FIELD_TYPES.NUMBER, - existsInDocs: true, - loading: true, - aggregatable: true, - }); - } - - if (metricsLoaded === false) { - setMetricsLoaded(true); - return; - } - - let aggregatableFields: any[] = overallStats.aggregatableExistsFields; - if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) { - aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields); - } - - const metricFieldsToShow = - metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields; - - metricFieldsToShow.forEach((field) => { - const fieldData = aggregatableFields.find((f) => { - return f.fieldName === field.displayName; - }); - - const metricConfig: FieldVisConfig = { - ...(fieldData ? fieldData : {}), - fieldFormat: currentIndexPattern.getFormatterForField(field), - type: ML_JOB_FIELD_TYPES.NUMBER, - loading: true, - aggregatable: true, - }; - - configs.push(metricConfig); - }); - - setMetricsStats({ - totalMetricFieldsCount: allMetricFields.length, - visibleMetricsCount: metricFieldsToShow.length, - }); - setMetricConfigs(configs); - } - - function createNonMetricCards() { - const allNonMetricFields = indexPatternFields.filter((f) => { - return ( - f.type !== KBN_FIELD_TYPES.NUMBER && - f.displayName !== undefined && - dataLoader.isDisplayField(f.displayName) === true - ); - }); - // Obtain the list of all non-metric fields which appear in documents - // (aggregatable or not aggregatable). - const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. - let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. - const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; - const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; - - allNonMetricFields.forEach((f) => { - const checkAggregatableField = aggregatableExistsFields.find( - (existsField) => existsField.fieldName === f.displayName - ); - - if (checkAggregatableField !== undefined) { - populatedNonMetricFields.push(f); - nonMetricFieldData.push(checkAggregatableField); - } else { - const checkNonAggregatableField = nonAggregatableExistsFields.find( - (existsField) => existsField.fieldName === f.displayName - ); - - if (checkNonAggregatableField !== undefined) { - populatedNonMetricFields.push(f); - nonMetricFieldData.push(checkNonAggregatableField); - } - } - }); - - if (nonMetricsLoaded === false) { - setNonMetricsLoaded(true); - return; - } - - if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) { - // Combine the field data obtained from Elasticsearch into a single array. - nonMetricFieldData = nonMetricFieldData.concat( - overallStats.aggregatableNotExistsFields, - overallStats.nonAggregatableNotExistsFields - ); - } - - const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields; - - const configs: FieldVisConfig[] = []; - - nonMetricFieldsToShow.forEach((field) => { - const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName); - - const nonMetricConfig = { - ...fieldData, - fieldFormat: currentIndexPattern.getFormatterForField(field), - aggregatable: field.aggregatable, - scripted: field.scripted, - loading: fieldData.existsInDocs, - }; - - // Map the field type from the Kibana index pattern to the field type - // used in the data visualizer. - const dataVisualizerType = kbnTypeToMLJobType(field); - if (dataVisualizerType !== undefined) { - nonMetricConfig.type = dataVisualizerType; - } else { - // Add a flag to indicate that this is one of the 'other' Kibana - // field types that do not yet have a specific card type. - nonMetricConfig.type = field.type; - nonMetricConfig.isUnsupportedType = true; - } - - configs.push(nonMetricConfig); - }); - - setNonMetricConfigs(configs); - } - - const wizardPanelWidth = '280px'; - - const configs = useMemo(() => { - let combinedConfigs = [...nonMetricConfigs, ...metricConfigs]; - if (visibleFieldTypes && visibleFieldTypes.length > 0) { - combinedConfigs = combinedConfigs.filter( - (config) => visibleFieldTypes.findIndex((field) => field === config.type) > -1 - ); - } - if (visibleFieldNames && visibleFieldNames.length > 0) { - combinedConfigs = combinedConfigs.filter( - (config) => visibleFieldNames.findIndex((field) => field === config.fieldName) > -1 - ); - } - - return combinedConfigs; - }, [nonMetricConfigs, metricConfigs, visibleFieldTypes, visibleFieldNames]); - - const fieldsCountStats: TotalFieldsStats | undefined = useMemo(() => { - let _visibleFieldsCount = 0; - let _totalFieldsCount = 0; - Object.keys(overallStats).forEach((key) => { - const fieldsGroup = overallStats[key as keyof OverallStats]; - if (Array.isArray(fieldsGroup) && fieldsGroup.length > 0) { - _totalFieldsCount += fieldsGroup.length; - } - }); - - if (showEmptyFields === true) { - _visibleFieldsCount = _totalFieldsCount; - } else { - _visibleFieldsCount = - overallStats.aggregatableExistsFields.length + - overallStats.nonAggregatableExistsFields.length; - } - return { visibleFieldsCount: _visibleFieldsCount, totalFieldsCount: _totalFieldsCount }; - }, [overallStats, showEmptyFields]); - - const getItemIdToExpandedRowMap = useCallback( - function (itemIds: string[], items: FieldVisConfig[]): ItemIdToExpandedRowMap { - return itemIds.reduce((m: ItemIdToExpandedRowMap, fieldName: string) => { - const item = items.find((fieldVisConfig) => fieldVisConfig.fieldName === fieldName); - if (item !== undefined) { - m[fieldName] = ( - - ); - } - return m; - }, {} as ItemIdToExpandedRowMap); - }, - [currentIndexPattern, searchQuery] - ); - - // Inject custom action column for the index based visualizer - const extendedColumns = useMemo(() => { - if (lensPlugin === undefined) { - // eslint-disable-next-line no-console - console.error('Lens plugin not available'); - return; - } - const actionColumn: EuiTableActionsColumnType = { - name: ( - - ), - actions: getActions(currentIndexPattern, lensPlugin, { searchQueryLanguage, searchString }), - width: '100px', - }; - - return [actionColumn]; - }, [currentIndexPattern, lensPlugin, searchQueryLanguage, searchString]); - - const helpLink = docLinks.links.ml.guide; - return ( - - - - - - - - - -

{currentIndexPattern.title}

- - - - - {currentIndexPattern.timeFieldName !== undefined && ( - - - - )} - - - - - - - - - - - - - - {overallStats?.totalCount !== undefined && ( - - - - )} - - - - - - - - items={configs} - pageState={dataVisualizerListState} - updatePageState={setDataVisualizerListState} - getItemIdToExpandedRowMap={getItemIdToExpandedRowMap} - extendedColumns={extendedColumns} - /> - - - - - - - - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss deleted file mode 100644 index 1832b0f78b895..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss +++ /dev/null @@ -1,86 +0,0 @@ -.mlFieldDataCard { - height: 420px; - box-shadow: none; - border-color: $euiBorderColor; - - // Note the names of these styles need to match the type of the field they are displaying. - .boolean { - color: $euiColorVis5; - border-color: $euiColorVis5; - } - - .date { - color: $euiColorVis7; - border-color: $euiColorVis7; - } - - .document_count { - color: $euiColorVis2; - border-color: $euiColorVis2; - } - - .geo_point { - color: $euiColorVis8; - border-color: $euiColorVis8; - } - - .ip { - color: $euiColorVis3; - border-color: $euiColorVis3; - } - - .keyword { - color: $euiColorVis0; - border-color: $euiColorVis0; - } - - .number { - color: $euiColorVis1; - border-color: $euiColorVis1; - } - - .text { - color: $euiColorVis9; - border-color: $euiColorVis9; - } - - .type-other, - .unknown { - color: $euiColorVis6; - border-color: $euiColorVis6; - } - - .mlFieldDataCard__content { - @include euiFontSizeS; - height: 385px; - overflow: hidden; - } - - .mlFieldDataCard__codeContent { - @include euiCodeFont; - } - - .mlFieldDataCard__geoContent { - z-index: auto; - flex: 1; - display: flex; - flex-direction: column; - height: 100%; - position: relative; - .embPanel__content { - display: flex; - flex: 1 1 100%; - z-index: 1; - min-height: 0; // Absolute must for Firefox to scroll contents - } - } - - .mlFieldDataCard__stats { - padding: $euiSizeS $euiSizeS 0 $euiSizeS; - text-align: center; - } - - .mlFieldDataCard__valuesTitle { - text-transform: uppercase; - } -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss deleted file mode 100644 index 9e838c180713f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss +++ /dev/null @@ -1,56 +0,0 @@ -@import 'components/field_data_expanded_row/index'; -@import 'components/field_count_stats/index'; -@import 'components/field_data_row/index'; - -.mlDataVisualizerFieldExpandedRow { - padding-left: $euiSize * 4; - width: 100%; - - .mlFieldDataCard__valuesTitle { - text-transform: uppercase; - text-align: left; - color: $euiColorDarkShade; - font-weight: bold; - padding-bottom: $euiSizeS; - } - - .mlFieldDataCard__codeContent { - @include euiCodeFont; - } -} - -.mlDataVisualizer { - .euiTableRow > .euiTableRowCell { - border-bottom: 0; - border-top: $euiBorderThin; - - } - .euiTableRow-isExpandedRow { - - .euiTableRowCell { - background-color: $euiColorEmptyShade !important; - border-top: 0; - border-bottom: $euiBorderThin; - &:hover { - background-color: $euiColorEmptyShade !important; - } - } - } - .mlDataVisualizerSummaryTable { - max-width: 350px; - min-width: 250px; - .euiTableRow > .euiTableRowCell { - border-bottom: 0; - } - .euiTableHeaderCell { - display: none; - } - } - .mlDataVisualizerSummaryTableWrapper { - max-width: 300px; - } - .mlDataVisualizerMapWrapper { - min-height: 300px; - min-width: 600px; - } -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx deleted file mode 100644 index 6c82e103a831f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiText } from '@elastic/eui'; -import React from 'react'; - -export const ExpandedRowFieldHeader = ({ children }: { children: React.ReactNode }) => ( - - {children} - -); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts deleted file mode 100644 index a92fa7f1e0659..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { ExpandedRowFieldHeader } from './expanded_row_field_header'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss deleted file mode 100644 index 7154d0da2c09c..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss +++ /dev/null @@ -1,3 +0,0 @@ -.mlDataVisualizerFieldCountContainer { - max-width: 300px; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts deleted file mode 100644 index d841ee2959f62..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { TotalFieldsCount, TotalFieldsCountProps, TotalFieldsStats } from './total_fields_count'; -export { - MetricFieldsCount, - MetricFieldsCountProps, - MetricFieldsStats, -} from './metric_fields_count'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx deleted file mode 100644 index dae22cf6daab8..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React, { FC } from 'react'; - -export interface MetricFieldsStats { - visibleMetricsCount: number; - totalMetricFieldsCount: number; -} -export interface MetricFieldsCountProps { - metricsStats?: MetricFieldsStats; -} - -export const MetricFieldsCount: FC = ({ metricsStats }) => { - if ( - !metricsStats || - metricsStats.visibleMetricsCount === undefined || - metricsStats.totalMetricFieldsCount === undefined - ) - return null; - return ( - <> - {metricsStats && ( - - - -
- -
- - - - - {metricsStats.visibleMetricsCount} - - - - - - - - - )} - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx deleted file mode 100644 index aacd7172903f5..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import React, { FC } from 'react'; - -export interface TotalFieldsStats { - visibleFieldsCount: number; - totalFieldsCount: number; -} - -export interface TotalFieldsCountProps { - fieldsCountStats?: TotalFieldsStats; -} - -export const TotalFieldsCount: FC = ({ fieldsCountStats }) => { - if ( - !fieldsCountStats || - fieldsCountStats.visibleFieldsCount === undefined || - fieldsCountStats.totalFieldsCount === undefined - ) - return null; - - return ( - - - -
- -
- - - - - - {fieldsCountStats.visibleFieldsCount} - - - - - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss deleted file mode 100644 index 799beec093cca..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import 'number_content'; - -.mlDataVisualizerExpandedRow { - @include euiBreakpoint('xs', 's', 'm') { - flex-direction: column; - } -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss deleted file mode 100644 index 066f405b39cd6..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss +++ /dev/null @@ -1,4 +0,0 @@ -.mlMetricDistributionChartContainer { - padding-top: $euiSizeXS; - width: 100%; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx deleted file mode 100644 index 6a09e968aa19f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, ReactNode, useMemo } from 'react'; -import { EuiBasicTable, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import { Axis, BarSeries, Chart, Settings } from '@elastic/charts'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; -import { getTFPercentage } from '../../utils'; -import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place'; -import { useDataVizChartTheme } from '../../hooks'; -import { DocumentStatsTable } from './document_stats'; -import { ExpandedRowContent } from './expanded_row_content'; - -function getPercentLabel(value: number): string { - if (value === 0) { - return '0%'; - } - if (value >= 0.1) { - return `${roundToDecimalPlace(value)}%`; - } else { - return '< 0.1%'; - } -} - -function getFormattedValue(value: number, totalCount: number): string { - const percentage = (value / totalCount) * 100; - return `${value} (${getPercentLabel(percentage)})`; -} - -const BOOLEAN_DISTRIBUTION_CHART_HEIGHT = 100; - -export const BooleanContent: FC = ({ config }) => { - const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; - const formattedPercentages = useMemo(() => getTFPercentage(config), [config]); - const theme = useDataVizChartTheme(); - if (!formattedPercentages) return null; - - const { trueCount, falseCount, count } = formattedPercentages; - const summaryTableItems = [ - { - function: 'true', - display: ( - - ), - value: getFormattedValue(trueCount, count), - }, - { - function: 'false', - display: ( - - ), - value: getFormattedValue(falseCount, count), - }, - ]; - const summaryTableColumns = [ - { - name: '', - render: (summaryItem: { display: ReactNode }) => summaryItem.display, - width: '75px', - }, - { - field: 'value', - name: '', - render: (v: string) => {v}, - }, - ]; - - const summaryTableTitle = i18n.translate( - 'xpack.ml.fieldDataCardExpandedRow.booleanContent.summaryTableTitle', - { - defaultMessage: 'Summary', - } - ); - - return ( - - - - - {summaryTableTitle} - - - - - - - - - - - getFormattedValue(d, count)} - /> - - - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx deleted file mode 100644 index ad773ba5a3b16..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, ReactNode } from 'react'; -import { EuiBasicTable, EuiFlexItem } from '@elastic/eui'; -// @ts-ignore -import { formatDate } from '@elastic/eui/lib/services/format'; -import { FormattedMessage } from '@kbn/i18n/react'; - -import { i18n } from '@kbn/i18n'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; -import { DocumentStatsTable } from './document_stats'; -import { ExpandedRowContent } from './expanded_row_content'; -const TIME_FORMAT = 'MMM D YYYY, HH:mm:ss.SSS'; -interface SummaryTableItem { - function: string; - display: ReactNode; - value: number | string | undefined | null; -} - -export const DateContent: FC = ({ config }) => { - const { stats } = config; - if (stats === undefined) return null; - - const { earliest, latest } = stats; - - const summaryTableTitle = i18n.translate('xpack.ml.fieldDataCard.cardDate.summaryTableTitle', { - defaultMessage: 'Summary', - }); - const summaryTableItems = [ - { - function: 'earliest', - display: ( - - ), - value: typeof earliest === 'string' ? earliest : formatDate(earliest, TIME_FORMAT), - }, - { - function: 'latest', - display: ( - - ), - value: typeof latest === 'string' ? latest : formatDate(latest, TIME_FORMAT), - }, - ]; - const summaryTableColumns = [ - { - name: '', - render: (summaryItem: { display: ReactNode }) => summaryItem.display, - width: '75px', - }, - { - field: 'value', - name: '', - render: (v: string) => {v}, - }, - ]; - - return ( - - - - {summaryTableTitle} - - className={'mlDataVisualizerSummaryTable'} - data-test-subj={'mlDateSummaryTable'} - compressed - items={summaryTableItems} - columns={summaryTableColumns} - tableCaption={summaryTableTitle} - tableLayout="auto" - /> - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx deleted file mode 100644 index c5b68975d9d31..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FormattedMessage } from '@kbn/i18n/react'; -import React, { FC, ReactNode } from 'react'; -import { i18n } from '@kbn/i18n'; -import { EuiBasicTable, EuiFlexItem } from '@elastic/eui'; -import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; -import { FieldDataRowProps } from '../../types'; -import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place'; - -const metaTableColumns = [ - { - name: '', - render: (metaItem: { display: ReactNode }) => metaItem.display, - width: '75px', - }, - { - field: 'value', - name: '', - render: (v: string) => {v}, - }, -]; - -const metaTableTitle = i18n.translate( - 'xpack.ml.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle', - { - defaultMessage: 'Documents stats', - } -); - -export const DocumentStatsTable: FC = ({ config }) => { - if ( - config?.stats === undefined || - config.stats.cardinality === undefined || - config.stats.count === undefined || - config.stats.sampleCount === undefined - ) - return null; - const { cardinality, count, sampleCount } = config.stats; - const metaTableItems = [ - { - function: 'count', - display: ( - - ), - value: count, - }, - { - function: 'percentage', - display: ( - - ), - value: `${roundToDecimalPlace((count / sampleCount) * 100)}%`, - }, - { - function: 'distinctValues', - display: ( - - ), - value: cardinality, - }, - ]; - - return ( - - {metaTableTitle} - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx deleted file mode 100644 index 8e14945b32a7f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, ReactNode } from 'react'; -import { EuiFlexGroup } from '@elastic/eui'; - -interface Props { - children: ReactNode; - dataTestSubj: string; -} -export const ExpandedRowContent: FC = ({ children, dataTestSubj }) => { - return ( - - {children} - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts deleted file mode 100644 index d35b0ae9688cf..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { BooleanContent } from './boolean_content'; -export { DateContent } from './date_content'; -export { KeywordContent } from './keyword_content'; -export { IpContent } from './ip_content'; -export { NumberContent } from './number_content'; -export { OtherContent } from './other_content'; -export { TextContent } from './text_content'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx deleted file mode 100644 index 23c7d721a9ab5..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { TopValues } from '../../../index_based/components/field_data_row/top_values'; -import { DocumentStatsTable } from './document_stats'; -import { ExpandedRowContent } from './expanded_row_content'; - -export const IpContent: FC = ({ config }) => { - const { stats } = config; - if (stats === undefined) return null; - const { count, sampleCount, cardinality } = stats; - if (count === undefined || sampleCount === undefined || cardinality === undefined) return null; - const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; - - return ( - - - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx deleted file mode 100644 index 9239632a3f909..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useEffect, useState } from 'react'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { TopValues } from '../../../index_based/components/field_data_row/top_values'; -import { ChoroplethMap } from '../../../index_based/components/field_data_row/choropleth_map'; -import { useMlKibana } from '../../../../../application/contexts/kibana'; -import { EMSTermJoinConfig } from '../../../../../../../maps/public'; -import { COMMON_EMS_LAYER_IDS } from '../../../../../../common/constants/embeddable_map'; -import { DocumentStatsTable } from './document_stats'; -import { ExpandedRowContent } from './expanded_row_content'; - -export const KeywordContent: FC = ({ config }) => { - const [EMSSuggestion, setEMSSuggestion] = useState(); - const { stats, fieldName } = config; - const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; - const { - services: { maps: mapsPlugin }, - } = useMlKibana(); - - const loadEMSTermSuggestions = async () => { - if (!mapsPlugin) return; - const suggestion: EMSTermJoinConfig | null = await mapsPlugin.suggestEMSTermJoinConfig({ - emsLayerIds: COMMON_EMS_LAYER_IDS, - sampleValues: Array.isArray(stats?.topValues) - ? stats?.topValues.map((value) => value.key) - : [], - sampleValuesColumnName: fieldName || '', - }); - setEMSSuggestion(suggestion); - }; - - useEffect( - function getInitialEMSTermSuggestion() { - loadEMSTermSuggestions(); - }, - [config?.fieldName] - ); - - return ( - - - {EMSSuggestion && stats && } - {EMSSuggestion === null && ( - - )} - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx deleted file mode 100644 index 9d091292f4502..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, ReactNode, useEffect, useState } from 'react'; -import { EuiBasicTable, EuiFlexItem, EuiText } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format'; -import { numberAsOrdinal } from '../../../../formatters/number_as_ordinal'; -import { - MetricDistributionChart, - MetricDistributionChartData, - buildChartDataFromStats, -} from '../metric_distribution_chart'; -import { TopValues } from '../../../index_based/components/field_data_row/top_values'; -import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; -import { DocumentStatsTable } from './document_stats'; -import { ExpandedRowContent } from './expanded_row_content'; - -const METRIC_DISTRIBUTION_CHART_WIDTH = 325; -const METRIC_DISTRIBUTION_CHART_HEIGHT = 200; - -interface SummaryTableItem { - function: string; - display: ReactNode; - value: number | string | undefined | null; -} - -export const NumberContent: FC = ({ config }) => { - const { stats } = config; - - useEffect(() => { - const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH); - setDistributionChartData(chartData); - }, []); - - const defaultChartData: MetricDistributionChartData[] = []; - const [distributionChartData, setDistributionChartData] = useState(defaultChartData); - - if (stats === undefined) return null; - const { min, median, max, distribution } = stats; - const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; - - const summaryTableItems = [ - { - function: 'min', - display: ( - - ), - value: kibanaFieldFormat(min, fieldFormat), - }, - { - function: 'median', - display: ( - - ), - value: kibanaFieldFormat(median, fieldFormat), - }, - { - function: 'max', - display: ( - - ), - value: kibanaFieldFormat(max, fieldFormat), - }, - ]; - const summaryTableColumns = [ - { - name: '', - render: (summaryItem: { display: ReactNode }) => summaryItem.display, - width: '75px', - }, - { - field: 'value', - name: '', - render: (v: string) => {v}, - }, - ]; - - const summaryTableTitle = i18n.translate( - 'xpack.ml.fieldDataCardExpandedRow.numberContent.summaryTableTitle', - { - defaultMessage: 'Summary', - } - ); - return ( - - - - {summaryTableTitle} - - className={'mlDataVisualizerSummaryTable'} - compressed - items={summaryTableItems} - columns={summaryTableColumns} - tableCaption={summaryTableTitle} - data-test-subj={'mlNumberSummaryTable'} - /> - - - {stats && ( - - )} - {distribution && ( - - - - - - - - - - - - - - - - - )} - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.tsx deleted file mode 100644 index 0734048e2bc2a..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.tsx +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; -import { EuiFlexItem } from '@elastic/eui'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list'; -import { DocumentStatsTable } from './document_stats'; -import { ExpandedRowContent } from './expanded_row_content'; - -export const OtherContent: FC = ({ config }) => { - const { stats } = config; - if (stats === undefined) return null; - return ( - - - {Array.isArray(stats.examples) && ( - - - - )} - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx deleted file mode 100644 index bbef29a9154af..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, Fragment } from 'react'; -import { EuiCallOut, EuiFlexItem, EuiSpacer } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; - -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list'; -import { ExpandedRowContent } from './expanded_row_content'; - -export const TextContent: FC = ({ config }) => { - const { stats } = config; - if (stats === undefined) return null; - - const { examples } = stats; - if (examples === undefined) return null; - - const numExamples = examples.length; - - return ( - - - {numExamples > 0 && } - {numExamples === 0 && ( - - - - _source, - }} - /> - - - - copy_to, - sourceParam: _source, - includesParam: includes, - excludesParam: excludes, - }} - /> - - - )} - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss deleted file mode 100644 index 27483feb573b8..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss +++ /dev/null @@ -1,3 +0,0 @@ -.mlDataVisualizerColumnHeaderIcon { - max-width: $euiSizeM; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx deleted file mode 100644 index 70adbbe85bc58..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useMemo } from 'react'; -import { EuiDataGridColumn } from '@elastic/eui'; -import { OrdinalChartData } from '../../../../../../common/types/field_histograms'; -import { ColumnChart } from '../../../../components/data_grid/column_chart'; -import { FieldDataRowProps } from '../../types'; -import { getTFPercentage } from '../../utils'; - -export const BooleanContentPreview: FC = ({ config }) => { - const chartData = useMemo(() => { - const results = getTFPercentage(config); - if (results) { - const data = [ - { key: 'true', key_as_string: 'true', doc_count: results.trueCount }, - { key: 'false', key_as_string: 'false', doc_count: results.falseCount }, - ]; - return { id: config.fieldName, cardinality: 2, data, type: 'boolean' } as OrdinalChartData; - } - }, [config]); - if (!chartData || config.fieldName === undefined) return null; - - const columnType: EuiDataGridColumn = { - id: config.fieldName, - schema: undefined, - }; - const dataTestSubj = `mlDataGridChart-${config.fieldName}`; - - return ( - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx deleted file mode 100644 index acbe081599c62..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui'; - -import React from 'react'; - -export const DistinctValues = ({ cardinality }: { cardinality?: number }) => { - if (cardinality === undefined) return null; - return ( - - - - - - {cardinality} - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx deleted file mode 100644 index 58afea0848154..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui'; - -import React from 'react'; -import type { FieldDataRowProps } from '../../types/field_data_row'; -import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place'; - -export const DocumentStat = ({ config }: FieldDataRowProps) => { - const { stats } = config; - if (stats === undefined) return null; - - const { count, sampleCount } = stats; - if (count === undefined || sampleCount === undefined) return null; - - const docsPercent = roundToDecimalPlace((count / sampleCount) * 100); - - return ( - - - - - - {count} ({docsPercent}%) - - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts deleted file mode 100644 index e4c0cc80eeb35..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { BooleanContentPreview } from './boolean_content_preview'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx deleted file mode 100644 index e9f04e9e59668..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC, useEffect, useState } from 'react'; -import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import classNames from 'classnames'; -import { - MetricDistributionChart, - MetricDistributionChartData, - buildChartDataFromStats, -} from '../metric_distribution_chart'; -import { formatSingleValue } from '../../../../formatters/format_value'; -import { FieldVisConfig } from '../../types'; -import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format'; - -const METRIC_DISTRIBUTION_CHART_WIDTH = 150; -const METRIC_DISTRIBUTION_CHART_HEIGHT = 80; - -export interface NumberContentPreviewProps { - config: FieldVisConfig; -} - -export const IndexBasedNumberContentPreview: FC = ({ config }) => { - const { stats, fieldFormat, fieldName } = config; - const defaultChartData: MetricDistributionChartData[] = []; - const [distributionChartData, setDistributionChartData] = useState(defaultChartData); - const [legendText, setLegendText] = useState<{ min: number; max: number } | undefined>(); - const dataTestSubj = `mlDataGridChart-${fieldName}`; - useEffect(() => { - const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH); - if ( - Array.isArray(chartData) && - chartData[0].x !== undefined && - chartData[chartData.length - 1].x !== undefined - ) { - setDistributionChartData(chartData); - setLegendText({ - min: formatSingleValue(chartData[0].x), - max: formatSingleValue(chartData[chartData.length - 1].x), - }); - } - }, []); - - return ( -
-
- -
-
- {legendText && ( - <> - - - - {kibanaFieldFormat(legendText.min, fieldFormat)} - - - {kibanaFieldFormat(legendText.max, fieldFormat)} - - - - )} -
-
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx deleted file mode 100644 index 07a2eae95c890..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; -import { EuiDataGridColumn } from '@elastic/eui'; -import { ChartData, OrdinalDataItem } from '../../../../../../common/types/field_histograms'; -import { ColumnChart } from '../../../../components/data_grid/column_chart'; -import type { FieldDataRowProps } from '../../types/field_data_row'; - -export const TopValuesPreview: FC = ({ config }) => { - const { stats } = config; - if (stats === undefined) return null; - const { topValues, cardinality } = stats; - if (cardinality === undefined || topValues === undefined || config.fieldName === undefined) - return null; - - const data: OrdinalDataItem[] = topValues.map((d) => ({ - ...d, - key: d.key.toString(), - })); - const chartData: ChartData = { - cardinality, - data, - id: config.fieldName, - type: 'ordinal', - }; - const columnType: EuiDataGridColumn = { - id: config.fieldName, - schema: undefined, - }; - return ( - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts deleted file mode 100644 index 72947f2953cb8..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { MetricDistributionChart, MetricDistributionChartData } from './metric_distribution_chart'; -export { buildChartDataFromStats } from './metric_distribution_chart_data_builder'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx deleted file mode 100644 index 4d9042dc74834..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; - -import { i18n } from '@kbn/i18n'; - -import { - AreaSeries, - Axis, - Chart, - CurveType, - Position, - ScaleType, - Settings, - TooltipValueFormatter, -} from '@elastic/charts'; - -import { MetricDistributionChartTooltipHeader } from './metric_distribution_chart_tooltip_header'; -import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format'; -import type { ChartTooltipValue } from '../../../../components/chart_tooltip/chart_tooltip_service'; -import { useDataVizChartTheme } from '../../hooks'; - -export interface MetricDistributionChartData { - x: number; - y: number; - dataMin: number; - dataMax: number; - percent: number; -} - -interface Props { - width: number; - height: number; - chartData: MetricDistributionChartData[]; - fieldFormat?: any; // Kibana formatter for field being viewed - hideXAxis?: boolean; -} - -const SPEC_ID = 'metric_distribution'; - -export const MetricDistributionChart: FC = ({ - width, - height, - chartData, - fieldFormat, - hideXAxis, -}) => { - // This value is shown to label the y axis values in the tooltip. - // Ideally we wouldn't show these values at all in the tooltip, - // but this is not yet possible with Elastic charts. - const seriesName = i18n.translate('xpack.ml.fieldDataCard.metricDistributionChart.seriesName', { - defaultMessage: 'distribution', - }); - - const theme = useDataVizChartTheme(); - - const headerFormatter: TooltipValueFormatter = (tooltipData: ChartTooltipValue) => { - const xValue = tooltipData.value; - const chartPoint: MetricDistributionChartData | undefined = chartData.find( - (data) => data.x === xValue - ); - - return ( - - ); - }; - - return ( -
- - - kibanaFieldFormat(d, fieldFormat)} - hide={hideXAxis === true} - /> - d.toFixed(3)} hide={true} /> - 0 ? chartData : [{ x: 0, y: 0 }]} - curve={CurveType.CURVE_STEP_AFTER} - /> - -
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx deleted file mode 100644 index a65b6bdc7458f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -const METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH = 3; // Minimum bar width, in pixels. -const METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR = 20; // Max bar height relative to median bar height. - -import { MetricDistributionChartData } from './metric_distribution_chart'; - -interface DistributionPercentile { - minValue: number; - maxValue: number; - percent: number; -} - -interface DistributionChartBar { - x0: number; - x1: number; - y: number; - dataMin: number; - dataMax: number; - percent: number; - isMinWidth: boolean; -} - -export function buildChartDataFromStats( - stats: any, - chartWidth: number -): MetricDistributionChartData[] { - // Process the raw percentiles data so it is in a suitable format for plotting in the metric distribution chart. - let chartData: MetricDistributionChartData[] = []; - - const distribution = stats.distribution; - if (distribution === undefined) { - return chartData; - } - - const percentiles: DistributionPercentile[] = distribution.percentiles; - if (percentiles.length === 0) { - return chartData; - } - - // Adjust x axis min and max if there is a single bar. - const minX = percentiles[0].minValue; - const maxX = percentiles[percentiles.length - 1].maxValue; - - let xAxisMin: number = minX; - let xAxisMax: number = maxX; - if (maxX === minX) { - if (minX !== 0) { - xAxisMin = 0; - xAxisMax = 2 * minX; - } else { - xAxisMax = 1; - } - } - - // Adjust the right hand x coordinates so that each bar is at least METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH. - const minBarWidth = - (METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH / chartWidth) * (xAxisMax - xAxisMin); - const processedData: DistributionChartBar[] = []; - let lastBar: DistributionChartBar; - percentiles.forEach((data, index) => { - if (index === 0) { - const bar: DistributionChartBar = { - x0: data.minValue, - x1: Math.max(data.minValue + minBarWidth, data.maxValue), - y: 0, // Set below - dataMin: data.minValue, - dataMax: data.maxValue, - percent: data.percent, - isMinWidth: false, - }; - - // Scale the height of the bar according to the range of data values in the bar. - bar.y = - (data.percent / (bar.x1 - bar.x0)) * - Math.max(1, minBarWidth / Math.max(data.maxValue - data.minValue, 0.5 * minBarWidth)); - bar.isMinWidth = data.maxValue <= data.minValue + minBarWidth; - processedData.push(bar); - lastBar = bar; - } else { - if (lastBar.isMinWidth === false || data.maxValue > lastBar.x1) { - const bar = { - x0: lastBar.x1, - x1: Math.max(lastBar.x1 + minBarWidth, data.maxValue), - y: 0, // Set below - dataMin: data.minValue, - dataMax: data.maxValue, - percent: data.percent, - isMinWidth: false, - }; - - // Scale the height of the bar according to the range of data values in the bar. - bar.y = - (data.percent / (bar.x1 - bar.x0)) * - Math.max(1, minBarWidth / Math.max(data.maxValue - data.minValue, 0.5 * minBarWidth)); - bar.isMinWidth = data.maxValue <= lastBar.x1 + minBarWidth; - processedData.push(bar); - lastBar = bar; - } else { - // Combine bars which are less than minBarWidth apart. - lastBar.percent = lastBar.percent + data.percent; - lastBar.y = lastBar.percent / (lastBar.x1 - lastBar.x0); - lastBar.dataMax = data.maxValue; - } - } - }); - - if (maxX !== minX) { - xAxisMax = processedData[processedData.length - 1].x1; - } - - // Adjust the maximum bar height to be (METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * median bar height). - let barHeights = processedData.map((data) => data.y); - barHeights = barHeights.sort((a, b) => a - b); - - let maxBarHeight = 0; - const processedDataLength = processedData.length; - if (Math.abs(processedDataLength % 2) === 1) { - maxBarHeight = - METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * - barHeights[Math.floor(processedDataLength / 2)]; - } else { - maxBarHeight = - (METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * - (barHeights[Math.floor(processedDataLength / 2) - 1] + - barHeights[Math.floor(processedDataLength / 2)])) / - 2; - } - - processedData.forEach((data) => { - data.y = Math.min(data.y, maxBarHeight); - }); - - // Convert the data to the format used by the chart. - chartData = processedData.map((data) => { - const { x0, y, dataMin, dataMax, percent } = data; - return { x: x0, y, dataMin, dataMax, percent }; - }); - - // Add a final point to drop the curve back to the y axis. - const last = processedData[processedData.length - 1]; - chartData.push({ - x: last.x1, - y: 0, - dataMin: last.dataMin, - dataMax: last.dataMax, - percent: last.percent, - }); - - return chartData; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx deleted file mode 100644 index 3144676a46c83..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -import { MetricDistributionChartData } from './metric_distribution_chart'; -import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format'; - -interface Props { - chartPoint: MetricDistributionChartData | undefined; - maxWidth: number; - fieldFormat?: any; // Kibana formatter for field being viewed -} - -export const MetricDistributionChartTooltipHeader: FC = ({ - chartPoint, - maxWidth, - fieldFormat, -}) => { - if (chartPoint === undefined) { - return null; - } - - return ( -
- {chartPoint.dataMax > chartPoint.dataMin ? ( - - ) : ( - - )} -
- ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx deleted file mode 100644 index 2003d07efca82..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx +++ /dev/null @@ -1,270 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { useMemo, useState } from 'react'; - -import { - CENTER_ALIGNMENT, - EuiBasicTableColumn, - EuiButtonIcon, - EuiFlexItem, - EuiIcon, - EuiInMemoryTable, - EuiText, - HorizontalAlignment, - LEFT_ALIGNMENT, - RIGHT_ALIGNMENT, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { EuiTableComputedColumnType } from '@elastic/eui/src/components/basic_table/table_types'; -import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; -import { FieldTypeIcon } from '../../components/field_type_icon'; -import { DocumentStat } from './components/field_data_row/document_stats'; -import { DistinctValues } from './components/field_data_row/distinct_values'; -import { IndexBasedNumberContentPreview } from './components/field_data_row/number_content_preview'; -import { - DataVisualizerFileBasedAppState, - DataVisualizerIndexBasedAppState, -} from '../../../../common/types/ml_url_generator'; -import { useTableSettings } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings'; -import { TopValuesPreview } from './components/field_data_row/top_values_preview'; -import type { MlJobFieldType } from '../../../../common/types/field_types'; -import { - FieldVisConfig, - FileBasedFieldVisConfig, - isIndexBasedFieldVisConfig, -} from './types/field_vis_config'; -import { BooleanContentPreview } from './components/field_data_row'; - -const FIELD_NAME = 'fieldName'; - -export type ItemIdToExpandedRowMap = Record; - -type DataVisualizerTableItem = FieldVisConfig | FileBasedFieldVisConfig; -interface DataVisualizerTableProps { - items: T[]; - pageState: DataVisualizerIndexBasedAppState | DataVisualizerFileBasedAppState; - updatePageState: ( - update: Partial - ) => void; - getItemIdToExpandedRowMap: (itemIds: string[], items: T[]) => ItemIdToExpandedRowMap; - extendedColumns?: Array>; -} - -export const DataVisualizerTable = ({ - items, - pageState, - updatePageState, - getItemIdToExpandedRowMap, - extendedColumns, -}: DataVisualizerTableProps) => { - const [expandedRowItemIds, setExpandedRowItemIds] = useState([]); - const [expandAll, toggleExpandAll] = useState(false); - - const { onTableChange, pagination, sorting } = useTableSettings( - items, - pageState, - updatePageState - ); - const showDistributions: boolean = - ('showDistributions' in pageState && pageState.showDistributions) ?? true; - const toggleShowDistribution = () => { - updatePageState({ - ...pageState, - showDistributions: !showDistributions, - }); - }; - - function toggleDetails(item: DataVisualizerTableItem) { - if (item.fieldName === undefined) return; - const index = expandedRowItemIds.indexOf(item.fieldName); - if (index !== -1) { - expandedRowItemIds.splice(index, 1); - } else { - expandedRowItemIds.push(item.fieldName); - } - - // spread to a new array otherwise the component wouldn't re-render - setExpandedRowItemIds([...expandedRowItemIds]); - } - - const columns = useMemo(() => { - const expanderColumn: EuiTableComputedColumnType = { - name: ( - toggleExpandAll(!expandAll)} - aria-label={ - !expandAll - ? i18n.translate('xpack.ml.datavisualizer.dataGrid.expandDetailsForAllAriaLabel', { - defaultMessage: 'Expand details for all fields', - }) - : i18n.translate('xpack.ml.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel', { - defaultMessage: 'Collapse details for all fields', - }) - } - iconType={expandAll ? 'arrowUp' : 'arrowDown'} - /> - ), - align: RIGHT_ALIGNMENT, - width: '40px', - isExpander: true, - render: (item: DataVisualizerTableItem) => { - if (item.fieldName === undefined) return null; - const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown'; - return ( - toggleDetails(item)} - aria-label={ - expandedRowItemIds.includes(item.fieldName) - ? i18n.translate('xpack.ml.datavisualizer.dataGrid.rowCollapse', { - defaultMessage: 'Hide details for {fieldName}', - values: { fieldName: item.fieldName }, - }) - : i18n.translate('xpack.ml.datavisualizer.dataGrid.rowExpand', { - defaultMessage: 'Show details for {fieldName}', - values: { fieldName: item.fieldName }, - }) - } - iconType={direction} - /> - ); - }, - 'data-test-subj': 'mlDataVisualizerTableColumnDetailsToggle', - }; - - const baseColumns = [ - expanderColumn, - { - field: 'type', - name: i18n.translate('xpack.ml.datavisualizer.dataGrid.typeColumnName', { - defaultMessage: 'Type', - }), - render: (fieldType: MlJobFieldType) => { - return ; - }, - width: '75px', - sortable: true, - align: CENTER_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnType', - }, - { - field: 'fieldName', - name: i18n.translate('xpack.ml.datavisualizer.dataGrid.nameColumnName', { - defaultMessage: 'Name', - }), - sortable: true, - truncateText: true, - render: (fieldName: string) => ( - - {fieldName} - - ), - align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnName', - }, - { - field: 'docCount', - name: i18n.translate('xpack.ml.datavisualizer.dataGrid.documentsCountColumnName', { - defaultMessage: 'Documents (%)', - }), - render: (value: number | undefined, item: DataVisualizerTableItem) => ( - - ), - sortable: (item: DataVisualizerTableItem) => item?.stats?.count, - align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnDocumentsCount', - }, - { - field: 'stats.cardinality', - name: i18n.translate('xpack.ml.datavisualizer.dataGrid.distinctValuesColumnName', { - defaultMessage: 'Distinct values', - }), - render: (cardinality?: number) => , - sortable: true, - align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnDistinctValues', - }, - { - name: ( -
- - {i18n.translate('xpack.ml.datavisualizer.dataGrid.distributionsColumnName', { - defaultMessage: 'Distributions', - })} - toggleShowDistribution()} - aria-label={i18n.translate( - 'xpack.ml.datavisualizer.dataGrid.showDistributionsAriaLabel', - { - defaultMessage: 'Show distributions', - } - )} - /> -
- ), - render: (item: DataVisualizerTableItem) => { - if (item === undefined || showDistributions === false) return null; - if ( - (item.type === ML_JOB_FIELD_TYPES.KEYWORD || item.type === ML_JOB_FIELD_TYPES.IP) && - item.stats?.topValues !== undefined - ) { - return ; - } - - if (item.type === ML_JOB_FIELD_TYPES.NUMBER) { - if (isIndexBasedFieldVisConfig(item) && item.stats?.distribution !== undefined) { - return ; - } - } - - if (item.type === ML_JOB_FIELD_TYPES.BOOLEAN) { - return ; - } - - return null; - }, - align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnDistribution', - }, - ]; - return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns; - }, [expandAll, showDistributions, updatePageState, extendedColumns]); - - const itemIdToExpandedRowMap = useMemo(() => { - let itemIds = expandedRowItemIds; - if (expandAll) { - itemIds = items.map((i) => i[FIELD_NAME]).filter((f) => f !== undefined) as string[]; - } - return getItemIdToExpandedRowMap(itemIds, items); - }, [expandAll, items, expandedRowItemIds]); - - return ( - - - className={'mlDataVisualizer'} - items={items} - itemId={FIELD_NAME} - columns={columns} - pagination={pagination} - sorting={sorting} - isExpandable={true} - itemIdToExpandedRowMap={itemIdToExpandedRowMap} - isSelectable={false} - onTableChange={onTableChange} - data-test-subj={'mlDataVisualizerTable'} - rowProps={(item) => ({ - 'data-test-subj': `mlDataVisualizerRow row-${item.fieldName}`, - })} - /> - - ); -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts deleted file mode 100644 index 85d85f51a623f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { useDataVizChartTheme } from './use_data_viz_chart_theme'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts deleted file mode 100644 index 0addadf3af0e9..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import type { PartialTheme } from '@elastic/charts'; -import { useMemo } from 'react'; -import { useCurrentEuiTheme } from '../../../components/color_range_legend'; -export const useDataVizChartTheme = (): PartialTheme => { - const { euiTheme } = useCurrentEuiTheme(); - const chartTheme = useMemo(() => { - const AREA_SERIES_COLOR = euiTheme.euiColorVis0; - return { - axes: { - tickLabel: { - fontSize: parseInt(euiTheme.euiFontSizeXS, 10), - fontFamily: euiTheme.euiFontFamily, - fontStyle: 'italic', - }, - }, - background: { color: 'transparent' }, - chartMargins: { - left: 0, - right: 0, - top: 0, - bottom: 0, - }, - chartPaddings: { - left: 0, - right: 0, - top: 4, - bottom: 0, - }, - scales: { barsPadding: 0.1 }, - colors: { - vizColors: [AREA_SERIES_COLOR], - }, - areaSeriesStyle: { - line: { - strokeWidth: 1, - visible: true, - }, - point: { - visible: false, - radius: 0, - opacity: 0, - }, - area: { visible: true, opacity: 1 }, - }, - }; - }, [euiTheme]); - return chartTheme; -}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts deleted file mode 100644 index 3009470af4858..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { DataVisualizerTable, ItemIdToExpandedRowMap } from './data_visualizer_stats_table'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts deleted file mode 100644 index 24209af23ceb4..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import type { FieldVisConfig, FileBasedFieldVisConfig } from './field_vis_config'; - -export interface FieldDataRowProps { - config: FieldVisConfig | FileBasedFieldVisConfig; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts deleted file mode 100644 index aa7bd2f5ecf6d..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { MlJobFieldType } from '../../../../../common/types/field_types'; - -export interface Percentile { - percent: number; - minValue: number; - maxValue: number; -} - -export interface MetricFieldVisStats { - avg?: number; - distribution?: { - percentiles: Percentile[]; - maxPercentile: number; - minPercentile: 0; - }; - max?: number; - median?: number; - min?: number; -} - -interface DocumentCountBuckets { - [key: string]: number; -} - -export interface FieldVisStats { - cardinality?: number; - count?: number; - sampleCount?: number; - trueCount?: number; - falseCount?: number; - earliest?: number; - latest?: number; - documentCounts?: { - buckets?: DocumentCountBuckets; - interval?: number; - }; - avg?: number; - distribution?: { - percentiles: Percentile[]; - maxPercentile: number; - minPercentile: 0; - }; - fieldName?: string; - isTopValuesSampled?: boolean; - max?: number; - median?: number; - min?: number; - topValues?: Array<{ key: number | string; doc_count: number }>; - topValuesSampleSize?: number; - topValuesSamplerShardSize?: number; - examples?: Array; - timeRangeEarliest?: number; - timeRangeLatest?: number; -} - -// The internal representation of the configuration used to build the visuals -// which display the field information. -export interface FieldVisConfig { - type: MlJobFieldType; - fieldName?: string; - existsInDocs: boolean; - aggregatable: boolean; - loading: boolean; - stats?: FieldVisStats; - fieldFormat?: any; - isUnsupportedType?: boolean; -} - -export interface FileBasedFieldVisConfig { - type: MlJobFieldType; - fieldName?: string; - stats?: FieldVisStats; - format?: string; -} - -export interface FileBasedUnknownFieldVisConfig { - fieldName: string; - type: 'text' | 'unknown'; - stats: { mean: number; count: number; sampleCount: number; cardinality: number }; -} - -export function isFileBasedFieldVisConfig( - field: FieldVisConfig | FileBasedFieldVisConfig -): field is FileBasedFieldVisConfig { - return !field.hasOwnProperty('existsInDocs'); -} - -export function isIndexBasedFieldVisConfig( - field: FieldVisConfig | FileBasedFieldVisConfig -): field is FieldVisConfig { - return field.hasOwnProperty('existsInDocs'); -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts deleted file mode 100644 index 161829461aa26..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { FieldDataRowProps } from './field_data_row'; -export { - FieldVisConfig, - FileBasedFieldVisConfig, - FieldVisStats, - MetricFieldVisStats, - isFileBasedFieldVisConfig, - isIndexBasedFieldVisConfig, -} from './field_vis_config'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts deleted file mode 100644 index 27da91153b3ba..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FileBasedFieldVisConfig } from './types'; - -export const getTFPercentage = (config: FileBasedFieldVisConfig) => { - const { stats } = config; - if (stats === undefined) return null; - const { count } = stats; - // use stats from index based config - let { trueCount, falseCount } = stats; - - // use stats from file based find structure results - if (stats.trueCount === undefined || stats.falseCount === undefined) { - if (config?.stats?.topValues) { - config.stats.topValues.forEach((doc) => { - if (doc.doc_count !== undefined) { - if (doc.key.toString().toLowerCase() === 'false') { - falseCount = doc.doc_count; - } - if (doc.key.toString().toLowerCase() === 'true') { - trueCount = doc.doc_count; - } - } - }); - } - } - if (count === undefined || trueCount === undefined || falseCount === undefined) return null; - return { - count, - trueCount, - falseCount, - }; -}; From aa352494c6036abdbe35e2564719b55256583a09 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 09:26:13 -0500 Subject: [PATCH 07/53] [ML] Rename files --- .../public/application/components/_index.scss | 2 +- .../components/bottom_bar/bottom_bar.tsx | 2 +- .../_file_data_visualizer_view.scss} | 0 .../file_data_visualizer_view/_index.scss | 1 + .../constants.ts | 0 .../file_data_visualizer_view.js} | 0 .../file_error_callouts.tsx | 0 .../index.js | 2 +- .../file_datavisualizer_view/_index.scss | 1 - .../index.ts | 5 ++++- .../index_data_visualizer_view.tsx} | 0 .../application/file_datavisualizer.tsx | 2 +- .../application/index_data_visualizer.tsx | 2 +- .../services/timefilter_refresh_service.ts | 2 +- .../file_data_visualizer/public/index.ts | 2 +- .../index_based/common/request.ts | 20 +++++++++++++++++++ .../index_based/data_loader/data_loader.ts | 2 +- .../services/ml_api_service/index.ts | 2 +- 18 files changed, 34 insertions(+), 11 deletions(-) rename x-pack/plugins/file_data_visualizer/public/application/components/{file_datavisualizer_view/_file_datavisualizer_view.scss => file_data_visualizer_view/_file_data_visualizer_view.scss} (100%) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_index.scss rename x-pack/plugins/file_data_visualizer/public/application/components/{file_datavisualizer_view => file_data_visualizer_view}/constants.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/components/{file_datavisualizer_view/file_datavisualizer_view.js => file_data_visualizer_view/file_data_visualizer_view.js} (100%) rename x-pack/plugins/file_data_visualizer/public/application/components/{file_datavisualizer_view => file_data_visualizer_view}/file_error_callouts.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/components/{file_datavisualizer_view => file_data_visualizer_view}/index.js (78%) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss rename x-pack/plugins/file_data_visualizer/public/application/components/{index_datavisualizer_view => index_data_visualizer_view}/index.ts (70%) rename x-pack/plugins/file_data_visualizer/public/application/components/{index_datavisualizer_view/index_datavisualizer_view.tsx => index_data_visualizer_view/index_data_visualizer_view.tsx} (100%) create mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss index a47f3712cbb64..e6784ef44c599 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss @@ -4,7 +4,7 @@ @import 'embedded_map/index'; @import 'experimental_badge/index'; @import 'file_contents/index'; -@import 'file_datavisualizer_view/index'; +@import 'file_data_visualizer_view/index'; @import 'import_summary/index'; @import 'results_view/index'; @import 'stats_table/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx index 30ce7a4c67f99..efe13ad0642a1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx @@ -16,7 +16,7 @@ import { EuiToolTip, } from '@elastic/eui'; -import { MODE as DATAVISUALIZER_MODE } from '../file_datavisualizer_view/constants'; +import { MODE as DATAVISUALIZER_MODE } from '../file_data_visualizer_view/constants'; interface BottomBarProps { mode: DATAVISUALIZER_MODE; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_file_datavisualizer_view.scss b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_file_data_visualizer_view.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_file_datavisualizer_view.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_file_data_visualizer_view.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_index.scss new file mode 100644 index 0000000000000..8bbc5bd609e7c --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_index.scss @@ -0,0 +1 @@ +@import 'file_data_visualizer_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/constants.ts b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/constants.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/constants.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/constants.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_datavisualizer_view.js b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_data_visualizer_view.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_datavisualizer_view.js rename to x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_data_visualizer_view.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_error_callouts.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_error_callouts.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_error_callouts.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_error_callouts.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/index.js similarity index 78% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js rename to x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/index.js index c3004f8a1ac3f..6a6130460fa40 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js +++ b/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/index.js @@ -5,4 +5,4 @@ * 2.0. */ -export { FileDataVisualizerView } from './file_datavisualizer_view'; +export { FileDataVisualizerView } from './file_data_visualizer_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss deleted file mode 100644 index c1191ad270e4c..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'file_datavisualizer_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index.ts similarity index 70% rename from x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index.ts index d1d9d988737e3..bcdef0966039d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index.ts @@ -5,4 +5,7 @@ * 2.0. */ -export { IndexDataVisualizerViewProps, IndexDataVisualizerView } from './index_datavisualizer_view'; +export { + IndexDataVisualizerViewProps, + IndexDataVisualizerView, +} from './index_data_visualizer_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/index_datavisualizer_view/index_datavisualizer_view.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx index b02fcd36d4c5f..feabb32b61d58 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx @@ -10,7 +10,7 @@ import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/p import { getCoreStart, getPluginsStart } from '../kibana_services'; // @ts-ignore -import { FileDataVisualizerView } from './components/file_datavisualizer_view/index'; +import { FileDataVisualizerView } from './components/file_data_visualizer_view/index'; export type FileDataVisualizerSpec = typeof FileDataVisualizer; export const FileDataVisualizer: FC = () => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx index e2747ecdba4cb..e7fa27abb71d8 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx @@ -16,7 +16,7 @@ import { getCoreStart, getPluginsStart } from '../kibana_services'; import { IndexDataVisualizerViewProps, IndexDataVisualizerView, -} from './components/index_datavisualizer_view'; +} from './components/index_data_visualizer_view'; import { Accessor, Provider as UrlStateContextProvider, diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts b/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts index 489b45592bc92..1059dfe61a6a7 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts @@ -7,6 +7,6 @@ import { Subject } from 'rxjs'; import { Required } from 'utility-types'; -import { Refresh } from '../components/index_datavisualizer_view/index_datavisualizer_view'; +import { Refresh } from '../components/index_data_visualizer_view/index_data_visualizer_view'; export const mlTimefilterRefresh$ = new Subject>(); diff --git a/x-pack/plugins/file_data_visualizer/public/index.ts b/x-pack/plugins/file_data_visualizer/public/index.ts index 774f0872880d0..6c17f541ef800 100644 --- a/x-pack/plugins/file_data_visualizer/public/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/index.ts @@ -7,7 +7,7 @@ import { FileDataVisualizerPlugin } from './plugin'; -export type { IndexDataVisualizerViewProps } from './application/components/index_datavisualizer_view'; +export type { IndexDataVisualizerViewProps } from './application/components/index_data_visualizer_view'; export function plugin() { return new FileDataVisualizerPlugin(); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts new file mode 100644 index 0000000000000..40a8c3a7d8b1b --- /dev/null +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { KBN_FIELD_TYPES } from '../../../../../../../../src/plugins/data/public'; +import { MlJobFieldType } from '../../../../../common/types/field_types'; + +export interface FieldRequestConfig { + fieldName?: string; + type: MlJobFieldType; + cardinality: number; +} + +export interface FieldHistogramRequestConfig { + fieldName: string; + type?: KBN_FIELD_TYPES; +} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts index 0da7d3d6b63d8..906a7d017112a 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts @@ -17,7 +17,7 @@ import { IndexPatternTitle } from '../../../../../common/types/kibana'; import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../common/constants/field_histograms'; import { ml } from '../../../services/ml_api_service'; -import { FieldHistogramRequestConfig, FieldRequestConfig } from '../common'; +import { FieldHistogramRequestConfig, FieldRequestConfig } from '../common/request'; import { RuntimeMappings } from '../../../../../common/types/fields'; import { ToastNotificationService, diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts index bf41b2aa1e940..9a1a99186c0f0 100644 --- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts +++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts @@ -38,7 +38,7 @@ import { import { FieldHistogramRequestConfig, FieldRequestConfig, -} from '../../datavisualizer/index_based/common'; +} from '../../datavisualizer/index_based/common/request'; import { DataRecognizerConfigResponse, Module } from '../../../../common/types/modules'; import { getHttp } from '../../util/dependency_cache'; import type { RuntimeMappings } from '../../../../common/types/fields'; From f2018637e5c4ceac2a19be620d3ab33e7d2e9a81 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 09:54:20 -0500 Subject: [PATCH 08/53] [ML] Move field type icon --- .../field_title_bar/_field_title_bar.scss | 2 +- .../components/field_title_bar/_index.scss | 0 .../field_title_bar/field_title_bar.test.tsx | 12 +-- .../field_title_bar/field_title_bar.tsx | 8 +- .../components/field_title_bar/index.ts | 0 .../field_type_icon/field_type_icon.test.tsx | 6 +- .../field_type_icon/field_type_icon.tsx | 29 +++--- .../components/field_type_icon/index.ts | 0 .../application/util/url_state.test.tsx | 89 ------------------- .../plugins/ml/public/application/_index.scss | 1 - .../field_type_icon.test.tsx.snap | 16 ---- 11 files changed, 28 insertions(+), 135 deletions(-) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_title_bar/_field_title_bar.scss (96%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_title_bar/_index.scss (100%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_title_bar/field_title_bar.test.tsx (90%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_title_bar/field_title_bar.tsx (87%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_title_bar/index.ts (100%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_type_icon/field_type_icon.test.tsx (84%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_type_icon/field_type_icon.tsx (82%) rename x-pack/plugins/{ml/public/application => file_data_visualizer/public/application/components}/components/field_type_icon/index.ts (100%) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx delete mode 100644 x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/_field_title_bar.scss b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss similarity index 96% rename from x-pack/plugins/ml/public/application/components/field_title_bar/_field_title_bar.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss index 77d95653638ac..cc4481f3fb9b8 100644 --- a/x-pack/plugins/ml/public/application/components/field_title_bar/_field_title_bar.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss @@ -1,4 +1,4 @@ -.ml-field-title-bar { +.dv-field-title-bar { @include euiFontSizeM; font-family: Roboto Mono, serif; font-style: normal; diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/components/field_title_bar/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_index.scss diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx similarity index 90% rename from x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.test.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx index 20fd024fdef86..630a0e3d6f091 100644 --- a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.test.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx @@ -5,18 +5,18 @@ * 2.0. */ -import { mountWithIntl } from '@kbn/test/jest'; +import { mountWithIntl } from '@kbn/test/target/types/jest'; import React from 'react'; import { FieldTitleBar } from './field_title_bar'; -import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; +import { JOB_FIELD_TYPES } from '../../../../../common'; describe('FieldTitleBar', () => { test(`card prop is an empty object`, () => { const props = { card: { - type: ML_JOB_FIELD_TYPES.NUMBER, + type: JOB_FIELD_TYPES.NUMBER, existsInDocs: true, loading: false, aggregatable: true, @@ -35,7 +35,7 @@ describe('FieldTitleBar', () => { test(`card.isUnsupportedType is true`, () => { const props = { card: { - type: ML_JOB_FIELD_TYPES.UNKNOWN, + type: JOB_FIELD_TYPES.UNKNOWN, fieldName: 'foo', existsInDocs: true, loading: false, @@ -56,7 +56,7 @@ describe('FieldTitleBar', () => { test(`card.fieldName and card.type is set`, () => { const props = { card: { - type: ML_JOB_FIELD_TYPES.KEYWORD, + type: JOB_FIELD_TYPES.KEYWORD, fieldName: 'bar', existsInDocs: true, loading: false, @@ -79,7 +79,7 @@ describe('FieldTitleBar', () => { const props = { card: { - type: ML_JOB_FIELD_TYPES.KEYWORD, + type: JOB_FIELD_TYPES.KEYWORD, fieldName: 'bar', existsInDocs: true, loading: false, diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx similarity index 87% rename from x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx index 85971b66a687f..e7f2cc7733f82 100644 --- a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx @@ -12,12 +12,12 @@ import { EuiText, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FieldTypeIcon } from '../field_type_icon'; -import { getMLJobTypeAriaLabel } from '../../util/field_types_utils'; +import { getJobTypeAriaLabel } from '../../../util/field_types_utils'; import { FieldVisConfig, FileBasedFieldVisConfig, isIndexBasedFieldVisConfig, -} from '../../datavisualizer/stats_table/types/field_vis_config'; +} from '../../stats_table/types'; interface Props { card: FieldVisConfig | FileBasedFieldVisConfig; @@ -31,7 +31,7 @@ export const FieldTitleBar: FC = ({ card }) => { }); const cardTitleAriaLabel = [fieldName]; - const classNames = ['ml-field-title-bar']; + const classNames = ['dv-field-title-bar']; if (card.fieldName === undefined) { classNames.push('document_count'); @@ -43,7 +43,7 @@ export const FieldTitleBar: FC = ({ card }) => { if (isIndexBasedFieldVisConfig(card) && card.isUnsupportedType !== true) { // All the supported field types have aria labels. - cardTitleAriaLabel.unshift(getMLJobTypeAriaLabel(card.type)!); + cardTitleAriaLabel.unshift(getJobTypeAriaLabel(card.type)!); } return ( diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/components/field_title_bar/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/index.ts diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx similarity index 84% rename from x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.test.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx index 4a8b067710c95..5382b4844d696 100644 --- a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.test.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx @@ -9,12 +9,12 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import { FieldTypeIcon } from './field_type_icon'; -import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; +import { JOB_FIELD_TYPES } from '../../../../../common'; describe('FieldTypeIcon', () => { test(`render component when type matches a field type`, () => { const typeIconComponent = shallow( - + ); expect(typeIconComponent).toMatchSnapshot(); }); @@ -24,7 +24,7 @@ describe('FieldTypeIcon', () => { jest.useFakeTimers(); const typeIconComponent = mount( - + ); const container = typeIconComponent.find({ 'data-test-subj': 'mlFieldTypeIcon' }); diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx similarity index 82% rename from x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx index 79ab210ce1dfe..3d81f9f971d28 100644 --- a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx @@ -10,14 +10,13 @@ import React, { FC } from 'react'; import { EuiToken, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; - -import { getMLJobTypeAriaLabel } from '../../util/field_types_utils'; -import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; -import type { MlJobFieldType } from '../../../../common/types/field_types'; +import { JobFieldType } from '../../../../../common/types'; +import { getJobTypeAriaLabel } from '../../../util/field_types_utils'; +import { JOB_FIELD_TYPES } from '../../../../../common'; interface FieldTypeIconProps { tooltipEnabled: boolean; - type: MlJobFieldType; + type: JobFieldType; fieldName?: string; needsAria: boolean; } @@ -36,43 +35,43 @@ export const FieldTypeIcon: FC = ({ fieldName, needsAria = true, }) => { - const ariaLabel = getMLJobTypeAriaLabel(type); + const ariaLabel = getJobTypeAriaLabel(type); let iconType = 'questionInCircle'; let color = 'euiColorVis6'; switch (type) { // Set icon types and colors - case ML_JOB_FIELD_TYPES.BOOLEAN: + case JOB_FIELD_TYPES.BOOLEAN: iconType = 'tokenBoolean'; color = 'euiColorVis5'; break; - case ML_JOB_FIELD_TYPES.DATE: + case JOB_FIELD_TYPES.DATE: iconType = 'tokenDate'; color = 'euiColorVis7'; break; - case ML_JOB_FIELD_TYPES.GEO_POINT: - case ML_JOB_FIELD_TYPES.GEO_SHAPE: + case JOB_FIELD_TYPES.GEO_POINT: + case JOB_FIELD_TYPES.GEO_SHAPE: iconType = 'tokenGeo'; color = 'euiColorVis8'; break; - case ML_JOB_FIELD_TYPES.TEXT: + case JOB_FIELD_TYPES.TEXT: iconType = 'document'; color = 'euiColorVis9'; break; - case ML_JOB_FIELD_TYPES.IP: + case JOB_FIELD_TYPES.IP: iconType = 'tokenIP'; color = 'euiColorVis3'; break; - case ML_JOB_FIELD_TYPES.KEYWORD: + case JOB_FIELD_TYPES.KEYWORD: iconType = 'tokenText'; color = 'euiColorVis0'; break; - case ML_JOB_FIELD_TYPES.NUMBER: + case JOB_FIELD_TYPES.NUMBER: iconType = 'tokenNumber'; color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2'; break; - case ML_JOB_FIELD_TYPES.UNKNOWN: + case JOB_FIELD_TYPES.UNKNOWN: // Use defaults break; } diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/components/field_type_icon/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx deleted file mode 100644 index 734c730dd91ba..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.test.tsx +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; -import { render, act } from '@testing-library/react'; -import { parseUrlState, useUrlState, UrlStateProvider } from './url_state'; - -const mockHistoryPush = jest.fn(); - -jest.mock('react-router-dom', () => ({ - useHistory: () => ({ - push: mockHistoryPush, - }), - useLocation: () => ({ - search: - "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d", - }), -})); - -describe('getUrlState', () => { - test('properly decode url with _g and _a', () => { - expect( - parseUrlState( - "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!t,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d" - ) - ).toEqual({ - _a: { - mlExplorerFilter: {}, - mlExplorerSwimlane: { - viewByFieldName: 'action', - }, - query: { - query_string: { - analyze_wildcard: true, - query: '*', - }, - }, - }, - _g: { - ml: { - jobIds: ['dec-2'], - }, - refreshInterval: { - display: 'Off', - pause: true, - value: 0, - }, - time: { - from: '2019-01-01T00:03:40.000Z', - mode: 'absolute', - to: '2019-08-30T11:55:07.000Z', - }, - }, - savedSearchId: '571aaf70-4c88-11e8-b3d7-01146121b73d', - }); - }); -}); - -describe('useUrlState', () => { - beforeEach(() => { - mockHistoryPush.mockClear(); - }); - - test('pushes a properly encoded search string to history', () => { - const TestComponent: FC = () => { - const [, setUrlState] = useUrlState('_a'); - return ; - }; - - const { getByText } = render( - - - - ); - - act(() => { - getByText('ButtonText').click(); - }); - - expect(mockHistoryPush).toHaveBeenCalledWith({ - search: - '_a=%28mlExplorerFilter%3A%28%29%2CmlExplorerSwimlane%3A%28viewByFieldName%3Aaction%29%2Cquery%3A%28%29%29&_g=%28ml%3A%28jobIds%3A%21%28dec-2%29%29%2CrefreshInterval%3A%28display%3AOff%2Cpause%3A%21f%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272019-01-01T00%3A03%3A40.000Z%27%2Cmode%3Aabsolute%2Cto%3A%272019-08-30T11%3A55%3A07.000Z%27%29%29&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d', - }); - }); -}); diff --git a/x-pack/plugins/ml/public/application/_index.scss b/x-pack/plugins/ml/public/application/_index.scss index 5023a8e597fb7..fb61a2a16c19d 100644 --- a/x-pack/plugins/ml/public/application/_index.scss +++ b/x-pack/plugins/ml/public/application/_index.scss @@ -21,7 +21,6 @@ @import 'components/color_range_legend/index'; @import 'components/controls/index'; @import 'components/entity_cell/index'; - @import 'components/field_title_bar/index'; @import 'components/influencers_list/index'; @import 'components/items_grid/index'; @import 'components/job_selector/index'; diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap b/x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap deleted file mode 100644 index 769ebdeba9955..0000000000000 --- a/x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap +++ /dev/null @@ -1,16 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`FieldTypeIcon render component when type matches a field type 1`] = ` - - - -`; From 6630d2eef256f6caa08171bd364573a9aa9dee24 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 13:57:30 -0500 Subject: [PATCH 09/53] [ML] Create new folder structure --- .../kibana_services.ts => common/hooks/use_time_filter.ts} | 6 +----- .../index_data_visualizer_view.tsx | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) rename x-pack/plugins/file_data_visualizer/public/application/{hooks/kibana_services.ts => common/hooks/use_time_filter.ts} (86%) diff --git a/x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts b/x-pack/plugins/file_data_visualizer/public/application/common/hooks/use_time_filter.ts similarity index 86% rename from x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/hooks/use_time_filter.ts index 5b07325b64a87..eb21fa1f97ba4 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/hooks/kibana_services.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/hooks/use_time_filter.ts @@ -6,11 +6,7 @@ */ import { useEffect } from 'react'; -import { useFileDataVisualizerKibana } from '../kibana_context'; - -export const useNotifications = () => { - return useFileDataVisualizerKibana().services.notifications; -}; +import { useFileDataVisualizerKibana } from '../../kibana_context'; interface UseTimefilterOptions { timeRangeSelector?: boolean; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx index 0bf4959e97933..8148716331cd4 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -53,7 +53,7 @@ import { FieldCountPanel } from '../field_count_panel'; import { DocumentCountContent } from '../document_count_content'; import { DataLoader } from '../../data_loader/data_loader'; import { JOB_FIELD_TYPES } from '../../../../common'; -import { useTimefilter } from '../../hooks/kibana_services'; +import { useTimefilter } from '../../common/hooks/use_time_filter'; import { kbnTypeToJobType } from '../../util/field_types_utils'; import { SearchPanel } from '../search_panel'; import { ActionsPanel } from '../actions_panel'; From d0b713c269b7d662797b4c08e471c830ac66414d Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 14:02:46 -0500 Subject: [PATCH 10/53] [ML] Organize index_data_visualizer --- .../date_picker_wrapper/date_picker_wrapper.tsx | 2 +- .../index_data_visualizer_view.tsx | 10 +++++----- .../file_data_visualizer/public/application/index.ts | 5 ++++- .../constants/index_data_visualizer_viewer.ts | 0 .../data_loader/data_loader.ts | 10 +++++----- .../hooks/use_time_filter.ts | 0 .../public/application/index_data_visualizer/index.ts | 8 ++++++++ .../index_data_visualizer.tsx | 10 +++++----- .../services/time_buckets.d.ts | 0 .../services/time_buckets.js | 4 ++-- .../services/timefilter_refresh_service.ts | 2 +- 11 files changed, 31 insertions(+), 20 deletions(-) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/constants/index_data_visualizer_viewer.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/data_loader/data_loader.ts (95%) rename x-pack/plugins/file_data_visualizer/public/application/{common => index_data_visualizer}/hooks/use_time_filter.ts (100%) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/index_data_visualizer.tsx (93%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/services/time_buckets.d.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/services/time_buckets.js (99%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/services/timefilter_refresh_service.ts (80%) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx index 1037bf8a91482..e30369ed1f6ae 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx @@ -18,7 +18,7 @@ import { import { useUrlState } from '../../util/url_state'; import { useFileDataVisualizerKibana } from '../../kibana_context'; -import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; +import { mlTimefilterRefresh$ } from '../../index_data_visualizer/services/timefilter_refresh_service'; interface TimePickerQuickRange { from: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx index 8148716331cd4..b4e428ac7d011 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -44,23 +44,23 @@ import type { import { OverallStats } from '../../types/overall_stats'; import { getActions } from '../field_data_row/action_menu'; import { IndexBasedDataVisualizerExpandedRow } from '../expanded_row/index_based_expanded_row'; -import { DATA_VISUALIZER_INDEX_VIEWER } from '../../constants/index_data_visualizer_viewer'; +import { DATA_VISUALIZER_INDEX_VIEWER } from '../../index_data_visualizer/constants/index_data_visualizer_viewer'; import { DataVisualizerIndexBasedAppState } from '../../types/index_data_visualizer_state'; import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../types/combined_query'; import { FieldRequestConfig, JobFieldType, SavedSearchSavedObject } from '../../../../common/types'; import { useFileDataVisualizerKibana } from '../../kibana_context'; import { FieldCountPanel } from '../field_count_panel'; import { DocumentCountContent } from '../document_count_content'; -import { DataLoader } from '../../data_loader/data_loader'; +import { DataLoader } from '../../index_data_visualizer/data_loader/data_loader'; import { JOB_FIELD_TYPES } from '../../../../common'; -import { useTimefilter } from '../../common/hooks/use_time_filter'; +import { useTimefilter } from '../../index_data_visualizer/hooks/use_time_filter'; import { kbnTypeToJobType } from '../../util/field_types_utils'; import { SearchPanel } from '../search_panel'; import { ActionsPanel } from '../actions_panel'; import { DatePickerWrapper } from '../date_picker_wrapper'; -import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; +import { mlTimefilterRefresh$ } from '../../index_data_visualizer/services/timefilter_refresh_service'; import { HelpMenu } from '../help_menu'; -import { TimeBuckets } from '../../services/time_buckets'; +import { TimeBuckets } from '../../index_data_visualizer/services/time_buckets'; export interface Refresh { lastRefresh: number; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index.ts index e017106793efa..dd642cc96c253 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index.ts @@ -6,4 +6,7 @@ */ export { FileDataVisualizer, FileDataVisualizerSpec } from './file_datavisualizer'; -export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer'; +export { + IndexDataVisualizer, + IndexDataVisualizerSpec, +} from './index_data_visualizer/index_data_visualizer'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/constants/index_data_visualizer_viewer.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/constants/index_data_visualizer_viewer.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts similarity index 95% rename from x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts index 62bcc9b1efa6f..ccd0afcf529cd 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/data_loader/data_loader.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts @@ -9,15 +9,15 @@ import { CoreSetup } from 'kibana/public'; import { estypes } from '@elastic/elasticsearch'; import { i18n } from '@kbn/i18n'; -import { IndexPattern } from '../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common'; -import { DEFAULT_SAMPLER_SHARD_SIZE, OMIT_FIELDS } from '../../../common/constants'; -import { FieldHistogramRequestConfig, FieldRequestConfig } from '../../../common/types'; +import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common'; +import { DEFAULT_SAMPLER_SHARD_SIZE, OMIT_FIELDS } from '../../../../common/constants'; +import { FieldHistogramRequestConfig, FieldRequestConfig } from '../../../../common/types'; import { getVisualizerFieldHistograms, getVisualizerFieldStats, getVisualizerOverallStats, -} from '../../api'; +} from '../../../api'; type IndexPatternTitle = string; type SavedSearchQuery = Record | null | undefined; diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/hooks/use_time_filter.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/hooks/use_time_filter.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts new file mode 100644 index 0000000000000..558063668c71c --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx similarity index 93% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index e7fa27abb71d8..a138e450d4a82 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -4,19 +4,19 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import './_index.scss'; +import '../_index.scss'; import React, { FC, useCallback } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import { parse, stringify } from 'query-string'; import { isEqual } from 'lodash'; // @ts-ignore import { encode } from 'rison-node'; -import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; -import { getCoreStart, getPluginsStart } from '../kibana_services'; +import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public'; +import { getCoreStart, getPluginsStart } from '../../kibana_services'; import { IndexDataVisualizerViewProps, IndexDataVisualizerView, -} from './components/index_data_visualizer_view'; +} from '../components/index_data_visualizer_view'; import { Accessor, Provider as UrlStateContextProvider, @@ -25,7 +25,7 @@ import { SetUrlState, getNestedProperty, isRisonSerializationRequired, -} from '../application/util/url_state'; +} from '../util/url_state'; export type IndexDataVisualizerSpec = typeof IndexDataVisualizer; diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.d.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.d.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js similarity index 99% rename from x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js index 816a14e885b90..cb9bb3924f1f4 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/services/time_buckets.js +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js @@ -5,11 +5,11 @@ * 2.0. */ -import { FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../../src/plugins/data/common'; +import { FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../../../src/plugins/data/common'; import { ary, assign, isPlainObject, isString, sortBy } from 'lodash'; import moment from 'moment'; import dateMath from '@elastic/datemath'; -import { parseInterval } from '../util/parse_interval'; +import { parseInterval } from '../../util/parse_interval'; const { duration: d } = moment; diff --git a/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts similarity index 80% rename from x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts index 1059dfe61a6a7..3a2902fd20266 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/services/timefilter_refresh_service.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts @@ -7,6 +7,6 @@ import { Subject } from 'rxjs'; import { Required } from 'utility-types'; -import { Refresh } from '../components/index_data_visualizer_view/index_data_visualizer_view'; +import { Refresh } from '../../components/index_data_visualizer_view/index_data_visualizer_view'; export const mlTimefilterRefresh$ = new Subject>(); From 8b7d221a3d940bce8afac492aa55509a5f0b3eec Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 14:10:41 -0500 Subject: [PATCH 11/53] [ML] Move types into index_data_visualizer folder --- .../geo_point_content_with_map.tsx | 2 +- .../components/expanded_row/index_based_expanded_row.tsx | 2 +- .../components/field_data_row/action_menu/actions.ts | 2 +- .../components/field_data_row/action_menu/lens_utils.ts | 2 +- .../index_data_visualizer_view.tsx | 9 ++++++--- .../components/search_panel/field_name_filter.tsx | 2 +- .../application/components/search_panel/search_panel.tsx | 2 +- .../{ => index_data_visualizer}/types/combined_query.ts | 0 .../types/index_data_visualizer_state.ts | 2 +- .../{ => index_data_visualizer}/types/overall_stats.ts | 0 10 files changed, 13 insertions(+), 10 deletions(-) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/types/combined_query.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/types/index_data_visualizer_state.ts (91%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/types/overall_stats.ts (100%) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx index b6136aa1e89d3..d3fce40ac17fc 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx @@ -8,7 +8,7 @@ import React, { FC, useEffect, useState } from 'react'; import { EuiFlexItem } from '@elastic/eui'; import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { CombinedQuery } from '../../../types/combined_query'; +import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content'; import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats'; import { ExamplesList } from '../../examples_list'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx index 7508f83b47356..4534d839efd0f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx @@ -20,7 +20,7 @@ import { import { NotInDocsContent } from '../not_in_docs_content'; import { FieldVisConfig } from '../stats_table/types'; import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { CombinedQuery } from '../../types/combined_query'; +import { CombinedQuery } from '../../index_data_visualizer/types/combined_query'; import { LoadingIndicator } from '../loading_indicator'; export const IndexBasedDataVisualizerExpandedRow = ({ diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts index b8189403531d1..3dbdb3f12586d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n'; import { Action } from '@elastic/eui/src/components/basic_table/action_types'; import { getCompatibleLensDataType, getLensAttributes } from './lens_utils'; import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { CombinedQuery } from '../../../types/combined_query'; +import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; import { FieldVisConfig } from '../../stats_table/types'; import { LensPublicStart } from '../../../../../../lens/public'; export function getActions( diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts index 760ab55ac1026..4382551aba920 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts @@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n'; import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import type { CombinedQuery } from '../../../types/combined_query'; +import type { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; import type { IndexPatternColumn, TypedLensByValueInput, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx index b4e428ac7d011..5ddce4a13cedc 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -41,12 +41,15 @@ import type { MetricFieldsStats, TotalFieldsStats, } from '../stats_table/components/field_count_stats'; -import { OverallStats } from '../../types/overall_stats'; +import { OverallStats } from '../../index_data_visualizer/types/overall_stats'; import { getActions } from '../field_data_row/action_menu'; import { IndexBasedDataVisualizerExpandedRow } from '../expanded_row/index_based_expanded_row'; import { DATA_VISUALIZER_INDEX_VIEWER } from '../../index_data_visualizer/constants/index_data_visualizer_viewer'; -import { DataVisualizerIndexBasedAppState } from '../../types/index_data_visualizer_state'; -import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../types/combined_query'; +import { DataVisualizerIndexBasedAppState } from '../../index_data_visualizer/types/index_data_visualizer_state'; +import { + SEARCH_QUERY_LANGUAGE, + SearchQueryLanguage, +} from '../../index_data_visualizer/types/combined_query'; import { FieldRequestConfig, JobFieldType, SavedSearchSavedObject } from '../../../../common/types'; import { useFileDataVisualizerKibana } from '../../kibana_context'; import { FieldCountPanel } from '../field_count_panel'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx index d3f4ac5d5f327..1309ec3c7e117 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx @@ -8,7 +8,7 @@ import React, { FC, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; import { Option, MultiSelectPicker } from '../multi_select_picker'; -import { OverallStats } from '../../types/overall_stats'; +import { OverallStats } from '../../index_data_visualizer/types/overall_stats'; interface Props { overallStats: OverallStats; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx index 85d09018deb09..cb3aa655f6684 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx @@ -23,7 +23,7 @@ import { ErrorMessage, SEARCH_QUERY_LANGUAGE, SearchQueryLanguage, -} from '../../types/combined_query'; +} from '../../index_data_visualizer/types/combined_query'; interface Props { indexPattern: IndexPattern; diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/combined_query.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/types/combined_query.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/combined_query.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts similarity index 91% rename from x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts index 40903f7af4976..7cd1c2bb3ce09 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/types/index_data_visualizer_state.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Query } from '../../../../../../src/plugins/data/common/query'; +import { Query } from '../../../../../../../src/plugins/data/common/query'; import { SearchQueryLanguage } from './combined_query'; export interface ListingPageUrlState { diff --git a/x-pack/plugins/file_data_visualizer/public/application/types/overall_stats.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/types/overall_stats.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts From c81c986c65d92c50ec1943af0411e44c8dec4f77 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 14:39:26 -0500 Subject: [PATCH 12/53] [ML] Move more files into file_data_visualizer --- .../public/application/_index.scss | 1 + .../public/application/components/_index.scss | 5 ----- .../application/components/edit_flyout/_index.scss | 1 - .../application/components/import_summary/_index.scss | 1 - .../loading_indicator/loading_indicator.tsx | 3 --- .../components/results_view/results_view.tsx | 4 ++-- .../application/file_data_visualizer/_index.scss | 1 + .../file_data_visualizer/components/_index.scss | 5 +++++ .../analysis_summary/_analysis_summary.scss | 0 .../components/analysis_summary/_index.scss | 0 .../components/analysis_summary/analysis_summary.tsx | 2 +- .../components/analysis_summary/index.ts | 0 .../components/bottom_bar/bottom_bar.tsx | 0 .../components/bottom_bar/index.ts | 0 .../edit_flyout/__snapshots__/overrides.test.js.snap | 0 .../components/edit_flyout/_edit_flyout.scss | 0 .../components/edit_flyout/_index.scss | 1 + .../components/edit_flyout/edit_flyout.js | 0 .../components/edit_flyout/index.js | 0 .../components/edit_flyout/options/index.js | 0 .../components/edit_flyout/options/option_lists.js | 0 .../components/edit_flyout/options/options.js | 0 .../components/edit_flyout/overrides.js | 2 +- .../components/edit_flyout/overrides.test.js | 0 .../components/edit_flyout/overrides_validation.js | 0 .../explanation_flyout/explanation_flyout.tsx | 2 +- .../components/explanation_flyout/index.ts | 0 .../components/file_contents/_file_contents.scss | 0 .../components/file_contents/_index.scss | 0 .../components/file_contents/file_contents.tsx | 0 .../components/file_contents/index.ts | 0 .../_file_data_visualizer_view.scss | 0 .../components/file_data_visualizer_view/_index.scss | 0 .../components/file_data_visualizer_view/constants.ts | 0 .../file_data_visualizer_view.js | 11 ++++++++--- .../file_data_visualizer_view/file_error_callouts.tsx | 4 ++-- .../components/file_data_visualizer_view/index.js | 0 .../components/import_errors/errors.tsx | 0 .../components/import_errors/index.ts | 0 .../components/import_progress/import_progress.tsx | 0 .../components/import_progress/index.ts | 0 .../components/import_settings/advanced.tsx | 4 ++-- .../components/import_settings/import_settings.tsx | 4 ++-- .../components/import_settings/index.ts | 0 .../components/import_settings/simple.tsx | 2 +- .../components/import_summary/_import_summary.scss} | 0 .../components/import_summary/_index.scss | 1 + .../components/import_summary/failures.tsx | 0 .../components/import_summary/import_summary.tsx | 0 .../components/import_summary/index.ts | 0 .../components/import_view/import_view.js | 8 ++++---- .../components/import_view/index.js | 0 .../components/json_editor/index.ts | 0 .../components/json_editor/json_editor.tsx | 2 +- .../file_data_visualizer.tsx} | 6 +++--- .../public/application/file_data_visualizer/index.ts | 8 ++++++++ .../file_data_visualizer/public/application/index.ts | 7 ++----- 57 files changed, 47 insertions(+), 38 deletions(-) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss create mode 100644 x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/_index.scss create mode 100644 x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/analysis_summary/_analysis_summary.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/analysis_summary/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/analysis_summary/analysis_summary.tsx (97%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/analysis_summary/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/bottom_bar/bottom_bar.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/bottom_bar/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/__snapshots__/overrides.test.js.snap (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/_edit_flyout.scss (100%) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/edit_flyout.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/index.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/options/index.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/options/option_lists.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/options/options.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/overrides.js (99%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/overrides.test.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/edit_flyout/overrides_validation.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/explanation_flyout/explanation_flyout.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/explanation_flyout/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_contents/_file_contents.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_contents/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_contents/file_contents.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_contents/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_data_visualizer_view/_file_data_visualizer_view.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_data_visualizer_view/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_data_visualizer_view/constants.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_data_visualizer_view/file_data_visualizer_view.js (97%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_data_visualizer_view/file_error_callouts.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/file_data_visualizer_view/index.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_errors/errors.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_errors/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_progress/import_progress.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_progress/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_settings/advanced.tsx (97%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_settings/import_settings.tsx (95%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_settings/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_settings/simple.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{components/import_summary/_import_sumary.scss => file_data_visualizer/components/import_summary/_import_summary.scss} (100%) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_summary/failures.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_summary/import_summary.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_summary/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_view/import_view.js (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/import_view/index.js (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/json_editor/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/json_editor/json_editor.tsx (94%) rename x-pack/plugins/file_data_visualizer/public/application/{file_datavisualizer.tsx => file_data_visualizer/file_data_visualizer.tsx} (84%) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/_index.scss index 841415620d691..9844897440b61 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/_index.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/_index.scss @@ -1 +1,2 @@ @import 'components/index'; +@import 'file_data_visualizer/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss index e6784ef44c599..dbc45e301edd6 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss @@ -1,11 +1,6 @@ @import 'about_panel/index'; -@import 'analysis_summary/index'; -@import 'edit_flyout/index'; @import 'embedded_map/index'; @import 'experimental_badge/index'; -@import 'file_contents/index'; -@import 'file_data_visualizer_view/index'; -@import 'import_summary/index'; @import 'results_view/index'; @import 'stats_table/index'; @import 'top_values/top_values'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss deleted file mode 100644 index 9558e46aad556..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'edit_flyout' diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss deleted file mode 100644 index 663e2db018921..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'import_sumary' diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx index d6f06be38cd39..ff606b7ec2ffd 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx @@ -10,9 +10,6 @@ import React, { FC, Fragment } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; - -// @remove - export const LoadingIndicator: FC = () => ( diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx index e2d21f242e4ef..e13ae2dab74cf 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx @@ -22,8 +22,8 @@ import { } from '@elastic/eui'; import { FindFileStructureResponse } from '../../../../../file_upload/common'; -import { FileContents } from '../file_contents'; -import { AnalysisSummary } from '../analysis_summary'; +import { FileContents } from '../../file_data_visualizer/components/file_contents'; +import { AnalysisSummary } from '../../file_data_visualizer/components/analysis_summary'; import { FieldsStatsGrid } from '../fields_stats_grid'; interface Props { diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/_index.scss new file mode 100644 index 0000000000000..841415620d691 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/_index.scss @@ -0,0 +1 @@ +@import 'components/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss new file mode 100644 index 0000000000000..a9847956c2c2f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss @@ -0,0 +1,5 @@ +@import 'analysis_summary/index'; +@import 'edit_flyout/index'; +@import 'file_contents/index'; +@import 'import_summary/index'; +@import 'file_data_visualizer_view/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_analysis_summary.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_analysis_summary.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/analysis_summary.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx similarity index 97% rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/analysis_summary.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx index 58177ea34286c..943c251ca1f21 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/analysis_summary.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx @@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { FC } from 'react'; import { EuiTitle, EuiSpacer, EuiDescriptionList } from '@elastic/eui'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ results }) => { const items = createDisplayItems(results); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_edit_flyout.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_edit_flyout.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss new file mode 100644 index 0000000000000..28489c50f19b4 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss @@ -0,0 +1 @@ +@import 'edit_flyout'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/index.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/index.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/index.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/index.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/option_lists.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/option_lists.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/options.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/options.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js similarity index 99% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js index cb0839b335a97..16fe5f793b17d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js @@ -31,7 +31,7 @@ import { // getCharsetOptions, } from './options'; import { isTimestampFormatValid } from './overrides_validation'; -import { withKibana } from '../../../../../../../src/plugins/kibana_react/public'; +import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public'; import { TIMESTAMP_OPTIONS, CUSTOM_DROPDOWN_OPTION } from './options/option_lists'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx index 606bab514ac9f..14047b70f688c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx @@ -20,7 +20,7 @@ import { EuiText, EuiSubSteps, } from '@elastic/eui'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; interface Props { results: FindFileStructureResponse; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_file_contents.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_file_contents.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_file_data_visualizer_view.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_file_data_visualizer_view.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/constants.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/constants.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_data_visualizer_view.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js similarity index 97% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_data_visualizer_view.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js index 2b774a906dba9..07226637169d7 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_data_visualizer_view.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js @@ -12,14 +12,19 @@ import { EuiSpacer } from '@elastic/eui'; import { isEqual } from 'lodash'; -import { AboutPanel, LoadingPanel } from '../about_panel'; +import { AboutPanel, LoadingPanel } from '../../../components/about_panel'; import { BottomBar } from '../bottom_bar'; -import { ResultsView } from '../results_view'; +import { ResultsView } from '../../../components/results_view'; import { FileCouldNotBeRead, FileTooLarge } from './file_error_callouts'; import { EditFlyout } from '../edit_flyout'; import { ExplanationFlyout } from '../explanation_flyout'; import { ImportView } from '../import_view'; -import { DEFAULT_LINES_TO_SAMPLE, readFile, createUrlOverrides, processResults } from '../utils'; +import { + DEFAULT_LINES_TO_SAMPLE, + readFile, + createUrlOverrides, + processResults, +} from '../../../components/utils'; import { MODE } from './constants'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_error_callouts.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_error_callouts.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx index b932dee35ebb8..a1c499ed4e78d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/file_error_callouts.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx @@ -11,8 +11,8 @@ import React, { FC } from 'react'; import { EuiCallOut, EuiSpacer, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui'; import numeral from '@elastic/numeral'; -import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../common'; -import { FindFileStructureErrorResponse } from '../../../../../file_upload/common'; +import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../../common'; +import { FindFileStructureErrorResponse } from '../../../../../../file_upload/common'; interface FileTooLargeProps { fileSize: number; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/index.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/file_data_visualizer_view/index.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_errors/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_progress/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx similarity index 97% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx index acb6415e93f9b..85767f3f337be 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx @@ -18,9 +18,9 @@ import { EuiFlexItem, } from '@elastic/eui'; -import { CombinedField, CombinedFieldsForm } from '../combined_fields'; +import { CombinedField, CombinedFieldsForm } from '../../../components/combined_fields'; import { JsonEditor, EDITOR_MODE } from '../json_editor'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; const EDITOR_HEIGHT = '300px'; interface Props { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/import_settings.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx similarity index 95% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/import_settings.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx index 90383acd7e6c5..9857c819b1773 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/import_settings.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx @@ -12,8 +12,8 @@ import { EuiTabbedContent, EuiSpacer } from '@elastic/eui'; import { SimpleSettings } from './simple'; import { AdvancedSettings } from './advanced'; -import { CombinedField } from '../combined_fields'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { CombinedField } from '../../../components/combined_fields'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; interface Props { index: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx index 2751b37cd3256..64295f0ce6a57 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx @@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { FC } from 'react'; import { EuiFieldText, EuiFormRow, EuiCheckbox, EuiSpacer } from '@elastic/eui'; -import { CombinedField, CombinedFieldsReadOnlyForm } from '../combined_fields'; +import { CombinedField, CombinedFieldsReadOnlyForm } from '../../../components/combined_fields'; interface Props { index: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_import_sumary.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_import_sumary.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss new file mode 100644 index 0000000000000..117e04733ed09 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss @@ -0,0 +1 @@ +@import 'import_summary'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js index 0eaba4c033910..fc7f67f785a7c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js @@ -20,8 +20,8 @@ import { import { i18n } from '@kbn/i18n'; import { debounce } from 'lodash'; -import { ResultsLinks } from '../results_links'; -import { FilebeatConfigFlyout } from '../filebeat_config_flyout'; +import { ResultsLinks } from '../../../components/results_links'; +import { FilebeatConfigFlyout } from '../../../components/filebeat_config_flyout'; import { ImportProgress, IMPORT_STATUS } from '../import_progress'; import { ImportErrors } from '../import_errors'; import { ImportSummary } from '../import_summary'; @@ -30,8 +30,8 @@ import { addCombinedFieldsToPipeline, addCombinedFieldsToMappings, getDefaultCombinedFields, -} from '../combined_fields'; -import { ExperimentalBadge } from '../experimental_badge'; +} from '../../../components/combined_fields'; +import { ExperimentalBadge } from '../../../components/experimental_badge'; const DEFAULT_TIME_FIELD = '@timestamp'; const DEFAULT_INDEX_SETTINGS = { number_of_shards: 1 }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_view/index.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/import_view/index.js rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx similarity index 94% rename from x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx index d429f8dada6ec..283e146abd00d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx @@ -8,7 +8,7 @@ import React, { FC } from 'react'; import { EuiCodeEditor, EuiCodeEditorProps } from '@elastic/eui'; -import { expandLiteralStrings, XJsonMode } from '../../shared_imports'; +import { expandLiteralStrings, XJsonMode } from '../../../shared_imports'; export const EDITOR_MODE = { TEXT: 'text', JSON: 'json', XJSON: new XJsonMode() }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx similarity index 84% rename from x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx index feabb32b61d58..d1e471ca4e7a9 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx @@ -4,10 +4,10 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import './_index.scss'; +import '../_index.scss'; import React, { FC } from 'react'; -import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; -import { getCoreStart, getPluginsStart } from '../kibana_services'; +import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public'; +import { getCoreStart, getPluginsStart } from '../../kibana_services'; // @ts-ignore import { FileDataVisualizerView } from './components/file_data_visualizer_view/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/index.ts new file mode 100644 index 0000000000000..ca87d73b6a758 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FileDataVisualizer, FileDataVisualizerSpec } from './file_data_visualizer'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index.ts index dd642cc96c253..c5b159940b986 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index.ts @@ -5,8 +5,5 @@ * 2.0. */ -export { FileDataVisualizer, FileDataVisualizerSpec } from './file_datavisualizer'; -export { - IndexDataVisualizer, - IndexDataVisualizerSpec, -} from './index_data_visualizer/index_data_visualizer'; +export { FileDataVisualizer, FileDataVisualizerSpec } from './file_data_visualizer'; +export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer'; From 64a663e48218cdb3cc0ea9f4380851ae0555e192 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 15:19:59 -0500 Subject: [PATCH 13/53] [ML] Move more files into index_data_visualizer --- .../public/application/components/_index.scss | 1 - .../components/results_view/_index.scss | 1 - .../components/_index.scss | 1 + .../file_data_visualizer_view.js | 2 +- .../components/results_view/_index.scss | 1 + .../results_view/_results_view.scss | 0 .../components/results_view/index.ts | 0 .../components/results_view/results_view.tsx | 8 +-- .../public/application/index.ts | 6 +- .../actions_panel/actions_panel.tsx | 28 ++------- .../components/actions_panel/index.ts | 0 .../full_time_range_selector.tsx | 0 .../full_time_range_selector_service.ts | 6 +- .../full_time_range_selector/index.tsx | 0 .../index_data_visualizer_view/index.ts | 0 .../index_data_visualizer_view.tsx | 60 +++++++++---------- .../search_panel/field_name_filter.tsx | 4 +- .../search_panel/field_type_filter.tsx | 6 +- .../components/search_panel/index.ts | 0 .../components/search_panel/search_panel.tsx | 8 +-- .../search_panel/shard_size_select.tsx | 0 .../index_data_visualizer/index.ts | 1 + .../index_data_visualizer.tsx | 2 +- .../services/timefilter_refresh_service.ts | 6 +- .../file_data_visualizer/public/index.ts | 4 +- 25 files changed, 67 insertions(+), 78 deletions(-) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss create mode 100644 x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/results_view/_results_view.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/results_view/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => file_data_visualizer}/components/results_view/results_view.tsx (90%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/actions_panel/actions_panel.tsx (81%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/actions_panel/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/full_time_range_selector/full_time_range_selector.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/full_time_range_selector/full_time_range_selector_service.ts (89%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/full_time_range_selector/index.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/index_data_visualizer_view/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/index_data_visualizer_view/index_data_visualizer_view.tsx (93%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/search_panel/field_name_filter.tsx (92%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/search_panel/field_type_filter.tsx (91%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/search_panel/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/search_panel/search_panel.tsx (94%) rename x-pack/plugins/file_data_visualizer/public/application/{ => index_data_visualizer}/components/search_panel/shard_size_select.tsx (100%) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss index dbc45e301edd6..bc45064a07648 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss @@ -1,6 +1,5 @@ @import 'about_panel/index'; @import 'embedded_map/index'; @import 'experimental_badge/index'; -@import 'results_view/index'; @import 'stats_table/index'; @import 'top_values/top_values'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss deleted file mode 100644 index af3737cf017de..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'results_view' diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss index a9847956c2c2f..1ec54fbe55cdd 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss @@ -3,3 +3,4 @@ @import 'file_contents/index'; @import 'import_summary/index'; @import 'file_data_visualizer_view/index'; +@import 'results_view/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js index 07226637169d7..8ee07b20587e0 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js @@ -14,7 +14,7 @@ import { isEqual } from 'lodash'; import { AboutPanel, LoadingPanel } from '../../../components/about_panel'; import { BottomBar } from '../bottom_bar'; -import { ResultsView } from '../../../components/results_view'; +import { ResultsView } from '../results_view'; import { FileCouldNotBeRead, FileTooLarge } from './file_error_callouts'; import { EditFlyout } from '../edit_flyout'; import { ExplanationFlyout } from '../explanation_flyout'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss new file mode 100644 index 0000000000000..31f819d4f08bd --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss @@ -0,0 +1 @@ +@import 'results_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_results_view.scss b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/results_view/_results_view.scss rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/index.ts b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/results_view/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx similarity index 90% rename from x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx rename to x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx index e13ae2dab74cf..7c6d8bb722a35 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx @@ -20,11 +20,11 @@ import { EuiFlexGroup, EuiFlexItem, } from '@elastic/eui'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; -import { FileContents } from '../../file_data_visualizer/components/file_contents'; -import { AnalysisSummary } from '../../file_data_visualizer/components/analysis_summary'; -import { FieldsStatsGrid } from '../fields_stats_grid'; +import { FileContents } from '../file_contents'; +import { AnalysisSummary } from '../analysis_summary'; +import { FieldsStatsGrid } from '../../../components/fields_stats_grid'; interface Props { data: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index.ts index c5b159940b986..6229f61be85e9 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index.ts @@ -6,4 +6,8 @@ */ export { FileDataVisualizer, FileDataVisualizerSpec } from './file_data_visualizer'; -export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer'; +export { + IndexDataVisualizer, + IndexDataVisualizerSpec, + IndexDataVisualizerViewProps, +} from './index_data_visualizer'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx similarity index 81% rename from x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx index 0f4c250e4b652..c37aae4864cb9 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/actions_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx @@ -13,11 +13,11 @@ import { EuiSpacer, EuiTitle } from '@elastic/eui'; import { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState, -} from '../../../../../../../src/plugins/discover/public'; -import type { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; -import { useUrlState } from '../../util/url_state'; -import { LinkCard } from '../link_card'; +} from '../../../../../../../../src/plugins/discover/public'; +import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns'; +import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { useUrlState } from '../../../util/url_state'; +import { LinkCard } from '../../../components/link_card'; interface Props { indexPattern: IndexPattern; @@ -27,7 +27,6 @@ interface Props { // @todo: add back create job card export const ActionsPanel: FC = ({ indexPattern, searchString, searchQueryLanguage }) => { - // const [recognizerResultsCount, setRecognizerResultsCount] = useState(0); const [globalState] = useUrlState('_g'); const [discoverLink, setDiscoverLink] = useState(''); @@ -40,13 +39,6 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer }, } = useFileDataVisualizerKibana(); - // const recognizerResults = { - // count: 0, - // onChange() { - // setRecognizerResultsCount(recognizerResults.count); - // }, - // }; - useEffect(() => { let unmounted = false; @@ -82,21 +74,13 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer if (!unmounted) { setDiscoverLink(discoverUrl); } - - // let mlUrlGenerator; - // try { - // discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR); - // } catch (error) { - // // ignore error thrown when url generator is not available - // return; - // } }; getDiscoverUrl(); return () => { unmounted = true; }; - }, [indexPattern, searchString, searchQueryLanguage, globalState]); + }, [indexPattern, searchString, searchQueryLanguage, globalState, capabilities, getUrlGenerator]); // Note we use display:none for the DataRecognizer section as it needs to be // passed the recognizerResults object, and then run the recognizer check which diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/actions_panel/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts similarity index 89% rename from x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts index b704eba3bb105..029291e7c5650 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/full_time_range_selector_service.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts @@ -9,9 +9,9 @@ import moment from 'moment'; import { estypes } from '@elastic/elasticsearch'; import { Query, TimefilterContract } from 'src/plugins/data/public'; import dateMath from '@elastic/datemath'; -import { IndexPattern } from '../../../../../../../src/plugins/data/public'; -import { isPopulatedObject } from '../utils/object_utils'; -import { getTimeFieldRange } from '../../../api'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/public'; +import { isPopulatedObject } from '../../../components/utils/object_utils'; +import { getTimeFieldRange } from '../../../../api'; export interface TimeRange { from: number; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/index.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/full_time_range_selector/index.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx similarity index 93% rename from x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx index 5ddce4a13cedc..644fb0e6222fe 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -31,44 +31,40 @@ import { UI_SETTINGS, Query, IndexPattern, -} from '../../../../../../../src/plugins/data/public'; -import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; -import { getQueryFromSavedSearch } from '../../util/index_utils'; -import { usePageUrlState, useUrlState } from '../../util/url_state'; -import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; -import { FieldVisConfig } from '../stats_table/types'; +} from '../../../../../../../../src/plugins/data/public'; +import { FullTimeRangeSelector } from '../full_time_range_selector'; +import { getQueryFromSavedSearch } from '../../../util/index_utils'; +import { usePageUrlState, useUrlState } from '../../../util/url_state'; +import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../../../components/stats_table'; +import { FieldVisConfig } from '../../../components/stats_table/types'; import type { MetricFieldsStats, TotalFieldsStats, -} from '../stats_table/components/field_count_stats'; -import { OverallStats } from '../../index_data_visualizer/types/overall_stats'; -import { getActions } from '../field_data_row/action_menu'; -import { IndexBasedDataVisualizerExpandedRow } from '../expanded_row/index_based_expanded_row'; -import { DATA_VISUALIZER_INDEX_VIEWER } from '../../index_data_visualizer/constants/index_data_visualizer_viewer'; -import { DataVisualizerIndexBasedAppState } from '../../index_data_visualizer/types/index_data_visualizer_state'; +} from '../../../components/stats_table/components/field_count_stats'; +import { OverallStats } from '../../types/overall_stats'; +import { getActions } from '../../../components/field_data_row/action_menu'; +import { IndexBasedDataVisualizerExpandedRow } from '../../../components/expanded_row/index_based_expanded_row'; +import { DATA_VISUALIZER_INDEX_VIEWER } from '../../constants/index_data_visualizer_viewer'; +import { DataVisualizerIndexBasedAppState } from '../../types/index_data_visualizer_state'; +import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../types/combined_query'; import { - SEARCH_QUERY_LANGUAGE, - SearchQueryLanguage, -} from '../../index_data_visualizer/types/combined_query'; -import { FieldRequestConfig, JobFieldType, SavedSearchSavedObject } from '../../../../common/types'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; -import { FieldCountPanel } from '../field_count_panel'; -import { DocumentCountContent } from '../document_count_content'; -import { DataLoader } from '../../index_data_visualizer/data_loader/data_loader'; -import { JOB_FIELD_TYPES } from '../../../../common'; -import { useTimefilter } from '../../index_data_visualizer/hooks/use_time_filter'; -import { kbnTypeToJobType } from '../../util/field_types_utils'; + FieldRequestConfig, + JobFieldType, + SavedSearchSavedObject, +} from '../../../../../common/types'; +import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { FieldCountPanel } from '../../../components/field_count_panel'; +import { DocumentCountContent } from '../../../components/document_count_content'; +import { DataLoader } from '../../data_loader/data_loader'; +import { JOB_FIELD_TYPES } from '../../../../../common'; +import { useTimefilter } from '../../hooks/use_time_filter'; +import { kbnTypeToJobType } from '../../../util/field_types_utils'; import { SearchPanel } from '../search_panel'; import { ActionsPanel } from '../actions_panel'; -import { DatePickerWrapper } from '../date_picker_wrapper'; -import { mlTimefilterRefresh$ } from '../../index_data_visualizer/services/timefilter_refresh_service'; -import { HelpMenu } from '../help_menu'; -import { TimeBuckets } from '../../index_data_visualizer/services/time_buckets'; - -export interface Refresh { - lastRefresh: number; - timeRange?: { start: string; end: string }; -} +import { DatePickerWrapper } from '../../../components/date_picker_wrapper'; +import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; +import { HelpMenu } from '../../../components/help_menu'; +import { TimeBuckets } from '../../services/time_buckets'; interface DataVisualizerPageState { overallStats: OverallStats; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx similarity index 92% rename from x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx index 1309ec3c7e117..28f186897c0b6 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_name_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx @@ -7,8 +7,8 @@ import React, { FC, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; -import { Option, MultiSelectPicker } from '../multi_select_picker'; -import { OverallStats } from '../../index_data_visualizer/types/overall_stats'; +import { Option, MultiSelectPicker } from '../../../components/multi_select_picker'; +import { OverallStats } from '../../types/overall_stats'; interface Props { overallStats: OverallStats; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx similarity index 91% rename from x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx index 0fc16ebf64c2b..f9343ad505ad4 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx @@ -8,9 +8,9 @@ import React, { FC, useMemo } from 'react'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { JOB_FIELD_TYPES, JobFieldType } from '../../../../common'; -import { FieldTypeIcon } from '../field_type_icon'; -import { MultiSelectPicker, Option } from '../multi_select_picker'; +import { JOB_FIELD_TYPES, JobFieldType } from '../../../../../common'; +import { FieldTypeIcon } from '../../../components/field_type_icon'; +import { MultiSelectPicker, Option } from '../../../components/multi_select_picker'; const ML_JOB_FIELD_TYPES_OPTIONS = { [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/search_panel/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx similarity index 94% rename from x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx index cb3aa655f6684..9e666272729c2 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/search_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx @@ -13,17 +13,17 @@ import { esQuery, Query, QueryStringInput, -} from '../../../../../../../src/plugins/data/public'; +} from '../../../../../../../../src/plugins/data/public'; import { ShardSizeFilter } from './shard_size_select'; import { DataVisualizerFieldNamesFilter } from './field_name_filter'; import { DatavisualizerFieldTypeFilter } from './field_type_filter'; -import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { JobFieldType } from '../../../../common/types'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { JobFieldType } from '../../../../../common/types'; import { ErrorMessage, SEARCH_QUERY_LANGUAGE, SearchQueryLanguage, -} from '../../index_data_visualizer/types/combined_query'; +} from '../../types/combined_query'; interface Props { indexPattern: IndexPattern; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/search_panel/shard_size_select.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/search_panel/shard_size_select.tsx rename to x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts index 558063668c71c..77b6f9b5ab18c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts @@ -6,3 +6,4 @@ */ export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer'; +export type { IndexDataVisualizerViewProps } from './components/index_data_visualizer_view'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index a138e450d4a82..973e8d8929668 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -16,7 +16,7 @@ import { getCoreStart, getPluginsStart } from '../../kibana_services'; import { IndexDataVisualizerViewProps, IndexDataVisualizerView, -} from '../components/index_data_visualizer_view'; +} from './components/index_data_visualizer_view'; import { Accessor, Provider as UrlStateContextProvider, diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts index 3a2902fd20266..8205d38ae1f47 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts @@ -7,6 +7,10 @@ import { Subject } from 'rxjs'; import { Required } from 'utility-types'; -import { Refresh } from '../../components/index_data_visualizer_view/index_data_visualizer_view'; + +export interface Refresh { + lastRefresh: number; + timeRange?: { start: string; end: string }; +} export const mlTimefilterRefresh$ = new Subject>(); diff --git a/x-pack/plugins/file_data_visualizer/public/index.ts b/x-pack/plugins/file_data_visualizer/public/index.ts index 6c17f541ef800..1257c64bf8352 100644 --- a/x-pack/plugins/file_data_visualizer/public/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/index.ts @@ -7,10 +7,10 @@ import { FileDataVisualizerPlugin } from './plugin'; -export type { IndexDataVisualizerViewProps } from './application/components/index_data_visualizer_view'; - export function plugin() { return new FileDataVisualizerPlugin(); } export { FileDataVisualizerPluginStart } from './plugin'; + +export type { IndexDataVisualizerViewProps } from './application'; From 8b7cb47eb7c994573f73d8aab28bbc30f66a3770 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 16:10:13 -0500 Subject: [PATCH 14/53] [ML] Add new data visualizer model --- .../common/utils/datafeed_utils.ts | 23 + .../utils/object_utils.ts | 0 .../common/utils/query_utils.ts | 76 + .../common/utils/string_utils.ts | 23 + .../file_data_visualizer/public/api/index.ts | 145 -- .../full_time_range_selector_service.ts | 4 +- .../data_loader/data_loader.ts | 4 +- .../services/time_field_range.ts | 35 + .../services/visualizer_stats.ts | 129 ++ .../models/data_visualizer/data_visualizer.ts | 1385 +++++++++++++++++ .../server/models/data_visualizer/index.ts | 8 + 11 files changed, 1682 insertions(+), 150 deletions(-) create mode 100644 x-pack/plugins/file_data_visualizer/common/utils/datafeed_utils.ts rename x-pack/plugins/file_data_visualizer/{public/application/components => common}/utils/object_utils.ts (100%) create mode 100644 x-pack/plugins/file_data_visualizer/common/utils/query_utils.ts create mode 100644 x-pack/plugins/file_data_visualizer/common/utils/string_utils.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts create mode 100644 x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/models/data_visualizer/data_visualizer.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/datafeed_utils.ts b/x-pack/plugins/file_data_visualizer/common/utils/datafeed_utils.ts new file mode 100644 index 0000000000000..14e679c519ce4 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/utils/datafeed_utils.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; + +export type Datafeed = estypes.Datafeed; +export type Aggregation = Record; + +export function getAggregations(obj: any): T | undefined { + if (obj?.aggregations !== undefined) return obj.aggregations; + if (obj?.aggs !== undefined) return obj.aggs; + return undefined; +} + +export const getDatafeedAggregations = ( + datafeedConfig: Partial | undefined +): Aggregation | undefined => { + return getAggregations(datafeedConfig); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/object_utils.ts b/x-pack/plugins/file_data_visualizer/common/utils/object_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/object_utils.ts rename to x-pack/plugins/file_data_visualizer/common/utils/object_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/query_utils.ts b/x-pack/plugins/file_data_visualizer/common/utils/query_utils.ts new file mode 100644 index 0000000000000..50f9b24373922 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/utils/query_utils.ts @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +/* + * Contains utility functions for building and processing queries. + */ + +// Builds the base filter criteria used in queries, +// adding criteria for the time range and an optional query. +export function buildBaseFilterCriteria( + timeFieldName?: string, + earliestMs?: number, + latestMs?: number, + query?: object +) { + const filterCriteria = []; + if (timeFieldName && earliestMs && latestMs) { + filterCriteria.push({ + range: { + [timeFieldName]: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis', + }, + }, + }); + } + + if (query) { + filterCriteria.push(query); + } + + return filterCriteria; +} + +// Wraps the supplied aggregations in a sampler aggregation. +// A supplied samplerShardSize (the shard_size parameter of the sampler aggregation) +// of less than 1 indicates no sampling, and the aggs are returned as-is. +export function buildSamplerAggregation( + aggs: any, + samplerShardSize: number +): Record { + if (samplerShardSize < 1) { + return aggs; + } + + return { + sample: { + sampler: { + shard_size: samplerShardSize, + }, + aggs, + }, + }; +} + +// Returns the path of aggregations in the elasticsearch response, as an array, +// depending on whether sampling is being used. +// A supplied samplerShardSize (the shard_size parameter of the sampler aggregation) +// of less than 1 indicates no sampling, and an empty array is returned. +export function getSamplerAggregationsResponsePath(samplerShardSize: number): string[] { + return samplerShardSize > 0 ? ['sample'] : []; +} + +// Returns a name which is safe to use in elasticsearch aggregations for the supplied +// field name. Aggregation names must be alpha-numeric and can only contain '_' and '-' characters, +// so if the supplied field names contains disallowed characters, the provided index +// identifier is used to return a safe 'dummy' name in the format 'field_index' e.g. field_0, field_1 +export function getSafeAggregationName(fieldName: string, index: number): string { + return fieldName.match(/^[a-zA-Z0-9-_.]+$/) ? fieldName : `field_${index}`; +} diff --git a/x-pack/plugins/file_data_visualizer/common/utils/string_utils.ts b/x-pack/plugins/file_data_visualizer/common/utils/string_utils.ts new file mode 100644 index 0000000000000..94515e4dd95e9 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/utils/string_utils.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +/** + * Creates a deterministic number based hash out of a string. + */ +export function stringHash(str: string): number { + let hash = 0; + let chr = 0; + if (str.length === 0) { + return hash; + } + for (let i = 0; i < str.length; i++) { + chr = str.charCodeAt(i); + hash = (hash << 5) - hash + chr; // eslint-disable-line no-bitwise + hash |= 0; // eslint-disable-line no-bitwise + } + return hash < 0 ? hash * -2 : hash; +} diff --git a/x-pack/plugins/file_data_visualizer/public/api/index.ts b/x-pack/plugins/file_data_visualizer/public/api/index.ts index 74825d1847105..746b43ac86e30 100644 --- a/x-pack/plugins/file_data_visualizer/public/api/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/api/index.ts @@ -5,12 +5,8 @@ * 2.0. */ -import { estypes } from '@elastic/elasticsearch'; import { lazyLoadModules } from '../lazy_load_bundle'; import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application'; -import type { FieldHistogramRequestConfig, FieldRequestConfig } from '../../common/types'; -import type { GetTimeFieldRangeResponse } from '../../common/types/time_field_request'; -import type { IndicesOptions } from '../../common/types/indices'; export async function getFileDataVisualizerComponent(): Promise { const modules = await lazyLoadModules(); @@ -20,144 +16,3 @@ export async function getIndexDataVisualizerComponent(): Promise({ - path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`, - method: 'POST', - body, - }); -} - -export async function getVisualizerFieldStats({ - indexPatternTitle, - query, - timeFieldName, - earliest, - latest, - samplerShardSize, - interval, - fields, - maxExamples, - runtimeMappings, -}: { - indexPatternTitle: string; - query: any; - timeFieldName?: string; - earliest?: number; - latest?: number; - samplerShardSize?: number; - interval?: number; - fields?: FieldRequestConfig[]; - maxExamples?: number; - runtimeMappings?: estypes.RuntimeFields; -}) { - const body = JSON.stringify({ - query, - timeFieldName, - earliest, - latest, - samplerShardSize, - interval, - fields, - maxExamples, - runtimeMappings, - }); - - const fileUploadModules = await lazyLoadModules(); - // @todo: update - return await fileUploadModules.getHttp().fetch({ - path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`, - method: 'POST', - body, - }); -} - -export async function getVisualizerFieldHistograms({ - indexPatternTitle, - query, - fields, - samplerShardSize, - runtimeMappings, -}: { - indexPatternTitle: string; - query: any; - fields: FieldHistogramRequestConfig[]; - samplerShardSize?: number; - runtimeMappings?: estypes.RuntimeFields; -}) { - const body = JSON.stringify({ - query, - fields, - samplerShardSize, - runtimeMappings, - }); - - const fileUploadModules = await lazyLoadModules(); - // @todo: update type - return await fileUploadModules.getHttp().fetch({ - path: `${basePath()}/data_visualizer/get_field_histograms/${indexPatternTitle}`, - method: 'POST', - body, - }); -} - -export async function getTimeFieldRange({ - index, - timeFieldName, - query, - runtimeMappings, - indicesOptions, -}: { - index: string; - timeFieldName?: string; - query: any; - runtimeMappings?: estypes.RuntimeFields; - indicesOptions?: IndicesOptions; -}) { - const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings, indicesOptions }); - const fileUploadModules = await lazyLoadModules(); - - return await fileUploadModules.getHttp().fetch({ - path: `${basePath()}/fields_service/time_field_range`, - method: 'POST', - body, - }); -} diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts index 029291e7c5650..9268ddcdebc68 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts @@ -10,8 +10,8 @@ import { estypes } from '@elastic/elasticsearch'; import { Query, TimefilterContract } from 'src/plugins/data/public'; import dateMath from '@elastic/datemath'; import { IndexPattern } from '../../../../../../../../src/plugins/data/public'; -import { isPopulatedObject } from '../../../components/utils/object_utils'; -import { getTimeFieldRange } from '../../../../api'; +import { isPopulatedObject } from '../../../../../common/utils/object_utils'; +import { getTimeFieldRange } from '../../services/time_field_range'; export interface TimeRange { from: number; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts index ccd0afcf529cd..4baf8ad24aca0 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts @@ -17,7 +17,7 @@ import { getVisualizerFieldHistograms, getVisualizerFieldStats, getVisualizerOverallStats, -} from '../../../api'; +} from '../services/visualizer_stats'; type IndexPatternTitle = string; type SavedSearchQuery = Record | null | undefined; @@ -30,7 +30,6 @@ export class DataLoader { private _indexPatternTitle: IndexPatternTitle = ''; private _maxExamples: number = MAX_EXAMPLES_DEFAULT; private _toastNotifications: CoreSetup['notifications']['toasts']; - // private _toastNotificationsService: ToastNotificationService; constructor( indexPattern: IndexPattern, @@ -41,7 +40,6 @@ export class DataLoader { .runtimeFields as estypes.RuntimeFields; this._indexPatternTitle = indexPattern.title; this._toastNotifications = toastNotifications; - // this._toastNotificationsService = toastNotificationServiceProvider(toastNotifications); } async loadOverallData( diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts new file mode 100644 index 0000000000000..c720edf34210b --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { IndicesOptions } from '../../../../common/types/indices'; +import { lazyLoadModules } from '../../../lazy_load_bundle'; +import { GetTimeFieldRangeResponse } from '../../../../common/types/time_field_request'; +import { basePath } from './visualizer_stats'; + +export async function getTimeFieldRange({ + index, + timeFieldName, + query, + runtimeMappings, + indicesOptions, +}: { + index: string; + timeFieldName?: string; + query: any; + runtimeMappings?: estypes.RuntimeFields; + indicesOptions?: IndicesOptions; +}) { + const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings, indicesOptions }); + const fileUploadModules = await lazyLoadModules(); + + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/fields_service/time_field_range`, + method: 'POST', + body, + }); +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts new file mode 100644 index 0000000000000..5f856433e74e7 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts @@ -0,0 +1,129 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { lazyLoadModules } from '../../../lazy_load_bundle'; +import type { FieldHistogramRequestConfig, FieldRequestConfig } from '../../../../common/types'; + +export function basePath() { + // @todo: change to internal/data_visualizer + return '/api/ml'; +} + +export async function getVisualizerOverallStats({ + indexPatternTitle, + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + aggregatableFields, + nonAggregatableFields, + runtimeMappings, +}: { + indexPatternTitle: string; + query: any; + timeFieldName?: string; + earliest?: number; + latest?: number; + samplerShardSize?: number; + aggregatableFields: string[]; + nonAggregatableFields: string[]; + runtimeMappings?: estypes.RuntimeFields; +}) { + const body = JSON.stringify({ + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + aggregatableFields, + nonAggregatableFields, + runtimeMappings, + }); + + const fileUploadModules = await lazyLoadModules(); + // @todo: update + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`, + method: 'POST', + body, + }); +} + +export async function getVisualizerFieldStats({ + indexPatternTitle, + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + interval, + fields, + maxExamples, + runtimeMappings, +}: { + indexPatternTitle: string; + query: any; + timeFieldName?: string; + earliest?: number; + latest?: number; + samplerShardSize?: number; + interval?: number; + fields?: FieldRequestConfig[]; + maxExamples?: number; + runtimeMappings?: estypes.RuntimeFields; +}) { + const body = JSON.stringify({ + query, + timeFieldName, + earliest, + latest, + samplerShardSize, + interval, + fields, + maxExamples, + runtimeMappings, + }); + + const fileUploadModules = await lazyLoadModules(); + // @todo: update + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`, + method: 'POST', + body, + }); +} + +export async function getVisualizerFieldHistograms({ + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings, +}: { + indexPatternTitle: string; + query: any; + fields: FieldHistogramRequestConfig[]; + samplerShardSize?: number; + runtimeMappings?: estypes.RuntimeFields; +}) { + const body = JSON.stringify({ + query, + fields, + samplerShardSize, + runtimeMappings, + }); + + const fileUploadModules = await lazyLoadModules(); + // @todo: update type + return await fileUploadModules.getHttp().fetch({ + path: `${basePath()}/data_visualizer/get_field_histograms/${indexPatternTitle}`, + method: 'POST', + body, + }); +} diff --git a/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/data_visualizer.ts new file mode 100644 index 0000000000000..83454e98a310f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/data_visualizer.ts @@ -0,0 +1,1385 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { IScopedClusterClient } from 'kibana/server'; +import { get, each, last, find } from 'lodash'; +import { estypes } from '@elastic/elasticsearch'; +import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/server'; +import { JOB_FIELD_TYPES } from '../../../common'; +import { + buildBaseFilterCriteria, + buildSamplerAggregation, + getSamplerAggregationsResponsePath, + getSafeAggregationName, +} from '../../../common/utils/query_utils'; +import { isPopulatedObject } from '../../../common/utils/object_utils'; +import { stringHash } from '../../../common/utils/string_utils'; +import { getDatafeedAggregations } from '../../../common/utils/datafeed_utils'; + +const SAMPLER_TOP_TERMS_THRESHOLD = 100000; +const SAMPLER_TOP_TERMS_SHARD_SIZE = 5000; +const AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE = 200; +const FIELDS_REQUEST_BATCH_SIZE = 10; + +const MAX_CHART_COLUMNS = 20; + +interface FieldData { + fieldName: string; + existsInDocs: boolean; + stats?: { + sampleCount?: number; + count?: number; + cardinality?: number; + }; +} + +export interface Field { + fieldName: string; + type: string; + cardinality: number; +} + +export interface HistogramField { + fieldName: string; + type: string; +} + +interface Distribution { + percentiles: any[]; + minPercentile: number; + maxPercentile: number; +} + +interface Aggs { + [key: string]: any; +} + +interface Bucket { + doc_count: number; +} + +interface NumericFieldStats { + fieldName: string; + count: number; + min: number; + max: number; + avg: number; + isTopValuesSampled: boolean; + topValues: Bucket[]; + topValuesSampleSize: number; + topValuesSamplerShardSize: number; + median?: number; + distribution?: Distribution; +} + +interface StringFieldStats { + fieldName: string; + isTopValuesSampled: boolean; + topValues: Bucket[]; + topValuesSampleSize: number; + topValuesSamplerShardSize: number; +} + +interface DateFieldStats { + fieldName: string; + count: number; + earliest: number; + latest: number; +} + +interface BooleanFieldStats { + fieldName: string; + count: number; + trueCount: number; + falseCount: number; + [key: string]: number | string; +} + +interface DocumentCountStats { + documentCounts: { + interval: number; + buckets: { [key: string]: number }; + }; +} + +interface FieldExamples { + fieldName: string; + examples: any[]; +} + +interface NumericColumnStats { + interval: number; + min: number; + max: number; +} +type NumericColumnStatsMap = Record; + +interface AggHistogram { + histogram: { + field: string; + interval: number; + }; +} + +interface AggTerms { + terms: { + field: string; + size: number; + }; +} + +interface NumericDataItem { + key: number; + key_as_string?: string; + doc_count: number; +} + +interface NumericChartData { + data: NumericDataItem[]; + id: string; + interval: number; + stats: [number, number]; + type: 'numeric'; +} + +interface OrdinalDataItem { + key: string; + key_as_string?: string; + doc_count: number; +} + +interface OrdinalChartData { + type: 'ordinal' | 'boolean'; + cardinality: number; + data: OrdinalDataItem[]; + id: string; +} + +interface UnsupportedChartData { + id: string; + type: 'unsupported'; +} + +export interface FieldAggCardinality { + field: string; + percent?: any; +} + +export interface ScriptAggCardinality { + script: any; +} + +export interface AggCardinality { + cardinality: FieldAggCardinality | ScriptAggCardinality; +} + +type ChartRequestAgg = AggHistogram | AggCardinality | AggTerms; + +type ChartData = NumericChartData | OrdinalChartData | UnsupportedChartData; + +type BatchStats = + | NumericFieldStats + | StringFieldStats + | BooleanFieldStats + | DateFieldStats + | DocumentCountStats + | FieldExamples; + +const getAggIntervals = async ( + { asCurrentUser }: IScopedClusterClient, + indexPatternTitle: string, + query: any, + fields: HistogramField[], + samplerShardSize: number, + runtimeMappings?: estypes.RuntimeFields +): Promise => { + const numericColumns = fields.filter((field) => { + return field.type === KBN_FIELD_TYPES.NUMBER || field.type === KBN_FIELD_TYPES.DATE; + }); + + if (numericColumns.length === 0) { + return {}; + } + + const minMaxAggs = numericColumns.reduce((aggs, c) => { + const id = stringHash(c.fieldName); + aggs[id] = { + stats: { + field: c.fieldName, + }, + }; + return aggs; + }, {} as Record); + + const { body } = await asCurrentUser.search({ + index: indexPatternTitle, + size: 0, + body: { + query, + aggs: buildSamplerAggregation(minMaxAggs, samplerShardSize), + size: 0, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }, + }); + + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations; + + return Object.keys(aggregations).reduce((p, aggName) => { + const stats = [aggregations[aggName].min, aggregations[aggName].max]; + if (!stats.includes(null)) { + const delta = aggregations[aggName].max - aggregations[aggName].min; + + let aggInterval = 1; + + if (delta > MAX_CHART_COLUMNS || delta <= 1) { + aggInterval = delta / (MAX_CHART_COLUMNS - 1); + } + + p[aggName] = { interval: aggInterval, min: stats[0], max: stats[1] }; + } + + return p; + }, {} as NumericColumnStatsMap); +}; + +// export for re-use by transforms plugin +export const getHistogramsForFields = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + fields: HistogramField[], + samplerShardSize: number, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + const aggIntervals = await getAggIntervals( + client, + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings + ); + + const chartDataAggs = fields.reduce((aggs, field) => { + const fieldName = field.fieldName; + const fieldType = field.type; + const id = stringHash(fieldName); + if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) { + if (aggIntervals[id] !== undefined) { + aggs[`${id}_histogram`] = { + histogram: { + field: fieldName, + interval: aggIntervals[id].interval !== 0 ? aggIntervals[id].interval : 1, + }, + }; + } + } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) { + if (fieldType === KBN_FIELD_TYPES.STRING) { + aggs[`${id}_cardinality`] = { + cardinality: { + field: fieldName, + }, + }; + } + aggs[`${id}_terms`] = { + terms: { + field: fieldName, + size: MAX_CHART_COLUMNS, + }, + }; + } + return aggs; + }, {} as Record); + + if (Object.keys(chartDataAggs).length === 0) { + return []; + } + + const { body } = await asCurrentUser.search({ + index: indexPatternTitle, + size: 0, + body: { + query, + aggs: buildSamplerAggregation(chartDataAggs, samplerShardSize), + size: 0, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }, + }); + + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations; + + const chartsData: ChartData[] = fields.map( + (field): ChartData => { + const fieldName = field.fieldName; + const fieldType = field.type; + const id = stringHash(field.fieldName); + + if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) { + if (aggIntervals[id] === undefined) { + return { + type: 'numeric', + data: [], + interval: 0, + stats: [0, 0], + id: fieldName, + }; + } + + return { + data: aggregations[`${id}_histogram`].buckets, + interval: aggIntervals[id].interval, + stats: [aggIntervals[id].min, aggIntervals[id].max], + type: 'numeric', + id: fieldName, + }; + } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) { + return { + type: fieldType === KBN_FIELD_TYPES.STRING ? 'ordinal' : 'boolean', + cardinality: + fieldType === KBN_FIELD_TYPES.STRING ? aggregations[`${id}_cardinality`].value : 2, + data: aggregations[`${id}_terms`].buckets, + id: fieldName, + }; + } + + return { + type: 'unsupported', + id: fieldName, + }; + } + ); + + return chartsData; +}; + +export class DataVisualizer { + private _client: IScopedClusterClient; + private _asCurrentUser: IScopedClusterClient['asCurrentUser']; + + constructor(client: IScopedClusterClient) { + this._asCurrentUser = client.asCurrentUser; + this._client = client; + } + + // Obtains overall stats on the fields in the supplied index pattern, returning an object + // containing the total document count, and four arrays showing which of the supplied + // aggregatable and non-aggregatable fields do or do not exist in documents. + // Sampling will be used if supplied samplerShardSize > 0. + async getOverallStats( + indexPatternTitle: string, + query: object, + aggregatableFields: string[], + nonAggregatableFields: string[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields + ) { + const stats = { + totalCount: 0, + aggregatableExistsFields: [] as FieldData[], + aggregatableNotExistsFields: [] as FieldData[], + nonAggregatableExistsFields: [] as FieldData[], + nonAggregatableNotExistsFields: [] as FieldData[], + }; + + // To avoid checking for the existence of too many aggregatable fields in one request, + // split the check into multiple batches (max 200 fields per request). + const batches: string[][] = [[]]; + each(aggregatableFields, (field) => { + let lastArray: string[] = last(batches) as string[]; + if (lastArray.length === AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE) { + lastArray = []; + batches.push(lastArray); + } + lastArray.push(field); + }); + + await Promise.all( + batches.map(async (fields) => { + const batchStats = await this.checkAggregatableFieldsExist( + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + undefined, + runtimeMappings + ); + + // Total count will be returned with each batch of fields. Just overwrite. + stats.totalCount = batchStats.totalCount; + + // Add to the lists of fields which do and do not exist. + stats.aggregatableExistsFields.push(...batchStats.aggregatableExistsFields); + stats.aggregatableNotExistsFields.push(...batchStats.aggregatableNotExistsFields); + }) + ); + + await Promise.all( + nonAggregatableFields.map(async (field) => { + const existsInDocs = await this.checkNonAggregatableFieldExists( + indexPatternTitle, + query, + field, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); + + const fieldData: FieldData = { + fieldName: field, + existsInDocs, + stats: {}, + }; + + if (existsInDocs === true) { + stats.nonAggregatableExistsFields.push(fieldData); + } else { + stats.nonAggregatableNotExistsFields.push(fieldData); + } + }) + ); + + return stats; + } + + // Obtains binned histograms for supplied list of fields. The statistics for each field in the + // returned array depend on the type of the field (keyword, number, date etc). + // Sampling will be used if supplied samplerShardSize > 0. + async getHistogramsForFields( + indexPatternTitle: string, + query: any, + fields: HistogramField[], + samplerShardSize: number, + runtimeMappings?: estypes.RuntimeFields + ): Promise { + return await getHistogramsForFields( + this._client, + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings + ); + } + + // Obtains statistics for supplied list of fields. The statistics for each field in the + // returned array depend on the type of the field (keyword, number, date etc). + // Sampling will be used if supplied samplerShardSize > 0. + async getStatsForFields( + indexPatternTitle: string, + query: any, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + intervalMs: number | undefined, + maxExamples: number, + runtimeMappings: estypes.RuntimeFields + ): Promise { + // Batch up fields by type, getting stats for multiple fields at a time. + const batches: Field[][] = []; + const batchedFields: { [key: string]: Field[][] } = {}; + each(fields, (field) => { + if (field.fieldName === undefined) { + // undefined fieldName is used for a document count request. + // getDocumentCountStats requires timeField - don't add to batched requests if not defined + if (timeFieldName !== undefined) { + batches.push([field]); + } + } else { + const fieldType = field.type; + if (batchedFields[fieldType] === undefined) { + batchedFields[fieldType] = [[]]; + } + let lastArray: Field[] = last(batchedFields[fieldType]) as Field[]; + if (lastArray.length === FIELDS_REQUEST_BATCH_SIZE) { + lastArray = []; + batchedFields[fieldType].push(lastArray); + } + lastArray.push(field); + } + }); + + each(batchedFields, (lists) => { + batches.push(...lists); + }); + + let results: BatchStats[] = []; + await Promise.all( + batches.map(async (batch) => { + let batchStats: BatchStats[] = []; + const first = batch[0]; + switch (first.type) { + case JOB_FIELD_TYPES.NUMBER: + // undefined fieldName is used for a document count request. + if (first.fieldName !== undefined) { + batchStats = await this.getNumericFieldsStats( + indexPatternTitle, + query, + batch, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); + } else { + // Will only ever be one document count card, + // so no value in batching up the single request. + if (intervalMs !== undefined) { + const stats = await this.getDocumentCountStats( + indexPatternTitle, + query, + timeFieldName, + earliestMs, + latestMs, + intervalMs, + runtimeMappings + ); + batchStats.push(stats); + } + } + break; + case JOB_FIELD_TYPES.KEYWORD: + case JOB_FIELD_TYPES.IP: + batchStats = await this.getStringFieldsStats( + indexPatternTitle, + query, + batch, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); + break; + case JOB_FIELD_TYPES.DATE: + batchStats = await this.getDateFieldsStats( + indexPatternTitle, + query, + batch, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); + break; + case JOB_FIELD_TYPES.BOOLEAN: + batchStats = await this.getBooleanFieldsStats( + indexPatternTitle, + query, + batch, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); + break; + case JOB_FIELD_TYPES.TEXT: + default: + // Use an exists filter on the the field name to get + // examples of the field, so cannot batch up. + await Promise.all( + batch.map(async (field) => { + const stats = await this.getFieldExamples( + indexPatternTitle, + query, + field.fieldName, + timeFieldName, + earliestMs, + latestMs, + maxExamples, + runtimeMappings + ); + batchStats.push(stats); + }) + ); + break; + } + + results = [...results, ...batchStats]; + }) + ); + + return results; + } + + async checkAggregatableFieldsExist( + indexPatternTitle: string, + query: any, + aggregatableFields: string[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs?: number, + latestMs?: number, + datafeedConfig?: estypes.Datafeed, + runtimeMappings?: estypes.RuntimeFields + ) { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + const datafeedAggregations = getDatafeedAggregations(datafeedConfig); + + // Value count aggregation faster way of checking if field exists than using + // filter aggregation with exists query. + const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {}; + + // Combine runtime fields from the index pattern as well as the datafeed + const combinedRuntimeMappings: estypes.RuntimeFields = { + ...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}), + ...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings) + ? datafeedConfig.runtime_mappings + : {}), + }; + + aggregatableFields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field, i); + aggs[`${safeFieldName}_count`] = { + filter: { exists: { field } }, + }; + + let cardinalityField: AggCardinality; + if (datafeedConfig?.script_fields?.hasOwnProperty(field)) { + cardinalityField = aggs[`${safeFieldName}_cardinality`] = { + cardinality: { script: datafeedConfig?.script_fields[field].script }, + }; + } else { + cardinalityField = { + cardinality: { field }, + }; + } + aggs[`${safeFieldName}_cardinality`] = cardinalityField; + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + ...(isPopulatedObject(aggs) ? { aggs: buildSamplerAggregation(aggs, samplerShardSize) } : {}), + ...(isPopulatedObject(combinedRuntimeMappings) + ? { runtime_mappings: combinedRuntimeMappings } + : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + track_total_hits: true, + size, + body: searchBody, + }); + + const aggregations = body.aggregations; + // @ts-expect-error incorrect search response type + const totalCount = body.hits.total.value; + const stats = { + totalCount, + aggregatableExistsFields: [] as FieldData[], + aggregatableNotExistsFields: [] as FieldData[], + }; + + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const sampleCount = + samplerShardSize > 0 ? get(aggregations, ['sample', 'doc_count'], 0) : totalCount; + aggregatableFields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field, i); + const count = get(aggregations, [...aggsPath, `${safeFieldName}_count`, 'doc_count'], 0); + if (count > 0) { + const cardinality = get( + aggregations, + [...aggsPath, `${safeFieldName}_cardinality`, 'value'], + 0 + ); + stats.aggregatableExistsFields.push({ + fieldName: field, + existsInDocs: true, + stats: { + sampleCount, + count, + cardinality, + }, + }); + } else { + if ( + datafeedConfig?.script_fields?.hasOwnProperty(field) || + datafeedConfig?.runtime_mappings?.hasOwnProperty(field) + ) { + const cardinality = get( + aggregations, + [...aggsPath, `${safeFieldName}_cardinality`, 'value'], + 0 + ); + stats.aggregatableExistsFields.push({ + fieldName: field, + existsInDocs: true, + stats: { + sampleCount, + count, + cardinality, + }, + }); + } else { + stats.aggregatableNotExistsFields.push({ + fieldName: field, + existsInDocs: false, + }); + } + } + }); + + return stats; + } + + async checkNonAggregatableFieldExists( + indexPatternTitle: string, + query: any, + field: string, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields + ) { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + filterCriteria.push({ exists: { field } }); + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + // @ts-expect-error incorrect search response type + return body.hits.total.value > 0; + } + + async getDocumentCountStats( + indexPatternTitle: string, + query: any, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + intervalMs: number, + runtimeMappings: estypes.RuntimeFields + ): Promise { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + // Don't use the sampler aggregation as this can lead to some potentially + // confusing date histogram results depending on the date range of data amongst shards. + + const aggs = { + eventRate: { + date_histogram: { + field: timeFieldName, + fixed_interval: `${intervalMs}ms`, + min_doc_count: 1, + }, + }, + }; + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + + const buckets: { [key: string]: number } = {}; + const dataByTimeBucket: Array<{ key: string; doc_count: number }> = get( + body, + ['aggregations', 'eventRate', 'buckets'], + [] + ); + each(dataByTimeBucket, (dataForTime) => { + const time = dataForTime.key; + buckets[time] = dataForTime.doc_count; + }); + + return { + documentCounts: { + interval: intervalMs, + buckets, + }, + }; + } + + async getNumericFieldsStats( + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields + ) { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + // Build the percents parameter which defines the percentiles to query + // for the metric distribution data. + // Use a fixed percentile spacing of 5%. + const MAX_PERCENT = 100; + const PERCENTILE_SPACING = 5; + let count = 0; + const percents = Array.from( + Array(MAX_PERCENT / PERCENTILE_SPACING), + () => (count += PERCENTILE_SPACING) + ); + + const aggs: { [key: string]: any } = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + aggs[`${safeFieldName}_field_stats`] = { + filter: { exists: { field: field.fieldName } }, + aggs: { + actual_stats: { + stats: { field: field.fieldName }, + }, + }, + }; + aggs[`${safeFieldName}_percentiles`] = { + percentiles: { + field: field.fieldName, + percents, + keyed: false, + }, + }; + + const top = { + terms: { + field: field.fieldName, + size: 10, + order: { + _count: 'desc', + }, + }, + }; + + // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation + // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1). + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + aggs[`${safeFieldName}_top`] = { + sampler: { + shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE, + }, + aggs: { + top, + }, + }; + } else { + aggs[`${safeFieldName}_top`] = top; + } + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: NumericFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const docCount = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'], + 0 + ); + const fieldStatsResp = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'], + {} + ); + + const topAggsPath = [...aggsPath, `${safeFieldName}_top`]; + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + topAggsPath.push('top'); + } + + const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []); + + const stats: NumericFieldStats = { + fieldName: field.fieldName, + count: docCount, + min: get(fieldStatsResp, 'min', 0), + max: get(fieldStatsResp, 'max', 0), + avg: get(fieldStatsResp, 'avg', 0), + isTopValuesSampled: + field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0, + topValues, + topValuesSampleSize: topValues.reduce( + (acc, curr) => acc + curr.doc_count, + get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0) + ), + topValuesSamplerShardSize: + field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD + ? SAMPLER_TOP_TERMS_SHARD_SIZE + : samplerShardSize, + }; + + if (stats.count > 0) { + const percentiles = get( + aggregations, + [...aggsPath, `${safeFieldName}_percentiles`, 'values'], + [] + ); + const medianPercentile: { value: number; key: number } | undefined = find(percentiles, { + key: 50, + }); + stats.median = medianPercentile !== undefined ? medianPercentile!.value : 0; + stats.distribution = this.processDistributionData( + percentiles, + PERCENTILE_SPACING, + stats.min + ); + } + + batchStats.push(stats); + }); + + return batchStats; + } + + async getStringFieldsStats( + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields + ) { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const aggs: Aggs = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const top = { + terms: { + field: field.fieldName, + size: 10, + order: { + _count: 'desc', + }, + }, + }; + + // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation + // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1). + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + aggs[`${safeFieldName}_top`] = { + sampler: { + shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE, + }, + aggs: { + top, + }, + }; + } else { + aggs[`${safeFieldName}_top`] = top; + } + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: StringFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + + const topAggsPath = [...aggsPath, `${safeFieldName}_top`]; + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + topAggsPath.push('top'); + } + + const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []); + + const stats = { + fieldName: field.fieldName, + isTopValuesSampled: + field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0, + topValues, + topValuesSampleSize: topValues.reduce( + (acc, curr) => acc + curr.doc_count, + get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0) + ), + topValuesSamplerShardSize: + field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD + ? SAMPLER_TOP_TERMS_SHARD_SIZE + : samplerShardSize, + }; + + batchStats.push(stats); + }); + + return batchStats; + } + + async getDateFieldsStats( + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields + ) { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const aggs: Aggs = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + aggs[`${safeFieldName}_field_stats`] = { + filter: { exists: { field: field.fieldName } }, + aggs: { + actual_stats: { + stats: { field: field.fieldName }, + }, + }, + }; + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: DateFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const docCount = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'], + 0 + ); + const fieldStatsResp = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'], + {} + ); + batchStats.push({ + fieldName: field.fieldName, + count: docCount, + earliest: get(fieldStatsResp, 'min', 0), + latest: get(fieldStatsResp, 'max', 0), + }); + }); + + return batchStats; + } + + async getBooleanFieldsStats( + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields + ) { + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const aggs: Aggs = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + aggs[`${safeFieldName}_value_count`] = { + filter: { exists: { field: field.fieldName } }, + }; + aggs[`${safeFieldName}_values`] = { + terms: { + field: field.fieldName, + size: 2, + }, + }; + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: BooleanFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const stats: BooleanFieldStats = { + fieldName: field.fieldName, + count: get(aggregations, [...aggsPath, `${safeFieldName}_value_count`, 'doc_count'], 0), + trueCount: 0, + falseCount: 0, + }; + + const valueBuckets: Array<{ [key: string]: number }> = get( + aggregations, + [...aggsPath, `${safeFieldName}_values`, 'buckets'], + [] + ); + valueBuckets.forEach((bucket) => { + stats[`${bucket.key_as_string}Count`] = bucket.doc_count; + }); + + batchStats.push(stats); + }); + + return batchStats; + } + + async getFieldExamples( + indexPatternTitle: string, + query: any, + field: string, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + maxExamples: number, + runtimeMappings?: estypes.RuntimeFields + ): Promise { + const index = indexPatternTitle; + + // Request at least 100 docs so that we have a chance of obtaining + // 'maxExamples' of the field. + const size = Math.max(100, maxExamples); + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + // Use an exists filter to return examples of the field. + filterCriteria.push({ + exists: { field }, + }); + + const searchBody = { + fields: [field], + _source: false, + query: { + bool: { + filter: filterCriteria, + }, + }, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await this._asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const stats = { + fieldName: field, + examples: [] as any[], + }; + // @ts-expect-error incorrect search response type + if (body.hits.total.value > 0) { + const hits = body.hits.hits; + for (let i = 0; i < hits.length; i++) { + // Use lodash get() to support field names containing dots. + const doc: object[] | undefined = get(hits[i].fields, field); + // the results from fields query is always an array + if (Array.isArray(doc) && doc.length > 0) { + const example = doc[0]; + if (example !== undefined && stats.examples.indexOf(example) === -1) { + stats.examples.push(example); + if (stats.examples.length === maxExamples) { + break; + } + } + } + } + } + + return stats; + } + + processDistributionData( + percentiles: Array<{ value: number }>, + percentileSpacing: number, + minValue: number + ): Distribution { + const distribution: Distribution = { percentiles: [], minPercentile: 0, maxPercentile: 100 }; + if (percentiles.length === 0) { + return distribution; + } + + let percentileBuckets: Array<{ value: number }> = []; + let lowerBound = minValue; + if (lowerBound >= 0) { + // By default return results for 0 - 90% percentiles. + distribution.minPercentile = 0; + distribution.maxPercentile = 90; + percentileBuckets = percentiles.slice(0, percentiles.length - 2); + + // Look ahead to the last percentiles and process these too if + // they don't add more than 50% to the value range. + const lastValue = (last(percentileBuckets) as any).value; + const upperBound = lowerBound + 1.5 * (lastValue - lowerBound); + const filteredLength = percentileBuckets.length; + for (let i = filteredLength; i < percentiles.length; i++) { + if (percentiles[i].value < upperBound) { + percentileBuckets.push(percentiles[i]); + distribution.maxPercentile += percentileSpacing; + } else { + break; + } + } + } else { + // By default return results for 5 - 95% percentiles. + const dataMin = lowerBound; + lowerBound = percentiles[0].value; + distribution.minPercentile = 5; + distribution.maxPercentile = 95; + percentileBuckets = percentiles.slice(1, percentiles.length - 1); + + // Add in 0-5 and 95-100% if they don't add more + // than 25% to the value range at either end. + const lastValue: number = (last(percentileBuckets) as any).value; + const maxDiff = 0.25 * (lastValue - lowerBound); + if (lowerBound - dataMin < maxDiff) { + percentileBuckets.splice(0, 0, percentiles[0]); + distribution.minPercentile = 0; + lowerBound = dataMin; + } + + if (percentiles[percentiles.length - 1].value - lastValue < maxDiff) { + percentileBuckets.push(percentiles[percentiles.length - 1]); + distribution.maxPercentile = 100; + } + } + + // Combine buckets with the same value. + const totalBuckets = percentileBuckets.length; + let lastBucketValue = lowerBound; + let numEqualValueBuckets = 0; + for (let i = 0; i < totalBuckets; i++) { + const bucket = percentileBuckets[i]; + + // Results from the percentiles aggregation can have precision rounding + // artifacts e.g returning 200 and 200.000000000123, so check for equality + // around double floating point precision i.e. 15 sig figs. + if (bucket.value.toPrecision(15) !== lastBucketValue.toPrecision(15)) { + // Create a bucket for any 'equal value' buckets which had a value <= last bucket + if (numEqualValueBuckets > 0) { + distribution.percentiles.push({ + percent: numEqualValueBuckets * percentileSpacing, + minValue: lastBucketValue, + maxValue: lastBucketValue, + }); + } + + distribution.percentiles.push({ + percent: percentileSpacing, + minValue: lastBucketValue, + maxValue: bucket.value, + }); + + lastBucketValue = bucket.value; + numEqualValueBuckets = 0; + } else { + numEqualValueBuckets++; + if (i === totalBuckets - 1) { + // If at the last bucket, create a final bucket for the equal value buckets. + distribution.percentiles.push({ + percent: numEqualValueBuckets * percentileSpacing, + minValue: lastBucketValue, + maxValue: lastBucketValue, + }); + } + } + } + + return distribution; + } +} diff --git a/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts b/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts new file mode 100644 index 0000000000000..55ddc76cde500 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { getHistogramsForFields, DataVisualizer } from './data_visualizer'; From c3d1ad9492c2f7fcf714df13d7f685cc645ac12b Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 16:23:01 -0500 Subject: [PATCH 15/53] [ML] Remove getVisualizerFieldStats which is not used by dv --- .../file_data_visualizer/common/constants.ts | 2 - .../common/types/field_request_config.ts | 48 +++++++++++++++++-- .../common/types/index.ts | 8 +++- .../stats_table/types/field_vis_config.ts | 43 +---------------- .../data_loader/data_loader.ts | 27 ++--------- .../services/visualizer_stats.ts | 36 ++------------ 6 files changed, 59 insertions(+), 105 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/common/constants.ts b/x-pack/plugins/file_data_visualizer/common/constants.ts index 7d3f49b3edda0..7e0fe65632ae3 100644 --- a/x-pack/plugins/file_data_visualizer/common/constants.ts +++ b/x-pack/plugins/file_data_visualizer/common/constants.ts @@ -30,6 +30,4 @@ export const JOB_FIELD_TYPES = { UNKNOWN: 'unknown', } as const; -// Default sampler shard size used for field histograms -export const DEFAULT_SAMPLER_SHARD_SIZE = 5000; export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score']; diff --git a/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts b/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts index 5b39ac0354408..36e8fe14b7002 100644 --- a/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts +++ b/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts @@ -5,16 +5,56 @@ * 2.0. */ -import type { KBN_FIELD_TYPES } from '../../../../../src/plugins/data/common'; import type { JobFieldType } from './index'; +export interface Percentile { + percent: number; + minValue: number; + maxValue: number; +} + export interface FieldRequestConfig { fieldName?: string; type: JobFieldType; cardinality: number; } -export interface FieldHistogramRequestConfig { - fieldName: string; - type?: KBN_FIELD_TYPES; +export interface DocumentCountBuckets { + [key: string]: number; +} + +export interface DocumentCounts { + buckets?: DocumentCountBuckets; + interval?: number; +} + +export interface FieldVisStats { + cardinality?: number; + count?: number; + sampleCount?: number; + trueCount?: number; + falseCount?: number; + earliest?: number; + latest?: number; + documentCounts?: { + buckets?: DocumentCountBuckets; + interval?: number; + }; + avg?: number; + distribution?: { + percentiles: Percentile[]; + maxPercentile: number; + minPercentile: 0; + }; + fieldName?: string; + isTopValuesSampled?: boolean; + max?: number; + median?: number; + min?: number; + topValues?: Array<{ key: number | string; doc_count: number }>; + topValuesSampleSize?: number; + topValuesSamplerShardSize?: number; + examples?: Array; + timeRangeEarliest?: number; + timeRangeLatest?: number; } diff --git a/x-pack/plugins/file_data_visualizer/common/types/index.ts b/x-pack/plugins/file_data_visualizer/common/types/index.ts index bdb8fbcac4070..8b51142e19129 100644 --- a/x-pack/plugins/file_data_visualizer/common/types/index.ts +++ b/x-pack/plugins/file_data_visualizer/common/types/index.ts @@ -7,7 +7,13 @@ import type { SimpleSavedObject } from 'kibana/public'; export type { JobFieldType } from './job_field_type'; -export type { FieldRequestConfig, FieldHistogramRequestConfig } from './field_request_config'; +export type { + FieldRequestConfig, + DocumentCountBuckets, + DocumentCounts, + FieldVisStats, + Percentile, +} from './field_request_config'; export type InputData = any[]; export interface DataVisualizerTableState { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts index 0629c42a42119..57166dfd3951e 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts @@ -5,13 +5,7 @@ * 2.0. */ -import { JobFieldType } from '../../../../../common'; - -export interface Percentile { - percent: number; - minValue: number; - maxValue: number; -} +import type { Percentile, JobFieldType, FieldVisStats } from '../../../../../common/types'; export interface MetricFieldVisStats { avg?: number; @@ -25,41 +19,6 @@ export interface MetricFieldVisStats { min?: number; } -interface DocumentCountBuckets { - [key: string]: number; -} - -export interface FieldVisStats { - cardinality?: number; - count?: number; - sampleCount?: number; - trueCount?: number; - falseCount?: number; - earliest?: number; - latest?: number; - documentCounts?: { - buckets?: DocumentCountBuckets; - interval?: number; - }; - avg?: number; - distribution?: { - percentiles: Percentile[]; - maxPercentile: number; - minPercentile: 0; - }; - fieldName?: string; - isTopValuesSampled?: boolean; - max?: number; - median?: number; - min?: number; - topValues?: Array<{ key: number | string; doc_count: number }>; - topValuesSampleSize?: number; - topValuesSamplerShardSize?: number; - examples?: Array; - timeRangeEarliest?: number; - timeRangeLatest?: number; -} - // The internal representation of the configuration used to build the visuals // which display the field information. export interface FieldVisConfig { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts index 4baf8ad24aca0..789f0d28f5d85 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts @@ -11,13 +11,9 @@ import { estypes } from '@elastic/elasticsearch'; import { i18n } from '@kbn/i18n'; import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common'; -import { DEFAULT_SAMPLER_SHARD_SIZE, OMIT_FIELDS } from '../../../../common/constants'; -import { FieldHistogramRequestConfig, FieldRequestConfig } from '../../../../common/types'; -import { - getVisualizerFieldHistograms, - getVisualizerFieldStats, - getVisualizerOverallStats, -} from '../services/visualizer_stats'; +import { OMIT_FIELDS } from '../../../../common/constants'; +import { FieldRequestConfig } from '../../../../common/types'; +import { getVisualizerFieldStats, getVisualizerOverallStats } from '../services/visualizer_stats'; type IndexPatternTitle = string; type SavedSearchQuery = Record | null | undefined; @@ -105,23 +101,6 @@ export class DataLoader { return stats; } - async loadFieldHistograms( - fields: FieldHistogramRequestConfig[], - query: string | SavedSearchQuery, - samplerShardSize = DEFAULT_SAMPLER_SHARD_SIZE, - editorRuntimeMappings?: estypes.RuntimeFields - ): Promise { - const stats = await getVisualizerFieldHistograms({ - indexPatternTitle: this._indexPatternTitle, - query, - fields, - samplerShardSize, - runtimeMappings: editorRuntimeMappings || this._runtimeMappings, - }); - - return stats; - } - displayError(err: any) { if (err.statusCode === 500) { this._toastNotifications.addError(err, { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts index 5f856433e74e7..622cf0265fd5b 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts @@ -7,7 +7,8 @@ import { estypes } from '@elastic/elasticsearch'; import { lazyLoadModules } from '../../../lazy_load_bundle'; -import type { FieldHistogramRequestConfig, FieldRequestConfig } from '../../../../common/types'; +import type { DocumentCounts, FieldRequestConfig, FieldVisStats } from '../../../../common/types'; +import { OverallStats } from '../types/overall_stats'; export function basePath() { // @todo: change to internal/data_visualizer @@ -48,7 +49,7 @@ export async function getVisualizerOverallStats({ const fileUploadModules = await lazyLoadModules(); // @todo: update - return await fileUploadModules.getHttp().fetch({ + return await fileUploadModules.getHttp().fetch({ path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`, method: 'POST', body, @@ -92,38 +93,9 @@ export async function getVisualizerFieldStats({ const fileUploadModules = await lazyLoadModules(); // @todo: update - return await fileUploadModules.getHttp().fetch({ + return await fileUploadModules.getHttp().fetch<[DocumentCounts, FieldVisStats]>({ path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`, method: 'POST', body, }); } - -export async function getVisualizerFieldHistograms({ - indexPatternTitle, - query, - fields, - samplerShardSize, - runtimeMappings, -}: { - indexPatternTitle: string; - query: any; - fields: FieldHistogramRequestConfig[]; - samplerShardSize?: number; - runtimeMappings?: estypes.RuntimeFields; -}) { - const body = JSON.stringify({ - query, - fields, - samplerShardSize, - runtimeMappings, - }); - - const fileUploadModules = await lazyLoadModules(); - // @todo: update type - return await fileUploadModules.getHttp().fetch({ - path: `${basePath()}/data_visualizer/get_field_histograms/${indexPatternTitle}`, - method: 'POST', - body, - }); -} From 0d12c9128ca4c65049ebc95fab805afa6fcd4295 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 16:25:25 -0500 Subject: [PATCH 16/53] [ML] Delete redundant folder --- .../field_title_bar/_field_title_bar.scss | 28 ---- .../components/field_title_bar/_index.scss | 1 - .../field_title_bar/field_title_bar.test.tsx | 113 --------------- .../field_title_bar/field_title_bar.tsx | 64 --------- .../components/field_title_bar/index.ts | 8 -- .../field_type_icon/field_type_icon.test.tsx | 52 ------- .../field_type_icon/field_type_icon.tsx | 129 ------------------ .../components/field_type_icon/index.ts | 8 -- 8 files changed, 403 deletions(-) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_index.scss delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/index.ts delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss deleted file mode 100644 index cc4481f3fb9b8..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_field_title_bar.scss +++ /dev/null @@ -1,28 +0,0 @@ -.dv-field-title-bar { - @include euiFontSizeM; - font-family: Roboto Mono, serif; - font-style: normal; - font-weight: bold; - font-size: $euiFontSizeS; - border-radius: $euiBorderRadius $euiBorderRadius 0 0; - padding: $euiSizeXS; - margin: (-$euiSize) (-$euiSize) 0 (-$euiSize); - border-top: 3px solid; - text-align: center; - - .field-type-icon { - vertical-align: middle; - margin-bottom: -$euiSizeXS; - display: inline-block; - } - - .field-name { - @include euiTextTruncate; - - vertical-align: middle; - padding-right: $euiSizeS; - max-width: 290px; // SASSTODO: Calculate value - display: inline-block; - margin-left: $euiSizeS; - } -} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_index.scss deleted file mode 100644 index d12cf5d008c44..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'field_title_bar'; \ No newline at end of file diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx deleted file mode 100644 index 630a0e3d6f091..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.test.tsx +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { mountWithIntl } from '@kbn/test/target/types/jest'; - -import React from 'react'; - -import { FieldTitleBar } from './field_title_bar'; -import { JOB_FIELD_TYPES } from '../../../../../common'; - -describe('FieldTitleBar', () => { - test(`card prop is an empty object`, () => { - const props = { - card: { - type: JOB_FIELD_TYPES.NUMBER, - existsInDocs: true, - loading: false, - aggregatable: true, - }, - }; - - const wrapper = mountWithIntl(); - - const fieldName = wrapper.find({ className: 'field-name' }).text(); - expect(fieldName).toEqual('document count'); - - const hasClassName = wrapper.find('EuiText').hasClass('document_count'); - expect(hasClassName).toBeTruthy(); - }); - - test(`card.isUnsupportedType is true`, () => { - const props = { - card: { - type: JOB_FIELD_TYPES.UNKNOWN, - fieldName: 'foo', - existsInDocs: true, - loading: false, - aggregatable: true, - isUnsupportedType: true, - }, - }; - - const wrapper = mountWithIntl(); - - const fieldName = wrapper.find({ className: 'field-name' }).text(); - expect(fieldName).toEqual(props.card.fieldName); - - const hasClassName = wrapper.find('EuiText').hasClass('type-other'); - expect(hasClassName).toBeTruthy(); - }); - - test(`card.fieldName and card.type is set`, () => { - const props = { - card: { - type: JOB_FIELD_TYPES.KEYWORD, - fieldName: 'bar', - existsInDocs: true, - loading: false, - aggregatable: true, - }, - }; - - const wrapper = mountWithIntl(); - - const fieldName = wrapper.find({ className: 'field-name' }).text(); - expect(fieldName).toEqual(props.card.fieldName); - - const hasClassName = wrapper.find('EuiText').hasClass(props.card.type); - expect(hasClassName).toBeTruthy(); - }); - - test(`tooltip hovering`, () => { - // Use fake timers so we don't have to wait for the EuiToolTip timeout - jest.useFakeTimers(); - - const props = { - card: { - type: JOB_FIELD_TYPES.KEYWORD, - fieldName: 'bar', - existsInDocs: true, - loading: false, - aggregatable: true, - }, - }; - const wrapper = mountWithIntl(); - const container = wrapper.find({ className: 'field-name' }); - - expect(wrapper.find('EuiToolTip').children()).toHaveLength(2); - - container.simulate('mouseover'); - - // Run the timers so the EuiTooltip will be visible - jest.runAllTimers(); - - wrapper.update(); - expect(wrapper.find('EuiToolTip').children()).toHaveLength(3); - - container.simulate('mouseout'); - - // Run the timers so the EuiTooltip will be hidden again - jest.runAllTimers(); - - wrapper.update(); - expect(wrapper.find('EuiToolTip').children()).toHaveLength(2); - - // Clearing all mocks will also reset fake timers. - jest.clearAllMocks(); - }); -}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx deleted file mode 100644 index e7f2cc7733f82..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/field_title_bar.tsx +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; - -import { EuiText, EuiToolTip } from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; - -import { FieldTypeIcon } from '../field_type_icon'; -import { getJobTypeAriaLabel } from '../../../util/field_types_utils'; -import { - FieldVisConfig, - FileBasedFieldVisConfig, - isIndexBasedFieldVisConfig, -} from '../../stats_table/types'; - -interface Props { - card: FieldVisConfig | FileBasedFieldVisConfig; -} - -export const FieldTitleBar: FC = ({ card }) => { - const fieldName = - card.fieldName || - i18n.translate('xpack.ml.fieldTitleBar.documentCountLabel', { - defaultMessage: 'document count', - }); - const cardTitleAriaLabel = [fieldName]; - - const classNames = ['dv-field-title-bar']; - - if (card.fieldName === undefined) { - classNames.push('document_count'); - } else if (isIndexBasedFieldVisConfig(card) && card.isUnsupportedType === true) { - classNames.push('type-other'); - } else { - classNames.push(card.type); - } - - if (isIndexBasedFieldVisConfig(card) && card.isUnsupportedType !== true) { - // All the supported field types have aria labels. - cardTitleAriaLabel.unshift(getJobTypeAriaLabel(card.type)!); - } - - return ( - - - -
- {fieldName} -
- - - ); -}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/index.ts deleted file mode 100644 index 9c2be066c1052..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_title_bar/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { FieldTitleBar } from './field_title_bar'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx deleted file mode 100644 index 5382b4844d696..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.test.tsx +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React from 'react'; -import { mount, shallow } from 'enzyme'; - -import { FieldTypeIcon } from './field_type_icon'; -import { JOB_FIELD_TYPES } from '../../../../../common'; - -describe('FieldTypeIcon', () => { - test(`render component when type matches a field type`, () => { - const typeIconComponent = shallow( - - ); - expect(typeIconComponent).toMatchSnapshot(); - }); - - test(`render with tooltip and test hovering`, () => { - // Use fake timers so we don't have to wait for the EuiToolTip timeout - jest.useFakeTimers(); - - const typeIconComponent = mount( - - ); - const container = typeIconComponent.find({ 'data-test-subj': 'mlFieldTypeIcon' }); - - expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1); - - container.simulate('mouseover'); - - // Run the timers so the EuiTooltip will be visible - jest.runAllTimers(); - - typeIconComponent.update(); - expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(2); - - container.simulate('mouseout'); - - // Run the timers so the EuiTooltip will be hidden again - jest.runAllTimers(); - - typeIconComponent.update(); - expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1); - - // Clearing all mocks will also reset fake timers. - jest.clearAllMocks(); - }); -}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx deleted file mode 100644 index 3d81f9f971d28..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/field_type_icon.tsx +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import React, { FC } from 'react'; - -import { EuiToken, EuiToolTip } from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; -import { JobFieldType } from '../../../../../common/types'; -import { getJobTypeAriaLabel } from '../../../util/field_types_utils'; -import { JOB_FIELD_TYPES } from '../../../../../common'; - -interface FieldTypeIconProps { - tooltipEnabled: boolean; - type: JobFieldType; - fieldName?: string; - needsAria: boolean; -} - -interface FieldTypeIconContainerProps { - ariaLabel: string | null; - iconType: string; - color: string; - needsAria: boolean; - [key: string]: any; -} - -export const FieldTypeIcon: FC = ({ - tooltipEnabled = false, - type, - fieldName, - needsAria = true, -}) => { - const ariaLabel = getJobTypeAriaLabel(type); - - let iconType = 'questionInCircle'; - let color = 'euiColorVis6'; - - switch (type) { - // Set icon types and colors - case JOB_FIELD_TYPES.BOOLEAN: - iconType = 'tokenBoolean'; - color = 'euiColorVis5'; - break; - case JOB_FIELD_TYPES.DATE: - iconType = 'tokenDate'; - color = 'euiColorVis7'; - break; - case JOB_FIELD_TYPES.GEO_POINT: - case JOB_FIELD_TYPES.GEO_SHAPE: - iconType = 'tokenGeo'; - color = 'euiColorVis8'; - break; - case JOB_FIELD_TYPES.TEXT: - iconType = 'document'; - color = 'euiColorVis9'; - break; - case JOB_FIELD_TYPES.IP: - iconType = 'tokenIP'; - color = 'euiColorVis3'; - break; - case JOB_FIELD_TYPES.KEYWORD: - iconType = 'tokenText'; - color = 'euiColorVis0'; - break; - case JOB_FIELD_TYPES.NUMBER: - iconType = 'tokenNumber'; - color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2'; - break; - case JOB_FIELD_TYPES.UNKNOWN: - // Use defaults - break; - } - - const containerProps = { - ariaLabel, - iconType, - color, - needsAria, - }; - - if (tooltipEnabled === true) { - // wrap the inner component inside because EuiToolTip doesn't seem - // to support having another component directly inside the tooltip anchor - // see https://github.com/elastic/eui/issues/839 - return ( - - - - ); - } - - return ; -}; - -// If the tooltip is used, it will apply its events to its first inner child. -// To pass on its properties we apply `rest` to the outer `span` element. -const FieldTypeIconContainer: FC = ({ - ariaLabel, - iconType, - color, - needsAria, - ...rest -}) => { - const wrapperProps: { className: string; 'aria-label'?: string } = { - className: 'field-type-icon', - }; - if (needsAria && ariaLabel) { - wrapperProps['aria-label'] = ariaLabel; - } - - return ( - - - - - - ); -}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/index.ts deleted file mode 100644 index fa825e447be30..0000000000000 --- a/x-pack/plugins/file_data_visualizer/public/application/components/components/field_type_icon/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export { FieldTypeIcon } from './field_type_icon'; From f343a9e6500c21ca52c2a43163a632ba45f2e96e Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 17:06:32 -0500 Subject: [PATCH 17/53] [ML] Copy old data visualizer routes to new plugin --- .../common/utils/runtime_field_utils.ts | 28 ++ .../services/visualizer_stats.ts | 6 +- .../server/capabilities.ts | 25 ++ .../file_data_visualizer/server/index.ts | 6 +- .../server/models/data_visualizer/index.ts | 2 +- .../file_data_visualizer/server/plugin.ts | 27 +- .../file_data_visualizer/server/routes.ts | 274 ++++++++++++++++++ .../server/routes/schemas/index.ts | 8 + .../schemas/index_data_visualizer_schemas.ts | 76 +++++ .../file_data_visualizer/server/types/deps.ts | 12 + .../server/types/index.ts | 8 + .../server/utils/error_wrapper.ts | 24 ++ .../ml/common/constants/field_histograms.ts | 1 - 13 files changed, 486 insertions(+), 11 deletions(-) create mode 100644 x-pack/plugins/file_data_visualizer/common/utils/runtime_field_utils.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/capabilities.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/routes.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/routes/schemas/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/types/deps.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/types/index.ts create mode 100644 x-pack/plugins/file_data_visualizer/server/utils/error_wrapper.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/runtime_field_utils.ts b/x-pack/plugins/file_data_visualizer/common/utils/runtime_field_utils.ts new file mode 100644 index 0000000000000..1ddaca7fe2069 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/utils/runtime_field_utils.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import { estypes } from '@elastic/elasticsearch'; +import { isPopulatedObject } from './object_utils'; +import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common'; + +type RuntimeType = typeof RUNTIME_FIELD_TYPES[number]; + +export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField { + return ( + ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) || + (isPopulatedObject(arg, ['type', 'script']) && + Object.keys(arg).length === 2 && + (typeof arg.script === 'string' || + (isPopulatedObject(arg.script, ['source']) && + Object.keys(arg.script).length === 1 && + typeof arg.script.source === 'string')))) && + RUNTIME_FIELD_TYPES.includes(arg.type as RuntimeType) + ); +} + +export function isRuntimeMappings(arg: unknown): arg is estypes.RuntimeFields { + return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d)); +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts index 622cf0265fd5b..57bacd8610d50 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts @@ -12,7 +12,7 @@ import { OverallStats } from '../types/overall_stats'; export function basePath() { // @todo: change to internal/data_visualizer - return '/api/ml'; + return '/internal/data_visualizer'; } export async function getVisualizerOverallStats({ @@ -50,7 +50,7 @@ export async function getVisualizerOverallStats({ const fileUploadModules = await lazyLoadModules(); // @todo: update return await fileUploadModules.getHttp().fetch({ - path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`, + path: `${basePath()}/get_overall_stats/${indexPatternTitle}`, method: 'POST', body, }); @@ -94,7 +94,7 @@ export async function getVisualizerFieldStats({ const fileUploadModules = await lazyLoadModules(); // @todo: update return await fileUploadModules.getHttp().fetch<[DocumentCounts, FieldVisStats]>({ - path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`, + path: `${basePath()}/get_field_stats/${indexPatternTitle}`, method: 'POST', body, }); diff --git a/x-pack/plugins/file_data_visualizer/server/capabilities.ts b/x-pack/plugins/file_data_visualizer/server/capabilities.ts new file mode 100644 index 0000000000000..9fb8eef3ed0d8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/capabilities.ts @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { CoreSetup } from 'kibana/server'; +import { StartDeps } from './types'; + +export const setupCapabilities = ( + core: Pick, 'capabilities' | 'getStartServices'> +) => { + core.capabilities.registerProvider(() => { + return { + dataVisualizer: { + show: true, + }, + }; + }); + + core.capabilities.registerSwitcher(async (request, capabilities, useDefaultCapabilities) => { + return capabilities; + }); +}; diff --git a/x-pack/plugins/file_data_visualizer/server/index.ts b/x-pack/plugins/file_data_visualizer/server/index.ts index 43067dbe99d0d..2d7449a0c5a48 100644 --- a/x-pack/plugins/file_data_visualizer/server/index.ts +++ b/x-pack/plugins/file_data_visualizer/server/index.ts @@ -5,6 +5,8 @@ * 2.0. */ -import { FileDataVisualizerPlugin } from './plugin'; +import { PluginInitializerContext } from 'kibana/server'; +import { DataVisualizerPlugin } from './plugin'; -export const plugin = () => new FileDataVisualizerPlugin(); +export const plugin = (initializerContext: PluginInitializerContext) => + new DataVisualizerPlugin(initializerContext); diff --git a/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts b/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts index 55ddc76cde500..a29957b159b7e 100644 --- a/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts +++ b/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts @@ -5,4 +5,4 @@ * 2.0. */ -export { getHistogramsForFields, DataVisualizer } from './data_visualizer'; +export * from './data_visualizer'; diff --git a/x-pack/plugins/file_data_visualizer/server/plugin.ts b/x-pack/plugins/file_data_visualizer/server/plugin.ts index f6893b7edaa53..1931535871db6 100644 --- a/x-pack/plugins/file_data_visualizer/server/plugin.ts +++ b/x-pack/plugins/file_data_visualizer/server/plugin.ts @@ -5,9 +5,28 @@ * 2.0. */ -import { Plugin } from 'src/core/server'; +import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server'; +import { Logger } from 'kibana/server'; +import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server'; +import { StartDeps } from './types'; +import { dataVisualizerRoutes } from './routes'; +import { setupCapabilities } from './capabilities'; -export class FileDataVisualizerPlugin implements Plugin { - setup() {} - start() {} +interface SetupDeps { + usageCollection: UsageCollectionSetup; +} + +export class DataVisualizerPlugin implements Plugin { + private readonly _logger: Logger; + + constructor(initializerContext: PluginInitializerContext) { + this._logger = initializerContext.logger.get(); + } + + async setup(coreSetup: CoreSetup, plugins: SetupDeps) { + dataVisualizerRoutes(coreSetup, this._logger); + setupCapabilities(coreSetup); + } + + start(core: CoreStart) {} } diff --git a/x-pack/plugins/file_data_visualizer/server/routes.ts b/x-pack/plugins/file_data_visualizer/server/routes.ts new file mode 100644 index 0000000000000..47ac73faaa38a --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/routes.ts @@ -0,0 +1,274 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { CoreSetup, IScopedClusterClient, Logger } from 'kibana/server'; +import { estypes } from '@elastic/elasticsearch'; +import { + dataVisualizerFieldHistogramsSchema, + dataVisualizerFieldStatsSchema, + dataVisualizerOverallStatsSchema, + indexPatternTitleSchema, +} from './routes/schemas'; +import { DataVisualizer, Field, HistogramField } from './models/data_visualizer'; +import type { StartDeps } from './types'; +import { wrapError } from './utils/error_wrapper'; + +function getOverallStats( + client: IScopedClusterClient, + indexPatternTitle: string, + query: object, + aggregatableFields: string[], + nonAggregatableFields: string[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings: estypes.RuntimeFields +) { + const dv = new DataVisualizer(client); + return dv.getOverallStats( + indexPatternTitle, + query, + aggregatableFields, + nonAggregatableFields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); +} + +function getStatsForFields( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + interval: number | undefined, + maxExamples: number, + runtimeMappings: estypes.RuntimeFields +) { + const dv = new DataVisualizer(client); + return dv.getStatsForFields( + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + interval, + maxExamples, + runtimeMappings + ); +} + +function getHistogramsForFields( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + fields: HistogramField[], + samplerShardSize: number, + runtimeMappings: estypes.RuntimeFields +) { + const dv = new DataVisualizer(client); + return dv.getHistogramsForFields( + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings + ); +} +/** + * Routes for the index data visualizer. + */ +export function dataVisualizerRoutes(coreSetup: CoreSetup, logger: Logger) { + const router = coreSetup.http.createRouter(); + + /** + * @apiGroup DataVisualizer + * + * @api {post} /internal/data_visualizer/get_field_histograms/:indexPatternTitle Get histograms for fields + * @apiName GetHistogramsForFields + * @apiDescription Returns the histograms on a list fields in the specified index pattern. + * + * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (body) dataVisualizerFieldHistogramsSchema + * + * @apiSuccess {Object} fieldName histograms by field, keyed on the name of the field. + */ + router.post( + { + path: '/internal/data_visualizer/get_field_histograms/{indexPatternTitle}', + validate: { + params: indexPatternTitleSchema, + body: dataVisualizerFieldHistogramsSchema, + }, + options: { + tags: ['access:ml:canAccessML'], + }, + }, + async (context, request, response) => { + try { + const { + params: { indexPatternTitle }, + body: { query, fields, samplerShardSize, runtimeMappings }, + } = request; + + const results = await getHistogramsForFields( + context.core.elasticsearch.client, + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings + ); + + return response.ok({ + body: results, + }); + } catch (e) { + logger.warn(e); + return response.customError(wrapError(e)); + } + } + ); + + /** + * @apiGroup DataVisualizer + * + * @api {post} /internal/data_visualizer/get_field_stats/:indexPatternTitle Get stats for fields + * @apiName GetStatsForFields + * @apiDescription Returns the stats on individual fields in the specified index pattern. + * + * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (body) dataVisualizerFieldStatsSchema + * + * @apiSuccess {Object} fieldName stats by field, keyed on the name of the field. + */ + router.post( + { + path: '/internal/data_visualizer/get_field_stats/{indexPatternTitle}', + validate: { + params: indexPatternTitleSchema, + body: dataVisualizerFieldStatsSchema, + }, + options: { + tags: ['access:ml:canAccessML'], + }, + }, + async (context, request, response) => { + try { + const { + params: { indexPatternTitle }, + body: { + query, + fields, + samplerShardSize, + timeFieldName, + earliest, + latest, + interval, + maxExamples, + runtimeMappings, + }, + } = request; + const results = await getStatsForFields( + context.core.elasticsearch.client, + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliest, + latest, + interval, + maxExamples, + runtimeMappings + ); + + return response.ok({ + body: results, + }); + } catch (e) { + logger.warn(e); + return response.customError(wrapError(e)); + } + } + ); + + /** + * @apiGroup DataVisualizer + * + * @api {post} /internal/data_visualizer/get_overall_stats/:indexPatternTitle Get overall stats + * @apiName GetOverallStats + * @apiDescription Returns the top level overall stats for the specified index pattern. + * + * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (body) dataVisualizerOverallStatsSchema + * + * @apiSuccess {number} totalCount total count of documents. + * @apiSuccess {Object} aggregatableExistsFields stats on aggregatable fields that exist in documents. + * @apiSuccess {Object} aggregatableNotExistsFields stats on aggregatable fields that do not exist in documents. + * @apiSuccess {Object} nonAggregatableExistsFields stats on non-aggregatable fields that exist in documents. + * @apiSuccess {Object} nonAggregatableNotExistsFields stats on non-aggregatable fields that do not exist in documents. + */ + router.post( + { + path: '/internal/data_visualizer/get_overall_stats/{indexPatternTitle}', + validate: { + params: indexPatternTitleSchema, + body: dataVisualizerOverallStatsSchema, + }, + options: { + tags: ['access:ml:canAccessML'], + }, + }, + async (context, request, response) => { + try { + const { + params: { indexPatternTitle }, + body: { + query, + aggregatableFields, + nonAggregatableFields, + samplerShardSize, + timeFieldName, + earliest, + latest, + runtimeMappings, + }, + } = request; + + const results = await getOverallStats( + context.core.elasticsearch.client, + indexPatternTitle, + query, + aggregatableFields, + nonAggregatableFields, + samplerShardSize, + timeFieldName, + earliest, + latest, + runtimeMappings + ); + + return response.ok({ + body: results, + }); + } catch (e) { + logger.warn(e); + return response.customError(wrapError(e)); + } + } + ); +} diff --git a/x-pack/plugins/file_data_visualizer/server/routes/schemas/index.ts b/x-pack/plugins/file_data_visualizer/server/routes/schemas/index.ts new file mode 100644 index 0000000000000..156336feef29e --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/routes/schemas/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export * from './index_data_visualizer_schemas'; diff --git a/x-pack/plugins/file_data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts b/x-pack/plugins/file_data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts new file mode 100644 index 0000000000000..0f145081d8cec --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { schema } from '@kbn/config-schema'; +import { isRuntimeField } from '../../../common/utils/runtime_field_utils'; + +export const runtimeMappingsSchema = schema.object( + {}, + { + unknowns: 'allow', + validate: (v: object) => { + if (Object.values(v).some((o) => !isRuntimeField(o))) { + return 'Invalid runtime field'; + } + }, + } +); + +export const indexPatternTitleSchema = schema.object({ + /** Title of the index pattern for which to return stats. */ + indexPatternTitle: schema.string(), +}); + +export const dataVisualizerFieldHistogramsSchema = schema.object({ + /** Query to match documents in the index. */ + query: schema.any(), + /** The fields to return histogram data. */ + fields: schema.arrayOf(schema.any()), + /** Number of documents to be collected in the sample processed on each shard, or -1 for no sampling. */ + samplerShardSize: schema.number(), + /** Optional search time runtime fields */ + runtimeMappings: runtimeMappingsSchema, +}); + +export const dataVisualizerFieldStatsSchema = schema.object({ + /** Query to match documents in the index. */ + query: schema.any(), + fields: schema.arrayOf(schema.any()), + /** Number of documents to be collected in the sample processed on each shard, or -1 for no sampling. */ + samplerShardSize: schema.number(), + /** Name of the time field in the index (optional). */ + timeFieldName: schema.maybe(schema.string()), + /** Earliest timestamp for search, as epoch ms (optional). */ + earliest: schema.maybe(schema.number()), + /** Latest timestamp for search, as epoch ms (optional). */ + latest: schema.maybe(schema.number()), + /** Aggregation interval, in milliseconds, to use for obtaining document counts over time (optional). */ + interval: schema.maybe(schema.number()), + /** Maximum number of examples to return for text type fields. */ + maxExamples: schema.number(), + /** Optional search time runtime fields */ + runtimeMappings: runtimeMappingsSchema, +}); + +export const dataVisualizerOverallStatsSchema = schema.object({ + /** Query to match documents in the index. */ + query: schema.any(), + /** Names of aggregatable fields for which to return stats. */ + aggregatableFields: schema.arrayOf(schema.string()), + /** Names of non-aggregatable fields for which to return stats. */ + nonAggregatableFields: schema.arrayOf(schema.string()), + /** Number of documents to be collected in the sample processed on each shard, or -1 for no sampling. */ + samplerShardSize: schema.number(), + /** Name of the time field in the index (optional). */ + timeFieldName: schema.maybe(schema.string()), + /** Earliest timestamp for search, as epoch ms (optional). */ + earliest: schema.maybe(schema.number()), + /** Latest timestamp for search, as epoch ms (optional). */ + latest: schema.maybe(schema.number()), + /** Optional search time runtime fields */ + runtimeMappings: runtimeMappingsSchema, +}); diff --git a/x-pack/plugins/file_data_visualizer/server/types/deps.ts b/x-pack/plugins/file_data_visualizer/server/types/deps.ts new file mode 100644 index 0000000000000..9dec735123ad1 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/types/deps.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { SecurityPluginStart } from '../../../security/server'; + +export interface StartDeps { + security?: SecurityPluginStart; +} diff --git a/x-pack/plugins/file_data_visualizer/server/types/index.ts b/x-pack/plugins/file_data_visualizer/server/types/index.ts new file mode 100644 index 0000000000000..4897886976175 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/types/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { StartDeps } from './deps'; diff --git a/x-pack/plugins/file_data_visualizer/server/utils/error_wrapper.ts b/x-pack/plugins/file_data_visualizer/server/utils/error_wrapper.ts new file mode 100644 index 0000000000000..e0e6e263128e9 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/utils/error_wrapper.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { CustomHttpResponseOptions, ResponseError } from 'kibana/server'; +import { boomify, isBoom } from '@hapi/boom'; + +export function wrapError(error: any): CustomHttpResponseOptions { + const boom = isBoom(error) + ? error + : boomify(error, { statusCode: error.status ?? error.statusCode }); + const statusCode = boom.output.statusCode; + return { + body: { + message: boom, + ...(statusCode !== 500 && error.body ? { attributes: { body: error.body } } : {}), + }, + headers: boom.output.headers as { [key: string]: string }, + statusCode, + }; +} diff --git a/x-pack/plugins/ml/common/constants/field_histograms.ts b/x-pack/plugins/ml/common/constants/field_histograms.ts index c35c421d6fac4..d87ed96a04e8b 100644 --- a/x-pack/plugins/ml/common/constants/field_histograms.ts +++ b/x-pack/plugins/ml/common/constants/field_histograms.ts @@ -5,6 +5,5 @@ * 2.0. */ -// @remove // Default sampler shard size used for field histograms export const DEFAULT_SAMPLER_SHARD_SIZE = 5000; From a8aaf3602a6f9db0f96573ad92128ec8e225c4f1 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 17:17:07 -0500 Subject: [PATCH 18/53] [ML] Remove old routes --- .../ml/common/constants/field_types.ts | 1 - .../plugins/ml/common/types/datavisualizer.ts | 26 --- .../ml/common/types/ml_url_generator.ts | 25 +-- .../analytics_list/use_table_settings.ts | 9 +- .../index_based/data_loader/data_loader.ts | 67 +------ .../services/ml_api_service/index.ts | 91 +-------- .../ml/public/application/util/index_utils.ts | 1 - .../ml/server/routes/data_visualizer.ts | 185 +----------------- 8 files changed, 6 insertions(+), 399 deletions(-) delete mode 100644 x-pack/plugins/ml/common/types/datavisualizer.ts diff --git a/x-pack/plugins/ml/common/constants/field_types.ts b/x-pack/plugins/ml/common/constants/field_types.ts index fa631d7a8d42e..04e1100e9f776 100644 --- a/x-pack/plugins/ml/common/constants/field_types.ts +++ b/x-pack/plugins/ml/common/constants/field_types.ts @@ -30,6 +30,5 @@ export const DOC_COUNT = 'doc_count'; */ export const _DOC_COUNT = '_doc_count'; -// @remove // List of system fields we don't want to display. export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score']; diff --git a/x-pack/plugins/ml/common/types/datavisualizer.ts b/x-pack/plugins/ml/common/types/datavisualizer.ts deleted file mode 100644 index ae1a07644480b..0000000000000 --- a/x-pack/plugins/ml/common/types/datavisualizer.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -// @remove -export interface AggregatableField { - fieldName: string; - stats: { - cardinality?: number; - count?: number; - sampleCount?: number; - }; - existsInDocs: boolean; -} - -export type NonAggregatableField = Omit; -export interface OverallStats { - totalCount: number; - aggregatableExistsFields: AggregatableField[]; - aggregatableNotExistsFields: NonAggregatableField[]; - nonAggregatableExistsFields: AggregatableField[]; - nonAggregatableNotExistsFields: NonAggregatableField[]; -} diff --git a/x-pack/plugins/ml/common/types/ml_url_generator.ts b/x-pack/plugins/ml/common/types/ml_url_generator.ts index 5dd6902097607..b83544866e979 100644 --- a/x-pack/plugins/ml/common/types/ml_url_generator.ts +++ b/x-pack/plugins/ml/common/types/ml_url_generator.ts @@ -5,11 +5,7 @@ * 2.0. */ -import type { - Query, - RefreshInterval, - TimeRange, -} from '../../../../../src/plugins/data/common/query'; +import type { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query'; import type { JobId } from './anomaly_detection_jobs/job'; import { ML_PAGES } from '../constants/ml_url_generator'; import type { DataFrameAnalysisConfigType } from './data_frame_analytics'; @@ -44,25 +40,6 @@ export interface MlGenericUrlPageState extends MlIndexBasedSearchState { [key: string]: any; } -// @remove -export interface DataVisualizerIndexBasedAppState extends Omit { - searchString?: Query['query']; - searchQuery?: Query['query']; - searchQueryLanguage?: SearchQueryLanguage; - visibleFieldTypes?: string[]; - visibleFieldNames?: string[]; - samplerShardSize?: number; - showDistributions?: boolean; - showAllFields?: boolean; - showEmptyFields?: boolean; -} - -export interface DataVisualizerFileBasedAppState extends Omit { - visibleFieldTypes?: string[]; - visibleFieldNames?: string[]; - showDistributions?: boolean; -} - export type MlGenericUrlState = MLPageState< | typeof ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER | typeof ML_PAGES.ANOMALY_DETECTION_CREATE_JOB diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts index 5ac7b00e8af67..993aadd3f810f 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts @@ -8,10 +8,6 @@ import { Direction, EuiBasicTableProps, Pagination, PropertySort } from '@elastic/eui'; import { useCallback, useMemo } from 'react'; import { ListingPageUrlState } from '../../../../../../../common/types/common'; -import { - DataVisualizerFileBasedAppState, - DataVisualizerIndexBasedAppState, -} from '../../../../../../../common/types/ml_url_generator'; const PAGE_SIZE_OPTIONS = [10, 25, 50]; @@ -42,10 +38,7 @@ interface UseTableSettingsReturnValue { export function useTableSettings( items: TypeOfItem[], - pageState: - | ListingPageUrlState - | DataVisualizerIndexBasedAppState - | DataVisualizerFileBasedAppState, + pageState: ListingPageUrlState, updatePageState: (update: Partial) => void ): UseTableSettingsReturnValue { const { pageIndex, pageSize, sortField, sortDirection } = pageState; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts index 906a7d017112a..c23f4670795f5 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n'; import { CoreSetup } from 'src/core/public'; -import { IndexPattern, KBN_FIELD_TYPES } from '../../../../../../../../src/plugins/data/public'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/public'; import { SavedSearchQuery } from '../../../contexts/ml'; import { OMIT_FIELDS } from '../../../../../common/constants/field_types'; @@ -17,7 +17,7 @@ import { IndexPatternTitle } from '../../../../../common/types/kibana'; import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../common/constants/field_histograms'; import { ml } from '../../../services/ml_api_service'; -import { FieldHistogramRequestConfig, FieldRequestConfig } from '../common/request'; +import { FieldHistogramRequestConfig } from '../common/request'; import { RuntimeMappings } from '../../../../../common/types/fields'; import { ToastNotificationService, @@ -44,69 +44,6 @@ export class DataLoader { this._toastNotificationsService = toastNotificationServiceProvider(toastNotifications); } - async loadOverallData( - query: string | SavedSearchQuery, - samplerShardSize: number, - earliest: number | undefined, - latest: number | undefined - ): Promise { - const aggregatableFields: string[] = []; - const nonAggregatableFields: string[] = []; - this._indexPattern.fields.forEach((field) => { - const fieldName = field.displayName !== undefined ? field.displayName : field.name; - if (this.isDisplayField(fieldName) === true) { - if (field.aggregatable === true && field.type !== KBN_FIELD_TYPES.GEO_SHAPE) { - aggregatableFields.push(fieldName); - } else { - nonAggregatableFields.push(fieldName); - } - } - }); - - // Need to find: - // 1. List of aggregatable fields that do exist in docs - // 2. List of aggregatable fields that do not exist in docs - // 3. List of non-aggregatable fields that do exist in docs. - // 4. List of non-aggregatable fields that do not exist in docs. - const stats = await ml.getVisualizerOverallStats({ - indexPatternTitle: this._indexPatternTitle, - query, - timeFieldName: this._indexPattern.timeFieldName, - samplerShardSize, - earliest, - latest, - aggregatableFields, - nonAggregatableFields, - runtimeMappings: this._runtimeMappings, - }); - - return stats; - } - - async loadFieldStats( - query: string | SavedSearchQuery, - samplerShardSize: number, - earliest: number | undefined, - latest: number | undefined, - fields: FieldRequestConfig[], - interval?: number - ): Promise { - const stats = await ml.getVisualizerFieldStats({ - indexPatternTitle: this._indexPatternTitle, - query, - timeFieldName: this._indexPattern.timeFieldName, - earliest, - latest, - samplerShardSize, - interval, - fields, - maxExamples: this._maxExamples, - runtimeMappings: this._runtimeMappings, - }); - - return stats; - } - async loadFieldHistograms( fields: FieldHistogramRequestConfig[], query: string | SavedSearchQuery, diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts index 9a1a99186c0f0..b117d50605571 100644 --- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts +++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts @@ -35,10 +35,7 @@ import { ModelSnapshot, IndicesOptions, } from '../../../../common/types/anomaly_detection_jobs'; -import { - FieldHistogramRequestConfig, - FieldRequestConfig, -} from '../../datavisualizer/index_based/common/request'; +import { FieldHistogramRequestConfig } from '../../datavisualizer/index_based/common/request'; import { DataRecognizerConfigResponse, Module } from '../../../../common/types/modules'; import { getHttp } from '../../util/dependency_cache'; import type { RuntimeMappings } from '../../../../common/types/fields'; @@ -107,11 +104,6 @@ export type MlApiServices = ReturnType; export const ml = mlApiServicesProvider(new HttpService(proxyHttpStart)); -// @remove -// ml.getVisualizerOverallStats -// ml.getVisualizerFieldStats; -// ml.getVisualizerFieldHistograms; -// getTimeFieldRange export function mlApiServicesProvider(httpService: HttpService) { return { getJobs(obj?: { jobId?: string }) { @@ -462,48 +454,6 @@ export function mlApiServicesProvider(httpService: HttpService) { }); }, - getVisualizerFieldStats({ - indexPatternTitle, - query, - timeFieldName, - earliest, - latest, - samplerShardSize, - interval, - fields, - maxExamples, - runtimeMappings, - }: { - indexPatternTitle: string; - query: any; - timeFieldName?: string; - earliest?: number; - latest?: number; - samplerShardSize?: number; - interval?: number; - fields?: FieldRequestConfig[]; - maxExamples?: number; - runtimeMappings?: RuntimeMappings; - }) { - const body = JSON.stringify({ - query, - timeFieldName, - earliest, - latest, - samplerShardSize, - interval, - fields, - maxExamples, - runtimeMappings, - }); - - return httpService.http({ - path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`, - method: 'POST', - body, - }); - }, - getVisualizerFieldHistograms({ indexPatternTitle, query, @@ -531,45 +481,6 @@ export function mlApiServicesProvider(httpService: HttpService) { }); }, - getVisualizerOverallStats({ - indexPatternTitle, - query, - timeFieldName, - earliest, - latest, - samplerShardSize, - aggregatableFields, - nonAggregatableFields, - runtimeMappings, - }: { - indexPatternTitle: string; - query: any; - timeFieldName?: string; - earliest?: number; - latest?: number; - samplerShardSize?: number; - aggregatableFields: string[]; - nonAggregatableFields: string[]; - runtimeMappings?: RuntimeMappings; - }) { - const body = JSON.stringify({ - query, - timeFieldName, - earliest, - latest, - samplerShardSize, - aggregatableFields, - nonAggregatableFields, - runtimeMappings, - }); - - return httpService.http({ - path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`, - method: 'POST', - body, - }); - }, - /** * Gets a list of calendars * @param obj diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts index 558f48ff1f5cf..9d705c8cd725f 100644 --- a/x-pack/plugins/ml/public/application/util/index_utils.ts +++ b/x-pack/plugins/ml/public/application/util/index_utils.ts @@ -122,7 +122,6 @@ export function getSavedSearchById(id: string): SavedSearchSavedObject | undefin return savedSearchesCache.find((s) => s.id === id); } -// @remove /** * Returns true if the index passed in is time based * an optional flag will trigger the display a notification at the top of the page diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts index 62a93f16d17fc..39cbb3e9d35f6 100644 --- a/x-pack/plugins/ml/server/routes/data_visualizer.ts +++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts @@ -8,70 +8,14 @@ import { IScopedClusterClient } from 'kibana/server'; import { wrapError } from '../client/error_wrapper'; import { DataVisualizer } from '../models/data_visualizer'; -import { Field, HistogramField } from '../models/data_visualizer/data_visualizer'; +import { HistogramField } from '../models/data_visualizer/data_visualizer'; import { dataVisualizerFieldHistogramsSchema, - dataVisualizerFieldStatsSchema, - dataVisualizerOverallStatsSchema, indexPatternTitleSchema, } from './schemas/data_visualizer_schema'; import { RouteInitialization } from '../types'; import { RuntimeMappings } from '../../common/types/fields'; -function getOverallStats( - client: IScopedClusterClient, - indexPatternTitle: string, - query: object, - aggregatableFields: string[], - nonAggregatableFields: string[], - samplerShardSize: number, - timeFieldName: string | undefined, - earliestMs: number | undefined, - latestMs: number | undefined, - runtimeMappings: RuntimeMappings -) { - const dv = new DataVisualizer(client); - return dv.getOverallStats( - indexPatternTitle, - query, - aggregatableFields, - nonAggregatableFields, - samplerShardSize, - timeFieldName, - earliestMs, - latestMs, - runtimeMappings - ); -} - -function getStatsForFields( - client: IScopedClusterClient, - indexPatternTitle: string, - query: any, - fields: Field[], - samplerShardSize: number, - timeFieldName: string | undefined, - earliestMs: number | undefined, - latestMs: number | undefined, - interval: number | undefined, - maxExamples: number, - runtimeMappings: RuntimeMappings -) { - const dv = new DataVisualizer(client); - return dv.getStatsForFields( - indexPatternTitle, - query, - fields, - samplerShardSize, - timeFieldName, - earliestMs, - latestMs, - interval, - maxExamples, - runtimeMappings - ); -} - function getHistogramsForFields( client: IScopedClusterClient, indexPatternTitle: string, @@ -141,131 +85,4 @@ export function dataVisualizerRoutes({ router, routeGuard }: RouteInitialization } }) ); - - /** - * @apiGroup DataVisualizer - * - * @api {post} /api/ml/data_visualizer/get_field_stats/:indexPatternTitle Get stats for fields - * @apiName GetStatsForFields - * @apiDescription Returns the stats on individual fields in the specified index pattern. - * - * @apiSchema (params) indexPatternTitleSchema - * @apiSchema (body) dataVisualizerFieldStatsSchema - * - * @apiSuccess {Object} fieldName stats by field, keyed on the name of the field. - */ - router.post( - { - path: '/api/ml/data_visualizer/get_field_stats/{indexPatternTitle}', - validate: { - params: indexPatternTitleSchema, - body: dataVisualizerFieldStatsSchema, - }, - options: { - tags: ['access:ml:canAccessML'], - }, - }, - routeGuard.basicLicenseAPIGuard(async ({ client, request, response }) => { - try { - const { - params: { indexPatternTitle }, - body: { - query, - fields, - samplerShardSize, - timeFieldName, - earliest, - latest, - interval, - maxExamples, - runtimeMappings, - }, - } = request; - const results = await getStatsForFields( - client, - indexPatternTitle, - query, - fields, - samplerShardSize, - timeFieldName, - earliest, - latest, - interval, - maxExamples, - runtimeMappings - ); - - return response.ok({ - body: results, - }); - } catch (e) { - return response.customError(wrapError(e)); - } - }) - ); - - /** - * @apiGroup DataVisualizer - * - * @api {post} /api/ml/data_visualizer/get_overall_stats/:indexPatternTitle Get overall stats - * @apiName GetOverallStats - * @apiDescription Returns the top level overall stats for the specified index pattern. - * - * @apiSchema (params) indexPatternTitleSchema - * @apiSchema (body) dataVisualizerOverallStatsSchema - * - * @apiSuccess {number} totalCount total count of documents. - * @apiSuccess {Object} aggregatableExistsFields stats on aggregatable fields that exist in documents. - * @apiSuccess {Object} aggregatableNotExistsFields stats on aggregatable fields that do not exist in documents. - * @apiSuccess {Object} nonAggregatableExistsFields stats on non-aggregatable fields that exist in documents. - * @apiSuccess {Object} nonAggregatableNotExistsFields stats on non-aggregatable fields that do not exist in documents. - */ - router.post( - { - path: '/api/ml/data_visualizer/get_overall_stats/{indexPatternTitle}', - validate: { - params: indexPatternTitleSchema, - body: dataVisualizerOverallStatsSchema, - }, - options: { - tags: ['access:ml:canAccessML'], - }, - }, - routeGuard.basicLicenseAPIGuard(async ({ client, request, response }) => { - try { - const { - params: { indexPatternTitle }, - body: { - query, - aggregatableFields, - nonAggregatableFields, - samplerShardSize, - timeFieldName, - earliest, - latest, - runtimeMappings, - }, - } = request; - - const results = await getOverallStats( - client, - indexPatternTitle, - query, - aggregatableFields, - nonAggregatableFields, - samplerShardSize, - timeFieldName, - earliest, - latest, - runtimeMappings - ); - - return response.ok({ - body: results, - }); - } catch (e) { - return response.customError(wrapError(e)); - } - }) - ); } From 9e0726634a484743815cfa73b87b0086c04189e7 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 27 May 2021 17:21:20 -0500 Subject: [PATCH 19/53] [ML] Disable for ml job cards tests for now --- .../functional/apps/ml/permissions/full_ml_access.ts | 12 +++++++----- .../functional/apps/ml/permissions/read_ml_access.ts | 9 +++++---- .../apps/ml/permissions/full_ml_access.ts | 9 +++++---- .../apps/ml/permissions/read_ml_access.ts | 12 +++++++----- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts index a203b078774c7..9957ae15701de 100644 --- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts @@ -101,7 +101,8 @@ export default function ({ getService }: FtrProviderContext) { const ecIndexPattern = 'ft_module_sample_ecommerce'; const ecExpectedTotalCount = '287'; - const ecExpectedModuleId = 'sample_data_ecommerce'; + // @TODO: Re-enable in follow up + // const ecExpectedModuleId = 'sample_data_ecommerce'; const uploadFilePath = path.join( __dirname, @@ -369,10 +370,11 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizerIndexBased.assertActionsPanelExists(); await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); - await ml.testExecution.logTestStep('should display job cards'); - await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists(); - await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId); - await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists(); + // @TODO: Re-enable in follow up + // await ml.testExecution.logTestStep('should display job cards'); + // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists(); + // await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId); + // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists(); }); it('should display elements on File Data Visualizer page correctly', async () => { diff --git a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts index 55cfb035d0cfe..a0585f7b24a19 100644 --- a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts @@ -362,10 +362,11 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizerIndexBased.assertActionsPanelExists(); await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); - await ml.testExecution.logTestStep('should not display job cards'); - await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); - await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); - await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists(); + // @TODO: Re-enable in follow up + // await ml.testExecution.logTestStep('should not display job cards'); + // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); + // await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); + // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists(); }); it('should display elements on File Data Visualizer page correctly', async () => { diff --git a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts index ced46f1f92d30..ccc9cd4f78b6d 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts @@ -138,10 +138,11 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizerIndexBased.assertActionsPanelExists(); await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); - await ml.testExecution.logTestStep('should not display job cards'); - await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); - await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); - await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists(); + // @TODO: Re-enable in follow up + // await ml.testExecution.logTestStep('should not display job cards'); + // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); + // await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); + // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists(); }); it('should display elements on File Data Visualizer page correctly', async () => { diff --git a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts index f207b79582004..e603611d5ec83 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts @@ -25,7 +25,8 @@ export default function ({ getService }: FtrProviderContext) { describe(`(${testUser.user})`, function () { const ecIndexPattern = 'ft_module_sample_ecommerce'; const ecExpectedTotalCount = '287'; - const ecExpectedModuleId = 'sample_data_ecommerce'; + // @TODO: Re-enable in follow up + // const ecExpectedModuleId = 'sample_data_ecommerce'; const uploadFilePath = path.join( __dirname, @@ -138,10 +139,11 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizerIndexBased.assertActionsPanelExists(); await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); - await ml.testExecution.logTestStep('should not display job cards'); - await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); - await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); - await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists(); + // @TODO: Re-enable in follow up + // await ml.testExecution.logTestStep('should not display job cards'); + // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); + // await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); + // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists(); }); it('should display elements on File Data Visualizer page correctly', async () => { From 89c916e8b4debeb2443baf8ec3373cc768ff4a55 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 09:29:14 -0500 Subject: [PATCH 20/53] [ML] Remove todos --- .../application/components/about_panel/welcome_content.tsx | 4 ++-- .../components/date_picker_wrapper/date_picker_wrapper.tsx | 4 ++-- .../application/components/embedded_map/embedded_map.tsx | 4 ++-- .../geo_point_content_with_map.tsx | 4 ++-- .../filebeat_config_flyout/filebeat_config_flyout.tsx | 4 ++-- .../public/application/components/help_menu/help_menu.tsx | 4 ++-- .../application/components/results_links/results_links.tsx | 6 +++--- .../components/field_data_expanded_row/keyword_content.tsx | 4 ++-- .../components/stats_table/hooks/use_color_range.ts | 4 ++-- .../components/actions_panel/actions_panel.tsx | 6 +++--- .../full_time_range_selector_service.ts | 4 ++-- .../index_data_visualizer_view.tsx | 4 ++-- .../index_data_visualizer/hooks/use_time_filter.ts | 4 ++-- .../index_data_visualizer/services/visualizer_stats.ts | 3 --- .../public/application/kibana_context.ts | 3 +-- 15 files changed, 29 insertions(+), 33 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx index 684b6dadcb290..268ff476c5c37 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx @@ -21,7 +21,7 @@ import { import { ExperimentalBadge } from '../experimental_badge'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../kibana_context'; export const WelcomeContent: FC = () => { const toolTipContent = i18n.translate( @@ -35,7 +35,7 @@ export const WelcomeContent: FC = () => { services: { fileUpload: { getMaxBytesFormatted }, }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); const maxFileSize = getMaxBytesFormatted(); return ( diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx index e30369ed1f6ae..e0f8477752c13 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx @@ -17,7 +17,7 @@ import { } from '../../../../../../../src/plugins/data/public'; import { useUrlState } from '../../util/url_state'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../kibana_context'; import { mlTimefilterRefresh$ } from '../../index_data_visualizer/services/timefilter_refresh_service'; interface TimePickerQuickRange { @@ -54,7 +54,7 @@ function updateLastRefresh(timeRange: OnRefreshProps) { } export const DatePickerWrapper: FC = () => { - const { services } = useFileDataVisualizerKibana(); + const { services } = useDataVisualizerKibana(); const config = services.uiSettings; const { timefilter, history } = services.data.query.timefilter; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx index 42bc5ebf61227..9d45a8f36c8da 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx @@ -23,7 +23,7 @@ import { isErrorEmbeddable, ViewMode, } from '../../../../../../../src/plugins/embeddable/public'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../kibana_context'; export function EmbeddedMapComponent({ layerList, @@ -41,7 +41,7 @@ export function EmbeddedMapComponent({ const { services: { embeddable: embeddablePlugin, maps: mapsPlugin }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); const factory: | EmbeddableFactory diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx index d3fce40ac17fc..5d5b95424c082 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx @@ -14,7 +14,7 @@ import { DocumentStatsTable } from '../../stats_table/components/field_data_expa import { ExamplesList } from '../../examples_list'; import { FieldVisConfig } from '../../stats_table/types'; import { LayerDescriptor } from '../../../../../../maps/common/descriptor_types'; -import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { useDataVisualizerKibana } from '../../../kibana_context'; import { JOB_FIELD_TYPES } from '../../../../../common'; import { ES_GEO_FIELD_TYPE } from '../../../../../../maps/common'; import { EmbeddedMapComponent } from '../../embedded_map'; @@ -28,7 +28,7 @@ export const GeoPointContentWithMap: FC<{ const [layerList, setLayerList] = useState([]); const { services: { maps: mapsPlugin }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); // Update the layer list with updated geo points upon refresh useEffect(() => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx index c2b7e18059769..2c8c752680ffb 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx @@ -22,7 +22,7 @@ import { EuiCopy, } from '@elastic/eui'; import { createFilebeatConfig } from './filebeat_config'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; // copy context? +import { useDataVisualizerKibana } from '../../kibana_context'; // copy context? import { FindFileStructureResponse } from '../../../../../file_upload/common'; export enum EDITOR_MODE { @@ -48,7 +48,7 @@ export const FilebeatConfigFlyout: FC = ({ const [username, setUsername] = useState(null); const { services: { security }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); useEffect(() => { if (security !== undefined) { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx index 5a8d6aa66e180..e5653fb4ff476 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx @@ -7,7 +7,7 @@ import React, { FC, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../kibana_context'; interface HelpMenuProps { docLink: string; @@ -15,7 +15,7 @@ interface HelpMenuProps { // Component for adding a documentation link to the help menu export const HelpMenu: FC = React.memo(({ docLink }) => { - const { chrome } = useFileDataVisualizerKibana().services; + const { chrome } = useDataVisualizerKibana().services; useEffect(() => { chrome.setHelpExtension({ diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx index db9fa8d8d51d9..5ab0ac76feb96 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx @@ -16,7 +16,7 @@ import { import { TimeRange, RefreshInterval } from '../../../../../../../src/plugins/data/public'; import { FindFileStructureResponse } from '../../../../../file_upload/common'; import type { FileUploadPluginStart } from '../../../../../file_upload/public'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../kibana_context'; interface Props { fieldStats: FindFileStructureResponse['field_stats']; @@ -44,7 +44,7 @@ export const ResultsLinks: FC = ({ }) => { const { services: { fileUpload }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); const [duration, setDuration] = useState({ from: 'now-30m', @@ -63,7 +63,7 @@ export const ResultsLinks: FC = ({ urlGenerators: { getUrlGenerator }, }, }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); useEffect(() => { let unmounted = false; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx index 6448883bfce73..b07a4581660da 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx @@ -9,7 +9,7 @@ import React, { FC, useCallback, useEffect, useState } from 'react'; import type { FieldDataRowProps } from '../../types/field_data_row'; import { TopValues } from '../../../top_values'; import { EMSTermJoinConfig } from '../../../../../../../maps/public'; -import { useFileDataVisualizerKibana } from '../../../../kibana_context'; +import { useDataVisualizerKibana } from '../../../../kibana_context'; import { DocumentStatsTable } from './document_stats'; import { ExpandedRowContent } from './expanded_row_content'; import { ChoroplethMap } from './choropleth_map'; @@ -27,7 +27,7 @@ export const KeywordContent: FC = ({ config }) => { const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; const { services: { maps: mapsPlugin }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); const loadEMSTermSuggestions = useCallback(async () => { if (!mapsPlugin) return; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts index e24134507e3a9..c6f463595e74d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts @@ -12,7 +12,7 @@ import euiThemeDark from '@elastic/eui/dist/eui_theme_dark.json'; import { i18n } from '@kbn/i18n'; -import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { useDataVisualizerKibana } from '../../../kibana_context'; /** * Custom color scale factory that takes the amount of feature influencers @@ -211,7 +211,7 @@ export type EuiThemeType = typeof euiThemeLight | typeof euiThemeDark; export function useCurrentEuiTheme() { const { services: { uiSettings }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); return useMemo( () => ({ euiTheme: uiSettings.get('theme:darkMode') ? euiThemeDark : euiThemeLight }), [uiSettings] diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx index c37aae4864cb9..8477b75162081 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx @@ -15,7 +15,7 @@ import { DiscoverUrlGeneratorState, } from '../../../../../../../../src/plugins/discover/public'; import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns'; -import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { useDataVisualizerKibana } from '../../../kibana_context'; import { useUrlState } from '../../../util/url_state'; import { LinkCard } from '../../../components/link_card'; @@ -25,7 +25,7 @@ interface Props { searchQueryLanguage?: string; } -// @todo: add back create job card +// @todo: Add back create job card in a follow up PR export const ActionsPanel: FC = ({ indexPattern, searchString, searchQueryLanguage }) => { const [globalState] = useUrlState('_g'); @@ -37,7 +37,7 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer urlGenerators: { getUrlGenerator }, }, }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); useEffect(() => { let unmounted = false; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts index 9268ddcdebc68..cfd1d769c82cc 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts @@ -12,6 +12,7 @@ import dateMath from '@elastic/datemath'; import { IndexPattern } from '../../../../../../../../src/plugins/data/public'; import { isPopulatedObject } from '../../../../../common/utils/object_utils'; import { getTimeFieldRange } from '../../services/time_field_range'; +import { GetTimeFieldRangeResponse } from '../../../../../common/types/time_field_request'; export interface TimeRange { from: number; @@ -22,8 +23,7 @@ export async function setFullTimeRange( timefilter: TimefilterContract, indexPattern: IndexPattern, query: Query - // @todo: fix any -): Promise { +): Promise { try { const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields; const resp = await getTimeFieldRange({ diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx index 644fb0e6222fe..dcca2edf9d9b0 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -52,7 +52,7 @@ import { JobFieldType, SavedSearchSavedObject, } from '../../../../../common/types'; -import { useFileDataVisualizerKibana } from '../../../kibana_context'; +import { useDataVisualizerKibana } from '../../../kibana_context'; import { FieldCountPanel } from '../../../components/field_count_panel'; import { DocumentCountContent } from '../../../components/document_count_content'; import { DataLoader } from '../../data_loader/data_loader'; @@ -125,7 +125,7 @@ const restorableDefaults = getDefaultDataVisualizerListState(); export const IndexDataVisualizerView: FC = (dataVisualizerProps) => { const { services: { lens: lensPlugin, docLinks, notifications, uiSettings }, - } = useFileDataVisualizerKibana(); + } = useDataVisualizerKibana(); const { toasts } = notifications; const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState( diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts index eb21fa1f97ba4..132d03c81c0e6 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts @@ -6,7 +6,7 @@ */ import { useEffect } from 'react'; -import { useFileDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../kibana_context'; interface UseTimefilterOptions { timeRangeSelector?: boolean; @@ -17,7 +17,7 @@ export const useTimefilter = ({ timeRangeSelector, autoRefreshSelector, }: UseTimefilterOptions = {}) => { - const { services } = useFileDataVisualizerKibana(); + const { services } = useDataVisualizerKibana(); const { timefilter } = services.data.query.timefilter; useEffect(() => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts index 57bacd8610d50..c6a4c6537f3b7 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts @@ -11,7 +11,6 @@ import type { DocumentCounts, FieldRequestConfig, FieldVisStats } from '../../.. import { OverallStats } from '../types/overall_stats'; export function basePath() { - // @todo: change to internal/data_visualizer return '/internal/data_visualizer'; } @@ -48,7 +47,6 @@ export async function getVisualizerOverallStats({ }); const fileUploadModules = await lazyLoadModules(); - // @todo: update return await fileUploadModules.getHttp().fetch({ path: `${basePath()}/get_overall_stats/${indexPatternTitle}`, method: 'POST', @@ -92,7 +90,6 @@ export async function getVisualizerFieldStats({ }); const fileUploadModules = await lazyLoadModules(); - // @todo: update return await fileUploadModules.getHttp().fetch<[DocumentCounts, FieldVisStats]>({ path: `${basePath()}/get_field_stats/${indexPatternTitle}`, method: 'POST', diff --git a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts index a5aa688eadbba..3fcd6b656f03d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts @@ -10,5 +10,4 @@ import { useKibana } from '../../../../../src/plugins/kibana_react/public'; import type { FileDataVisualizerStartDependencies } from '../plugin'; export type StartServices = CoreStart & FileDataVisualizerStartDependencies; -// @todo: rename -export const useFileDataVisualizerKibana = () => useKibana(); +export const useDataVisualizerKibana = () => useKibana(); From bd304350f5c275f05bf1ba9a241b0c54aa1944bf Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 09:42:03 -0500 Subject: [PATCH 21/53] [ML] Move the toast error to the UI component --- .../full_time_range_selector.tsx | 24 ++++++++++-- .../full_time_range_selector_service.ts | 37 +++++++------------ .../services/time_field_range.ts | 2 +- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index ffcd423cfc50f..072f28c36899f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -10,7 +10,9 @@ import React, { FC } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { Query, IndexPattern, TimefilterContract } from 'src/plugins/data/public'; import { EuiButton } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; import { setFullTimeRange } from './full_time_range_selector_service'; +import { useDataVisualizerKibana } from '../../../kibana_context'; interface Props { timefilter: TimefilterContract; @@ -29,11 +31,25 @@ export const FullTimeRangeSelector: FC = ({ disabled, callback, }) => { + const { + services: { + notifications: { toasts }, + }, + } = useDataVisualizerKibana(); + // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop async function setRange(i: IndexPattern, q: Query) { - const fullTimeRange = await setFullTimeRange(timefilter, i, q); - if (typeof callback === 'function') { - callback(fullTimeRange); + try { + const fullTimeRange = await setFullTimeRange(timefilter, i, q); + if (typeof callback === 'function') { + callback(fullTimeRange); + } + } catch (e) { + toasts.addDanger( + i18n.translate('dataVisualizer.fullTimeRangeSelector.errorSettingTimeRangeNotification', { + defaultMessage: 'An error occurred setting the time range.', + }) + ); } } return ( @@ -43,7 +59,7 @@ export const FullTimeRangeSelector: FC = ({ data-test-subj="mlButtonUseFullData" > { - try { - const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields; - const resp = await getTimeFieldRange({ - index: indexPattern.title, - timeFieldName: indexPattern.timeFieldName, - query, - ...(isPopulatedObject(runtimeMappings) ? { runtimeMappings } : {}), - }); - timefilter.setTime({ - from: moment(resp.start.epoch).toISOString(), - to: moment(resp.end.epoch).toISOString(), - }); - return resp; - } catch (resp) { - // @todo - // const toastNotifications = getToastNotifications(); - // toastNotifications.addDanger( - // i18n.translate('xpack.ml.fullTimeRangeSelector.errorSettingTimeRangeNotification', { - // defaultMessage: 'An error occurred setting the time range.', - // }) - // ); - // return resp; - } +): Promise { + const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields; + const resp = await getTimeFieldRange({ + index: indexPattern.title, + timeFieldName: indexPattern.timeFieldName, + query, + ...(isPopulatedObject(runtimeMappings) ? { runtimeMappings } : {}), + }); + timefilter.setTime({ + from: moment(resp.start.epoch).toISOString(), + to: moment(resp.end.epoch).toISOString(), + }); + return resp; } export function getTimeFilterRange(timefilter: TimefilterContract): TimeRange { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts index c720edf34210b..4ab4a49ef3d51 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts @@ -23,7 +23,7 @@ export async function getTimeFieldRange({ query: any; runtimeMappings?: estypes.RuntimeFields; indicesOptions?: IndicesOptions; -}) { +}): Promise { const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings, indicesOptions }); const fileUploadModules = await lazyLoadModules(); From df79e2160f74c0e733c0bf445fadd8ea91555d4e Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 10:27:00 -0500 Subject: [PATCH 22/53] [ML] Fix map styling --- .../geo_point_content_with_map.tsx | 5 +++-- .../index_data_visualizer/services/time_field_range.ts | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx index 5d5b95424c082..6b0ce353f80a4 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx @@ -57,7 +57,8 @@ export const GeoPointContentWithMap: FC<{ } } updateIndexPatternSearchLayer(); - }, [indexPattern, combinedQuery, config, mapsPlugin, layerList]); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [indexPattern, combinedQuery, config, mapsPlugin]); if (stats?.examples === undefined) return null; return ( @@ -67,7 +68,7 @@ export const GeoPointContentWithMap: FC<{ - + diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts index 4ab4a49ef3d51..e74b7de1fb707 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts @@ -9,7 +9,6 @@ import { estypes } from '@elastic/elasticsearch'; import { IndicesOptions } from '../../../../common/types/indices'; import { lazyLoadModules } from '../../../lazy_load_bundle'; import { GetTimeFieldRangeResponse } from '../../../../common/types/time_field_request'; -import { basePath } from './visualizer_stats'; export async function getTimeFieldRange({ index, @@ -28,7 +27,7 @@ export async function getTimeFieldRange({ const fileUploadModules = await lazyLoadModules(); return await fileUploadModules.getHttp().fetch({ - path: `${basePath()}/fields_service/time_field_range`, + path: `/api/ml/fields_service/time_field_range`, method: 'POST', body, }); From adbcaac7c3170bd79b5f7c2fdf7aa662719d595b Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 10:55:26 -0500 Subject: [PATCH 23/53] [ML] Add runtime_mappings for internal/file_upload/time_field_range --- .../services/time_field_range.ts | 9 ++-- .../server/get_time_field_range.ts | 7 +++- x-pack/plugins/file_upload/server/routes.ts | 13 ++++-- x-pack/plugins/file_upload/server/schemas.ts | 13 ++++++ .../server/utils/runtime_field_utils.ts | 41 +++++++++++++++++++ 5 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts index e74b7de1fb707..089e815cffe89 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts @@ -6,7 +6,6 @@ */ import { estypes } from '@elastic/elasticsearch'; -import { IndicesOptions } from '../../../../common/types/indices'; import { lazyLoadModules } from '../../../lazy_load_bundle'; import { GetTimeFieldRangeResponse } from '../../../../common/types/time_field_request'; @@ -15,19 +14,17 @@ export async function getTimeFieldRange({ timeFieldName, query, runtimeMappings, - indicesOptions, }: { index: string; timeFieldName?: string; query: any; runtimeMappings?: estypes.RuntimeFields; - indicesOptions?: IndicesOptions; -}): Promise { - const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings, indicesOptions }); +}) { + const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings }); const fileUploadModules = await lazyLoadModules(); return await fileUploadModules.getHttp().fetch({ - path: `/api/ml/fields_service/time_field_range`, + path: `/internal/file_upload/time_field_range`, method: 'POST', body, }); diff --git a/x-pack/plugins/file_upload/server/get_time_field_range.ts b/x-pack/plugins/file_upload/server/get_time_field_range.ts index 66a428128cbe1..988622335a939 100644 --- a/x-pack/plugins/file_upload/server/get_time_field_range.ts +++ b/x-pack/plugins/file_upload/server/get_time_field_range.ts @@ -5,11 +5,15 @@ * 2.0. */ import { IScopedClusterClient } from 'kibana/server'; +import { estypes } from '@elastic/elasticsearch'; +import { isPopulatedObject } from './utils/runtime_field_utils'; + export async function getTimeFieldRange( client: IScopedClusterClient, index: string[] | string, timeFieldName: string, - query: any + query: any, + runtimeMappings?: estypes.RuntimeFields ): Promise<{ success: boolean; start: { epoch: number; string: string }; @@ -36,6 +40,7 @@ export async function getTimeFieldRange( }, }, }, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), }, }); diff --git a/x-pack/plugins/file_upload/server/routes.ts b/x-pack/plugins/file_upload/server/routes.ts index 3033f8300712c..bd3aa2688c735 100644 --- a/x-pack/plugins/file_upload/server/routes.ts +++ b/x-pack/plugins/file_upload/server/routes.ts @@ -21,7 +21,12 @@ import { getTimeFieldRange } from './get_time_field_range'; import { analyzeFile } from './analyze_file'; import { updateTelemetry } from './telemetry'; -import { importFileBodySchema, importFileQuerySchema, analyzeFileQuerySchema } from './schemas'; +import { + importFileBodySchema, + importFileQuerySchema, + analyzeFileQuerySchema, + runtimeMappingsSchema, +} from './schemas'; import { StartDeps } from './types'; import { checkFileUploadPrivileges } from './check_privileges'; @@ -219,6 +224,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge timeFieldName: schema.string(), /** Query to match documents in the index(es). */ query: schema.maybe(schema.any()), + runtimeMappings: schema.maybe(runtimeMappingsSchema), }), }, options: { @@ -227,12 +233,13 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge }, async (context, request, response) => { try { - const { index, timeFieldName, query } = request.body; + const { index, timeFieldName, query, runtimeMappings } = request.body; const resp = await getTimeFieldRange( context.core.elasticsearch.client, index, timeFieldName, - query + query, + runtimeMappings ); return response.ok({ diff --git a/x-pack/plugins/file_upload/server/schemas.ts b/x-pack/plugins/file_upload/server/schemas.ts index a0d54cf9ec553..58b7c5d7866e3 100644 --- a/x-pack/plugins/file_upload/server/schemas.ts +++ b/x-pack/plugins/file_upload/server/schemas.ts @@ -6,6 +6,7 @@ */ import { schema } from '@kbn/config-schema'; +import { isRuntimeField } from '../../ml/common'; export const analyzeFileQuerySchema = schema.object({ charset: schema.maybe(schema.string()), @@ -40,3 +41,15 @@ export const importFileBodySchema = schema.object({ pipeline: schema.maybe(schema.any()), }), }); + +export const runtimeMappingsSchema = schema.object( + {}, + { + unknowns: 'allow', + validate: (v: object) => { + if (Object.values(v).some((o) => !isRuntimeField(o))) { + return 'Invalid runtime field'; + } + }, + } +); diff --git a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts new file mode 100644 index 0000000000000..7742918ac66e6 --- /dev/null +++ b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common/index_patterns'; + +type RuntimeType = typeof RUNTIME_FIELD_TYPES[number]; + +export const isPopulatedObject = ( + arg: unknown, + requiredAttributes: U[] = [] +): arg is Record => { + return ( + typeof arg === 'object' && + arg !== null && + Object.keys(arg).length > 0 && + (requiredAttributes.length === 0 || + requiredAttributes.every((d) => ({}.hasOwnProperty.call(arg, d)))) + ); +}; + +export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField { + return ( + ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) || + (isPopulatedObject(arg, ['type', 'script']) && + Object.keys(arg).length === 2 && + (typeof arg.script === 'string' || + (isPopulatedObject(arg.script, ['source']) && + Object.keys(arg.script).length === 1 && + typeof arg.script.source === 'string')))) && + RUNTIME_FIELD_TYPES.includes(arg.type as RuntimeType) + ); +} + +export function isRuntimeMappings(arg: unknown): arg is estypes.RuntimeFields { + return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d)); +} From ef65d20bea06c500543072bba62e591d327597ba Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 10:59:13 -0500 Subject: [PATCH 24/53] [ML] Move routes into folder --- .../plugins/file_data_visualizer/server/routes/index.ts | 8 ++++++++ .../file_data_visualizer/server/{ => routes}/routes.ts | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 x-pack/plugins/file_data_visualizer/server/routes/index.ts rename x-pack/plugins/file_data_visualizer/server/{ => routes}/routes.ts (97%) diff --git a/x-pack/plugins/file_data_visualizer/server/routes/index.ts b/x-pack/plugins/file_data_visualizer/server/routes/index.ts new file mode 100644 index 0000000000000..892f6cbd77361 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/routes/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { dataVisualizerRoutes } from './routes'; diff --git a/x-pack/plugins/file_data_visualizer/server/routes.ts b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts similarity index 97% rename from x-pack/plugins/file_data_visualizer/server/routes.ts rename to x-pack/plugins/file_data_visualizer/server/routes/routes.ts index 47ac73faaa38a..51ca0f9e16109 100644 --- a/x-pack/plugins/file_data_visualizer/server/routes.ts +++ b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts @@ -12,10 +12,10 @@ import { dataVisualizerFieldStatsSchema, dataVisualizerOverallStatsSchema, indexPatternTitleSchema, -} from './routes/schemas'; -import { DataVisualizer, Field, HistogramField } from './models/data_visualizer'; -import type { StartDeps } from './types'; -import { wrapError } from './utils/error_wrapper'; +} from './schemas'; +import { DataVisualizer, Field, HistogramField } from '../models/data_visualizer'; +import type { StartDeps } from '../types'; +import { wrapError } from '../utils/error_wrapper'; function getOverallStats( client: IScopedClusterClient, From 25b0f579548446071a6c3771d1ebaccbccb20454 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 11:01:27 -0500 Subject: [PATCH 25/53] [ML] Update permissions --- x-pack/plugins/file_data_visualizer/server/routes/routes.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts index 51ca0f9e16109..05a4c5140d370 100644 --- a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts +++ b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts @@ -114,7 +114,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: dataVisualizerFieldHistogramsSchema, }, options: { - tags: ['access:ml:canAccessML'], + tags: ['access:dataVisualizer:view'], }, }, async (context, request, response) => { @@ -163,7 +163,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: dataVisualizerFieldStatsSchema, }, options: { - tags: ['access:ml:canAccessML'], + tags: ['access:dataVisualizer:view'], }, }, async (context, request, response) => { @@ -230,7 +230,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: dataVisualizerOverallStatsSchema, }, options: { - tags: ['access:ml:canAccessML'], + tags: ['access:dataVisualizer:view'], }, }, async (context, request, response) => { From 21a460fcfd7a7a3c48792860c5b9ba2524aab65c Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 11:19:17 -0500 Subject: [PATCH 26/53] [ML] Update texts --- .../document_count_chart.tsx | 10 +- .../total_count_header.tsx | 4 +- .../field_count_panel/field_count_panel.tsx | 2 +- .../field_data_row/action_menu/actions.ts | 4 +- .../field_data_row/action_menu/lens_utils.ts | 8 +- .../components/help_menu/help_menu.tsx | 4 +- .../loading_indicator/loading_indicator.tsx | 5 +- .../not_in_docs_context.tsx | 2 +- .../actions_panel/actions_panel.tsx | 6 +- .../full_time_range_selector.tsx | 11 ++- .../index_data_visualizer_view.tsx | 22 +++-- .../search_panel/field_name_filter.tsx | 2 +- .../search_panel/field_type_filter.tsx | 2 +- .../components/search_panel/search_panel.tsx | 4 +- .../search_panel/shard_size_select.tsx | 8 +- .../data_loader/data_loader.ts | 4 +- .../translations/translations/ja-JP.json | 91 +++++------------- .../translations/translations/zh-CN.json | 95 +++++-------------- 18 files changed, 103 insertions(+), 181 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx index 4c8740cc76b6f..796a165175efd 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx @@ -41,9 +41,12 @@ export const DocumentCountChart: FC = ({ timeRangeLatest, interval, }) => { - const seriesName = i18n.translate('xpack.ml.fieldDataCard.documentCountChart.seriesLabel', { - defaultMessage: 'document count', - }); + const seriesName = i18n.translate( + 'xpack.fileDataVisualizer.fieldDataCard.documentCountChart.seriesLabel', + { + defaultMessage: 'document count', + } + ); const xDomain = { min: timeRangeEarliest, @@ -65,6 +68,7 @@ export const DocumentCountChart: FC = ({ ]; } return chartPoints; + // eslint-disable-next-line react-hooks/exhaustive-deps }, [chartPoints, timeRangeEarliest, timeRangeLatest, interval]); return ( diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx index 24a89ec070fe7..d374b6679e983 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx @@ -14,13 +14,13 @@ export const TotalCountHeader = ({ totalCount }: { totalCount: number }) => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx index e5942a5f230a7..f8daeb34964b1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx @@ -38,7 +38,7 @@ export const FieldCountPanel: FC = ({ data-test-subj="mlDataVisualizerShowEmptyFieldsSwitch" label={ } diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts index 3dbdb3f12586d..b019c8d7cc466 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts @@ -20,11 +20,11 @@ export function getActions( const canUseLensEditor = lensPlugin.canUseEditor(); return [ { - name: i18n.translate('xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle', { + name: i18n.translate('xpack.fileDataVisualizer.indexBasedDataGrid.exploreInLensTitle', { defaultMessage: 'Explore in Lens', }), description: i18n.translate( - 'xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription', + 'xpack.fileDataVisualizer.indexBasedDataGrid.exploreInLensDescription', { defaultMessage: 'Explore in Lens', } diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts index 4382551aba920..07c0c0b5bc673 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts @@ -20,10 +20,10 @@ interface ColumnsAndLayer { layer: XYLayerConfig; } -const TOP_VALUES_LABEL = i18n.translate('xpack.ml.dataVisualizer.lensChart.topValuesLabel', { +const TOP_VALUES_LABEL = i18n.translate('xpack.fileDataVisualizer.lensChart.topValuesLabel', { defaultMessage: 'Top values', }); -const COUNT = i18n.translate('xpack.ml.dataVisualizer.lensChart.countLabel', { +const COUNT = i18n.translate('xpack.fileDataVisualizer.lensChart.countLabel', { defaultMessage: 'Count', }); @@ -65,7 +65,7 @@ export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: Ind col2: { dataType: 'number', isBucketed: false, - label: i18n.translate('xpack.ml.dataVisualizer.lensChart.averageOfLabel', { + label: i18n.translate('xpack.fileDataVisualizer.lensChart.averageOfLabel', { defaultMessage: 'Average of {fieldName}', values: { fieldName: item.fieldName }, }), @@ -247,7 +247,7 @@ export function getLensAttributes( return { visualizationType: 'lnsXY', - title: i18n.translate('xpack.ml.dataVisualizer.lensChart.chartTitle', { + title: i18n.translate('xpack.fileDataVisualizer.lensChart.chartTitle', { defaultMessage: 'Lens for {fieldName}', values: { fieldName: item.fieldName }, }), diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx index e5653fb4ff476..a6ffb668092ff 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx @@ -19,8 +19,8 @@ export const HelpMenu: FC = React.memo(({ docLink }) => { useEffect(() => { chrome.setHelpExtension({ - appName: i18n.translate('xpack.ml.chrome.help.appName', { - defaultMessage: 'Machine Learning', + appName: i18n.translate('xpack.fileDataVisualizer.chrome.help.appName', { + defaultMessage: 'Data Visualizer', }), links: [ { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx index ff606b7ec2ffd..6f0d5b8ecd6b7 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx @@ -21,7 +21,10 @@ export const LoadingIndicator: FC = () => ( - + diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx index e3bb4323ce6a8..5d06e3207298f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx @@ -20,7 +20,7 @@ export const NotInDocsContent: FC = () => ( diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx index 8477b75162081..4f409aaea6b2c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx @@ -92,7 +92,7 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer

@@ -102,14 +102,14 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer href={discoverLink} icon="discoverApp" description={i18n.translate( - 'xpack.ml.datavisualizer.actionsPanel.viewIndexInDiscoverDescription', + 'xpack.fileDataVisualizer.actionsPanel.viewIndexInDiscoverDescription', { defaultMessage: 'Explore the documents in your index.', } )} title={ } diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index 072f28c36899f..6108574df203c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -46,9 +46,12 @@ export const FullTimeRangeSelector: FC = ({ } } catch (e) { toasts.addDanger( - i18n.translate('dataVisualizer.fullTimeRangeSelector.errorSettingTimeRangeNotification', { - defaultMessage: 'An error occurred setting the time range.', - }) + i18n.translate( + 'xpack.fileDataVisualizer.fullTimeRangeSelector.errorSettingTimeRangeNotification', + { + defaultMessage: 'An error occurred setting the time range.', + } + ) ); } } @@ -59,7 +62,7 @@ export const FullTimeRangeSelector: FC = ({ data-test-subj="mlButtonUseFullData" > = (dataVi useEffect(() => { if (!currentIndexPattern.isTimeBased()) { toasts.addWarning({ - title: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle', { - defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', - values: { indexPatternTitle: currentIndexPattern.title }, - }), - text: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription', { - defaultMessage: 'Anomaly detection only runs over time-based indices', - }), + title: i18n.translate( + 'xpack.fileDataVisualizer.indexPatternNotBasedOnTimeSeriesNotificationTitle', + { + defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', + values: { indexPatternTitle: currentIndexPattern.title }, + } + ), + text: i18n.translate( + 'xpack.fileDataVisualizer.indexPatternNotBasedOnTimeSeriesNotificationDescription', + { + defaultMessage: 'Anomaly detection only runs over time-based indices', + } + ), }); } }, [currentIndexPattern, toasts]); @@ -755,7 +761,7 @@ export const IndexDataVisualizerView: FC = (dataVi const actionColumn: EuiTableActionsColumnType = { name: ( ), diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx index 28f186897c0b6..a4133e1d444b1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx @@ -45,7 +45,7 @@ export const DataVisualizerFieldNamesFilter: FC = ({ const fieldNameTitle = useMemo( () => - i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldNameSelect', { + i18n.translate('xpack.fileDataVisualizer.indexBased.fieldNameSelect', { defaultMessage: 'Field name', }), [] diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx index f9343ad505ad4..e52c16f67fb03 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx @@ -55,7 +55,7 @@ export const DatavisualizerFieldTypeFilter: FC<{ }, [indexedFieldTypes]); const fieldTypeTitle = useMemo( () => - i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldTypeSelect', { + i18n.translate('xpack.fileDataVisualizer.indexBased.fieldTypeSelect', { defaultMessage: 'Field type', }), [] diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx index 9e666272729c2..4f0c2a614d01d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx @@ -111,7 +111,7 @@ export const SearchPanel: FC = ({ onChange={searchChangeHandler} onSubmit={searchHandler} placeholder={i18n.translate( - 'xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText', + 'xpack.fileDataVisualizer.searchPanel.queryBarPlaceholderText', { defaultMessage: 'Search… (e.g. status:200 AND extension:"PHP")', } @@ -125,7 +125,7 @@ export const SearchPanel: FC = ({ > {i18n.translate( - 'xpack.ml.datavisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar', + 'xpack.fileDataVisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar', { defaultMessage: 'Invalid query', } diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx index 5351d3467020f..250e8693bac56 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx @@ -22,7 +22,7 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { v > 0 ? ( {v} }} /> @@ -30,7 +30,7 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { ) : ( @@ -46,7 +46,7 @@ export const ShardSizeFilter: FC = ({ samplerShardSize, setSamplerShardSi options={searchSizeOptions} valueOfSelected={String(samplerShardSize)} onChange={(value) => setSamplerShardSize(+value)} - aria-label={i18n.translate('xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel', { + aria-label={i18n.translate('xpack.fileDataVisualizer.searchPanel.sampleSizeAriaLabel', { defaultMessage: 'Select number of documents to sample', })} data-test-subj="mlDataVisualizerShardSizeSelect" @@ -54,7 +54,7 @@ export const ShardSizeFilter: FC = ({ samplerShardSize, setSamplerShardSi Date: Fri, 28 May 2021 13:44:48 -0500 Subject: [PATCH 27/53] [ML] Update schemas import and api get_field_stats --- x-pack/plugins/file_upload/server/schemas.ts | 2 +- .../api_integration/apis/ml/data_visualizer/get_field_stats.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/file_upload/server/schemas.ts b/x-pack/plugins/file_upload/server/schemas.ts index 58b7c5d7866e3..baf7ed864f2e6 100644 --- a/x-pack/plugins/file_upload/server/schemas.ts +++ b/x-pack/plugins/file_upload/server/schemas.ts @@ -6,7 +6,7 @@ */ import { schema } from '@kbn/config-schema'; -import { isRuntimeField } from '../../ml/common'; +import { isRuntimeField } from './utils/runtime_field_utils'; export const analyzeFileQuerySchema = schema.object({ charset: schema.maybe(schema.string()), diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts index 6e7231065c377..c1a928095a07d 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts @@ -167,7 +167,7 @@ export default ({ getService }: FtrProviderContext) => { expectedResponsecode: number ): Promise { const { body } = await supertest - .post(`/api/ml/data_visualizer/get_field_stats/${index}`) + .post(`/internal/data_visualizer/get_field_stats/${index}`) .auth(user, ml.securityCommon.getPasswordForUser(user)) .set(COMMON_REQUEST_HEADERS) .send(requestBody) From 644302091d3eef83f8797c2ac4560d2545044656 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 28 May 2021 15:47:37 -0500 Subject: [PATCH 28/53] [ML] Reorg folders into common --- .../public/application/_index.scss | 2 +- .../{ => common}/components/_index.scss | 0 .../components/about_panel/_about_panel.scss | 0 .../components/about_panel/_index.scss | 0 .../components/about_panel/about_panel.tsx | 0 .../components/about_panel/index.ts | 0 .../about_panel/welcome_content.tsx | 2 +- .../combined_fields/combined_field_label.tsx | 0 .../combined_fields/combined_fields_form.tsx | 2 +- .../combined_fields_read_only_form.tsx | 0 .../components/combined_fields/geo_point.tsx | 2 +- .../components/combined_fields/index.ts | 0 .../components/combined_fields/types.ts | 0 .../components/combined_fields/utils.test.ts | 0 .../components/combined_fields/utils.ts | 2 +- .../date_picker_wrapper.tsx | 6 ++--- .../components/date_picker_wrapper/index.ts | 0 .../document_count_chart.tsx | 0 .../document_count_chart/index.ts | 0 .../document_count_content.tsx | 0 .../document_count_content/index.ts | 0 .../total_count_header.tsx | 0 .../embedded_map/_embedded_map.scss | 0 .../components/embedded_map/_index.scss | 0 .../components/embedded_map/embedded_map.tsx | 12 ++++----- .../components/embedded_map/index.ts | 0 .../examples_list/examples_list.tsx | 0 .../components/examples_list/index.ts | 0 .../expanded_row/file_based_expanded_row.tsx | 2 +- .../geo_point_content/format_utils.ts | 2 +- .../geo_point_content/geo_point_content.tsx | 0 .../expanded_row/geo_point_content/index.ts | 0 .../geo_point_content_with_map.tsx | 12 ++++----- .../geo_point_content_with_map/index.ts | 0 .../components/expanded_row/index.ts | 0 .../expanded_row/index_based_expanded_row.tsx | 6 ++--- .../common/components/expanded_row/types.ts | 6 +++++ .../_experimental_badge.scss | 0 .../components/experimental_badge/_index.scss | 0 .../experimental_badge/experimental_badge.tsx | 0 .../components/experimental_badge/index.ts | 0 .../field_count_panel/field_count_panel.tsx | 0 .../components/field_count_panel/index.ts | 0 .../field_data_row/action_menu/actions.ts | 6 ++--- .../field_data_row/action_menu/index.ts | 0 .../field_data_row/action_menu/lens_utils.ts | 8 +++--- .../components/field_data_row/index.ts | 0 .../field_data_row/number_content_preview.tsx | 0 .../field_names_filter/field_names_filter.tsx | 0 .../components/field_names_filter/index.ts | 0 .../field_type_icon.test.tsx.snap | 0 .../field_type_icon/field_type_icon.test.tsx | 2 +- .../field_type_icon/field_type_icon.tsx | 4 +-- .../components/field_type_icon/index.ts | 0 .../field_types_filter/field_types_filter.tsx | 2 +- .../components/field_types_filter/index.ts | 0 .../fields_stats_grid/create_fields.ts | 4 +-- .../fields_stats_grid/fields_stats_grid.tsx | 4 +-- .../fields_stats_grid/filter_fields.ts | 2 +- .../fields_stats_grid/get_field_names.ts | 8 +++--- .../components/fields_stats_grid/index.ts | 0 .../filebeat_config_flyout/filebeat_config.ts | 2 +- .../filebeat_config_flyout.tsx | 4 +-- .../filebeat_config_flyout/index.ts | 0 .../components/help_menu/help_menu.tsx | 2 +- .../components/help_menu/index.tsx | 0 .../components/link_card/index.ts | 0 .../components/link_card/link_card.tsx | 0 .../components/loading_indicator/index.ts | 0 .../loading_indicator/loading_indicator.tsx | 0 .../components/multi_select_picker/index.ts | 0 .../multi_select_picker.tsx | 0 .../components/not_in_docs_content/index.ts | 0 .../not_in_docs_context.tsx | 0 .../components/results_links/index.ts | 0 .../results_links/results_links.tsx | 10 +++---- .../stats_table/_field_data_row.scss | 0 .../components/stats_table/_index.scss | 0 .../expanded_row_field_header.tsx | 0 .../expanded_row_field_header/index.ts | 0 .../components/field_count_stats/_index.scss | 0 .../components/field_count_stats/index.ts | 0 .../field_count_stats/metric_fields_count.tsx | 0 .../field_count_stats/total_fields_count.tsx | 0 .../field_data_expanded_row/_index.scss | 0 .../_number_content.scss | 0 .../boolean_content.tsx | 0 .../choropleth_map.tsx | 6 ++--- .../field_data_expanded_row/date_content.tsx | 0 .../document_stats.tsx | 0 .../expanded_row_content.tsx | 0 .../field_data_expanded_row/index.ts | 0 .../field_data_expanded_row/ip_content.tsx | 0 .../keyword_content.tsx | 4 +-- .../number_content.tsx | 0 .../field_data_expanded_row/other_content.tsx | 0 .../field_data_expanded_row/text_content.tsx | 0 .../components/field_data_row/_index.scss | 0 .../boolean_content_preview.tsx | 0 .../field_data_row/column_chart.scss | 0 .../field_data_row/column_chart.tsx | 0 .../field_data_row/distinct_values.tsx | 0 .../field_data_row/document_stats.tsx | 0 .../field_data_row/field_histograms.ts | 0 .../components/field_data_row/index.ts | 0 .../field_data_row/number_content_preview.tsx | 0 .../field_data_row/top_values_preview.tsx | 0 .../field_data_row/use_column_chart.test.tsx | 2 +- .../field_data_row/use_column_chart.tsx | 2 +- .../metric_distribution_chart/index.ts | 0 .../metric_distribution_chart.tsx | 0 ...metric_distribution_chart_data_builder.tsx | 0 ...tric_distribution_chart_tooltip_header.tsx | 0 .../data_visualizer_stats_table.tsx | 2 +- .../stats_table/hooks/color_range_legend.tsx | 0 .../components/stats_table/hooks/index.ts | 0 .../stats_table/hooks/use_color_range.test.ts | 0 .../stats_table/hooks/use_color_range.ts | 2 +- .../hooks/use_data_viz_chart_theme.ts | 0 .../components/stats_table/index.ts | 0 .../stats_table/types/field_data_row.ts | 0 .../stats_table/types/field_vis_config.ts | 2 +- .../components/stats_table/types/index.ts | 0 .../stats_table/use_table_settings.ts | 2 +- .../components/stats_table/utils.ts | 0 .../components/top_values/_top_values.scss | 0 .../components/top_values/index.ts | 0 .../components/top_values/top_values.tsx | 0 .../components/utils/format_value.ts | 0 .../{ => common}/components/utils/index.ts | 0 .../components/utils/kibana_field_format.ts | 0 .../utils/number_as_ordinal.test.ts | 0 .../components/utils/number_as_ordinal.ts | 0 .../utils/round_to_decimal_place.test.ts | 0 .../utils/round_to_decimal_place.ts | 0 .../{ => common}/components/utils/utils.ts | 2 +- .../util/field_types_utils.test.ts | 2 +- .../{ => common}/util/field_types_utils.ts | 6 ++--- .../{ => common}/util/get_max_bytes.ts | 2 +- .../{ => common}/util/index_utils.ts | 4 +-- .../{ => common}/util/parse_interval.test.ts | 0 .../{ => common}/util/parse_interval.ts | 0 .../{ => common}/util/url_state.tsx | 0 .../components/expanded_row/types.ts | 0 .../file_data_visualizer_view.js | 4 +-- .../components/import_settings/advanced.tsx | 2 +- .../import_settings/import_settings.tsx | 2 +- .../components/import_settings/simple.tsx | 5 +++- .../components/import_view/import_view.js | 8 +++--- .../components/results_view/results_view.tsx | 2 +- .../actions_panel/actions_panel.tsx | 4 +-- .../index_data_visualizer_view.tsx | 27 ++++++++++--------- .../search_panel/field_name_filter.tsx | 2 +- .../search_panel/field_type_filter.tsx | 4 +-- .../index_data_visualizer.tsx | 2 +- .../services/time_buckets.js | 2 +- .../file_data_visualizer/public/plugin.ts | 2 +- 157 files changed, 115 insertions(+), 103 deletions(-) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/about_panel/_about_panel.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/about_panel/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/about_panel/about_panel.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/about_panel/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/about_panel/welcome_content.tsx (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/combined_field_label.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/combined_fields_form.tsx (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/combined_fields_read_only_form.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/geo_point.tsx (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/types.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/utils.test.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/combined_fields/utils.ts (99%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/date_picker_wrapper/date_picker_wrapper.tsx (95%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/date_picker_wrapper/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/document_count_content/document_count_chart/document_count_chart.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/document_count_content/document_count_chart/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/document_count_content/document_count_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/document_count_content/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/document_count_content/total_count_header.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/embedded_map/_embedded_map.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/embedded_map/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/embedded_map/embedded_map.tsx (92%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/embedded_map/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/examples_list/examples_list.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/examples_list/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/file_based_expanded_row.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/geo_point_content/format_utils.ts (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/geo_point_content/geo_point_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/geo_point_content/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx (84%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/geo_point_content_with_map/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/expanded_row/index_based_expanded_row.tsx (89%) create mode 100644 x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/types.ts rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/experimental_badge/_experimental_badge.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/experimental_badge/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/experimental_badge/experimental_badge.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/experimental_badge/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_count_panel/field_count_panel.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_count_panel/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_data_row/action_menu/actions.ts (85%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_data_row/action_menu/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_data_row/action_menu/lens_utils.ts (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_data_row/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_data_row/number_content_preview.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_names_filter/field_names_filter.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_names_filter/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_type_icon/field_type_icon.test.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_type_icon/field_type_icon.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_type_icon/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_types_filter/field_types_filter.tsx (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/field_types_filter/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/fields_stats_grid/create_fields.ts (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/fields_stats_grid/fields_stats_grid.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/fields_stats_grid/filter_fields.ts (95%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/fields_stats_grid/get_field_names.ts (85%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/fields_stats_grid/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/filebeat_config_flyout/filebeat_config.ts (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/filebeat_config_flyout/filebeat_config_flyout.tsx (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/filebeat_config_flyout/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/help_menu/help_menu.tsx (93%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/help_menu/index.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/link_card/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/link_card/link_card.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/loading_indicator/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/loading_indicator/loading_indicator.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/multi_select_picker/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/multi_select_picker/multi_select_picker.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/not_in_docs_content/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/not_in_docs_content/not_in_docs_context.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/results_links/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/results_links/results_links.tsx (95%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/_field_data_row.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/expanded_row_field_header/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_count_stats/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_count_stats/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_count_stats/metric_fields_count.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_count_stats/total_fields_count.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/_number_content.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/boolean_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx (94%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/date_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/document_stats.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/ip_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/keyword_content.tsx (93%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/number_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/other_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_expanded_row/text_content.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/_index.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/boolean_content_preview.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/column_chart.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/column_chart.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/distinct_values.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/document_stats.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/field_histograms.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/number_content_preview.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/top_values_preview.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/use_column_chart.test.tsx (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/field_data_row/use_column_chart.tsx (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/metric_distribution_chart/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/data_visualizer_stats_table.tsx (99%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/hooks/color_range_legend.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/hooks/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/hooks/use_color_range.test.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/hooks/use_color_range.ts (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/hooks/use_data_viz_chart_theme.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/types/field_data_row.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/types/field_vis_config.ts (98%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/types/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/use_table_settings.ts (96%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/stats_table/utils.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/top_values/_top_values.scss (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/top_values/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/top_values/top_values.tsx (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/format_value.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/index.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/kibana_field_format.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/number_as_ordinal.test.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/number_as_ordinal.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/round_to_decimal_place.test.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/round_to_decimal_place.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/components/utils/utils.ts (99%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/field_types_utils.test.ts (95%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/field_types_utils.ts (92%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/get_max_bytes.ts (89%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/index_utils.ts (78%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/parse_interval.test.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/parse_interval.ts (100%) rename x-pack/plugins/file_data_visualizer/public/application/{ => common}/util/url_state.tsx (100%) delete mode 100644 x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/types.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/_index.scss index 9844897440b61..9d38869d6d61c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/_index.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/_index.scss @@ -1,2 +1,2 @@ -@import 'components/index'; +@import 'common/components/index'; @import 'file_data_visualizer/index'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_about_panel.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_about_panel.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_about_panel.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_about_panel.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/about_panel.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/about_panel.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/welcome_content.tsx similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/welcome_content.tsx index 268ff476c5c37..b96a16d390e15 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/welcome_content.tsx @@ -21,7 +21,7 @@ import { import { ExperimentalBadge } from '../experimental_badge'; -import { useDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../../kibana_context'; export const WelcomeContent: FC = () => { const toolTipContent = i18n.translate( diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_field_label.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_field_label.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx index fddab3edc3ec0..d36f83b9f647f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx @@ -29,7 +29,7 @@ import { removeCombinedFieldsFromMappings, removeCombinedFieldsFromPipeline, } from './utils'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; interface Props { mappingsString: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/geo_point.tsx similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/geo_point.tsx index 578d22384be33..1e6a70c9aa0ec 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/geo_point.tsx @@ -29,7 +29,7 @@ import { getFieldNames, getNameCollisionMsg, } from './utils'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; interface Props { addCombinedField: (combinedField: CombinedField) => void; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/types.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/types.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/types.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/types.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.test.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.ts similarity index 99% rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.ts index efd166d4821c5..0fead0a1ead25 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.ts @@ -13,7 +13,7 @@ import { FindFileStructureResponse, IngestPipeline, Mappings, -} from '../../../../../file_upload/common'; +} from '../../../../../../file_upload/common'; const COMMON_LAT_NAMES = ['latitude', 'lat']; const COMMON_LON_NAMES = ['longitude', 'long', 'lon']; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx similarity index 95% rename from x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx index e0f8477752c13..c51752c0c57f0 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/date_picker_wrapper.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx @@ -14,11 +14,11 @@ import { TimeHistoryContract, TimeRange, UI_SETTINGS, -} from '../../../../../../../src/plugins/data/public'; +} from '../../../../../../../../src/plugins/data/public'; import { useUrlState } from '../../util/url_state'; -import { useDataVisualizerKibana } from '../../kibana_context'; -import { mlTimefilterRefresh$ } from '../../index_data_visualizer/services/timefilter_refresh_service'; +import { useDataVisualizerKibana } from '../../../kibana_context'; +import { mlTimefilterRefresh$ } from '../../../index_data_visualizer/services/timefilter_refresh_service'; interface TimePickerQuickRange { from: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/date_picker_wrapper/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/document_count_chart.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_chart/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/document_count_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/document_count_content/total_count_header.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx similarity index 92% rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx index 9d45a8f36c8da..42aee628e5faa 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx @@ -8,22 +8,22 @@ import React, { useEffect, useRef, useState } from 'react'; import { htmlIdGenerator } from '@elastic/eui'; -import { LayerDescriptor } from '../../../../../maps/common/descriptor_types'; -import { INITIAL_LOCATION } from '../../../../../maps/common/constants'; +import { LayerDescriptor } from '../../../../../../maps/common/descriptor_types'; +import { INITIAL_LOCATION } from '../../../../../../maps/common/constants'; import { MapEmbeddable, MapEmbeddableInput, MapEmbeddableOutput, // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../../../../maps/public/embeddable'; -import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../maps/public'; +} from '../../../../../../maps/public/embeddable'; +import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../../maps/public'; import { EmbeddableFactory, ErrorEmbeddable, isErrorEmbeddable, ViewMode, -} from '../../../../../../../src/plugins/embeddable/public'; -import { useDataVisualizerKibana } from '../../kibana_context'; +} from '../../../../../../../../src/plugins/embeddable/public'; +import { useDataVisualizerKibana } from '../../../kibana_context'; export function EmbeddedMapComponent({ layerList, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/examples_list.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/examples_list.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx index 620bcfef8ff6c..8509efb9db95d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx @@ -16,7 +16,7 @@ import { NumberContent, } from '../stats_table/components/field_data_expanded_row'; import { GeoPointContent } from './geo_point_content/geo_point_content'; -import { JOB_FIELD_TYPES } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; import type { FileBasedFieldVisConfig } from '../stats_table/types/field_vis_config'; export const FileBasedDataVisualizerExpandedRow = ({ item }: { item: FileBasedFieldVisConfig }) => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts index 69e361aba9bca..ddc9255b4834d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts @@ -8,7 +8,7 @@ import { Feature, Point } from 'geojson'; import { euiPaletteColorBlind } from '@elastic/eui'; import { DEFAULT_GEO_REGEX } from './geo_point_content'; -import { SOURCE_TYPES } from '../../../../../../maps/common/constants'; +import { SOURCE_TYPES } from '../../../../../../../maps/common/constants'; export const convertWKTGeoToLonLat = ( value: string | number diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx similarity index 84% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx index 6b0ce353f80a4..bbf9f291fc0a3 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx @@ -7,16 +7,16 @@ import React, { FC, useEffect, useState } from 'react'; import { EuiFlexItem } from '@elastic/eui'; -import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; +import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query'; import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content'; import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats'; import { ExamplesList } from '../../examples_list'; import { FieldVisConfig } from '../../stats_table/types'; -import { LayerDescriptor } from '../../../../../../maps/common/descriptor_types'; -import { useDataVisualizerKibana } from '../../../kibana_context'; -import { JOB_FIELD_TYPES } from '../../../../../common'; -import { ES_GEO_FIELD_TYPE } from '../../../../../../maps/common'; +import { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types'; +import { useDataVisualizerKibana } from '../../../../kibana_context'; +import { JOB_FIELD_TYPES } from '../../../../../../common'; +import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common'; import { EmbeddedMapComponent } from '../../embedded_map'; export const GeoPointContentWithMap: FC<{ diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content_with_map/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx similarity index 89% rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx index 4534d839efd0f..0d92afb08289b 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index_based_expanded_row.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { GeoPointContentWithMap } from './geo_point_content_with_map'; -import { JOB_FIELD_TYPES } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; import { BooleanContent, DateContent, @@ -19,8 +19,8 @@ import { } from '../stats_table/components/field_data_expanded_row'; import { NotInDocsContent } from '../not_in_docs_content'; import { FieldVisConfig } from '../stats_table/types'; -import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { CombinedQuery } from '../../index_data_visualizer/types/combined_query'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; import { LoadingIndicator } from '../loading_indicator'; export const IndexBasedDataVisualizerExpandedRow = ({ diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/types.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/types.ts new file mode 100644 index 0000000000000..1fec1c76430eb --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/types.ts @@ -0,0 +1,6 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/field_count_panel.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_count_panel/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts similarity index 85% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts index b019c8d7cc466..23915d4d724cf 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/actions.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts @@ -8,10 +8,10 @@ import { i18n } from '@kbn/i18n'; import { Action } from '@elastic/eui/src/components/basic_table/action_types'; import { getCompatibleLensDataType, getLensAttributes } from './lens_utils'; -import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; +import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query'; import { FieldVisConfig } from '../../stats_table/types'; -import { LensPublicStart } from '../../../../../../lens/public'; +import { LensPublicStart } from '../../../../../../../lens/public'; export function getActions( indexPattern: IndexPattern, lensPlugin: LensPublicStart, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts index 07c0c0b5bc673..776785a3c332a 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/action_menu/lens_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts @@ -6,15 +6,15 @@ */ import { i18n } from '@kbn/i18n'; -import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; -import type { CombinedQuery } from '../../../index_data_visualizer/types/combined_query'; +import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query'; import type { IndexPatternColumn, TypedLensByValueInput, XYLayerConfig, -} from '../../../../../../lens/public'; +} from '../../../../../../../lens/public'; import { FieldVisConfig } from '../../stats_table/types'; -import { JOB_FIELD_TYPES } from '../../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../../common'; interface ColumnsAndLayer { columns: Record; layer: XYLayerConfig; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx index d1321ad8f9f4d..6b7c9eafc8c3e 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import { FieldTypeIcon } from './field_type_icon'; -import { JOB_FIELD_TYPES } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; describe('FieldTypeIcon', () => { test(`render component when type matches a field type`, () => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx index 2dd7ff635bacd..4109b9624ac26 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx @@ -12,8 +12,8 @@ import { EuiToken, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { getJobTypeAriaLabel } from '../../util/field_types_utils'; -import { JOB_FIELD_TYPES } from '../../../../common'; -import type { JobFieldType } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; +import type { JobFieldType } from '../../../../../common'; interface FieldTypeIconProps { tooltipEnabled: boolean; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx index 8c5602bc625f8..264d59fcc296d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx @@ -14,7 +14,7 @@ import type { FileBasedUnknownFieldVisConfig, } from '../stats_table/types/field_vis_config'; import { FieldTypeIcon } from '../field_type_icon'; -import { JOB_FIELD_TYPES } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; const JOB_FIELD_TYPES_OPTIONS = { [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts index f45071d6e96b5..f80ccd42919e2 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; import { getFieldNames, getSupportedFieldType } from './get_field_names'; import { FileBasedFieldVisConfig } from '../stats_table/types'; -import { JOB_FIELD_TYPES } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; import { roundToDecimalPlace } from '../utils'; export function createFields(results: FindFileStructureResponse) { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx index 3b5b1bbf81dba..5ff6284285226 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx @@ -7,8 +7,8 @@ import React, { useMemo, FC, useState } from 'react'; import { EuiFlexGroup, EuiSpacer } from '@elastic/eui'; -import type { FindFileStructureResponse } from '../../../../../file_upload/common'; -import type { DataVisualizerTableState } from '../../../../common'; +import type { FindFileStructureResponse } from '../../../../../../file_upload/common'; +import type { DataVisualizerTableState } from '../../../../../common'; import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; import type { FileBasedFieldVisConfig } from '../stats_table/types/field_vis_config'; import { FileBasedDataVisualizerExpandedRow } from '../expanded_row'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts similarity index 95% rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts index 0120b17452558..6c164233bdbc1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { JOB_FIELD_TYPES } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; import type { FileBasedFieldVisConfig, FileBasedUnknownFieldVisConfig, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts similarity index 85% rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts index 83c517dfe965e..6ca6421bbd124 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts @@ -6,10 +6,10 @@ */ import { difference } from 'lodash'; -import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/common'; -import type { FindFileStructureResponse } from '../../../../../file_upload/common'; -import type { JobFieldType } from '../../../../common'; -import { JOB_FIELD_TYPES } from '../../../../common'; +import { ES_FIELD_TYPES } from '../../../../../../../../src/plugins/data/common'; +import type { FindFileStructureResponse } from '../../../../../../file_upload/common'; +import type { JobFieldType } from '../../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../../common'; export function getFieldNames(results: FindFileStructureResponse) { const { mappings, field_stats: fieldStats, column_names: columnNames } = results; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts index 1cbb177c86442..aa5510b0878a5 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; export function createFilebeatConfig( index: string, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx index 2c8c752680ffb..085d527b27b8d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx @@ -22,8 +22,8 @@ import { EuiCopy, } from '@elastic/eui'; import { createFilebeatConfig } from './filebeat_config'; -import { useDataVisualizerKibana } from '../../kibana_context'; // copy context? -import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import { useDataVisualizerKibana } from '../../../kibana_context'; // copy context? +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; export enum EDITOR_MODE { HIDDEN, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/help_menu.tsx similarity index 93% rename from x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/help_menu.tsx index a6ffb668092ff..f44cad1376df7 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/help_menu.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/help_menu.tsx @@ -7,7 +7,7 @@ import React, { FC, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; -import { useDataVisualizerKibana } from '../../kibana_context'; +import { useDataVisualizerKibana } from '../../../kibana_context'; interface HelpMenuProps { docLink: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/help_menu/index.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/index.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/help_menu/index.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/index.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/link_card/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/link_card/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/link_card/link_card.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/link_card.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/link_card/link_card.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/link_card.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/loading_indicator/loading_indicator.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/not_in_docs_content/not_in_docs_context.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/results_links/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/results_links.tsx similarity index 95% rename from x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/results_links.tsx index 5ab0ac76feb96..03efb8efda484 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/results_links.tsx @@ -12,11 +12,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui'; import { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState, -} from '../../../../../../../src/plugins/discover/public'; -import { TimeRange, RefreshInterval } from '../../../../../../../src/plugins/data/public'; -import { FindFileStructureResponse } from '../../../../../file_upload/common'; -import type { FileUploadPluginStart } from '../../../../../file_upload/public'; -import { useDataVisualizerKibana } from '../../kibana_context'; +} from '../../../../../../../../src/plugins/discover/public'; +import { TimeRange, RefreshInterval } from '../../../../../../../../src/plugins/data/public'; +import { FindFileStructureResponse } from '../../../../../../file_upload/common'; +import type { FileUploadPluginStart } from '../../../../../../file_upload/public'; +import { useDataVisualizerKibana } from '../../../kibana_context'; interface Props { fieldStats: FindFileStructureResponse['field_stats']; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_field_data_row.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_field_data_row.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx similarity index 94% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx index acbb77a7e0cac..6e0f44c06903f 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx @@ -14,10 +14,10 @@ import { SOURCE_TYPES, STYLE_TYPE, COLOR_MAP_TYPE, -} from '../../../../../../../maps/common/constants'; -import { EMSTermJoinConfig } from '../../../../../../../maps/public'; +} from '../../../../../../../../maps/common/constants'; +import { EMSTermJoinConfig } from '../../../../../../../../maps/public'; import { FieldVisStats } from '../../types'; -import { VectorLayerDescriptor } from '../../../../../../../maps/common/descriptor_types'; +import { VectorLayerDescriptor } from '../../../../../../../../maps/common/descriptor_types'; import { EmbeddedMapComponent } from '../../../embedded_map'; export const getChoroplethTopValuesLayer = ( diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx similarity index 93% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx index b07a4581660da..dca304835da1c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx @@ -8,8 +8,8 @@ import React, { FC, useCallback, useEffect, useState } from 'react'; import type { FieldDataRowProps } from '../../types/field_data_row'; import { TopValues } from '../../../top_values'; -import { EMSTermJoinConfig } from '../../../../../../../maps/public'; -import { useDataVisualizerKibana } from '../../../../kibana_context'; +import { EMSTermJoinConfig } from '../../../../../../../../maps/public'; +import { useDataVisualizerKibana } from '../../../../../kibana_context'; import { DocumentStatsTable } from './document_stats'; import { ExpandedRowContent } from './expanded_row_content'; import { ChoroplethMap } from './choropleth_map'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx index 2c92c366b2d73..aff4d6d62c6c8 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx @@ -10,7 +10,7 @@ import { render } from '@testing-library/react'; import { renderHook } from '@testing-library/react-hooks'; import '@testing-library/jest-dom/extend-expect'; -import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/public'; +import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public'; import { isNumericChartData, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx index bd1df7f32c375..664be145125a4 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx @@ -15,7 +15,7 @@ import { euiPaletteColorBlind, EuiDataGridColumn } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/public'; +import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public'; import { isNumericChartData, diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx similarity index 99% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx index bfa40c487a2ac..3ab112687214d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx @@ -21,7 +21,7 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { EuiTableComputedColumnType } from '@elastic/eui/src/components/basic_table/table_types'; -import { JOB_FIELD_TYPES, JobFieldType, DataVisualizerTableState } from '../../../../common'; +import { JOB_FIELD_TYPES, JobFieldType, DataVisualizerTableState } from '../../../../../common'; import { FieldTypeIcon } from '../field_type_icon'; import { DocumentStat } from './components/field_data_row/document_stats'; import { DistinctValues } from './components/field_data_row/distinct_values'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts index c6f463595e74d..39a0ff53e27e5 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts @@ -12,7 +12,7 @@ import euiThemeDark from '@elastic/eui/dist/eui_theme_dark.json'; import { i18n } from '@kbn/i18n'; -import { useDataVisualizerKibana } from '../../../kibana_context'; +import { useDataVisualizerKibana } from '../../../../kibana_context'; /** * Custom color scale factory that takes the amount of feature influencers diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_data_row.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_data_row.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts similarity index 98% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts index 57166dfd3951e..d58497f6cd7cc 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { Percentile, JobFieldType, FieldVisStats } from '../../../../../common/types'; +import type { Percentile, JobFieldType, FieldVisStats } from '../../../../../../common/types'; export interface MetricFieldVisStats { avg?: number; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/use_table_settings.ts similarity index 96% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/use_table_settings.ts index e2ff18a8001aa..3fbf333bdc876 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/use_table_settings.ts @@ -8,7 +8,7 @@ import { Direction, EuiBasicTableProps, Pagination, PropertySort } from '@elastic/eui'; import { useCallback, useMemo } from 'react'; -import { DataVisualizerTableState } from '../../../../common'; +import { DataVisualizerTableState } from '../../../../../common'; const PAGE_SIZE_OPTIONS = [10, 25, 50]; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss b/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/_top_values.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss rename to x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/_top_values.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/format_value.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/format_value.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/kibana_field_format.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/kibana_field_format.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/utils.ts similarity index 99% rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/components/utils/utils.ts index 1d47e633188c5..4396809da64bb 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/utils.ts @@ -6,7 +6,7 @@ */ import { isEqual } from 'lodash'; -import { AnalysisResult, InputOverrides, MB } from '../../../../../file_upload/common'; +import { AnalysisResult, InputOverrides, MB } from '../../../../../../file_upload/common'; export const DEFAULT_LINES_TO_SAMPLE = 1000; const UPLOAD_SIZE_MB = 5; diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts b/x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.test.ts similarity index 95% rename from x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.test.ts index 6f81c0bf4e7d3..5c0867c7a0745 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.test.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { JOB_FIELD_TYPES } from '../../../common'; +import { JOB_FIELD_TYPES } from '../../../../common'; import { getJobTypeAriaLabel, jobTypeAriaLabels } from './field_types_utils'; describe('field type utils', () => { diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.ts similarity index 92% rename from x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.ts index a0c38b562ef09..0a5f822e7dfe3 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.ts @@ -6,9 +6,9 @@ */ import { i18n } from '@kbn/i18n'; -import { JOB_FIELD_TYPES } from '../../../common'; -import type { IndexPatternField } from '../../../../../../src/plugins/data/common/index_patterns/fields'; -import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common'; +import { JOB_FIELD_TYPES } from '../../../../common'; +import type { IndexPatternField } from '../../../../../../../src/plugins/data/common/index_patterns/fields'; +import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common'; export const jobTypeAriaLabels = { BOOLEAN: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.booleanTypeAriaLabel', { diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts b/x-pack/plugins/file_data_visualizer/public/application/common/util/get_max_bytes.ts similarity index 89% rename from x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/util/get_max_bytes.ts index 821a94bf5166d..e4f8e69470c8b 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/util/get_max_bytes.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { getPluginsStart } from '../../kibana_services'; +import { getPluginsStart } from '../../../kibana_services'; // expose the fileUpload plugin's getMaxBytesFormatted for use in ML // so ML doesn't need to depend on the fileUpload plugin for this one function diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/common/util/index_utils.ts similarity index 78% rename from x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/util/index_utils.ts index 13ad14b273a86..ecb673351f017 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/util/index_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/util/index_utils.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { Query } from '../../../../../../src/plugins/data/common/query'; -import { SavedSearchSavedObject } from '../../../common/types'; +import { Query } from '../../../../../../../src/plugins/data/common/query'; +import { SavedSearchSavedObject } from '../../../../common/types'; export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) { const search = savedSearch.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.test.ts b/x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.ts b/x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/util/parse_interval.ts rename to x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/util/url_state.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/util/url_state.tsx rename to x-pack/plugins/file_data_visualizer/public/application/common/util/url_state.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/types.ts b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/types.ts deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js index 8ee07b20587e0..83917977a8c25 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js @@ -12,7 +12,7 @@ import { EuiSpacer } from '@elastic/eui'; import { isEqual } from 'lodash'; -import { AboutPanel, LoadingPanel } from '../../../components/about_panel'; +import { AboutPanel, LoadingPanel } from '../../../common/components/about_panel'; import { BottomBar } from '../bottom_bar'; import { ResultsView } from '../results_view'; import { FileCouldNotBeRead, FileTooLarge } from './file_error_callouts'; @@ -24,7 +24,7 @@ import { readFile, createUrlOverrides, processResults, -} from '../../../components/utils'; +} from '../../../common/components/utils'; import { MODE } from './constants'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx index 85767f3f337be..456afd2e6c9f1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx @@ -18,7 +18,7 @@ import { EuiFlexItem, } from '@elastic/eui'; -import { CombinedField, CombinedFieldsForm } from '../../../components/combined_fields'; +import { CombinedField, CombinedFieldsForm } from '../../../common/components/combined_fields'; import { JsonEditor, EDITOR_MODE } from '../json_editor'; import { FindFileStructureResponse } from '../../../../../../file_upload/common'; const EDITOR_HEIGHT = '300px'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx index 9857c819b1773..727b7b2feeabb 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx @@ -12,7 +12,7 @@ import { EuiTabbedContent, EuiSpacer } from '@elastic/eui'; import { SimpleSettings } from './simple'; import { AdvancedSettings } from './advanced'; -import { CombinedField } from '../../../components/combined_fields'; +import { CombinedField } from '../../../common/components/combined_fields'; import { FindFileStructureResponse } from '../../../../../../file_upload/common'; interface Props { diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx index 64295f0ce6a57..579f547a5f7ea 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx @@ -10,7 +10,10 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { FC } from 'react'; import { EuiFieldText, EuiFormRow, EuiCheckbox, EuiSpacer } from '@elastic/eui'; -import { CombinedField, CombinedFieldsReadOnlyForm } from '../../../components/combined_fields'; +import { + CombinedField, + CombinedFieldsReadOnlyForm, +} from '../../../common/components/combined_fields'; interface Props { index: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js index fc7f67f785a7c..4c1835990489c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js @@ -20,8 +20,8 @@ import { import { i18n } from '@kbn/i18n'; import { debounce } from 'lodash'; -import { ResultsLinks } from '../../../components/results_links'; -import { FilebeatConfigFlyout } from '../../../components/filebeat_config_flyout'; +import { ResultsLinks } from '../../../common/components/results_links'; +import { FilebeatConfigFlyout } from '../../../common/components/filebeat_config_flyout'; import { ImportProgress, IMPORT_STATUS } from '../import_progress'; import { ImportErrors } from '../import_errors'; import { ImportSummary } from '../import_summary'; @@ -30,8 +30,8 @@ import { addCombinedFieldsToPipeline, addCombinedFieldsToMappings, getDefaultCombinedFields, -} from '../../../components/combined_fields'; -import { ExperimentalBadge } from '../../../components/experimental_badge'; +} from '../../../common/components/combined_fields'; +import { ExperimentalBadge } from '../../../common/components/experimental_badge'; const DEFAULT_TIME_FIELD = '@timestamp'; const DEFAULT_INDEX_SETTINGS = { number_of_shards: 1 }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx index 7c6d8bb722a35..8d1668694c482 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx @@ -24,7 +24,7 @@ import { FindFileStructureResponse } from '../../../../../../file_upload/common' import { FileContents } from '../file_contents'; import { AnalysisSummary } from '../analysis_summary'; -import { FieldsStatsGrid } from '../../../components/fields_stats_grid'; +import { FieldsStatsGrid } from '../../../common/components/fields_stats_grid'; interface Props { data: string; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx index 4f409aaea6b2c..ba3a3d66105c1 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx @@ -16,8 +16,8 @@ import { } from '../../../../../../../../src/plugins/discover/public'; import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns'; import { useDataVisualizerKibana } from '../../../kibana_context'; -import { useUrlState } from '../../../util/url_state'; -import { LinkCard } from '../../../components/link_card'; +import { useUrlState } from '../../../common/util/url_state'; +import { LinkCard } from '../../../common/components/link_card'; interface Props { indexPattern: IndexPattern; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx index be84e00eb5869..787db77a9415d 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -33,17 +33,20 @@ import { IndexPattern, } from '../../../../../../../../src/plugins/data/public'; import { FullTimeRangeSelector } from '../full_time_range_selector'; -import { getQueryFromSavedSearch } from '../../../util/index_utils'; -import { usePageUrlState, useUrlState } from '../../../util/url_state'; -import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../../../components/stats_table'; -import { FieldVisConfig } from '../../../components/stats_table/types'; +import { getQueryFromSavedSearch } from '../../../common/util/index_utils'; +import { usePageUrlState, useUrlState } from '../../../common/util/url_state'; +import { + DataVisualizerTable, + ItemIdToExpandedRowMap, +} from '../../../common/components/stats_table'; +import { FieldVisConfig } from '../../../common/components/stats_table/types'; import type { MetricFieldsStats, TotalFieldsStats, -} from '../../../components/stats_table/components/field_count_stats'; +} from '../../../common/components/stats_table/components/field_count_stats'; import { OverallStats } from '../../types/overall_stats'; -import { getActions } from '../../../components/field_data_row/action_menu'; -import { IndexBasedDataVisualizerExpandedRow } from '../../../components/expanded_row/index_based_expanded_row'; +import { getActions } from '../../../common/components/field_data_row/action_menu'; +import { IndexBasedDataVisualizerExpandedRow } from '../../../common/components/expanded_row/index_based_expanded_row'; import { DATA_VISUALIZER_INDEX_VIEWER } from '../../constants/index_data_visualizer_viewer'; import { DataVisualizerIndexBasedAppState } from '../../types/index_data_visualizer_state'; import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../types/combined_query'; @@ -53,17 +56,17 @@ import { SavedSearchSavedObject, } from '../../../../../common/types'; import { useDataVisualizerKibana } from '../../../kibana_context'; -import { FieldCountPanel } from '../../../components/field_count_panel'; -import { DocumentCountContent } from '../../../components/document_count_content'; +import { FieldCountPanel } from '../../../common/components/field_count_panel'; +import { DocumentCountContent } from '../../../common/components/document_count_content'; import { DataLoader } from '../../data_loader/data_loader'; import { JOB_FIELD_TYPES } from '../../../../../common'; import { useTimefilter } from '../../hooks/use_time_filter'; -import { kbnTypeToJobType } from '../../../util/field_types_utils'; +import { kbnTypeToJobType } from '../../../common/util/field_types_utils'; import { SearchPanel } from '../search_panel'; import { ActionsPanel } from '../actions_panel'; -import { DatePickerWrapper } from '../../../components/date_picker_wrapper'; +import { DatePickerWrapper } from '../../../common/components/date_picker_wrapper'; import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; -import { HelpMenu } from '../../../components/help_menu'; +import { HelpMenu } from '../../../common/components/help_menu'; import { TimeBuckets } from '../../services/time_buckets'; interface DataVisualizerPageState { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx index a4133e1d444b1..6dd45f29c05d6 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx @@ -7,7 +7,7 @@ import React, { FC, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; -import { Option, MultiSelectPicker } from '../../../components/multi_select_picker'; +import { Option, MultiSelectPicker } from '../../../common/components/multi_select_picker'; import { OverallStats } from '../../types/overall_stats'; interface Props { diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx index e52c16f67fb03..07787e1720773 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx @@ -9,8 +9,8 @@ import React, { FC, useMemo } from 'react'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { JOB_FIELD_TYPES, JobFieldType } from '../../../../../common'; -import { FieldTypeIcon } from '../../../components/field_type_icon'; -import { MultiSelectPicker, Option } from '../../../components/multi_select_picker'; +import { FieldTypeIcon } from '../../../common/components/field_type_icon'; +import { MultiSelectPicker, Option } from '../../../common/components/multi_select_picker'; const ML_JOB_FIELD_TYPES_OPTIONS = { [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index 973e8d8929668..d0970725b3bf3 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -25,7 +25,7 @@ import { SetUrlState, getNestedProperty, isRisonSerializationRequired, -} from '../util/url_state'; +} from '../common/util/url_state'; export type IndexDataVisualizerSpec = typeof IndexDataVisualizer; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js index cb9bb3924f1f4..6a68ebeef7c30 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js +++ b/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js @@ -9,7 +9,7 @@ import { FIELD_FORMAT_IDS, UI_SETTINGS } from '../../../../../../../src/plugins/ import { ary, assign, isPlainObject, isString, sortBy } from 'lodash'; import moment from 'moment'; import dateMath from '@elastic/datemath'; -import { parseInterval } from '../../util/parse_interval'; +import { parseInterval } from '../../common/util/parse_interval'; const { duration: d } = moment; diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/file_data_visualizer/public/plugin.ts index 630b475fe0172..4a27c82bee473 100644 --- a/x-pack/plugins/file_data_visualizer/public/plugin.ts +++ b/x-pack/plugins/file_data_visualizer/public/plugin.ts @@ -17,7 +17,7 @@ import type { MapsStartApi } from '../../maps/public'; import type { SecurityPluginSetup } from '../../security/public'; import type { LensPublicStart } from '../../lens/public'; import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api'; -import { getMaxBytesFormatted } from './application/util/get_max_bytes'; +import { getMaxBytesFormatted } from './application/common/util/get_max_bytes'; // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface FileDataVisualizerSetupDependencies {} From ebf33b470526d6d69b12a9a1605766ccaa6a14ec Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Tue, 1 Jun 2021 12:18:02 -0500 Subject: [PATCH 29/53] [ML] Update types & tests --- .../components/field_data_expanded_row/choropleth_map.tsx | 2 +- .../common/components/stats_table/types/index.ts | 1 - .../application/common/components/top_values/top_values.tsx | 2 +- x-pack/plugins/file_data_visualizer/server/routes/routes.ts | 6 +++--- .../apis/ml/data_visualizer/get_field_stats.ts | 3 ++- .../apis/ml/data_visualizer/get_overall_stats.ts | 3 ++- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx index 6e0f44c06903f..3417b9753b26a 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx @@ -16,9 +16,9 @@ import { COLOR_MAP_TYPE, } from '../../../../../../../../maps/common/constants'; import { EMSTermJoinConfig } from '../../../../../../../../maps/public'; -import { FieldVisStats } from '../../types'; import { VectorLayerDescriptor } from '../../../../../../../../maps/common/descriptor_types'; import { EmbeddedMapComponent } from '../../../embedded_map'; +import { FieldVisStats } from '../../../../../../../common/types'; export const getChoroplethTopValuesLayer = ( fieldName: string, diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts index 161829461aa26..171d029482e27 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts @@ -9,7 +9,6 @@ export { FieldDataRowProps } from './field_data_row'; export { FieldVisConfig, FileBasedFieldVisConfig, - FieldVisStats, MetricFieldVisStats, isFileBasedFieldVisConfig, isIndexBasedFieldVisConfig, diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx b/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx index c1815fad41de8..1cec44e1cd58c 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx @@ -20,7 +20,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import classNames from 'classnames'; import { roundToDecimalPlace, kibanaFieldFormat } from '../utils'; import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header'; -import { FieldVisStats } from '../stats_table/types'; +import { FieldVisStats } from '../../../../../common/types'; interface Props { stats: FieldVisStats | undefined; diff --git a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts index 05a4c5140d370..d31d2a4c33492 100644 --- a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts +++ b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts @@ -114,7 +114,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: dataVisualizerFieldHistogramsSchema, }, options: { - tags: ['access:dataVisualizer:view'], + tags: ['access:ml:canAccessML', 'access:dataVisualizer:view'], }, }, async (context, request, response) => { @@ -163,7 +163,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: dataVisualizerFieldStatsSchema, }, options: { - tags: ['access:dataVisualizer:view'], + tags: ['access:ml:canAccessML', 'access:dataVisualizer:view'], }, }, async (context, request, response) => { @@ -230,7 +230,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: dataVisualizerOverallStatsSchema, }, options: { - tags: ['access:dataVisualizer:view'], + tags: ['access:ml:canAccessML', 'access:dataVisualizer:view'], }, }, async (context, request, response) => { diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts index c1a928095a07d..66285d80b7475 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts @@ -176,7 +176,8 @@ export default ({ getService }: FtrProviderContext) => { return body; } - describe('get_field_stats', function () { + // Move these tests to file_data_visualizer plugin + describe.skip('get_field_stats', function () { before(async () => { await esArchiver.loadIfNeeded('ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts index 601a4a04eb0c6..0cfb304e93e89 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts @@ -123,7 +123,8 @@ export default ({ getService }: FtrProviderContext) => { }, ]; - describe('get_overall_stats', function () { + // Move these tests to file_data_visualizer plugin + describe.skip('get_overall_stats', function () { before(async () => { await esArchiver.loadIfNeeded('ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); From 9512da4bc08490207d347bd7c020899eec4384ab Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 2 Jun 2021 11:58:31 -0500 Subject: [PATCH 30/53] [ML] Update internal/data_visualizer permissions and action panel tests --- .../plugins/file_data_visualizer/server/routes/routes.ts | 9 --------- .../apis/ml/data_visualizer/get_field_stats.ts | 2 +- .../apis/ml/data_visualizer/get_overall_stats.ts | 4 ++-- .../functional/apps/ml/permissions/full_ml_access.ts | 4 +++- .../functional/apps/ml/permissions/read_ml_access.ts | 6 ++++-- .../apps/ml/permissions/full_ml_access.ts | 6 ++++-- .../apps/ml/permissions/read_ml_access.ts | 4 +++- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts index d31d2a4c33492..0488fc5efe288 100644 --- a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts +++ b/x-pack/plugins/file_data_visualizer/server/routes/routes.ts @@ -113,9 +113,6 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l params: indexPatternTitleSchema, body: dataVisualizerFieldHistogramsSchema, }, - options: { - tags: ['access:ml:canAccessML', 'access:dataVisualizer:view'], - }, }, async (context, request, response) => { try { @@ -162,9 +159,6 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l params: indexPatternTitleSchema, body: dataVisualizerFieldStatsSchema, }, - options: { - tags: ['access:ml:canAccessML', 'access:dataVisualizer:view'], - }, }, async (context, request, response) => { try { @@ -229,9 +223,6 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l params: indexPatternTitleSchema, body: dataVisualizerOverallStatsSchema, }, - options: { - tags: ['access:ml:canAccessML', 'access:dataVisualizer:view'], - }, }, async (context, request, response) => { try { diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts index 66285d80b7475..84373d14c4e56 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts @@ -177,7 +177,7 @@ export default ({ getService }: FtrProviderContext) => { } // Move these tests to file_data_visualizer plugin - describe.skip('get_field_stats', function () { + describe('get_field_stats', function () { before(async () => { await esArchiver.loadIfNeeded('ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts index 0cfb304e93e89..f701fd64e32e6 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts @@ -124,7 +124,7 @@ export default ({ getService }: FtrProviderContext) => { ]; // Move these tests to file_data_visualizer plugin - describe.skip('get_overall_stats', function () { + describe('get_overall_stats', function () { before(async () => { await esArchiver.loadIfNeeded('ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); @@ -133,7 +133,7 @@ export default ({ getService }: FtrProviderContext) => { for (const testData of testDataList) { it(`${testData.testTitle}`, async () => { const { body } = await supertest - .post(`/api/ml/data_visualizer/get_overall_stats/${testData.index}`) + .post(`/internal/data_visualizer/get_overall_stats/${testData.index}`) .auth(testData.user, ml.securityCommon.getPasswordForUser(testData.user)) .set(COMMON_REQUEST_HEADERS) .send(testData.requestBody) diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts index 9957ae15701de..473be32439e44 100644 --- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts @@ -367,7 +367,9 @@ export default function ({ getService }: FtrProviderContext) { testUser.discoverAvailable ? 'with' : 'without' } Discover card` ); - await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + if (testUser.discoverAvailable) { + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + } await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); // @TODO: Re-enable in follow up diff --git a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts index a0585f7b24a19..5cadf5b8fd72a 100644 --- a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts @@ -102,7 +102,7 @@ export default function ({ getService }: FtrProviderContext) { const ecIndexPattern = 'ft_module_sample_ecommerce'; const ecExpectedTotalCount = '287'; - const ecExpectedModuleId = 'sample_data_ecommerce'; + // const ecExpectedModuleId = 'sample_data_ecommerce'; const uploadFilePath = path.join( __dirname, @@ -359,7 +359,9 @@ export default function ({ getService }: FtrProviderContext) { testUser.discoverAvailable ? 'with' : 'without' } Discover card` ); - await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + if (testUser.discoverAvailable) { + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + } await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); // @TODO: Re-enable in follow up diff --git a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts index d4acfc5df46f3..abd494df7a853 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts @@ -25,7 +25,7 @@ export default function ({ getService }: FtrProviderContext) { describe(`(${testUser.user})`, function () { const ecIndexPattern = 'ft_module_sample_ecommerce'; const ecExpectedTotalCount = '287'; - const ecExpectedModuleId = 'sample_data_ecommerce'; + // const ecExpectedModuleId = 'sample_data_ecommerce'; const uploadFilePath = path.join( __dirname, @@ -135,7 +135,9 @@ export default function ({ getService }: FtrProviderContext) { testUser.discoverAvailable ? 'with' : 'without' } Discover card` ); - await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + if (testUser.discoverAvailable) { + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + } await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); // @TODO: Re-enable in follow up diff --git a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts index e603611d5ec83..ce72a25a2ee37 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts @@ -136,7 +136,9 @@ export default function ({ getService }: FtrProviderContext) { testUser.discoverAvailable ? 'with' : 'without' } Discover card` ); - await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + if (testUser.discoverAvailable) { + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + } await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable); // @TODO: Re-enable in follow up From 5e81e92b7e5d4be96a556247bf4fcc999e58dc66 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 2 Jun 2021 12:27:32 -0500 Subject: [PATCH 31/53] [ML] Update imports after #100863 --- .../public/lazy_load_bundle/component_wrapper.tsx | 4 +++- x-pack/plugins/file_data_visualizer/public/plugin.ts | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/component_wrapper.tsx b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/component_wrapper.tsx index e6835d9e7a668..028c0a402039d 100644 --- a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/component_wrapper.tsx +++ b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/component_wrapper.tsx @@ -7,7 +7,9 @@ import React, { FC } from 'react'; -const FileDataVisualizerComponent = React.lazy(() => import('../application/file_datavisualizer')); +const FileDataVisualizerComponent = React.lazy( + () => import('../application/file_data_visualizer/file_data_visualizer') +); export const FileDataVisualizerWrapper: FC = () => { return ( diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/file_data_visualizer/public/plugin.ts index 404c1734637a7..60c3aa5ecfa42 100644 --- a/x-pack/plugins/file_data_visualizer/public/plugin.ts +++ b/x-pack/plugins/file_data_visualizer/public/plugin.ts @@ -18,8 +18,7 @@ import type { MapsStartApi } from '../../maps/public'; import type { SecurityPluginSetup } from '../../security/public'; import type { LensPublicStart } from '../../lens/public'; import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api'; -import { getFileDataVisualizerComponent } from './api'; -import { getMaxBytesFormatted } from './application/util/get_max_bytes'; +import { getMaxBytesFormatted } from './application/common/util/get_max_bytes'; import { registerHomeAddData } from './register_home'; export interface FileDataVisualizerSetupDependencies { From d501b6fbfd6e1aaea38772a78376cf4adc3fab1b Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Wed, 2 Jun 2021 13:20:43 -0500 Subject: [PATCH 32/53] [ML] Fix CI --- .../components/edit_flyout/overrides.test.js | 2 +- .../data_visualizer/index_data_visualizer.ts | 2 +- .../index_data_visualizer_actions_panel.ts | 46 ++++++++++--------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js index 8e11d5150359d..03679a2a65e65 100644 --- a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js +++ b/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js @@ -10,7 +10,7 @@ import React from 'react'; import { Overrides } from './overrides'; -jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({ +jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({ withKibana: (comp) => { return comp; }, diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts index 609cf05dad541..348d8ad5f8d72 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts @@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types'; -import { FieldVisConfig } from '../../../../../plugins/ml/public/application/datavisualizer/stats_table/types'; +import { FieldVisConfig } from '../../../../../plugins/file_data_visualizer/public/application/common/components/stats_table/types'; interface MetricFieldVisConfig extends FieldVisConfig { statsMaxDecimalPlaces: number; diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts index bc80d8850032b..2c89f34c41a3d 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts @@ -15,15 +15,16 @@ export default function ({ getService }: FtrProviderContext) { this.tags(['mlqa']); const indexPatternName = 'ft_farequote'; - const advancedJobWizardDatafeedQuery = `{ - "bool": { - "must": [ - { - "match_all": {} - } - ] - } -}`; // Note query is not currently passed to the wizard + // @TODO: Re-enable in follow up + // const advancedJobWizardDatafeedQuery = `{ + // "bool": { + // "must": [ + // { + // "match_all": {} + // } + // ] + // } + // }`; // Note query is not currently passed to the wizard before(async () => { await esArchiver.loadIfNeeded('ml/farequote'); @@ -47,19 +48,20 @@ export default function ({ getService }: FtrProviderContext) { await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(indexPatternName); }); - it('opens the advanced job wizard', async () => { - await ml.testExecution.logTestStep('displays the actions panel with advanced job card'); - await ml.dataVisualizerIndexBased.assertActionsPanelExists(); - await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists(); - await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists(); - - // Note the search is not currently passed to the wizard, just the index. - await ml.testExecution.logTestStep('displays the actions panel with advanced job card'); - await ml.dataVisualizerIndexBased.clickCreateAdvancedJobButton(); - await ml.jobTypeSelection.assertAdvancedJobWizardOpen(); - await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists(); - await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery); - }); + // @TODO: Re-enable in follow up + // it('opens the advanced job wizard', async () => { + // await ml.testExecution.logTestStep('displays the actions panel with advanced job card'); + // await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists(); + // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists(); + // + // // Note the search is not currently passed to the wizard, just the index. + // await ml.testExecution.logTestStep('displays the actions panel with advanced job card'); + // await ml.dataVisualizerIndexBased.clickCreateAdvancedJobButton(); + // await ml.jobTypeSelection.assertAdvancedJobWizardOpen(); + // await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists(); + // await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery); + // }); }); describe('view in discover page action', function () { From 035b8b43d703db669eb434fce65de1aa5400355f Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 3 Jun 2021 09:11:10 -0500 Subject: [PATCH 33/53] [ML] Rename folder from file_data_visualizer to data_visualizer --- .../common/constants.ts | 0 .../{file_data_visualizer => data_visualizer}/common/index.ts | 0 .../common/types/field_request_config.ts | 0 .../common/types/index.ts | 0 .../common/types/indices.ts | 0 .../common/types/job_field_type.ts | 0 .../common/types/time_field_request.ts | 0 .../common/utils/datafeed_utils.ts | 0 .../common/utils/object_utils.ts | 0 .../common/utils/query_utils.ts | 0 .../common/utils/runtime_field_utils.ts | 0 .../common/utils/string_utils.ts | 0 .../{file_data_visualizer => data_visualizer}/jest.config.js | 0 .../{file_data_visualizer => data_visualizer}/kibana.json | 2 +- .../public/api/index.ts | 0 .../public/application/_index.scss | 0 .../public/application/common/components/_index.scss | 0 .../application/common/components/about_panel/_about_panel.scss | 0 .../application/common/components/about_panel/_index.scss | 0 .../application/common/components/about_panel/about_panel.tsx | 0 .../public/application/common/components/about_panel/index.ts | 0 .../common/components/about_panel/welcome_content.tsx | 0 .../common/components/combined_fields/combined_field_label.tsx | 0 .../common/components/combined_fields/combined_fields_form.tsx | 0 .../combined_fields/combined_fields_read_only_form.tsx | 0 .../application/common/components/combined_fields/geo_point.tsx | 0 .../application/common/components/combined_fields/index.ts | 0 .../application/common/components/combined_fields/types.ts | 0 .../application/common/components/combined_fields/utils.test.ts | 0 .../application/common/components/combined_fields/utils.ts | 0 .../components/date_picker_wrapper/date_picker_wrapper.tsx | 0 .../application/common/components/date_picker_wrapper/index.ts | 0 .../document_count_chart/document_count_chart.tsx | 0 .../document_count_content/document_count_chart/index.ts | 0 .../document_count_content/document_count_content.tsx | 0 .../common/components/document_count_content/index.ts | 0 .../components/document_count_content/total_count_header.tsx | 0 .../common/components/embedded_map/_embedded_map.scss | 0 .../application/common/components/embedded_map/_index.scss | 0 .../application/common/components/embedded_map/embedded_map.tsx | 0 .../public/application/common/components/embedded_map/index.ts | 0 .../common/components/examples_list/examples_list.tsx | 0 .../public/application/common/components/examples_list/index.ts | 0 .../common/components/expanded_row/file_based_expanded_row.tsx | 0 .../components/expanded_row/geo_point_content/format_utils.ts | 0 .../expanded_row/geo_point_content/geo_point_content.tsx | 0 .../common/components/expanded_row/geo_point_content/index.ts | 0 .../geo_point_content_with_map/geo_point_content_with_map.tsx | 0 .../components/expanded_row/geo_point_content_with_map/index.ts | 0 .../public/application/common/components/expanded_row/index.ts | 0 .../common/components/expanded_row/index_based_expanded_row.tsx | 0 .../public/application/common/components/expanded_row/types.ts | 0 .../components/experimental_badge/_experimental_badge.scss | 0 .../common/components/experimental_badge/_index.scss | 0 .../common/components/experimental_badge/experimental_badge.tsx | 0 .../application/common/components/experimental_badge/index.ts | 0 .../common/components/field_count_panel/field_count_panel.tsx | 0 .../application/common/components/field_count_panel/index.ts | 0 .../common/components/field_data_row/action_menu/actions.ts | 0 .../common/components/field_data_row/action_menu/index.ts | 0 .../common/components/field_data_row/action_menu/lens_utils.ts | 0 .../application/common/components/field_data_row/index.ts | 0 .../common/components/field_data_row/number_content_preview.tsx | 0 .../common/components/field_names_filter/field_names_filter.tsx | 0 .../application/common/components/field_names_filter/index.ts | 0 .../field_type_icon/__snapshots__/field_type_icon.test.tsx.snap | 0 .../common/components/field_type_icon/field_type_icon.test.tsx | 0 .../common/components/field_type_icon/field_type_icon.tsx | 0 .../application/common/components/field_type_icon/index.ts | 0 .../common/components/field_types_filter/field_types_filter.tsx | 0 .../application/common/components/field_types_filter/index.ts | 0 .../common/components/fields_stats_grid/create_fields.ts | 0 .../common/components/fields_stats_grid/fields_stats_grid.tsx | 0 .../common/components/fields_stats_grid/filter_fields.ts | 0 .../common/components/fields_stats_grid/get_field_names.ts | 0 .../application/common/components/fields_stats_grid/index.ts | 0 .../common/components/filebeat_config_flyout/filebeat_config.ts | 0 .../filebeat_config_flyout/filebeat_config_flyout.tsx | 0 .../common/components/filebeat_config_flyout/index.ts | 0 .../application/common/components/help_menu/help_menu.tsx | 0 .../public/application/common/components/help_menu/index.tsx | 0 .../public/application/common/components/link_card/index.ts | 0 .../application/common/components/link_card/link_card.tsx | 0 .../application/common/components/loading_indicator/index.ts | 0 .../common/components/loading_indicator/loading_indicator.tsx | 0 .../application/common/components/multi_select_picker/index.ts | 0 .../components/multi_select_picker/multi_select_picker.tsx | 0 .../application/common/components/not_in_docs_content/index.ts | 0 .../components/not_in_docs_content/not_in_docs_context.tsx | 0 .../public/application/common/components/results_links/index.ts | 0 .../common/components/results_links/results_links.tsx | 0 .../common/components/stats_table/_field_data_row.scss | 0 .../application/common/components/stats_table/_index.scss | 0 .../expanded_row_field_header/expanded_row_field_header.tsx | 0 .../stats_table/components/expanded_row_field_header/index.ts | 0 .../stats_table/components/field_count_stats/_index.scss | 0 .../stats_table/components/field_count_stats/index.ts | 0 .../components/field_count_stats/metric_fields_count.tsx | 0 .../components/field_count_stats/total_fields_count.tsx | 0 .../stats_table/components/field_data_expanded_row/_index.scss | 0 .../components/field_data_expanded_row/_number_content.scss | 0 .../components/field_data_expanded_row/boolean_content.tsx | 0 .../components/field_data_expanded_row/choropleth_map.tsx | 0 .../components/field_data_expanded_row/date_content.tsx | 0 .../components/field_data_expanded_row/document_stats.tsx | 0 .../components/field_data_expanded_row/expanded_row_content.tsx | 0 .../stats_table/components/field_data_expanded_row/index.ts | 0 .../components/field_data_expanded_row/ip_content.tsx | 0 .../components/field_data_expanded_row/keyword_content.tsx | 0 .../components/field_data_expanded_row/number_content.tsx | 0 .../components/field_data_expanded_row/other_content.tsx | 0 .../components/field_data_expanded_row/text_content.tsx | 0 .../stats_table/components/field_data_row/_index.scss | 0 .../components/field_data_row/boolean_content_preview.tsx | 0 .../stats_table/components/field_data_row/column_chart.scss | 0 .../stats_table/components/field_data_row/column_chart.tsx | 0 .../stats_table/components/field_data_row/distinct_values.tsx | 0 .../stats_table/components/field_data_row/document_stats.tsx | 0 .../stats_table/components/field_data_row/field_histograms.ts | 0 .../components/stats_table/components/field_data_row/index.ts | 0 .../components/field_data_row/number_content_preview.tsx | 0 .../components/field_data_row/top_values_preview.tsx | 0 .../components/field_data_row/use_column_chart.test.tsx | 0 .../stats_table/components/field_data_row/use_column_chart.tsx | 0 .../stats_table/components/metric_distribution_chart/index.ts | 0 .../metric_distribution_chart/metric_distribution_chart.tsx | 0 .../metric_distribution_chart_data_builder.tsx | 0 .../metric_distribution_chart_tooltip_header.tsx | 0 .../components/stats_table/data_visualizer_stats_table.tsx | 0 .../common/components/stats_table/hooks/color_range_legend.tsx | 0 .../application/common/components/stats_table/hooks/index.ts | 0 .../common/components/stats_table/hooks/use_color_range.test.ts | 0 .../common/components/stats_table/hooks/use_color_range.ts | 0 .../components/stats_table/hooks/use_data_viz_chart_theme.ts | 0 .../public/application/common/components/stats_table/index.ts | 0 .../common/components/stats_table/types/field_data_row.ts | 0 .../common/components/stats_table/types/field_vis_config.ts | 0 .../application/common/components/stats_table/types/index.ts | 0 .../common/components/stats_table/use_table_settings.ts | 0 .../public/application/common/components/stats_table/utils.ts | 0 .../application/common/components/top_values/_top_values.scss | 0 .../public/application/common/components/top_values/index.ts | 0 .../application/common/components/top_values/top_values.tsx | 0 .../public/application/common/components/utils/format_value.ts | 0 .../public/application/common/components/utils/index.ts | 0 .../application/common/components/utils/kibana_field_format.ts | 0 .../common/components/utils/number_as_ordinal.test.ts | 0 .../application/common/components/utils/number_as_ordinal.ts | 0 .../common/components/utils/round_to_decimal_place.test.ts | 0 .../common/components/utils/round_to_decimal_place.ts | 0 .../public/application/common/components/utils/utils.ts | 0 .../public/application/common/util/field_types_utils.test.ts | 0 .../public/application/common/util/field_types_utils.ts | 0 .../public/application/common/util/get_max_bytes.ts | 0 .../public/application/common/util/index_utils.ts | 0 .../public/application/common/util/parse_interval.test.ts | 0 .../public/application/common/util/parse_interval.ts | 0 .../public/application/common/util/url_state.tsx | 0 .../public/application/file_data_visualizer/_index.scss | 0 .../application/file_data_visualizer/components/_index.scss | 0 .../components/analysis_summary/_analysis_summary.scss | 0 .../components/analysis_summary/_index.scss | 0 .../components/analysis_summary/analysis_summary.tsx | 0 .../file_data_visualizer/components/analysis_summary/index.ts | 0 .../file_data_visualizer/components/bottom_bar/bottom_bar.tsx | 0 .../file_data_visualizer/components/bottom_bar/index.ts | 0 .../components/edit_flyout/__snapshots__/overrides.test.js.snap | 0 .../components/edit_flyout/_edit_flyout.scss | 0 .../file_data_visualizer/components/edit_flyout/_index.scss | 0 .../file_data_visualizer/components/edit_flyout/edit_flyout.js | 0 .../file_data_visualizer/components/edit_flyout/index.js | 0 .../components/edit_flyout/options/index.js | 0 .../components/edit_flyout/options/option_lists.js | 0 .../components/edit_flyout/options/options.js | 0 .../file_data_visualizer/components/edit_flyout/overrides.js | 0 .../components/edit_flyout/overrides.test.js | 0 .../components/edit_flyout/overrides_validation.js | 0 .../components/explanation_flyout/explanation_flyout.tsx | 0 .../file_data_visualizer/components/explanation_flyout/index.ts | 0 .../components/file_contents/_file_contents.scss | 0 .../file_data_visualizer/components/file_contents/_index.scss | 0 .../components/file_contents/file_contents.tsx | 0 .../file_data_visualizer/components/file_contents/index.ts | 0 .../file_data_visualizer_view/_file_data_visualizer_view.scss | 0 .../components/file_data_visualizer_view/_index.scss | 0 .../components/file_data_visualizer_view/constants.ts | 0 .../file_data_visualizer_view/file_data_visualizer_view.js | 0 .../file_data_visualizer_view/file_error_callouts.tsx | 0 .../components/file_data_visualizer_view/index.js | 0 .../file_data_visualizer/components/import_errors/errors.tsx | 0 .../file_data_visualizer/components/import_errors/index.ts | 0 .../components/import_progress/import_progress.tsx | 0 .../file_data_visualizer/components/import_progress/index.ts | 0 .../components/import_settings/advanced.tsx | 0 .../components/import_settings/import_settings.tsx | 0 .../file_data_visualizer/components/import_settings/index.ts | 0 .../file_data_visualizer/components/import_settings/simple.tsx | 0 .../components/import_summary/_import_summary.scss | 0 .../file_data_visualizer/components/import_summary/_index.scss | 0 .../file_data_visualizer/components/import_summary/failures.tsx | 0 .../components/import_summary/import_summary.tsx | 0 .../file_data_visualizer/components/import_summary/index.ts | 0 .../file_data_visualizer/components/import_view/import_view.js | 0 .../file_data_visualizer/components/import_view/index.js | 0 .../file_data_visualizer/components/json_editor/index.ts | 0 .../file_data_visualizer/components/json_editor/json_editor.tsx | 0 .../file_data_visualizer/components/results_view/_index.scss | 0 .../components/results_view/_results_view.scss | 0 .../file_data_visualizer/components/results_view/index.ts | 0 .../components/results_view/results_view.tsx | 0 .../application/file_data_visualizer/file_data_visualizer.tsx | 0 .../public/application/file_data_visualizer/index.ts | 0 .../public/application/index.ts | 0 .../components/actions_panel/actions_panel.tsx | 0 .../index_data_visualizer/components/actions_panel/index.ts | 0 .../full_time_range_selector/full_time_range_selector.tsx | 0 .../full_time_range_selector_service.ts | 0 .../components/full_time_range_selector/index.tsx | 0 .../components/index_data_visualizer_view/index.ts | 0 .../index_data_visualizer_view/index_data_visualizer_view.tsx | 0 .../components/search_panel/field_name_filter.tsx | 0 .../components/search_panel/field_type_filter.tsx | 0 .../index_data_visualizer/components/search_panel/index.ts | 0 .../components/search_panel/search_panel.tsx | 0 .../components/search_panel/shard_size_select.tsx | 0 .../constants/index_data_visualizer_viewer.ts | 0 .../index_data_visualizer/data_loader/data_loader.ts | 0 .../application/index_data_visualizer/hooks/use_time_filter.ts | 0 .../public/application/index_data_visualizer/index.ts | 0 .../application/index_data_visualizer/index_data_visualizer.tsx | 0 .../index_data_visualizer/services/time_buckets.d.ts | 0 .../application/index_data_visualizer/services/time_buckets.js | 0 .../index_data_visualizer/services/time_field_range.ts | 0 .../services/timefilter_refresh_service.ts | 0 .../index_data_visualizer/services/visualizer_stats.ts | 0 .../application/index_data_visualizer/types/combined_query.ts | 0 .../index_data_visualizer/types/index_data_visualizer_state.ts | 0 .../application/index_data_visualizer/types/overall_stats.ts | 0 .../public/application/kibana_context.ts | 0 .../public/application/shared_imports.ts | 0 .../{file_data_visualizer => data_visualizer}/public/index.ts | 0 .../public/kibana_services.ts | 0 .../public/lazy_load_bundle/component_wrapper.tsx | 0 .../public/lazy_load_bundle/index.ts | 0 .../public/lazy_load_bundle/lazy/index.ts | 0 .../{file_data_visualizer => data_visualizer}/public/plugin.ts | 0 .../public/register_home.ts | 0 .../server/capabilities.ts | 0 .../{file_data_visualizer => data_visualizer}/server/index.ts | 0 .../server/models/data_visualizer/data_visualizer.ts | 0 .../server/models/data_visualizer/index.ts | 0 .../{file_data_visualizer => data_visualizer}/server/plugin.ts | 0 .../server/routes/index.ts | 0 .../server/routes/routes.ts | 0 .../server/routes/schemas/index.ts | 0 .../server/routes/schemas/index_data_visualizer_schemas.ts | 0 .../server/types/deps.ts | 0 .../server/types/index.ts | 0 .../server/utils/error_wrapper.ts | 0 .../{file_data_visualizer => data_visualizer}/tsconfig.json | 0 .../ml/public/application/contexts/kibana/kibana_context.ts | 2 +- .../datavisualizer/index_based/index_data_visualizer.tsx | 2 +- x-pack/plugins/ml/public/application/util/dependency_cache.ts | 2 +- x-pack/plugins/ml/public/plugin.ts | 2 +- x-pack/plugins/ml/tsconfig.json | 2 +- .../functional/apps/ml/data_visualizer/index_data_visualizer.ts | 2 +- 266 files changed, 7 insertions(+), 7 deletions(-) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/constants.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/types/field_request_config.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/types/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/types/indices.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/types/job_field_type.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/types/time_field_request.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/utils/datafeed_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/utils/object_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/utils/query_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/utils/runtime_field_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/common/utils/string_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/jest.config.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/kibana.json (93%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/api/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/about_panel/_about_panel.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/about_panel/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/about_panel/about_panel.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/about_panel/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/about_panel/welcome_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/combined_field_label.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/combined_fields_form.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/geo_point.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/types.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/utils.test.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/combined_fields/utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/date_picker_wrapper/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/document_count_content/document_count_chart/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/document_count_content/document_count_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/document_count_content/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/document_count_content/total_count_header.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/embedded_map/_embedded_map.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/embedded_map/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/embedded_map/embedded_map.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/embedded_map/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/examples_list/examples_list.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/examples_list/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/file_based_expanded_row.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/geo_point_content/format_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/geo_point_content/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/index_based_expanded_row.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/expanded_row/types.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/experimental_badge/_experimental_badge.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/experimental_badge/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/experimental_badge/experimental_badge.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/experimental_badge/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_count_panel/field_count_panel.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_count_panel/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_data_row/action_menu/actions.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_data_row/action_menu/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_data_row/action_menu/lens_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_data_row/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_data_row/number_content_preview.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_names_filter/field_names_filter.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_names_filter/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_type_icon/field_type_icon.test.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_type_icon/field_type_icon.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_type_icon/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_types_filter/field_types_filter.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/field_types_filter/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/fields_stats_grid/create_fields.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/fields_stats_grid/filter_fields.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/fields_stats_grid/get_field_names.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/fields_stats_grid/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/filebeat_config_flyout/filebeat_config.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/filebeat_config_flyout/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/help_menu/help_menu.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/help_menu/index.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/link_card/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/link_card/link_card.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/loading_indicator/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/loading_indicator/loading_indicator.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/multi_select_picker/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/multi_select_picker/multi_select_picker.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/not_in_docs_content/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/results_links/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/results_links/results_links.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/_field_data_row.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_count_stats/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_count_stats/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/column_chart.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/data_visualizer_stats_table.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/hooks/color_range_legend.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/hooks/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/hooks/use_color_range.test.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/hooks/use_color_range.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/types/field_data_row.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/types/field_vis_config.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/types/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/use_table_settings.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/stats_table/utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/top_values/_top_values.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/top_values/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/top_values/top_values.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/format_value.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/kibana_field_format.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/number_as_ordinal.test.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/number_as_ordinal.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/round_to_decimal_place.test.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/round_to_decimal_place.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/components/utils/utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/field_types_utils.test.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/field_types_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/get_max_bytes.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/index_utils.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/parse_interval.test.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/parse_interval.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/common/util/url_state.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/analysis_summary/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/analysis_summary/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/bottom_bar/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/index.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/options/index.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/options/options.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/overrides.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/explanation_flyout/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_contents/_file_contents.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_contents/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_contents/file_contents.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_contents/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_errors/errors.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_errors/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_progress/import_progress.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_progress/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_settings/advanced.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_settings/import_settings.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_settings/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_settings/simple.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_summary/_import_summary.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_summary/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_summary/failures.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_summary/import_summary.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_summary/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_view/import_view.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/import_view/index.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/json_editor/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/json_editor/json_editor.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/results_view/_index.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/results_view/_results_view.scss (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/results_view/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/components/results_view/results_view.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/file_data_visualizer.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/file_data_visualizer/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/actions_panel/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/search_panel/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/search_panel/search_panel.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/data_loader/data_loader.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/hooks/use_time_filter.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/index_data_visualizer.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/services/time_buckets.d.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/services/time_buckets.js (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/services/time_field_range.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/services/timefilter_refresh_service.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/services/visualizer_stats.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/types/combined_query.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/types/index_data_visualizer_state.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/index_data_visualizer/types/overall_stats.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/kibana_context.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/application/shared_imports.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/kibana_services.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/lazy_load_bundle/component_wrapper.tsx (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/lazy_load_bundle/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/lazy_load_bundle/lazy/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/plugin.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/public/register_home.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/capabilities.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/models/data_visualizer/data_visualizer.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/models/data_visualizer/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/plugin.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/routes/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/routes/routes.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/routes/schemas/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/routes/schemas/index_data_visualizer_schemas.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/types/deps.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/types/index.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/server/utils/error_wrapper.ts (100%) rename x-pack/plugins/{file_data_visualizer => data_visualizer}/tsconfig.json (100%) diff --git a/x-pack/plugins/file_data_visualizer/common/constants.ts b/x-pack/plugins/data_visualizer/common/constants.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/constants.ts rename to x-pack/plugins/data_visualizer/common/constants.ts diff --git a/x-pack/plugins/file_data_visualizer/common/index.ts b/x-pack/plugins/data_visualizer/common/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/index.ts rename to x-pack/plugins/data_visualizer/common/index.ts diff --git a/x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts b/x-pack/plugins/data_visualizer/common/types/field_request_config.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/types/field_request_config.ts rename to x-pack/plugins/data_visualizer/common/types/field_request_config.ts diff --git a/x-pack/plugins/file_data_visualizer/common/types/index.ts b/x-pack/plugins/data_visualizer/common/types/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/types/index.ts rename to x-pack/plugins/data_visualizer/common/types/index.ts diff --git a/x-pack/plugins/file_data_visualizer/common/types/indices.ts b/x-pack/plugins/data_visualizer/common/types/indices.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/types/indices.ts rename to x-pack/plugins/data_visualizer/common/types/indices.ts diff --git a/x-pack/plugins/file_data_visualizer/common/types/job_field_type.ts b/x-pack/plugins/data_visualizer/common/types/job_field_type.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/types/job_field_type.ts rename to x-pack/plugins/data_visualizer/common/types/job_field_type.ts diff --git a/x-pack/plugins/file_data_visualizer/common/types/time_field_request.ts b/x-pack/plugins/data_visualizer/common/types/time_field_request.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/types/time_field_request.ts rename to x-pack/plugins/data_visualizer/common/types/time_field_request.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/datafeed_utils.ts b/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/utils/datafeed_utils.ts rename to x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/object_utils.ts b/x-pack/plugins/data_visualizer/common/utils/object_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/utils/object_utils.ts rename to x-pack/plugins/data_visualizer/common/utils/object_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/query_utils.ts b/x-pack/plugins/data_visualizer/common/utils/query_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/utils/query_utils.ts rename to x-pack/plugins/data_visualizer/common/utils/query_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/runtime_field_utils.ts b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/utils/runtime_field_utils.ts rename to x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/common/utils/string_utils.ts b/x-pack/plugins/data_visualizer/common/utils/string_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/common/utils/string_utils.ts rename to x-pack/plugins/data_visualizer/common/utils/string_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/jest.config.js b/x-pack/plugins/data_visualizer/jest.config.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/jest.config.js rename to x-pack/plugins/data_visualizer/jest.config.js diff --git a/x-pack/plugins/file_data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json similarity index 93% rename from x-pack/plugins/file_data_visualizer/kibana.json rename to x-pack/plugins/data_visualizer/kibana.json index f1f02102f078a..3934f0ee3417f 100644 --- a/x-pack/plugins/file_data_visualizer/kibana.json +++ b/x-pack/plugins/data_visualizer/kibana.json @@ -1,5 +1,5 @@ { - "id": "fileDataVisualizer", + "id": "dataVisualizer", "version": "8.0.0", "kibanaVersion": "kibana", "server": true, diff --git a/x-pack/plugins/file_data_visualizer/public/api/index.ts b/x-pack/plugins/data_visualizer/public/api/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/api/index.ts rename to x-pack/plugins/data_visualizer/public/api/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/_index.scss b/x-pack/plugins/data_visualizer/public/application/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/_index.scss rename to x-pack/plugins/data_visualizer/public/application/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_about_panel.scss b/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/_about_panel.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_about_panel.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/about_panel/_about_panel.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/about_panel/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/about_panel.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/about_panel.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/about_panel.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/about_panel/about_panel.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/about_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/welcome_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/welcome_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/about_panel/welcome_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/about_panel/welcome_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/geo_point.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/geo_point.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/types.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/types.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/types.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/types.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.test.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/combined_fields/utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/date_picker_wrapper/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/embedded_map/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/examples_list.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/examples_list.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/examples_list/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/examples_list/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/types.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/types.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/expanded_row/types.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/types.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/experimental_badge/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_count_panel/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_names_filter/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap rename to x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_type_icon/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/field_types_filter/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/fields_stats_grid/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/help_menu.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/help_menu.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/index.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/index.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/help_menu/index.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/help_menu/index.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/link_card/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/link_card/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/link_card.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/link_card/link_card.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/link_card/link_card.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/link_card/link_card.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/results_links/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/results_links.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/results_links/results_links.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_field_data_row.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_field_data_row.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_field_data_row.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_field_data_row.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/types/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/use_table_settings.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/use_table_settings.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/use_table_settings.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/use_table_settings.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/stats_table/utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/_top_values.scss b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/_top_values.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/_top_values.scss rename to x-pack/plugins/data_visualizer/public/application/common/components/top_values/_top_values.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/top_values/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/top_values/top_values.tsx rename to x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/format_value.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/format_value.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/format_value.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/format_value.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/index.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/kibana_field_format.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/kibana_field_format.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/number_as_ordinal.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/components/utils/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/components/utils/utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.test.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.test.ts rename to x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/field_types_utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/get_max_bytes.ts b/x-pack/plugins/data_visualizer/public/application/common/util/get_max_bytes.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/get_max_bytes.ts rename to x-pack/plugins/data_visualizer/public/application/common/util/get_max_bytes.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/index_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/index_utils.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/index_utils.ts rename to x-pack/plugins/data_visualizer/public/application/common/util/index_utils.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.test.ts b/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.test.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.test.ts rename to x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.test.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.ts b/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/parse_interval.ts rename to x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/common/util/url_state.tsx b/x-pack/plugins/data_visualizer/public/application/common/util/url_state.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/common/util/url_state.tsx rename to x-pack/plugins/data_visualizer/public/application/common/util/url_state.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/index.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/import_view/index.js rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/file_data_visualizer/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/data_visualizer/public/application/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index.ts rename to x-pack/plugins/data_visualizer/public/application/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_buckets.js rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/combined_query.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/combined_query.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/combined_query.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/combined_query.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts rename to x-pack/plugins/data_visualizer/public/application/kibana_context.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts b/x-pack/plugins/data_visualizer/public/application/shared_imports.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts rename to x-pack/plugins/data_visualizer/public/application/shared_imports.ts diff --git a/x-pack/plugins/file_data_visualizer/public/index.ts b/x-pack/plugins/data_visualizer/public/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/index.ts rename to x-pack/plugins/data_visualizer/public/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/kibana_services.ts b/x-pack/plugins/data_visualizer/public/kibana_services.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/kibana_services.ts rename to x-pack/plugins/data_visualizer/public/kibana_services.ts diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/component_wrapper.tsx b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/component_wrapper.tsx similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/component_wrapper.tsx rename to x-pack/plugins/data_visualizer/public/lazy_load_bundle/component_wrapper.tsx diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts rename to x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/lazy/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts rename to x-pack/plugins/data_visualizer/public/lazy_load_bundle/lazy/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/plugin.ts rename to x-pack/plugins/data_visualizer/public/plugin.ts diff --git a/x-pack/plugins/file_data_visualizer/public/register_home.ts b/x-pack/plugins/data_visualizer/public/register_home.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/public/register_home.ts rename to x-pack/plugins/data_visualizer/public/register_home.ts diff --git a/x-pack/plugins/file_data_visualizer/server/capabilities.ts b/x-pack/plugins/data_visualizer/server/capabilities.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/capabilities.ts rename to x-pack/plugins/data_visualizer/server/capabilities.ts diff --git a/x-pack/plugins/file_data_visualizer/server/index.ts b/x-pack/plugins/data_visualizer/server/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/index.ts rename to x-pack/plugins/data_visualizer/server/index.ts diff --git a/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/models/data_visualizer/data_visualizer.ts rename to x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts diff --git a/x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/models/data_visualizer/index.ts rename to x-pack/plugins/data_visualizer/server/models/data_visualizer/index.ts diff --git a/x-pack/plugins/file_data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/plugin.ts rename to x-pack/plugins/data_visualizer/server/plugin.ts diff --git a/x-pack/plugins/file_data_visualizer/server/routes/index.ts b/x-pack/plugins/data_visualizer/server/routes/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/routes/index.ts rename to x-pack/plugins/data_visualizer/server/routes/index.ts diff --git a/x-pack/plugins/file_data_visualizer/server/routes/routes.ts b/x-pack/plugins/data_visualizer/server/routes/routes.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/routes/routes.ts rename to x-pack/plugins/data_visualizer/server/routes/routes.ts diff --git a/x-pack/plugins/file_data_visualizer/server/routes/schemas/index.ts b/x-pack/plugins/data_visualizer/server/routes/schemas/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/routes/schemas/index.ts rename to x-pack/plugins/data_visualizer/server/routes/schemas/index.ts diff --git a/x-pack/plugins/file_data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts b/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts rename to x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts diff --git a/x-pack/plugins/file_data_visualizer/server/types/deps.ts b/x-pack/plugins/data_visualizer/server/types/deps.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/types/deps.ts rename to x-pack/plugins/data_visualizer/server/types/deps.ts diff --git a/x-pack/plugins/file_data_visualizer/server/types/index.ts b/x-pack/plugins/data_visualizer/server/types/index.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/types/index.ts rename to x-pack/plugins/data_visualizer/server/types/index.ts diff --git a/x-pack/plugins/file_data_visualizer/server/utils/error_wrapper.ts b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts similarity index 100% rename from x-pack/plugins/file_data_visualizer/server/utils/error_wrapper.ts rename to x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts diff --git a/x-pack/plugins/file_data_visualizer/tsconfig.json b/x-pack/plugins/data_visualizer/tsconfig.json similarity index 100% rename from x-pack/plugins/file_data_visualizer/tsconfig.json rename to x-pack/plugins/data_visualizer/tsconfig.json diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts index b69a8a9b7867a..c82d85ea9c998 100644 --- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts +++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts @@ -18,7 +18,7 @@ import { MlServicesContext } from '../../app'; import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public'; import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public'; import type { MapsStartApi } from '../../../../../maps/public'; -import type { FileDataVisualizerPluginStart } from '../../../../../file_data_visualizer/public'; +import type { FileDataVisualizerPluginStart } from '../../../../../data_visualizer/public'; import type { LensPublicStart } from '../../../../../lens/public'; import { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx index 6ad84b979d290..a18f7154fcb60 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx @@ -10,7 +10,7 @@ import { useMlKibana, useTimefilter } from '../../contexts/kibana'; import { NavigationMenu } from '../../components/navigation_menu'; import { HelpMenu } from '../../components/help_menu'; import { useMlContext } from '../../contexts/ml'; -import { IndexDataVisualizerViewProps } from '../../../../../file_data_visualizer/public'; +import { IndexDataVisualizerViewProps } from '../../../../../data_visualizer/public'; export const IndexDataVisualizerPage: FC = () => { const mlContext = useMlContext(); const { currentIndexPattern, combinedQuery, currentSavedSearch } = mlContext; diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts index 759d0dcc68741..87d6adeacf620 100644 --- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts +++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts @@ -23,7 +23,7 @@ import type { IndexPatternsContract, DataPublicPluginStart } from 'src/plugins/d import type { SharePluginStart } from 'src/plugins/share/public'; import type { SecurityPluginSetup } from '../../../../security/public'; import type { MapsStartApi } from '../../../../maps/public'; -import type { FileDataVisualizerPluginStart } from '../../../../file_data_visualizer/public'; +import type { FileDataVisualizerPluginStart } from '../../../../data_visualizer/public'; export interface DependencyCache { timefilter: DataPublicPluginSetup['query']['timefilter'] | null; diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts index 1f41f0a1d25c3..43e533b765b3a 100644 --- a/x-pack/plugins/ml/public/plugin.ts +++ b/x-pack/plugins/ml/public/plugin.ts @@ -51,7 +51,7 @@ import { TriggersAndActionsUIPublicPluginSetup, TriggersAndActionsUIPublicPluginStart, } from '../../triggers_actions_ui/public'; -import { FileDataVisualizerPluginStart } from '../../file_data_visualizer/public'; +import { FileDataVisualizerPluginStart } from '../../data_visualizer/public'; import { PluginSetupContract as AlertingSetup } from '../../alerting/public'; import { registerManagementSection } from './application/management'; diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json index d887cfc885253..221718d423383 100644 --- a/x-pack/plugins/ml/tsconfig.json +++ b/x-pack/plugins/ml/tsconfig.json @@ -24,7 +24,7 @@ { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" }, { "path": "../cloud/tsconfig.json" }, { "path": "../features/tsconfig.json" }, - { "path": "../file_data_visualizer/tsconfig.json" }, + { "path": "../data_visualizer/tsconfig.json"}, { "path": "../license_management/tsconfig.json" }, { "path": "../licensing/tsconfig.json" }, { "path": "../maps/tsconfig.json" }, diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts index 348d8ad5f8d72..d83d151e7125e 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts @@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types'; -import { FieldVisConfig } from '../../../../../plugins/file_data_visualizer/public/application/common/components/stats_table/types'; +import { FieldVisConfig } from '../../../../../plugins/data_visualizer/public/application/common/components/stats_table/types'; interface MetricFieldVisConfig extends FieldVisConfig { statsMaxDecimalPlaces: number; From 88e3ea9250e0cc1202de8fb6d42e12d30201502a Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 3 Jun 2021 11:03:36 -0500 Subject: [PATCH 34/53] [ML] Rename i18n ids --- x-pack/.i18nrc.json | 2 +- .../application/common/components/_index.scss | 1 - .../combined_fields/combined_fields_form.tsx | 28 +- .../combined_fields_read_only_form.tsx | 4 +- .../components/combined_fields/geo_point.tsx | 10 +- .../components/combined_fields/utils.ts | 2 +- .../document_count_chart.tsx | 2 +- .../total_count_header.tsx | 4 +- .../examples_list/examples_list.tsx | 4 +- .../experimental_badge/experimental_badge.tsx | 2 +- .../field_count_panel/field_count_panel.tsx | 2 +- .../field_data_row/action_menu/actions.ts | 11 +- .../field_data_row/action_menu/lens_utils.ts | 8 +- .../field_data_row/number_content_preview.tsx | 12 +- .../field_names_filter/field_names_filter.tsx | 2 +- .../field_type_icon/field_type_icon.tsx | 2 +- .../field_types_filter/field_types_filter.tsx | 2 +- .../filebeat_config_flyout/filebeat_config.ts | 2 +- .../filebeat_config_flyout.tsx | 14 +- .../common/components/help_menu/help_menu.tsx | 2 +- .../loading_indicator/loading_indicator.tsx | 2 +- .../multi_select_picker.tsx | 2 +- .../not_in_docs_context.tsx | 2 +- .../results_links/results_links.tsx | 8 +- .../field_count_stats/metric_fields_count.tsx | 4 +- .../field_count_stats/total_fields_count.tsx | 4 +- .../boolean_content.tsx | 8 +- .../choropleth_map.tsx | 4 +- .../field_data_expanded_row/date_content.tsx | 6 +- .../document_stats.tsx | 8 +- .../number_content.tsx | 12 +- .../field_data_expanded_row/text_content.tsx | 6 +- .../field_data_row/use_column_chart.tsx | 8 +- .../metric_distribution_chart.tsx | 2 +- ...tric_distribution_chart_tooltip_header.tsx | 4 +- .../data_visualizer_stats_table.tsx | 55 +- .../stats_table/hooks/use_color_range.ts | 37 +- .../components/top_values/top_values.tsx | 4 +- .../common/util/field_types_utils.ts | 16 +- .../components/_index.scss | 1 + .../components/about_panel/_about_panel.scss | 0 .../components/about_panel/_index.scss | 0 .../components/about_panel/about_panel.tsx | 4 +- .../components/about_panel/index.ts | 0 .../about_panel/welcome_content.tsx | 20 +- .../analysis_summary/analysis_summary.tsx | 16 +- .../components/bottom_bar/bottom_bar.tsx | 10 +- .../__snapshots__/overrides.test.js.snap | 8 +- .../components/edit_flyout/edit_flyout.js | 6 +- .../components/edit_flyout/overrides.js | 37 +- .../edit_flyout/overrides_validation.js | 8 +- .../explanation_flyout/explanation_flyout.tsx | 6 +- .../file_contents/file_contents.tsx | 4 +- .../file_data_visualizer_view.js | 4 +- .../file_error_callouts.tsx | 14 +- .../components/import_errors/errors.tsx | 20 +- .../import_progress/import_progress.tsx | 47 +- .../components/import_settings/advanced.tsx | 16 +- .../import_settings/import_settings.tsx | 4 +- .../components/import_settings/simple.tsx | 8 +- .../components/import_summary/failures.tsx | 2 +- .../import_summary/import_summary.tsx | 16 +- .../components/import_view/import_view.js | 24 +- .../components/results_view/results_view.tsx | 6 +- .../actions_panel/actions_panel.tsx | 6 +- .../full_time_range_selector.tsx | 4 +- .../index_data_visualizer_view.tsx | 6 +- .../search_panel/field_name_filter.tsx | 2 +- .../search_panel/field_type_filter.tsx | 2 +- .../components/search_panel/search_panel.tsx | 4 +- .../search_panel/shard_size_select.tsx | 8 +- .../data_loader/data_loader.ts | 4 +- .../data_visualizer/public/register_home.ts | 2 +- .../index_based/data_loader/data_loader.ts | 34 +- .../translations/translations/ja-JP.json | 483 +++++++++-------- .../translations/translations/zh-CN.json | 493 +++++++++--------- 76 files changed, 788 insertions(+), 849 deletions(-) rename x-pack/plugins/data_visualizer/public/application/{common => file_data_visualizer}/components/about_panel/_about_panel.scss (100%) rename x-pack/plugins/data_visualizer/public/application/{common => file_data_visualizer}/components/about_panel/_index.scss (100%) rename x-pack/plugins/data_visualizer/public/application/{common => file_data_visualizer}/components/about_panel/about_panel.tsx (93%) rename x-pack/plugins/data_visualizer/public/application/{common => file_data_visualizer}/components/about_panel/index.ts (100%) rename x-pack/plugins/data_visualizer/public/application/{common => file_data_visualizer}/components/about_panel/welcome_content.tsx (83%) diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index b2c3a36ae3414..9b98ca864f496 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -19,7 +19,7 @@ "xpack.endpoint": "plugins/endpoint", "xpack.enterpriseSearch": "plugins/enterprise_search", "xpack.features": "plugins/features", - "xpack.fileDataVisualizer": "plugins/file_data_visualizer", + "xpack.dataVisualizer": "plugins/data_visualizer", "xpack.fileUpload": "plugins/file_upload", "xpack.globalSearch": ["plugins/global_search"], "xpack.globalSearchBar": ["plugins/global_search_bar"], diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss index bc45064a07648..f57abbbe6396b 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss +++ b/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss @@ -1,4 +1,3 @@ -@import 'about_panel/index'; @import 'embedded_map/index'; @import 'experimental_badge/index'; @import 'stats_table/index'; diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx index d36f83b9f647f..e77dc853fdc52 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx @@ -110,7 +110,7 @@ export class CombinedFieldsForm extends Component { return JSON.parse(this.props.mappingsString); } catch (error) { throw new Error( - i18n.translate('xpack.fileDataVisualizer.combinedFieldsForm.mappingsParseError', { + i18n.translate('xpack.dataVisualizer.combinedFieldsForm.mappingsParseError', { defaultMessage: 'Error parsing mappings: {error}', values: { error: error.message }, }) @@ -123,7 +123,7 @@ export class CombinedFieldsForm extends Component { return JSON.parse(this.props.pipelineString); } catch (error) { throw new Error( - i18n.translate('xpack.fileDataVisualizer.combinedFieldsForm.pipelineParseError', { + i18n.translate('xpack.dataVisualizer.combinedFieldsForm.pipelineParseError', { defaultMessage: 'Error parsing pipeline: {error}', values: { error: error.message }, }) @@ -149,9 +149,12 @@ export class CombinedFieldsForm extends Component { }; render() { - const geoPointLabel = i18n.translate('xpack.fileDataVisualizer.geoPointCombinedFieldLabel', { - defaultMessage: 'Add geo point field', - }); + const geoPointLabel = i18n.translate( + 'xpack.dataVisualizer.file.geoPointForm.combinedFieldLabel', + { + defaultMessage: 'Add geo point field', + } + ); const panels = [ { id: 0, @@ -176,7 +179,7 @@ export class CombinedFieldsForm extends Component { ]; return ( @@ -192,15 +195,12 @@ export class CombinedFieldsForm extends Component { iconType="trash" color="danger" onClick={this.removeCombinedField.bind(null, idx)} - title={i18n.translate('xpack.fileDataVisualizer.removeCombinedFieldsLabel', { + title={i18n.translate('xpack.dataVisualizer.removeCombinedFieldsLabel', { + defaultMessage: 'Remove combined field', + })} + aria-label={i18n.translate('xpack.dataVisualizer.removeCombinedFieldsLabel', { defaultMessage: 'Remove combined field', })} - aria-label={i18n.translate( - 'xpack.fileDataVisualizer.removeCombinedFieldsLabel', - { - defaultMessage: 'Remove combined field', - } - )} /> )} @@ -216,7 +216,7 @@ export class CombinedFieldsForm extends Component { isDisabled={this.props.isDisabled} > diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx index 978383f8e5e10..a7296c372afe4 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx @@ -20,10 +20,10 @@ export function CombinedFieldsReadOnlyForm({ }) { return combinedFields.length ? ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx index 1e6a70c9aa0ec..f6cfcc32e733a 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx @@ -119,7 +119,7 @@ export class GeoPointForm extends Component { return ( @@ -131,7 +131,7 @@ export class GeoPointForm extends Component { @@ -143,7 +143,7 @@ export class GeoPointForm extends Component { { onChange={this.onGeoPointFieldChange} isInvalid={this.state.geoPointFieldError !== ''} aria-label={i18n.translate( - 'xpack.fileDataVisualizer.geoPointForm.geoPointFieldAriaLabel', + 'xpack.dataVisualizer.file.geoPointForm.geoPointFieldAriaLabel', { defaultMessage: 'Geo point field, required field', } @@ -179,7 +179,7 @@ export class GeoPointForm extends Component { onClick={this.onSubmit} > diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts index 0fead0a1ead25..e021de5e5beca 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts @@ -127,7 +127,7 @@ export function createGeoPointCombinedField( } export function getNameCollisionMsg(name: string) { - return i18n.translate('xpack.fileDataVisualizer.nameCollisionMsg', { + return i18n.translate('xpack.dataVisualizer.nameCollisionMsg', { defaultMessage: '"{name}" already exists, please provide a unique name', values: { name }, }); diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx index 796a165175efd..07f55b7c09328 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx @@ -42,7 +42,7 @@ export const DocumentCountChart: FC = ({ interval, }) => { const seriesName = i18n.translate( - 'xpack.fileDataVisualizer.fieldDataCard.documentCountChart.seriesLabel', + 'xpack.dataVisualizer.dataGrid.field.documentCountChart.seriesLabel', { defaultMessage: 'document count', } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx index d374b6679e983..ed19a903850e3 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx @@ -14,13 +14,13 @@ export const TotalCountHeader = ({ totalCount }: { totalCount: number }) => { diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx index 1c533075af27b..f7e93915d6267 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx @@ -23,7 +23,7 @@ export const ExamplesList: FC = ({ examples }) => { if (examples.length === 0) { examplesContent = ( ); @@ -44,7 +44,7 @@ export const ExamplesList: FC = ({ examples }) => {
= ({ tooltipConte className="experimental-badge" label={ } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx index f8daeb34964b1..0f7c5d499cb40 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx @@ -38,7 +38,7 @@ export const FieldCountPanel: FC = ({ data-test-subj="mlDataVisualizerShowEmptyFieldsSwitch" label={ } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts index 23915d4d724cf..c8a1de4772bcf 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts @@ -20,15 +20,12 @@ export function getActions( const canUseLensEditor = lensPlugin.canUseEditor(); return [ { - name: i18n.translate('xpack.fileDataVisualizer.indexBasedDataGrid.exploreInLensTitle', { + name: i18n.translate('xpack.dataVisualizer.index.dataGrid.exploreInLensTitle', { + defaultMessage: 'Explore in Lens', + }), + description: i18n.translate('xpack.dataVisualizer.index.dataGrid.exploreInLensDescription', { defaultMessage: 'Explore in Lens', }), - description: i18n.translate( - 'xpack.fileDataVisualizer.indexBasedDataGrid.exploreInLensDescription', - { - defaultMessage: 'Explore in Lens', - } - ), type: 'icon', icon: 'lensApp', available: (item: FieldVisConfig) => diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts index 776785a3c332a..4d90defc668a4 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts @@ -20,10 +20,10 @@ interface ColumnsAndLayer { layer: XYLayerConfig; } -const TOP_VALUES_LABEL = i18n.translate('xpack.fileDataVisualizer.lensChart.topValuesLabel', { +const TOP_VALUES_LABEL = i18n.translate('xpack.dataVisualizer.index.lensChart.topValuesLabel', { defaultMessage: 'Top values', }); -const COUNT = i18n.translate('xpack.fileDataVisualizer.lensChart.countLabel', { +const COUNT = i18n.translate('xpack.dataVisualizer.index.lensChart.countLabel', { defaultMessage: 'Count', }); @@ -65,7 +65,7 @@ export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: Ind col2: { dataType: 'number', isBucketed: false, - label: i18n.translate('xpack.fileDataVisualizer.lensChart.averageOfLabel', { + label: i18n.translate('xpack.dataVisualizer.index.lensChart.averageOfLabel', { defaultMessage: 'Average of {fieldName}', values: { fieldName: item.fieldName }, }), @@ -247,7 +247,7 @@ export function getLensAttributes( return { visualizationType: 'lnsXY', - title: i18n.translate('xpack.fileDataVisualizer.lensChart.chartTitle', { + title: i18n.translate('xpack.dataVisualizer.index.lensChart.chartTitle', { defaultMessage: 'Lens for {fieldName}', values: { fieldName: item.fieldName }, }), diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx index c02976cdb3853..08d2d42c6c027 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx @@ -24,26 +24,20 @@ export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFie - + - + diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx index 466722adc7179..3d5a0e8441f14 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx @@ -26,7 +26,7 @@ export const DataVisualizerFieldNamesFilter: FC = ({ }) => { const fieldNameTitle = useMemo( () => - i18n.translate('xpack.fileDataVisualizer.fieldNameSelect', { + i18n.translate('xpack.dataVisualizer.fieldNameSelect', { defaultMessage: 'Field name', }), [] diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx index 4109b9624ac26..50823006db3b6 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx @@ -91,7 +91,7 @@ export const FieldTypeIcon: FC = ({ return ( = ({ }) => { const fieldNameTitle = useMemo( () => - i18n.translate('xpack.fileDataVisualizer.fieldTypeSelect', { + i18n.translate('xpack.dataVisualizer.fieldTypeSelect', { defaultMessage: 'Field type', }), [] diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts index aa5510b0878a5..54dfbe72c3c7f 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts @@ -36,7 +36,7 @@ export function createFilebeatConfig( } function getPaths() { - const txt = i18n.translate('xpack.fileDataVisualizer.fileBeatConfig.paths', { + const txt = i18n.translate('xpack.dataVisualizer.fileBeatConfig.paths', { defaultMessage: 'add path to your files here', }); return [' paths:', ` - '<${txt}>'`]; diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx index 085d527b27b8d..238cdcc2f8d9e 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx @@ -75,7 +75,7 @@ export const FilebeatConfigFlyout: FC = ({ @@ -85,7 +85,7 @@ export const FilebeatConfigFlyout: FC = ({ {(copy) => ( @@ -108,7 +108,7 @@ const Contents: FC<{
@@ -116,14 +116,14 @@ const Contents: FC<{

{index} }} />

filebeat.yml }} /> @@ -137,7 +137,7 @@ const Contents: FC<{

{username === null ? ( {''}, @@ -145,7 +145,7 @@ const Contents: FC<{ /> ) : ( {username}, diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx index f44cad1376df7..9aa19b511b79a 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx @@ -19,7 +19,7 @@ export const HelpMenu: FC = React.memo(({ docLink }) => { useEffect(() => { chrome.setHelpExtension({ - appName: i18n.translate('xpack.fileDataVisualizer.chrome.help.appName', { + appName: i18n.translate('xpack.dataVisualizer.chrome.help.appName', { defaultMessage: 'Data Visualizer', }), links: [ diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx index 6f0d5b8ecd6b7..07733aaa54cc8 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx @@ -22,7 +22,7 @@ export const LoadingIndicator: FC = () => ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx index 2093b61a7ef4d..caa58009fda5d 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx @@ -32,7 +32,7 @@ const NoFilterItems = () => {

diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx index 5d06e3207298f..e4fd3b96405df 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx @@ -20,7 +20,7 @@ export const NotInDocsContent: FC = () => ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx index 03efb8efda484..a674446397db9 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx @@ -176,7 +176,7 @@ export const ResultsLinks: FC = ({ icon={} title={ } @@ -192,7 +192,7 @@ export const ResultsLinks: FC = ({ icon={} title={ } @@ -208,7 +208,7 @@ export const ResultsLinks: FC = ({ icon={} title={ } @@ -223,7 +223,7 @@ export const ResultsLinks: FC = ({ data-test-subj="fileDataVisFilebeatConfigLink" title={ } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx index 93582a7cef9ed..cd6b50e63d8b6 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx @@ -37,7 +37,7 @@ export const MetricFieldsCount: FC = ({ metricsStats })
@@ -55,7 +55,7 @@ export const MetricFieldsCount: FC = ({ metricsStats }) diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx index 9d554c7025d80..a4d6de6eb9be6 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx @@ -37,7 +37,7 @@ export const TotalFieldsCount: FC = ({ fieldsCountStats }
@@ -56,7 +56,7 @@ export const TotalFieldsCount: FC = ({ fieldsCountStats } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx index 7c9ddcdab29c8..16e5d666c12b2 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx @@ -49,7 +49,7 @@ export const BooleanContent: FC = ({ config }) => { function: 'true', display: ( ), @@ -59,7 +59,7 @@ export const BooleanContent: FC = ({ config }) => { function: 'false', display: ( ), @@ -80,7 +80,7 @@ export const BooleanContent: FC = ({ config }) => { ]; const summaryTableTitle = i18n.translate( - 'xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.summaryTableTitle', + 'xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.summaryTableTitle', { defaultMessage: 'Summary', } @@ -104,7 +104,7 @@ export const BooleanContent: FC = ({ config }) => { diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx index 3417b9753b26a..6bd4de22beca4 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx @@ -27,7 +27,7 @@ export const getChoroplethTopValuesLayer = ( ): VectorLayerDescriptor => { return { id: htmlIdGenerator()(), - label: i18n.translate('xpack.fileDataVisualizer.choroplethMap.topValuesCount', { + label: i18n.translate('xpack.dataVisualizer.choroplethMap.topValuesCount', { defaultMessage: 'Top values count for {fieldName}', values: { fieldName }, }), @@ -112,7 +112,7 @@ export const ChoroplethMap: FC = ({ stats, suggestion }) => { = ({ config }) => { const { earliest, latest } = stats; const summaryTableTitle = i18n.translate( - 'xpack.fileDataVisualizer.fieldDataCard.cardDate.summaryTableTitle', + 'xpack.dataVisualizer.dataGrid.field.cardDate.summaryTableTitle', { defaultMessage: 'Summary', } @@ -40,7 +40,7 @@ export const DateContent: FC = ({ config }) => { function: 'earliest', display: ( ), @@ -50,7 +50,7 @@ export const DateContent: FC = ({ config }) => { function: 'latest', display: ( ), diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx index f3ac0d94aa255..0e735abdeef6b 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx @@ -27,7 +27,7 @@ const metaTableColumns = [ ]; const metaTableTitle = i18n.translate( - 'xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle', + 'xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.metaTableTitle', { defaultMessage: 'Documents stats', } @@ -47,7 +47,7 @@ export const DocumentStatsTable: FC = ({ config }) => { function: 'count', display: ( ), @@ -57,7 +57,7 @@ export const DocumentStatsTable: FC = ({ config }) => { function: 'percentage', display: ( ), @@ -67,7 +67,7 @@ export const DocumentStatsTable: FC = ({ config }) => { function: 'distinctValues', display: ( ), diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx index e83eecb64d02e..12df88760ddae 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx @@ -52,7 +52,7 @@ export const NumberContent: FC = ({ config }) => { function: 'min', display: ( ), @@ -62,7 +62,7 @@ export const NumberContent: FC = ({ config }) => { function: 'median', display: ( ), @@ -72,7 +72,7 @@ export const NumberContent: FC = ({ config }) => { function: 'max', display: ( ), @@ -93,7 +93,7 @@ export const NumberContent: FC = ({ config }) => { ]; const summaryTableTitle = i18n.translate( - 'xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.summaryTableTitle', + 'xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.summaryTableTitle', { defaultMessage: 'Summary', } @@ -121,7 +121,7 @@ export const NumberContent: FC = ({ config }) => { @@ -138,7 +138,7 @@ export const NumberContent: FC = ({ config }) => { = ({ config }) => { = ({ config }) => { iconType="alert" > _source, @@ -51,7 +51,7 @@ export const TextContent: FC = ({ config }) => { copy_to, diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx index 664be145125a4..2bcf1854235d2 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx @@ -81,13 +81,13 @@ export const getLegendText = ( maxChartColumns = MAX_CHART_COLUMNS ): LegendText => { if (chartData.type === 'unsupported') { - return i18n.translate('xpack.fileDataVisualizer.dataGridChart.histogramNotAvailable', { + return i18n.translate('xpack.dataVisualizer.dataGridChart.histogramNotAvailable', { defaultMessage: 'Chart not supported.', }); } if (chartData.data.length === 0) { - return i18n.translate('xpack.fileDataVisualizer.dataGridChart.notEnoughData', { + return i18n.translate('xpack.dataVisualizer.dataGridChart.notEnoughData', { defaultMessage: `0 documents contain field.`, }); } @@ -106,14 +106,14 @@ export const getLegendText = ( } if (isOrdinalChartData(chartData) && chartData.cardinality <= maxChartColumns) { - return i18n.translate('xpack.fileDataVisualizer.dataGridChart.singleCategoryLegend', { + return i18n.translate('xpack.dataVisualizer.dataGridChart.singleCategoryLegend', { defaultMessage: `{cardinality, plural, one {# category} other {# categories}}`, values: { cardinality: chartData.cardinality }, }); } if (isOrdinalChartData(chartData) && chartData.cardinality > maxChartColumns) { - return i18n.translate('xpack.fileDataVisualizer.dataGridChart.topCategoriesLegend', { + return i18n.translate('xpack.dataVisualizer.dataGridChart.topCategoriesLegend', { defaultMessage: `top {maxChartColumns} of {cardinality} categories`, values: { cardinality: chartData.cardinality, maxChartColumns }, }); diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx index caa560488d499..06a73c5c7885e 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx @@ -58,7 +58,7 @@ export const MetricDistributionChart: FC = ({ // Ideally we wouldn't show these values at all in the tooltip, // but this is not yet possible with Elastic charts. const seriesName = i18n.translate( - 'xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.seriesName', + 'xpack.dataVisualizer.dataGrid.field.metricDistributionChart.seriesName', { defaultMessage: 'distribution', } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx index 9fd613ac96b8e..fd3bcdf4fb79b 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx @@ -31,7 +31,7 @@ export const MetricDistributionChartTooltipHeader: FC = ({
{chartPoint.dataMax > chartPoint.dataMin ? ( = ({ /> ) : ( ({ onClick={() => toggleExpandAll(!expandAll)} aria-label={ !expandAll - ? i18n.translate( - 'xpack.fileDataVisualizer.datavisualizer.dataGrid.expandDetailsForAllAriaLabel', - { - defaultMessage: 'Expand details for all fields', - } - ) - : i18n.translate( - 'xpack.fileDataVisualizer.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel', - { - defaultMessage: 'Collapse details for all fields', - } - ) + ? i18n.translate('xpack.dataVisualizer.dataGrid.expandDetailsForAllAriaLabel', { + defaultMessage: 'Expand details for all fields', + }) + : i18n.translate('xpack.dataVisualizer.dataGrid.collapseDetailsForAllAriaLabel', { + defaultMessage: 'Collapse details for all fields', + }) } iconType={expandAll ? 'arrowUp' : 'arrowDown'} /> @@ -123,11 +117,11 @@ export const DataVisualizerTable = ({ onClick={() => toggleDetails(item)} aria-label={ expandedRowItemIds.includes(item.fieldName) - ? i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.rowCollapse', { + ? i18n.translate('xpack.dataVisualizer.dataGrid.rowCollapse', { defaultMessage: 'Hide details for {fieldName}', values: { fieldName: item.fieldName }, }) - : i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.rowExpand', { + : i18n.translate('xpack.dataVisualizer.dataGrid.rowExpand', { defaultMessage: 'Show details for {fieldName}', values: { fieldName: item.fieldName }, }) @@ -143,7 +137,7 @@ export const DataVisualizerTable = ({ expanderColumn, { field: 'type', - name: i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.typeColumnName', { + name: i18n.translate('xpack.dataVisualizer.dataGrid.typeColumnName', { defaultMessage: 'Type', }), render: (fieldType: JobFieldType) => { @@ -156,7 +150,7 @@ export const DataVisualizerTable = ({ }, { field: 'fieldName', - name: i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.nameColumnName', { + name: i18n.translate('xpack.dataVisualizer.dataGrid.nameColumnName', { defaultMessage: 'Name', }), sortable: true, @@ -171,12 +165,9 @@ export const DataVisualizerTable = ({ }, { field: 'docCount', - name: i18n.translate( - 'xpack.fileDataVisualizer.datavisualizer.dataGrid.documentsCountColumnName', - { - defaultMessage: 'Documents (%)', - } - ), + name: i18n.translate('xpack.dataVisualizer.dataGrid.documentsCountColumnName', { + defaultMessage: 'Documents (%)', + }), render: (value: number | undefined, item: DataVisualizerTableItem) => ( ), @@ -186,12 +177,9 @@ export const DataVisualizerTable = ({ }, { field: 'stats.cardinality', - name: i18n.translate( - 'xpack.fileDataVisualizer.datavisualizer.dataGrid.distinctValuesColumnName', - { - defaultMessage: 'Distinct values', - } - ), + name: i18n.translate('xpack.dataVisualizer.dataGrid.distinctValuesColumnName', { + defaultMessage: 'Distinct values', + }), render: (cardinality?: number) => , sortable: true, align: LEFT_ALIGNMENT as HorizontalAlignment, @@ -201,19 +189,16 @@ export const DataVisualizerTable = ({ name: (
- {i18n.translate( - 'xpack.fileDataVisualizer.datavisualizer.dataGrid.distributionsColumnName', - { - defaultMessage: 'Distributions', - } - )} + {i18n.translate('xpack.dataVisualizer.dataGrid.distributionsColumnName', { + defaultMessage: 'Distributions', + })} toggleShowDistribution()} aria-label={i18n.translate( - 'xpack.fileDataVisualizer.datavisualizer.dataGrid.showDistributionsAriaLabel', + 'xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel', { defaultMessage: 'Show distributions', } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts index 39a0ff53e27e5..b1d26a5437b44 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts @@ -51,22 +51,19 @@ export enum COLOR_RANGE_SCALE { export const colorRangeScaleOptions = [ { value: COLOR_RANGE_SCALE.LINEAR, - text: i18n.translate('xpack.fileDataVisualizer.components.colorRangeLegend.linearScaleLabel', { + text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.linearScaleLabel', { defaultMessage: 'Linear', }), }, { value: COLOR_RANGE_SCALE.INFLUENCER, - text: i18n.translate( - 'xpack.fileDataVisualizer.components.colorRangeLegend.influencerScaleLabel', - { - defaultMessage: 'Influencer custom scale', - } - ), + text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.influencerScaleLabel', { + defaultMessage: 'Influencer custom scale', + }), }, { value: COLOR_RANGE_SCALE.SQRT, - text: i18n.translate('xpack.fileDataVisualizer.components.colorRangeLegend.sqrtScaleLabel', { + text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.sqrtScaleLabel', { defaultMessage: 'Sqrt', }), }, @@ -86,26 +83,20 @@ export enum COLOR_RANGE { export const colorRangeOptions = [ { value: COLOR_RANGE.BLUE, - text: i18n.translate( - 'xpack.fileDataVisualizer.components.colorRangeLegend.blueColorRangeLabel', - { - defaultMessage: 'Blue', - } - ), + text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.blueColorRangeLabel', { + defaultMessage: 'Blue', + }), }, { value: COLOR_RANGE.RED, - text: i18n.translate( - 'xpack.fileDataVisualizer.components.colorRangeLegend.redColorRangeLabel', - { - defaultMessage: 'Red', - } - ), + text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.redColorRangeLabel', { + defaultMessage: 'Red', + }), }, { value: COLOR_RANGE.RED_GREEN, text: i18n.translate( - 'xpack.fileDataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel', + 'xpack.dataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel', { defaultMessage: 'Red - Green', } @@ -114,7 +105,7 @@ export const colorRangeOptions = [ { value: COLOR_RANGE.GREEN_RED, text: i18n.translate( - 'xpack.fileDataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel', + 'xpack.dataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel', { defaultMessage: 'Green - Red', } @@ -123,7 +114,7 @@ export const colorRangeOptions = [ { value: COLOR_RANGE.YELLOW_GREEN_BLUE, text: i18n.translate( - 'xpack.fileDataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel', + 'xpack.dataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel', { defaultMessage: 'Yellow - Green - Blue', } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx index 1cec44e1cd58c..aabd729a12612 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx @@ -52,7 +52,7 @@ export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed @@ -100,7 +100,7 @@ export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed = ({ onFilePickerChange }) => { {

diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/index.ts similarity index 100% rename from x-pack/plugins/data_visualizer/public/application/common/components/about_panel/index.ts rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/index.ts diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/welcome_content.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx similarity index 83% rename from x-pack/plugins/data_visualizer/public/application/common/components/about_panel/welcome_content.tsx rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx index b96a16d390e15..86b869fe06fa1 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/about_panel/welcome_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx @@ -19,13 +19,13 @@ import { EuiTitle, } from '@elastic/eui'; -import { ExperimentalBadge } from '../experimental_badge'; +import { ExperimentalBadge } from '../../../common/components/experimental_badge'; import { useDataVisualizerKibana } from '../../../kibana_context'; export const WelcomeContent: FC = () => { const toolTipContent = i18n.translate( - 'xpack.fileDataVisualizer.welcomeContent.experimentalFeatureTooltip', + 'xpack.dataVisualizer.file.welcomeContent.experimentalFeatureTooltip', { defaultMessage: "Experimental feature. We'd love to hear your feedback.", } @@ -47,7 +47,7 @@ export const WelcomeContent: FC = () => {

, @@ -59,7 +59,7 @@ export const WelcomeContent: FC = () => {

@@ -69,7 +69,7 @@ export const WelcomeContent: FC = () => {

@@ -83,7 +83,7 @@ export const WelcomeContent: FC = () => {

@@ -99,7 +99,7 @@ export const WelcomeContent: FC = () => {

@@ -115,7 +115,7 @@ export const WelcomeContent: FC = () => {

@@ -126,7 +126,7 @@ export const WelcomeContent: FC = () => {

@@ -136,7 +136,7 @@ export const WelcomeContent: FC = () => {

= ({ re

@@ -37,7 +37,7 @@ function createDisplayItems(results: FindFileStructureResponse) { { title: ( ), @@ -53,7 +53,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -64,7 +64,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -74,7 +74,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -87,7 +87,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -99,7 +99,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -111,7 +111,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( = ({ mode, onChangeMode, onCancel, di content={ disableImport ? ( ) : null @@ -52,7 +52,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di data-test-subj="mlFileDataVisOpenImportPageButton" > @@ -61,7 +61,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di onCancel()}> @@ -76,7 +76,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di onChangeMode(DATAVISUALIZER_MODE.READ)}> @@ -84,7 +84,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di onCancel()}> diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap index 00dd652457daf..8b69f7d742489 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap @@ -13,7 +13,7 @@ exports[`Overrides render overrides 1`] = ` label={ } @@ -33,7 +33,7 @@ exports[`Overrides render overrides 1`] = ` label={ } @@ -94,7 +94,7 @@ exports[`Overrides render overrides 1`] = ` label={ } @@ -335,7 +335,7 @@ exports[`Overrides render overrides 1`] = ` label={ } diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js index 7cdee6f823bd6..cc6f5c45b3105 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js @@ -69,7 +69,7 @@ export class EditFlyout extends Component {

@@ -96,7 +96,7 @@ export class EditFlyout extends Component { @@ -108,7 +108,7 @@ export class EditFlyout extends Component { fill > diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js index 16fe5f793b17d..b7eb790d2cf4e 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js @@ -52,7 +52,7 @@ class OverridesUI extends Component { } linesToSampleErrors = i18n.translate( - 'xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleErrorMessage', + 'xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleErrorMessage', { defaultMessage: 'Value must be greater than {min} and less than or equal to {max}', values: { @@ -63,7 +63,7 @@ class OverridesUI extends Component { ); customTimestampFormatErrors = i18n.translate( - 'xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatErrorMessage', + 'xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatErrorMessage', { defaultMessage: `Timestamp format must be a combination of these Java date/time formats: yy, yyyy, M, MM, MMM, MMMM, d, dd, EEE, EEEE, H, HH, h, mm, ss, S through SSSSSSSSS, a, XX, XXX, zzz`, @@ -274,9 +274,12 @@ class OverridesUI extends Component { const timestampFormatHelp = ( - {i18n.translate('xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatHelpText', { - defaultMessage: 'See more on accepted formats', - })} + {i18n.translate( + 'xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatHelpText', + { + defaultMessage: 'See more on accepted formats', + } + )} ); @@ -288,7 +291,7 @@ class OverridesUI extends Component { isInvalid={linesToSampleValid === false} label={ } @@ -303,7 +306,7 @@ class OverridesUI extends Component { } @@ -321,7 +324,7 @@ class OverridesUI extends Component { } @@ -338,7 +341,7 @@ class OverridesUI extends Component { } @@ -350,7 +353,7 @@ class OverridesUI extends Component { } @@ -369,7 +372,7 @@ class OverridesUI extends Component { id={'hasHeaderRow'} label={ } @@ -383,7 +386,7 @@ class OverridesUI extends Component { id={'shouldTrimFields'} label={ } @@ -398,7 +401,7 @@ class OverridesUI extends Component { } @@ -415,7 +418,7 @@ class OverridesUI extends Component { helpText={timestampFormatHelp} label={ } @@ -434,7 +437,7 @@ class OverridesUI extends Component { isInvalid={timestampFormatValid === false} label={ } @@ -450,7 +453,7 @@ class OverridesUI extends Component { } @@ -480,7 +483,7 @@ class OverridesUI extends Component {

diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js index c833d55351b6d..281131892e1e6 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js @@ -41,7 +41,7 @@ export function isTimestampFormatValid(timestampFormat) { if (timestampFormat.indexOf('?') >= 0) { result.isValid = false; result.errorMessage = i18n.translate( - 'xpack.fileDataVisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage', + 'xpack.dataVisualizer.file.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage', { defaultMessage: 'Timestamp format {timestampFormat} not supported because it contains a question mark character ({fieldPlaceholder})', @@ -86,7 +86,7 @@ export function isTimestampFormatValid(timestampFormat) { result.isValid = false; result.errorMessage = i18n.translate( - 'xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage', + 'xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterValidationErrorMessage', { defaultMessage: 'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported', @@ -101,7 +101,7 @@ export function isTimestampFormatValid(timestampFormat) { if (curChar === 'S') { // disable exceeds maximum line length error so i18n check passes result.errorMessage = i18n.translate( - 'xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage', + 'xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterSValidationErrorMessage', { defaultMessage: 'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported because it is not preceded by ss and a separator from {sep}', // eslint-disable-line @@ -128,7 +128,7 @@ export function isTimestampFormatValid(timestampFormat) { if (prevLetterGroup == null) { result.isValid = false; result.errorMessage = i18n.translate( - 'xpack.fileDataVisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage', + 'xpack.dataVisualizer.file.editFlyout.overrides.timestampEmptyValidationErrorMessage', { defaultMessage: 'No time format letter groups in timestamp format {timestampFormat}', values: { diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx index 14047b70f688c..9898dd53ec66a 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx @@ -34,7 +34,7 @@ export const ExplanationFlyout: FC = ({ results, closeFlyout }) => {

@@ -48,7 +48,7 @@ export const ExplanationFlyout: FC = ({ results, closeFlyout }) => { @@ -63,7 +63,7 @@ const Content: FC<{ explanation: string[] }> = ({ explanation }) => ( <> diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx index fa54cf9cbc05c..9588cad9f72f7 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx @@ -31,7 +31,7 @@ export const FileContents: FC = ({ data, format, numberOfLines }) => {

@@ -39,7 +39,7 @@ export const FileContents: FC = ({ data, format, numberOfLines }) => {
), diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx index a1c499ed4e78d..f94729e9cd98a 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx @@ -31,7 +31,7 @@ export const FileTooLarge: FC = ({ fileSize, maxFileSize }) = errorText = (

= ({ fileSize, maxFileSize }) = errorText = (

= ({ fileSize, maxFileSize }) = } @@ -92,7 +92,7 @@ export const FileCouldNotBeRead: FC = ({ } @@ -103,13 +103,13 @@ export const FileCouldNotBeRead: FC = ({ {loaded === false && ( <>
@@ -122,7 +122,7 @@ export const FileCouldNotBeRead: FC = ({ <> diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx index 5a6f78a1a3068..1a54b844574c5 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx @@ -38,56 +38,56 @@ function title(statuses: Statuses) { case statuses.readStatus: return ( ); case statuses.parseJSONStatus: return ( ); case statuses.indexCreatedStatus: return ( ); case statuses.ingestPipelineCreatedStatus: return ( ); case statuses.uploadStatus: return ( ); case statuses.indexPatternCreatedStatus: return ( ); case statuses.permissionCheckStatus: return ( ); default: return ( ); @@ -105,7 +105,7 @@ const ImportError: FC<{ error: any }> = ({ error }) => { id="more" buttonContent={ } @@ -151,7 +151,7 @@ function toString(error: any): ImportError { } return { - msg: i18n.translate('xpack.fileDataVisualizer.importErrors.unknownErrorMessage', { + msg: i18n.translate('xpack.dataVisualizer.file.importErrors.unknownErrorMessage', { defaultMessage: 'Unknown error', }), }; diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx index 8296a4885bf2c..a058afca84c76 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx @@ -80,31 +80,31 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } let processFileTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.processFileTitle', + 'xpack.dataVisualizer.file.importProgress.processFileTitle', { defaultMessage: 'Process file', } ); let createIndexTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.createIndexTitle', + 'xpack.dataVisualizer.file.importProgress.createIndexTitle', { defaultMessage: 'Create index', } ); let createIngestPipelineTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.createIngestPipelineTitle', + 'xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle', { defaultMessage: 'Create ingest pipeline', } ); let uploadingDataTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.uploadDataTitle', + 'xpack.dataVisualizer.file.importProgress.uploadDataTitle', { defaultMessage: 'Upload data', } ); let createIndexPatternTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.createIndexPatternTitle', + 'xpack.dataVisualizer.file.importProgress.createIndexPatternTitle', { defaultMessage: 'Create index pattern', } @@ -113,7 +113,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { const creatingIndexStatus = (

@@ -122,7 +122,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { const creatingIndexAndIngestPipelineStatus = (

@@ -130,7 +130,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { if (completedStep >= 0) { processFileTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.processingFileTitle', + 'xpack.dataVisualizer.file.importProgress.processingFileTitle', { defaultMessage: 'Processing file', } @@ -138,7 +138,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { statusInfo = (

@@ -146,13 +146,13 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 1) { processFileTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.fileProcessedTitle', + 'xpack.dataVisualizer.file.importProgress.fileProcessedTitle', { defaultMessage: 'File processed', } ); createIndexTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.creatingIndexTitle', + 'xpack.dataVisualizer.file.importProgress.creatingIndexTitle', { defaultMessage: 'Creating index', } @@ -161,11 +161,14 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { createPipeline === true ? creatingIndexAndIngestPipelineStatus : creatingIndexStatus; } if (completedStep >= 2) { - createIndexTitle = i18n.translate('xpack.fileDataVisualizer.importProgress.indexCreatedTitle', { - defaultMessage: 'Index created', - }); + createIndexTitle = i18n.translate( + 'xpack.dataVisualizer.file.importProgress.indexCreatedTitle', + { + defaultMessage: 'Index created', + } + ); createIngestPipelineTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.creatingIngestPipelineTitle', + 'xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle', { defaultMessage: 'Creating ingest pipeline', } @@ -175,13 +178,13 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 3) { createIngestPipelineTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.ingestPipelineCreatedTitle', + 'xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle', { defaultMessage: 'Ingest pipeline created', } ); uploadingDataTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.uploadingDataTitle', + 'xpack.dataVisualizer.file.importProgress.uploadingDataTitle', { defaultMessage: 'Uploading data', } @@ -190,14 +193,14 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 4) { uploadingDataTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.dataUploadedTitle', + 'xpack.dataVisualizer.file.importProgress.dataUploadedTitle', { defaultMessage: 'Data uploaded', } ); if (createIndexPattern === true) { createIndexPatternTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.creatingIndexPatternTitle', + 'xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle', { defaultMessage: 'Creating index pattern', } @@ -205,7 +208,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { statusInfo = (

@@ -216,7 +219,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 5) { createIndexPatternTitle = i18n.translate( - 'xpack.fileDataVisualizer.importProgress.indexPatternCreatedTitle', + 'xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle', { defaultMessage: 'Index pattern created', } @@ -290,7 +293,7 @@ const UploadFunctionProgress: FC<{ progress: number }> = ({ progress }) => {

diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx index 456afd2e6c9f1..a60b291d7e723 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx @@ -69,7 +69,7 @@ export const AdvancedSettings: FC = ({ } @@ -78,7 +78,7 @@ export const AdvancedSettings: FC = ({ > = ({ onChange={onIndexChange} isInvalid={indexNameError !== ''} aria-label={i18n.translate( - 'xpack.fileDataVisualizer.advancedImportSettings.indexNameAriaLabel', + 'xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel', { defaultMessage: 'Index name, required field', } @@ -102,7 +102,7 @@ export const AdvancedSettings: FC = ({ id="createIndexPattern" label={ } @@ -116,7 +116,7 @@ export const AdvancedSettings: FC = ({ } @@ -184,7 +184,7 @@ const IndexSettings: FC = ({ initialized, data, onChange }) => } @@ -209,7 +209,7 @@ const Mappings: FC = ({ initialized, data, onChange }) => { } @@ -234,7 +234,7 @@ const IngestPipeline: FC = ({ initialized, data, onChange }) => } diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx index 727b7b2feeabb..4e36dc42b54a5 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx @@ -59,7 +59,7 @@ export const ImportSettings: FC = ({ const tabs = [ { id: 'simple-settings', - name: i18n.translate('xpack.fileDataVisualizer.importSettings.simpleTabName', { + name: i18n.translate('xpack.dataVisualizer.file.importSettings.simpleTabName', { defaultMessage: 'Simple', }), content: ( @@ -80,7 +80,7 @@ export const ImportSettings: FC = ({ }, { id: 'advanced-settings', - name: i18n.translate('xpack.fileDataVisualizer.importSettings.advancedTabName', { + name: i18n.translate('xpack.dataVisualizer.file.importSettings.advancedTabName', { defaultMessage: 'Advanced', }), content: ( diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx index 579f547a5f7ea..34423f5d67358 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx @@ -39,7 +39,7 @@ export const SimpleSettings: FC = ({ } @@ -48,7 +48,7 @@ export const SimpleSettings: FC = ({ > = ({ onChange={onIndexChange} isInvalid={indexNameError !== ''} aria-label={i18n.translate( - 'xpack.fileDataVisualizer.simpleImportSettings.indexNameAriaLabel', + 'xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel', { defaultMessage: 'Index name, required field', } @@ -73,7 +73,7 @@ export const SimpleSettings: FC = ({ id="createIndexPattern" label={ } diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx index c8f62021b7bae..184403ce22893 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx @@ -51,7 +51,7 @@ export class Failures extends Component { id="failureList" buttonContent={ } diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx index f981b1fdf9f23..495fd9ca93b94 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx @@ -45,7 +45,7 @@ export const ImportSummary: FC = ({ } @@ -62,7 +62,7 @@ export const ImportSummary: FC = ({ } @@ -71,7 +71,7 @@ export const ImportSummary: FC = ({ >

), @@ -111,7 +111,7 @@ function createDisplayItems( { title: ( ), @@ -123,7 +123,7 @@ function createDisplayItems( items.splice(1, 0, { title: ( ), @@ -135,7 +135,7 @@ function createDisplayItems( items.splice(1, 0, { title: ( ), @@ -147,7 +147,7 @@ function createDisplayItems( items.push({ title: ( ), diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js index 4c1835990489c..95b04afc69f61 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js @@ -129,7 +129,7 @@ export class ImportView extends Component { })) === false ) { errors.push( - i18n.translate('xpack.fileDataVisualizer.importView.importPermissionError', { + i18n.translate('xpack.dataVisualizer.file.importView.importPermissionError', { defaultMessage: 'You do not have permission to create or import data into index {index}.', values: { @@ -169,7 +169,7 @@ export class ImportView extends Component { } catch (error) { success = false; const parseError = i18n.translate( - 'xpack.fileDataVisualizer.importView.parseSettingsError', + 'xpack.dataVisualizer.file.importView.parseSettingsError', { defaultMessage: 'Error parsing settings:', } @@ -182,7 +182,7 @@ export class ImportView extends Component { } catch (error) { success = false; const parseError = i18n.translate( - 'xpack.fileDataVisualizer.importView.parseMappingsError', + 'xpack.dataVisualizer.file.importView.parseMappingsError', { defaultMessage: 'Error parsing mappings:', } @@ -197,7 +197,7 @@ export class ImportView extends Component { } catch (error) { success = false; const parseError = i18n.translate( - 'xpack.fileDataVisualizer.importView.parsePipelineError', + 'xpack.dataVisualizer.file.importView.parsePipelineError', { defaultMessage: 'Error parsing ingest pipeline:', } @@ -354,7 +354,7 @@ export class ImportView extends Component { const exists = await this.props.fileUpload.checkIndexExists(index); const indexNameError = exists ? ( ) : ( @@ -507,14 +507,14 @@ export class ImportView extends Component {

  } @@ -555,7 +555,7 @@ export class ImportView extends Component { data-test-subj="mlFileDataVisImportButton" > @@ -564,7 +564,7 @@ export class ImportView extends Component { {initialized === true && importing === false && ( @@ -696,7 +696,7 @@ function isIndexNameValid(name) { ) { return ( ); @@ -713,7 +713,7 @@ function isIndexPatternNameValid(name, indexPatternNames, index) { if (indexPatternNames.find((i) => i === name)) { return ( ); @@ -729,7 +729,7 @@ function isIndexPatternNameValid(name, indexPatternNames, index) { // name should match index return ( ); diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx index 8d1668694c482..5f77417b04abd 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx @@ -72,7 +72,7 @@ export const ResultsView: FC = ({ showEditFlyout()} disabled={disableButtons}> @@ -80,7 +80,7 @@ export const ResultsView: FC = ({ showExplanationFlyout()} disabled={disableButtons}> @@ -94,7 +94,7 @@ export const ResultsView: FC = ({

diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx index ba3a3d66105c1..f93cb116db50e 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx @@ -92,7 +92,7 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer

@@ -102,14 +102,14 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer href={discoverLink} icon="discoverApp" description={i18n.translate( - 'xpack.fileDataVisualizer.actionsPanel.viewIndexInDiscoverDescription', + 'xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription', { defaultMessage: 'Explore the documents in your index.', } )} title={ } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index 6108574df203c..1a6cc492067ed 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -47,7 +47,7 @@ export const FullTimeRangeSelector: FC = ({ } catch (e) { toasts.addDanger( i18n.translate( - 'xpack.fileDataVisualizer.fullTimeRangeSelector.errorSettingTimeRangeNotification', + 'xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification', { defaultMessage: 'An error occurred setting the time range.', } @@ -62,7 +62,7 @@ export const FullTimeRangeSelector: FC = ({ data-test-subj="mlButtonUseFullData" > = (dataVi if (!currentIndexPattern.isTimeBased()) { toasts.addWarning({ title: i18n.translate( - 'xpack.fileDataVisualizer.indexPatternNotBasedOnTimeSeriesNotificationTitle', + 'xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationTitle', { defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', values: { indexPatternTitle: currentIndexPattern.title }, } ), text: i18n.translate( - 'xpack.fileDataVisualizer.indexPatternNotBasedOnTimeSeriesNotificationDescription', + 'xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationDescription', { defaultMessage: 'Anomaly detection only runs over time-based indices', } @@ -764,7 +764,7 @@ export const IndexDataVisualizerView: FC = (dataVi const actionColumn: EuiTableActionsColumnType = { name: ( ), diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx index 6dd45f29c05d6..d7972f75d5ed7 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx @@ -45,7 +45,7 @@ export const DataVisualizerFieldNamesFilter: FC = ({ const fieldNameTitle = useMemo( () => - i18n.translate('xpack.fileDataVisualizer.indexBased.fieldNameSelect', { + i18n.translate('xpack.dataVisualizer.index.fieldNameSelect', { defaultMessage: 'Field name', }), [] diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx index 07787e1720773..8d8ec651107df 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx @@ -55,7 +55,7 @@ export const DatavisualizerFieldTypeFilter: FC<{ }, [indexedFieldTypes]); const fieldTypeTitle = useMemo( () => - i18n.translate('xpack.fileDataVisualizer.indexBased.fieldTypeSelect', { + i18n.translate('xpack.dataVisualizer.index.fieldTypeSelect', { defaultMessage: 'Field type', }), [] diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx index 4f0c2a614d01d..b82108b97d823 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx @@ -111,7 +111,7 @@ export const SearchPanel: FC = ({ onChange={searchChangeHandler} onSubmit={searchHandler} placeholder={i18n.translate( - 'xpack.fileDataVisualizer.searchPanel.queryBarPlaceholderText', + 'xpack.dataVisualizer.searchPanel.queryBarPlaceholderText', { defaultMessage: 'Search… (e.g. status:200 AND extension:"PHP")', } @@ -125,7 +125,7 @@ export const SearchPanel: FC = ({ > {i18n.translate( - 'xpack.fileDataVisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar', + 'xpack.dataVisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar', { defaultMessage: 'Invalid query', } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx index 250e8693bac56..8d02450025bda 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx @@ -22,7 +22,7 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { v > 0 ? ( {v} }} /> @@ -30,7 +30,7 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { ) : ( @@ -46,7 +46,7 @@ export const ShardSizeFilter: FC = ({ samplerShardSize, setSamplerShardSi options={searchSizeOptions} valueOfSelected={String(samplerShardSize)} onChange={(value) => setSamplerShardSize(+value)} - aria-label={i18n.translate('xpack.fileDataVisualizer.searchPanel.sampleSizeAriaLabel', { + aria-label={i18n.translate('xpack.dataVisualizer.searchPanel.sampleSizeAriaLabel', { defaultMessage: 'Select number of documents to sample', })} data-test-subj="mlDataVisualizerShardSizeSelect" @@ -54,7 +54,7 @@ export const ShardSizeFilter: FC = ({ samplerShardSize, setSamplerShardSi Date: Thu, 3 Jun 2021 11:25:42 -0500 Subject: [PATCH 35/53] [ML] Update fileDataVisualizer -> dataVisualizer dependency name in ml plugin --- .../public/application/kibana_context.ts | 4 ++-- .../plugins/data_visualizer/public/index.ts | 6 ++--- .../data_visualizer/public/kibana_services.ts | 6 ++--- .../plugins/data_visualizer/public/plugin.ts | 22 +++++++++---------- x-pack/plugins/ml/kibana.json | 2 +- .../ml/public/__mocks__/ml_start_deps.ts | 2 +- x-pack/plugins/ml/public/application/app.tsx | 4 ++-- .../contexts/kibana/kibana_context.ts | 4 ++-- .../datavisualizer_selector.tsx | 6 ++--- .../file_based/file_datavisualizer.tsx | 6 ++--- .../index_based/index_data_visualizer.tsx | 2 +- .../application/util/dependency_cache.ts | 14 ++++++------ x-pack/plugins/ml/public/plugin.ts | 6 ++--- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts index 3fcd6b656f03d..f7ce13d2fd48d 100644 --- a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts +++ b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts @@ -7,7 +7,7 @@ import { CoreStart } from 'kibana/public'; import { useKibana } from '../../../../../src/plugins/kibana_react/public'; -import type { FileDataVisualizerStartDependencies } from '../plugin'; +import type { DataVisualizerStartDependencies } from '../plugin'; -export type StartServices = CoreStart & FileDataVisualizerStartDependencies; +export type StartServices = CoreStart & DataVisualizerStartDependencies; export const useDataVisualizerKibana = () => useKibana(); diff --git a/x-pack/plugins/data_visualizer/public/index.ts b/x-pack/plugins/data_visualizer/public/index.ts index 1257c64bf8352..b0a622dfe490b 100644 --- a/x-pack/plugins/data_visualizer/public/index.ts +++ b/x-pack/plugins/data_visualizer/public/index.ts @@ -5,12 +5,12 @@ * 2.0. */ -import { FileDataVisualizerPlugin } from './plugin'; +import { DataVisualizerPlugin } from './plugin'; export function plugin() { - return new FileDataVisualizerPlugin(); + return new DataVisualizerPlugin(); } -export { FileDataVisualizerPluginStart } from './plugin'; +export { DataVisualizerPluginStart } from './plugin'; export type { IndexDataVisualizerViewProps } from './application'; diff --git a/x-pack/plugins/data_visualizer/public/kibana_services.ts b/x-pack/plugins/data_visualizer/public/kibana_services.ts index 6a5fe85c72477..458d3aca9e525 100644 --- a/x-pack/plugins/data_visualizer/public/kibana_services.ts +++ b/x-pack/plugins/data_visualizer/public/kibana_services.ts @@ -6,11 +6,11 @@ */ import { CoreStart } from 'kibana/public'; -import { FileDataVisualizerStartDependencies } from './plugin'; +import { DataVisualizerStartDependencies } from './plugin'; let coreStart: CoreStart; -let pluginsStart: FileDataVisualizerStartDependencies; -export function setStartServices(core: CoreStart, plugins: FileDataVisualizerStartDependencies) { +let pluginsStart: DataVisualizerStartDependencies; +export function setStartServices(core: CoreStart, plugins: DataVisualizerStartDependencies) { coreStart = core; pluginsStart = plugins; } diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts index 60c3aa5ecfa42..6f078c073e75d 100644 --- a/x-pack/plugins/data_visualizer/public/plugin.ts +++ b/x-pack/plugins/data_visualizer/public/plugin.ts @@ -21,10 +21,10 @@ import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from import { getMaxBytesFormatted } from './application/common/util/get_max_bytes'; import { registerHomeAddData } from './register_home'; -export interface FileDataVisualizerSetupDependencies { +export interface DataVisualizerSetupDependencies { home?: HomePublicPluginSetup; } -export interface FileDataVisualizerStartDependencies { +export interface DataVisualizerStartDependencies { data: DataPublicPluginStart; fileUpload: FileUploadPluginStart; maps: MapsStartApi; @@ -34,24 +34,24 @@ export interface FileDataVisualizerStartDependencies { lens: LensPublicStart; } -export type FileDataVisualizerPluginSetup = ReturnType; -export type FileDataVisualizerPluginStart = ReturnType; +export type DataVisualizerPluginSetup = ReturnType; +export type DataVisualizerPluginStart = ReturnType; -export class FileDataVisualizerPlugin +export class DataVisualizerPlugin implements Plugin< - FileDataVisualizerPluginSetup, - FileDataVisualizerPluginStart, - FileDataVisualizerSetupDependencies, - FileDataVisualizerStartDependencies + DataVisualizerPluginSetup, + DataVisualizerPluginStart, + DataVisualizerSetupDependencies, + DataVisualizerStartDependencies > { - public setup(core: CoreSetup, plugins: FileDataVisualizerSetupDependencies) { + public setup(core: CoreSetup, plugins: DataVisualizerSetupDependencies) { if (plugins.home) { registerHomeAddData(plugins.home); } } - public start(core: CoreStart, plugins: FileDataVisualizerStartDependencies) { + public start(core: CoreStart, plugins: DataVisualizerStartDependencies) { setStartServices(core, plugins); return { getFileDataVisualizerComponent, diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json index 6804b3f52b52a..92bac61f3fab3 100644 --- a/x-pack/plugins/ml/kibana.json +++ b/x-pack/plugins/ml/kibana.json @@ -10,7 +10,7 @@ "data", "cloud", "features", - "fileDataVisualizer", + "dataVisualizer", "licensing", "share", "embeddable", diff --git a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts index ad47e84319e4a..0907cce832bf8 100644 --- a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts +++ b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts @@ -24,5 +24,5 @@ export const createMlStartDepsMock = () => ({ maps: jest.fn(), lens: lensPluginMock.createStartContract(), triggersActionsUi: triggersActionsUiMock.createStart(), - fileDataVisualizer: jest.fn(), + dataVisualizer: jest.fn(), }); diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx index e2fbcc77f2767..f16a7c561ac5d 100644 --- a/x-pack/plugins/ml/public/application/app.tsx +++ b/x-pack/plugins/ml/public/application/app.tsx @@ -82,7 +82,7 @@ const App: FC = ({ coreStart, deps, appMountParams }) => { embeddable: deps.embeddable, maps: deps.maps, triggersActionsUi: deps.triggersActionsUi, - fileDataVisualizer: deps.fileDataVisualizer, + dataVisualizer: deps.dataVisualizer, ...coreStart, }; @@ -125,7 +125,7 @@ export const renderApp = ( security: deps.security, urlGenerators: deps.share.urlGenerators, maps: deps.maps, - fileDataVisualizer: deps.fileDataVisualizer, + dataVisualizer: deps.dataVisualizer, }); appMountParams.onAppLeave((actions) => actions.default()); diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts index c82d85ea9c998..841f0d03fa21c 100644 --- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts +++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts @@ -18,7 +18,7 @@ import { MlServicesContext } from '../../app'; import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public'; import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public'; import type { MapsStartApi } from '../../../../../maps/public'; -import type { FileDataVisualizerPluginStart } from '../../../../../data_visualizer/public'; +import type { DataVisualizerPluginStart } from '../../../../../data_visualizer/public'; import type { LensPublicStart } from '../../../../../lens/public'; import { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public'; @@ -31,7 +31,7 @@ interface StartPlugins { maps?: MapsStartApi; lens?: LensPublicStart; triggersActionsUi?: TriggersAndActionsUIPublicPluginStart; - fileDataVisualizer?: FileDataVisualizerPluginStart; + dataVisualizer?: DataVisualizerPluginStart; } export type StartServices = CoreStart & StartPlugins & { diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx index 5f9127740709f..3b3b1af30610d 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx @@ -56,7 +56,7 @@ export const DatavisualizerSelector: FC = () => { licenseManagement, http: { basePath }, docLinks, - fileDataVisualizer, + dataVisualizer, }, } = useMlKibana(); @@ -68,12 +68,12 @@ export const DatavisualizerSelector: FC = () => { licenseManagement.enabled === true && isFullLicense() === false; - if (fileDataVisualizer === undefined) { + if (dataVisualizer === undefined) { // eslint-disable-next-line no-console console.error('File data visualizer plugin not available'); return null; } - const maxFileSize = fileDataVisualizer.getMaxBytesFormatted(); + const maxFileSize = dataVisualizer.getMaxBytesFormatted(); return ( diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx index 3b4cfbf33fbfc..0e9eeda51f786 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx @@ -15,13 +15,13 @@ import { useMlKibana } from '../../contexts/kibana'; export const FileDataVisualizerPage: FC = () => { useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); const { - services: { docLinks, fileDataVisualizer }, + services: { docLinks, dataVisualizer }, } = useMlKibana(); const [FileDataVisualizer, setFileDataVisualizer] = useState | null>(null); useEffect(() => { - if (fileDataVisualizer !== undefined) { - const { getFileDataVisualizerComponent } = fileDataVisualizer; + if (dataVisualizer !== undefined) { + const { getFileDataVisualizerComponent } = dataVisualizer; getFileDataVisualizerComponent().then(setFileDataVisualizer); } }, []); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx index a18f7154fcb60..1ba017bba8064 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx @@ -17,7 +17,7 @@ export const IndexDataVisualizerPage: FC = () => { useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); const { - services: { docLinks, fileDataVisualizer: dataVisualizer }, + services: { docLinks, dataVisualizer }, } = useMlKibana(); const [ IndexDataVisualizer, diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts index 87d6adeacf620..4a3194ed4113f 100644 --- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts +++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts @@ -23,7 +23,7 @@ import type { IndexPatternsContract, DataPublicPluginStart } from 'src/plugins/d import type { SharePluginStart } from 'src/plugins/share/public'; import type { SecurityPluginSetup } from '../../../../security/public'; import type { MapsStartApi } from '../../../../maps/public'; -import type { FileDataVisualizerPluginStart } from '../../../../data_visualizer/public'; +import type { DataVisualizerPluginStart } from '../../../../data_visualizer/public'; export interface DependencyCache { timefilter: DataPublicPluginSetup['query']['timefilter'] | null; @@ -44,7 +44,7 @@ export interface DependencyCache { i18n: I18nStart | null; urlGenerators: SharePluginStart['urlGenerators'] | null; maps: MapsStartApi | null; - fileDataVisualizer: FileDataVisualizerPluginStart | null; + dataVisualizer: DataVisualizerPluginStart | null; } const cache: DependencyCache = { @@ -66,7 +66,7 @@ const cache: DependencyCache = { i18n: null, urlGenerators: null, maps: null, - fileDataVisualizer: null, + dataVisualizer: null, }; export function setDependencyCache(deps: Partial) { @@ -87,7 +87,7 @@ export function setDependencyCache(deps: Partial) { cache.security = deps.security || null; cache.i18n = deps.i18n || null; cache.urlGenerators = deps.urlGenerators || null; - cache.fileDataVisualizer = deps.fileDataVisualizer || null; + cache.dataVisualizer = deps.dataVisualizer || null; } export function getTimefilter() { @@ -215,8 +215,8 @@ export function clearCache() { } export function getFileDataVisualizer() { - if (cache.fileDataVisualizer === null) { - throw new Error("fileDataVisualizer hasn't been initialized"); + if (cache.dataVisualizer === null) { + throw new Error("dataVisualizer hasn't been initialized"); } - return cache.fileDataVisualizer; + return cache.dataVisualizer; } diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts index 43e533b765b3a..42440883408ae 100644 --- a/x-pack/plugins/ml/public/plugin.ts +++ b/x-pack/plugins/ml/public/plugin.ts @@ -51,7 +51,7 @@ import { TriggersAndActionsUIPublicPluginSetup, TriggersAndActionsUIPublicPluginStart, } from '../../triggers_actions_ui/public'; -import { FileDataVisualizerPluginStart } from '../../data_visualizer/public'; +import { DataVisualizerPluginStart } from '../../data_visualizer/public'; import { PluginSetupContract as AlertingSetup } from '../../alerting/public'; import { registerManagementSection } from './application/management'; @@ -65,7 +65,7 @@ export interface MlStartDependencies { maps?: MapsStartApi; lens?: LensPublicStart; triggersActionsUi?: TriggersAndActionsUIPublicPluginStart; - fileDataVisualizer: FileDataVisualizerPluginStart; + dataVisualizer: DataVisualizerPluginStart; } export interface MlSetupDependencies { @@ -123,7 +123,7 @@ export class MlPlugin implements Plugin { lens: pluginsStart.lens, kibanaVersion, triggersActionsUi: pluginsStart.triggersActionsUi, - fileDataVisualizer: pluginsStart.fileDataVisualizer, + dataVisualizer: pluginsStart.dataVisualizer, }, params ); From 76b7dffd497b14c40e603af1931c03370beb12ee Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 3 Jun 2021 13:33:11 -0500 Subject: [PATCH 36/53] [ML] Remove ml prefix in data test subjs --- .../date_picker_wrapper.tsx | 4 +- .../document_count_chart.tsx | 2 +- .../total_count_header.tsx | 4 +- .../components/embedded_map/embedded_map.tsx | 2 +- .../examples_list/examples_list.tsx | 2 +- .../expanded_row/file_based_expanded_row.tsx | 2 +- .../geo_point_content/geo_point_content.tsx | 4 +- .../geo_point_content_with_map.tsx | 2 +- .../expanded_row/index_based_expanded_row.tsx | 4 +- .../field_count_panel/field_count_panel.tsx | 4 +- .../field_data_row/action_menu/actions.ts | 4 +- .../field_names_filter/field_names_filter.tsx | 2 +- .../field_types_filter/field_types_filter.tsx | 2 +- .../fields_stats_grid/fields_stats_grid.tsx | 4 +- .../field_count_stats/metric_fields_count.tsx | 6 +- .../field_count_stats/total_fields_count.tsx | 6 +- .../boolean_content.tsx | 2 +- .../field_data_expanded_row/date_content.tsx | 4 +- .../document_stats.tsx | 2 +- .../field_data_expanded_row/ip_content.tsx | 2 +- .../keyword_content.tsx | 2 +- .../number_content.tsx | 6 +- .../field_data_expanded_row/other_content.tsx | 2 +- .../field_data_expanded_row/text_content.tsx | 2 +- .../boolean_content_preview.tsx | 2 +- .../field_data_row/number_content_preview.tsx | 2 +- .../field_data_row/top_values_preview.tsx | 2 +- .../metric_distribution_chart.tsx | 2 +- .../data_visualizer_stats_table.tsx | 24 ++-- .../components/top_values/top_values.tsx | 9 +- .../components/about_panel/about_panel.tsx | 4 +- .../components/bottom_bar/bottom_bar.tsx | 2 +- .../file_error_callouts.tsx | 4 +- .../components/import_settings/simple.tsx | 4 +- .../import_summary/import_summary.tsx | 2 +- .../components/import_view/import_view.js | 6 +- .../components/results_view/results_view.tsx | 12 +- .../actions_panel/actions_panel.tsx | 4 +- .../full_time_range_selector.tsx | 2 +- .../index_data_visualizer_view.tsx | 8 +- .../search_panel/field_name_filter.tsx | 2 +- .../search_panel/field_type_filter.tsx | 2 +- .../components/search_panel/search_panel.tsx | 4 +- .../search_panel/shard_size_select.tsx | 6 +- .../services/timefilter_refresh_service.ts | 2 +- .../components/data_grid/column_chart.scss | 8 +- .../components/data_grid/column_chart.tsx | 9 +- .../components/data_grid/use_column_chart.tsx | 2 +- .../components/data_grid/use_data_grid.tsx | 2 +- .../ml_embedded_map/_ml_embedded_map.scss | 2 +- .../ml_embedded_map/ml_embedded_map.tsx | 4 +- .../datavisualizer_selector.tsx | 12 +- .../search_deep_links.ts | 2 +- .../ml/data_frame_analytics_creation.ts | 14 ++- .../functional/services/ml/data_visualizer.ts | 18 +-- .../services/ml/data_visualizer_file_based.ts | 42 ++++--- .../ml/data_visualizer_index_based.ts | 54 ++++----- .../services/ml/data_visualizer_table.ts | 108 ++++++++++-------- .../services/ml/job_source_selection.ts | 2 +- .../functional/services/transform/wizard.ts | 16 ++- 60 files changed, 255 insertions(+), 221 deletions(-) diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx index c51752c0c57f0..f6f53f40d6b9e 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx @@ -18,7 +18,7 @@ import { import { useUrlState } from '../../util/url_state'; import { useDataVisualizerKibana } from '../../../kibana_context'; -import { mlTimefilterRefresh$ } from '../../../index_data_visualizer/services/timefilter_refresh_service'; +import { dataVisualizerTimefilterRefresh$ } from '../../../index_data_visualizer/services/timefilter_refresh_service'; interface TimePickerQuickRange { from: string; @@ -50,7 +50,7 @@ function getRecentlyUsedRangesFactory(timeHistory: TimeHistoryContract) { } function updateLastRefresh(timeRange: OnRefreshProps) { - mlTimefilterRefresh$.next({ lastRefresh: Date.now(), timeRange }); + dataVisualizerTimefilterRefresh$.next({ lastRefresh: Date.now(), timeRange }); } export const DatePickerWrapper: FC = () => { diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx index 07f55b7c09328..34faed01f613e 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx @@ -72,7 +72,7 @@ export const DocumentCountChart: FC = ({ }, [chartPoints, timeRangeEarliest, timeRangeLatest, interval]); return ( -
+
{ return ( - + + diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx index f7e93915d6267..296820479437c 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx @@ -41,7 +41,7 @@ export const ExamplesList: FC = ({ examples }) => { } return ( -
+
{getCardContent()}
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx index c395b06059e8f..b732e542658b5 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx @@ -60,7 +60,7 @@ export const GeoPointContent: FC = ({ config }) => { } }, [config]); return ( - + {formattedResults && Array.isArray(formattedResults.examples) && ( @@ -70,7 +70,7 @@ export const GeoPointContent: FC = ({ config }) => { {formattedResults && Array.isArray(formattedResults.layerList) && ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx index bbf9f291fc0a3..b4c8c3c22f5a9 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx @@ -62,7 +62,7 @@ export const GeoPointContentWithMap: FC<{ if (stats?.examples === undefined) return null; return ( - + diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx index 0d92afb08289b..6406012a0540b 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx @@ -76,8 +76,8 @@ export const IndexBasedDataVisualizerExpandedRow = ({ return (
{loading === true ? : getCardContent()}
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx index 0f7c5d499cb40..c79ed4ade7092 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx @@ -29,13 +29,13 @@ export const FieldCountPanel: FC = ({ alignItems="center" gutterSize="xs" style={{ marginLeft: 4 }} - data-test-subj="mlDataVisualizerFieldCountPanel" + data-test-subj="dataVisualizerFieldCountPanel" > = ({ options={options} onChange={setVisibleFieldNames} checkedOptions={visibleFieldNames} - dataTestSubj={'mlDataVisualizerFieldNameSelect'} + dataTestSubj={'dataVisualizerFieldNameSelect'} /> ); }; diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx index f36a4571ad23c..152926ad84ba7 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx @@ -87,7 +87,7 @@ export const DataVisualizerFieldTypesFilter: FC = ({ options={options} onChange={setVisibleFieldTypes} checkedOptions={visibleFieldTypes} - dataTestSubj={'mlDataVisualizerFieldTypeSelect'} + dataTestSubj={'dataVisualizerFieldTypeSelect'} /> ); }; diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx index 5ff6284285226..f1c164768d6e7 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx @@ -85,14 +85,14 @@ export const FieldsStatsGrid: FC = ({ results }) => { alignItems="center" gutterSize="xs" style={{ marginLeft: 4 }} - data-test-subj="mlDataVisualizerFieldCountPanel" + data-test-subj="dataVisualizerFieldCountPanel" > = ({ metricsStats }) gutterSize="s" alignItems="center" className="dataVisualizerFieldCountContainer" - data-test-subj="mlDataVisualizerMetricFieldsSummary" + data-test-subj="dataVisualizerMetricFieldsSummary" > @@ -47,13 +47,13 @@ export const MetricFieldsCount: FC = ({ metricsStats }) {metricsStats.visibleMetricsCount} - + = ({ fieldsCountStats } gutterSize="s" alignItems="center" className="dataVisualizerFieldCountContainer" - data-test-subj="mlDataVisualizerFieldsSummary" + data-test-subj="dataVisualizerFieldsSummary" > @@ -48,13 +48,13 @@ export const TotalFieldsCount: FC = ({ fieldsCountStats } {fieldsCountStats.visibleFieldsCount} - + = ({ config }) => { ); return ( - + diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx index 4a4fc6905391a..4adb76575dd48 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx @@ -71,13 +71,13 @@ export const DateContent: FC = ({ config }) => { ]; return ( - + {summaryTableTitle} className={'dataVisualizerSummaryTable'} - data-test-subj={'mlDateSummaryTable'} + data-test-subj={'dataVisualizerDateSummaryTable'} compressed items={summaryTableItems} columns={summaryTableColumns} diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx index 0e735abdeef6b..f4ed74193d90a 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx @@ -77,7 +77,7 @@ export const DocumentStatsTable: FC = ({ config }) => { return ( {metaTableTitle} diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx index 07adf3103b78e..77cf5fad5cca8 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx @@ -19,7 +19,7 @@ export const IpContent: FC = ({ config }) => { const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; return ( - + diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx index dca304835da1c..22fe8244ef760 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx @@ -50,7 +50,7 @@ export const KeywordContent: FC = ({ config }) => { ); return ( - + {EMSSuggestion && stats && } diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx index 12df88760ddae..ef3ac5a267346 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx @@ -99,7 +99,7 @@ export const NumberContent: FC = ({ config }) => { } ); return ( - + {summaryTableTitle} @@ -109,7 +109,7 @@ export const NumberContent: FC = ({ config }) => { items={summaryTableItems} columns={summaryTableColumns} tableCaption={summaryTableTitle} - data-test-subj={'mlNumberSummaryTable'} + data-test-subj={'dataVisualizerNumberSummaryTable'} /> @@ -117,7 +117,7 @@ export const NumberContent: FC = ({ config }) => { )} {distribution && ( - + = ({ config }) => { const { stats } = config; if (stats === undefined) return null; return ( - + {Array.isArray(stats.examples) && ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx index 7b9d1c2856215..700a715a33396 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx @@ -25,7 +25,7 @@ export const TextContent: FC = ({ config }) => { const numExamples = examples.length; return ( - + {numExamples > 0 && } {numExamples === 0 && ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx index b4ae44916ee34..ceb2e6f241682 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx @@ -29,7 +29,7 @@ export const BooleanContentPreview: FC = ({ config }) => { id: config.fieldName, schema: undefined, }; - const dataTestSubj = `mlDataGridChart-${config.fieldName}`; + const dataTestSubj = `dataVisualizerDataGridChart-${config.fieldName}`; return ( = ({ const defaultChartData: MetricDistributionChartData[] = []; const [distributionChartData, setDistributionChartData] = useState(defaultChartData); const [legendText, setLegendText] = useState<{ min: number; max: number } | undefined>(); - const dataTestSubj = `mlDataGridChart-${fieldName}`; + const dataTestSubj = `dataVisualizerDataGridChart-${fieldName}`; useEffect(() => { const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH); if ( diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx index 63b15fdf30b3b..4e5af381906bf 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx @@ -36,7 +36,7 @@ export const TopValuesPreview: FC = ({ config }) => { diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx index 06a73c5c7885e..2c4739206d47f 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx @@ -82,7 +82,7 @@ export const MetricDistributionChart: FC = ({ }; return ( -
+
({ const expanderColumn: EuiTableComputedColumnType = { name: ( toggleExpandAll(!expandAll)} aria-label={ !expandAll @@ -113,7 +115,7 @@ export const DataVisualizerTable = ({ const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown'; return ( toggleDetails(item)} aria-label={ expandedRowItemIds.includes(item.fieldName) @@ -130,7 +132,7 @@ export const DataVisualizerTable = ({ /> ); }, - 'data-test-subj': 'mlDataVisualizerTableColumnDetailsToggle', + 'data-test-subj': 'dataVisualizerTableColumnDetailsToggle', }; const baseColumns = [ @@ -146,7 +148,7 @@ export const DataVisualizerTable = ({ width: '75px', sortable: true, align: CENTER_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnType', + 'data-test-subj': 'dataVisualizerTableColumnType', }, { field: 'fieldName', @@ -161,7 +163,7 @@ export const DataVisualizerTable = ({ ), align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnName', + 'data-test-subj': 'dataVisualizerTableColumnName', }, { field: 'docCount', @@ -173,7 +175,7 @@ export const DataVisualizerTable = ({ ), sortable: (item: DataVisualizerTableItem) => item?.stats?.count, align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnDocumentsCount', + 'data-test-subj': 'dataVisualizerTableColumnDocumentsCount', }, { field: 'stats.cardinality', @@ -183,7 +185,7 @@ export const DataVisualizerTable = ({ render: (cardinality?: number) => , sortable: true, align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnDistinctValues', + 'data-test-subj': 'dataVisualizerTableColumnDistinctValues', }, { name: ( @@ -230,7 +232,7 @@ export const DataVisualizerTable = ({ return null; }, align: LEFT_ALIGNMENT as HorizontalAlignment, - 'data-test-subj': 'mlDataVisualizerTableColumnDistribution', + 'data-test-subj': 'dataVisualizerTableColumnDistribution', }, ]; return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns; @@ -247,7 +249,7 @@ export const DataVisualizerTable = ({ }, [expandAll, items, expandedRowItemIds]); return ( - + className={'dataVisualizer'} items={items} @@ -259,9 +261,9 @@ export const DataVisualizerTable = ({ itemIdToExpandedRowMap={itemIdToExpandedRowMap} isSelectable={false} onTableChange={onTableChange} - data-test-subj={'mlDataVisualizerTable'} + data-test-subj={'dataVisualizerTable'} rowProps={(item) => ({ - 'data-test-subj': `mlDataVisualizerRow row-${item.fieldName}`, + 'data-test-subj': `dataVisualizerRow row-${item.fieldName}`, })} /> diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx index aabd729a12612..7a20b054462a6 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx @@ -49,7 +49,7 @@ export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed } = stats; const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count; return ( - + = ({ stats, fieldFormat, barColor, compressed /> -
+
{Array.isArray(topValues) && topValues.map((value) => ( @@ -75,7 +78,7 @@ export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed - + = ({ onFilePickerChange }) => { return ( - + @@ -63,7 +63,7 @@ export const AboutPanel: FC = ({ onFilePickerChange }) => { export const LoadingPanel: FC = () => { return ( - +
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx index 891bd5cd728d5..fb8ba63af36dc 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx @@ -49,7 +49,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di fill isDisabled={disableImport} onClick={() => onChangeMode(DATAVISUALIZER_MODE.IMPORT)} - data-test-subj="mlFileDataVisOpenImportPageButton" + data-test-subj="dataVisualizerFileOpenImportPageButton" > = ({ fileSize, maxFileSize }) = } color="danger" iconType="cross" - data-test-subj="mlFileUploadErrorCallout fileTooLarge" + data-test-subj="dataVisualizerFileUploadErrorCallout fileTooLarge" > {errorText} @@ -98,7 +98,7 @@ export const FileCouldNotBeRead: FC = ({ } color="danger" iconType="cross" - data-test-subj="mlFileUploadErrorCallout fileCouldNotBeRead" + data-test-subj="dataVisualizerFileUploadErrorCallout fileCouldNotBeRead" > {loaded === false && ( <> diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx index 34423f5d67358..02f33c49b77c4 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx @@ -63,7 +63,7 @@ export const SimpleSettings: FC = ({ defaultMessage: 'Index name, required field', } )} - data-test-subj="mlFileDataVisIndexNameInput" + data-test-subj="dataVisualizerFileIndexNameInput" /> @@ -80,7 +80,7 @@ export const SimpleSettings: FC = ({ checked={createIndexPattern === true} disabled={initialized === true} onChange={onCreateIndexPatternChange} - data-test-subj="mlFileDataVisCreateIndexPatternCheckbox" + data-test-subj="dataVisualizerFileCreateIndexPatternCheckbox" /> diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx index 495fd9ca93b94..1d8217d8df223 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx @@ -51,7 +51,7 @@ export const ImportSummary: FC = ({ } color="success" iconType="check" - data-test-subj="mlFileImportSuccessCallout" + data-test-subj="dataVisualizerFileImportSuccessCallout" > diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js index 95b04afc69f61..74a3638f555d0 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js @@ -495,7 +495,7 @@ export class ImportView extends Component { checkingValidIndex === true; return ( - + @@ -503,7 +503,7 @@ export class ImportView extends Component { - +

= ({ disableButtons, }) => { return ( - + -

{fileName}

+

{fileName}
- + = ({ - + @@ -90,9 +90,9 @@ export const ResultsView: FC = ({ - + -

+

= ({ indexPattern, searchString, searchQuer // passed the recognizerResults object, and then run the recognizer check which // controls whether the recognizer section is ultimately displayed. return ( -
+
{discoverLink && ( <> @@ -113,7 +113,7 @@ export const ActionsPanel: FC = ({ indexPattern, searchString, searchQuer defaultMessage="Discover" /> } - data-test-subj="mlDataVisualizerViewInDiscoverCard" + data-test-subj="dataVisualizerViewInDiscoverCard" /> )} diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index 1a6cc492067ed..93e5ca3a3260d 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -59,7 +59,7 @@ export const FullTimeRangeSelector: FC = ({ setRange(indexPattern, query)} - data-test-subj="mlButtonUseFullData" + data-test-subj="dataVisualizerButtonUseFullData" > = (dataVi useEffect(() => { const timeUpdateSubscription = merge( timefilter.getTimeUpdate$(), - mlTimefilterRefresh$ + dataVisualizerTimefilterRefresh$ ).subscribe(() => { setGlobalState({ time: timefilter.getTime(), @@ -778,7 +778,7 @@ export const IndexDataVisualizerView: FC = (dataVi const helpLink = docLinks.links.ml.guide; return ( - + @@ -788,7 +788,7 @@ export const IndexDataVisualizerView: FC = (dataVi

{currentIndexPattern.title}

 - + {currentIndexPattern.timeFieldName !== undefined && ( diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx index d7972f75d5ed7..634bf25dbc8a0 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx @@ -57,7 +57,7 @@ export const DataVisualizerFieldNamesFilter: FC = ({ options={items} onChange={setVisibleFieldNames} checkedOptions={visibleFieldNames} - dataTestSubj={'mlDataVisualizerFieldNameSelect'} + dataTestSubj={'dataVisualizerFieldNameSelect'} /> ); }; diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx index 8d8ec651107df..4f9de09dc670e 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx @@ -66,7 +66,7 @@ export const DatavisualizerFieldTypeFilter: FC<{ options={options} onChange={setVisibleFieldTypes} checkedOptions={visibleFieldTypes} - dataTestSubj={'mlDataVisualizerFieldTypeSelect'} + dataTestSubj={'dataVisualizerFieldTypeSelect'} /> ); }; diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx index b82108b97d823..5f4a57ee2eb09 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx @@ -98,7 +98,7 @@ export const SearchPanel: FC = ({ const searchChangeHandler = (query: Query) => setSearchInput(query); return ( - + = ({ } )} disableAutoFocus={true} - dataTestSubj="mlDataVisualizerQueryInput" + dataTestSubj="dataVisualizerQueryInput" languageSwitcherPopoverAnchorPosition="rightDown" /> } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx index 8d02450025bda..85f3d2b596105 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx @@ -20,7 +20,7 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => { value: String(v), inputDisplay: v > 0 ? ( - + { /> ) : ( - + = ({ samplerShardSize, setSamplerShardSi aria-label={i18n.translate('xpack.dataVisualizer.searchPanel.sampleSizeAriaLabel', { defaultMessage: 'Select number of documents to sample', })} - data-test-subj="mlDataVisualizerShardSizeSelect" + data-test-subj="dataVisualizerShardSizeSelect" /> diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts index 8205d38ae1f47..49ef9107c3ece 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts @@ -13,4 +13,4 @@ export interface Refresh { timeRange?: { start: string; end: string }; } -export const mlTimefilterRefresh$ = new Subject>(); +export const dataVisualizerTimefilterRefresh$ = new Subject>(); diff --git a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss index 756804a0e6aa0..e5f70ba5926c6 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss +++ b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss @@ -1,9 +1,9 @@ -.mlDataGridChart__histogram { +.dataVisualizerDataGridChart__histogram { width: 100%; height: $euiSizeXL + $euiSizeXXL; } -.mlDataGridChart__legend { +.dataVisualizerDataGridChart__legend { @include euiTextTruncate; @include euiFontSizeXS; @@ -16,11 +16,11 @@ text-align: left; } -.mlDataGridChart__legend--numeric { +.dataVisualizerDataGridChart__legend--numeric { text-align: right; } -.mlDataGridChart__legendBoolean { +.dataVisualizerDataGridChart__legendBoolean { width: 100%; min-width: $euiButtonMinWidth; td { text-align: center } diff --git a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx index 3800256927d54..c864c63e0d9e4 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx @@ -53,7 +53,10 @@ export const ColumnChart: FC = ({ return (
{!isUnsupportedChartData(chartData) && data.length > 0 && ( -
+
= ({
)}
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx index 4764a1674df2f..43dd018d72c29 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx @@ -94,7 +94,7 @@ export const getLegendText = ( if (chartData.type === 'boolean') { return ( - +
{chartData.data[0] !== undefined && } diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx index 633c3d9aab002..a4ea9916d3a98 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx @@ -113,7 +113,7 @@ export const useDataGrid = ( ) : undefined, }; diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss index 495fc40ddb27c..4dfd1c8a866bd 100644 --- a/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss +++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss @@ -1,4 +1,4 @@ -.mlEmbeddedMapContent { +.dataVisualizerEmbeddedMapContent { width: 100%; height: 100%; display: flex; diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx index 0ca5389f1d423..1911a232102e2 100644 --- a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx +++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx @@ -147,8 +147,8 @@ export function MlEmbeddedMapComponent({ return (
); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx index 3b3b1af30610d..dd3db6914d251 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx @@ -138,7 +138,7 @@ export const DatavisualizerSelector: FC = () => { navigateToPath('/filedatavisualizer')} - data-test-subj="mlDataVisualizerUploadFileButton" + data-test-subj="dataVisualizerUploadFileButton" > { /> } - data-test-subj="mlDataVisualizerCardImportData" + data-test-subj="dataVisualizerCardImportData" /> @@ -168,7 +168,7 @@ export const DatavisualizerSelector: FC = () => { navigateToPath('/datavisualizer_index_select')} - data-test-subj="mlDataVisualizerSelectIndexButton" + data-test-subj="dataVisualizerSelectIndexButton" > { /> } - data-test-subj="mlDataVisualizerCardIndexData" + data-test-subj="dataVisualizerCardIndexData" /> @@ -198,7 +198,7 @@ export const DatavisualizerSelector: FC = () => { { /> } - data-test-subj="mlDataVisualizerCardStartTrial" + data-test-subj="dataVisualizerCardStartTrial" /> diff --git a/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts b/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts index d682a93fa274c..e6ffa3b530858 100644 --- a/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts +++ b/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts @@ -44,7 +44,7 @@ const DATA_FRAME_ANALYTICS_DEEP_LINK: AppDeepLink = { }; const DATA_VISUALIZER_DEEP_LINK: AppDeepLink = { - id: 'mlDataVisualizerDeepLink', + id: 'dataVisualizerDeepLink', title: i18n.translate('xpack.ml.deepLink.dataVisualizer', { defaultMessage: 'Data Visualizer', }), diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts index b22748608589e..1fe07955a02e2 100644 --- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts +++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts @@ -146,21 +146,25 @@ export function MachineLearningDataFrameAnalyticsCreationProvider( await retry.tryForTime(5000, async () => { for (const expected of expectedHistogramCharts.values()) { const id = expected.id; - await testSubjects.existOrFail(`mlDataGridChart-${id}`); + await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}`); if (expected.chartAvailable) { - await testSubjects.existOrFail(`mlDataGridChart-${id}-histogram`); + await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}-histogram`); } else { - await testSubjects.missingOrFail(`mlDataGridChart-${id}-histogram`); + await testSubjects.missingOrFail(`dataVisualizerDataGridChart-${id}-histogram`); } - const actualLegend = await testSubjects.getVisibleText(`mlDataGridChart-${id}-legend`); + const actualLegend = await testSubjects.getVisibleText( + `dataVisualizerDataGridChart-${id}-legend` + ); expect(actualLegend).to.eql( expected.legend, `Legend text for column '${id}' should be '${expected.legend}' (got '${actualLegend}')` ); - const actualId = await testSubjects.getVisibleText(`mlDataGridChart-${id}-id`); + const actualId = await testSubjects.getVisibleText( + `dataVisualizerDataGridChart-${id}-id` + ); expect(actualId).to.eql( expected.id, `Id text for column '${id}' should be '${expected.id}' (got '${actualId}')` diff --git a/x-pack/test/functional/services/ml/data_visualizer.ts b/x-pack/test/functional/services/ml/data_visualizer.ts index 2ebc1e1ad3017..2ca10d799122f 100644 --- a/x-pack/test/functional/services/ml/data_visualizer.ts +++ b/x-pack/test/functional/services/ml/data_visualizer.ts @@ -14,19 +14,19 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide return { async assertDataVisualizerImportDataCardExists() { - await testSubjects.existOrFail('mlDataVisualizerCardImportData'); + await testSubjects.existOrFail('dataVisualizerCardImportData'); }, async assertDataVisualizerIndexDataCardExists() { - await testSubjects.existOrFail('mlDataVisualizerCardIndexData'); + await testSubjects.existOrFail('dataVisualizerCardIndexData'); }, async assertDataVisualizerStartTrialCardExists() { - await testSubjects.existOrFail('mlDataVisualizerCardStartTrial'); + await testSubjects.existOrFail('dataVisualizerCardStartTrial'); }, async assertSelectIndexButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('mlDataVisualizerSelectIndexButton'); + const isEnabled = await testSubjects.isEnabled('dataVisualizerSelectIndexButton'); expect(isEnabled).to.eql( expectedValue, `Expected "select index" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -36,7 +36,7 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide }, async assertUploadFileButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('mlDataVisualizerUploadFileButton'); + const isEnabled = await testSubjects.isEnabled('dataVisualizerUploadFileButton'); expect(isEnabled).to.eql( expectedValue, `Expected "upload file" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -46,7 +46,7 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide }, async assertStartTrialButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('mlDataVisualizerStartTrialButton'); + const isEnabled = await testSubjects.isEnabled('dataVisualizerStartTrialButton'); expect(isEnabled).to.eql( expectedValue, `Expected "start trial" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -56,13 +56,13 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide }, async navigateToIndexPatternSelection() { - await testSubjects.click('mlDataVisualizerSelectIndexButton'); + await testSubjects.click('dataVisualizerSelectIndexButton'); await testSubjects.existOrFail('mlPageSourceSelection'); }, async navigateToFileUpload() { - await testSubjects.click('mlDataVisualizerUploadFileButton'); - await testSubjects.existOrFail('mlPageFileDataVisualizerUpload'); + await testSubjects.click('dataVisualizerUploadFileButton'); + await testSubjects.existOrFail('dataVisualizerPageFileUpload'); }, }; } diff --git a/x-pack/test/functional/services/ml/data_visualizer_file_based.ts b/x-pack/test/functional/services/ml/data_visualizer_file_based.ts index e32c04f82804c..5eece4057ac0c 100644 --- a/x-pack/test/functional/services/ml/data_visualizer_file_based.ts +++ b/x-pack/test/functional/services/ml/data_visualizer_file_based.ts @@ -25,18 +25,18 @@ export function MachineLearningDataVisualizerFileBasedProvider( log.debug(`Importing file '${path}' ...`); await PageObjects.common.setFileInputPath(path); - await testSubjects.waitForDeleted('mlPageFileDataVisLoading'); + await testSubjects.waitForDeleted('dataVisualizerPageFileLoading'); if (expectError) { - await testSubjects.existOrFail('~mlFileUploadErrorCallout'); + await testSubjects.existOrFail('~dataVisualizerFileUploadErrorCallout'); } else { - await testSubjects.missingOrFail('~mlFileUploadErrorCallout'); - await testSubjects.existOrFail('mlPageFileDataVisResults'); + await testSubjects.missingOrFail('~dataVisualizerFileUploadErrorCallout'); + await testSubjects.existOrFail('dataVisualizerPageFileResults'); } }, async assertFileTitle(expectedTitle: string) { - const actualTitle = await testSubjects.getVisibleText('mlFileDataVisResultsTitle'); + const actualTitle = await testSubjects.getVisibleText('dataVisualizerFileResultsTitle'); expect(actualTitle).to.eql( expectedTitle, `Expected file title to be '${expectedTitle}' (got '${actualTitle}')` @@ -44,15 +44,15 @@ export function MachineLearningDataVisualizerFileBasedProvider( }, async assertFileContentPanelExists() { - await testSubjects.existOrFail('mlFileDataVisFileContentPanel'); + await testSubjects.existOrFail('dataVisualizerFileFileContentPanel'); }, async assertSummaryPanelExists() { - await testSubjects.existOrFail('mlFileDataVisSummaryPanel'); + await testSubjects.existOrFail('dataVisualizerFileSummaryPanel'); }, async assertFileStatsPanelExists() { - await testSubjects.existOrFail('mlFileDataVisFileStatsPanel'); + await testSubjects.existOrFail('dataVisualizerFileFileStatsPanel'); }, async assertNumberOfFieldCards(number: number) { @@ -64,7 +64,7 @@ export function MachineLearningDataVisualizerFileBasedProvider( }, async assertImportButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('mlFileDataVisOpenImportPageButton'); + const isEnabled = await testSubjects.isEnabled('dataVisualizerFileOpenImportPageButton'); expect(isEnabled).to.eql( expectedValue, `Expected "import" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -74,17 +74,17 @@ export function MachineLearningDataVisualizerFileBasedProvider( }, async navigateToFileImport() { - await testSubjects.click('mlFileDataVisOpenImportPageButton'); - await testSubjects.existOrFail('mlPageFileDataVisImport'); + await testSubjects.click('dataVisualizerFileOpenImportPageButton'); + await testSubjects.existOrFail('dataVisualizerPageFileImport'); }, async assertImportSettingsPanelExists() { - await testSubjects.existOrFail('mlFileDataVisImportSettingsPanel'); + await testSubjects.existOrFail('dataVisualizerFileImportSettingsPanel'); }, async assertIndexNameValue(expectedValue: string) { const actualIndexName = await testSubjects.getAttribute( - 'mlFileDataVisIndexNameInput', + 'dataVisualizerFileIndexNameInput', 'value' ); expect(actualIndexName).to.eql( @@ -94,14 +94,16 @@ export function MachineLearningDataVisualizerFileBasedProvider( }, async setIndexName(indexName: string) { - await mlCommonUI.setValueWithChecks('mlFileDataVisIndexNameInput', indexName, { + await mlCommonUI.setValueWithChecks('dataVisualizerFileIndexNameInput', indexName, { clearWithKeyboard: true, }); await this.assertIndexNameValue(indexName); }, async assertCreateIndexPatternCheckboxValue(expectedValue: boolean) { - const isChecked = await testSubjects.isChecked('mlFileDataVisCreateIndexPatternCheckbox'); + const isChecked = await testSubjects.isChecked( + 'dataVisualizerFileCreateIndexPatternCheckbox' + ); expect(isChecked).to.eql( expectedValue, `Expected create index pattern checkbox to be ${expectedValue ? 'checked' : 'unchecked'}` @@ -109,10 +111,12 @@ export function MachineLearningDataVisualizerFileBasedProvider( }, async setCreateIndexPatternCheckboxState(newState: boolean) { - const isChecked = await testSubjects.isChecked('mlFileDataVisCreateIndexPatternCheckbox'); + const isChecked = await testSubjects.isChecked( + 'dataVisualizerFileCreateIndexPatternCheckbox' + ); if (isChecked !== newState) { // this checkbox can't be clicked directly, instead click the corresponding label - const panel = await testSubjects.find('mlFileDataVisImportSettingsPanel'); + const panel = await testSubjects.find('dataVisualizerFileImportSettingsPanel'); const label = await panel.findByCssSelector('[for="createIndexPattern"]'); await label.click(); } @@ -120,9 +124,9 @@ export function MachineLearningDataVisualizerFileBasedProvider( }, async startImportAndWaitForProcessing() { - await testSubjects.clickWhenNotDisabled('mlFileDataVisImportButton'); + await testSubjects.clickWhenNotDisabled('dataVisualizerFileImportButton'); await retry.tryForTime(60 * 1000, async () => { - await testSubjects.existOrFail('mlFileImportSuccessCallout'); + await testSubjects.existOrFail('dataVisualizerFileImportSuccessCallout'); }); }, diff --git a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts index 4beaa78d0189b..7f32968ec4326 100644 --- a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts +++ b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts @@ -19,12 +19,12 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ return { async assertTimeRangeSelectorSectionExists() { - await testSubjects.existOrFail('mlDataVisualizerTimeRangeSelectorSection'); + await testSubjects.existOrFail('dataVisualizerTimeRangeSelectorSection'); }, async assertTotalDocumentCount(expectedFormattedTotalDocCount: string) { await retry.tryForTime(5000, async () => { - const docCount = await testSubjects.getVisibleText('mlDataVisualizerTotalDocCount'); + const docCount = await testSubjects.getVisibleText('dataVisualizerTotalDocCount'); expect(docCount).to.eql( expectedFormattedTotalDocCount, `Expected total document count to be '${expectedFormattedTotalDocCount}' (got '${docCount}')` @@ -33,40 +33,40 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ }, async clickUseFullDataButton(expectedFormattedTotalDocCount: string) { - await testSubjects.clickWhenNotDisabled('mlButtonUseFullData'); + await testSubjects.clickWhenNotDisabled('dataVisualizerButtonUseFullData'); await this.assertTotalDocumentCount(expectedFormattedTotalDocCount); }, async assertTotalDocCountHeaderExist() { await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail(`mlDataVisualizerTotalDocCountHeader`); + await testSubjects.existOrFail(`dataVisualizerTotalDocCountHeader`); }); }, async assertTotalDocCountChartExist() { await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail(`mlFieldDataDocumentCountChart`); + await testSubjects.existOrFail(`dataVisualizerDocumentCountChart`); }); }, async assertFieldCountPanelExist() { await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail(`mlDataVisualizerFieldCountPanel`); + await testSubjects.existOrFail(`dataVisualizerFieldCountPanel`); }); }, async assertMetricFieldsSummaryExist() { await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail(`mlDataVisualizerMetricFieldsSummary`); + await testSubjects.existOrFail(`dataVisualizerMetricFieldsSummary`); }); }, async assertVisibleMetricFieldsCount(count: number) { const expectedCount = count.toString(); await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail('mlDataVisualizerVisibleMetricFieldsCount'); + await testSubjects.existOrFail('dataVisualizerVisibleMetricFieldsCount'); const actualCount = await testSubjects.getVisibleText( - 'mlDataVisualizerVisibleMetricFieldsCount' + 'dataVisualizerVisibleMetricFieldsCount' ); expect(expectedCount).to.eql( expectedCount, @@ -78,9 +78,9 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ async assertTotalMetricFieldsCount(count: number) { const expectedCount = count.toString(); await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail('mlDataVisualizerMetricFieldsCount'); + await testSubjects.existOrFail('dataVisualizerMetricFieldsCount'); const actualCount = await testSubjects.getVisibleText( - 'mlDataVisualizerVisibleMetricFieldsCount' + 'dataVisualizerVisibleMetricFieldsCount' ); expect(expectedCount).to.contain( expectedCount, @@ -92,8 +92,8 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ async assertVisibleFieldsCount(count: number) { const expectedCount = count.toString(); await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail('mlDataVisualizerVisibleFieldsCount'); - const actualCount = await testSubjects.getVisibleText('mlDataVisualizerVisibleFieldsCount'); + await testSubjects.existOrFail('dataVisualizerVisibleFieldsCount'); + const actualCount = await testSubjects.getVisibleText('dataVisualizerVisibleFieldsCount'); expect(expectedCount).to.eql( expectedCount, `Expected fields count to be '${expectedCount}' (got '${actualCount}')` @@ -104,8 +104,8 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ async assertTotalFieldsCount(count: number) { const expectedCount = count.toString(); await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail('mlDataVisualizerTotalFieldsCount'); - const actualCount = await testSubjects.getVisibleText('mlDataVisualizerTotalFieldsCount'); + await testSubjects.existOrFail('dataVisualizerTotalFieldsCount'); + const actualCount = await testSubjects.getVisibleText('dataVisualizerTotalFieldsCount'); expect(expectedCount).to.contain( expectedCount, `Expected total fields count to be '${expectedCount}' (got '${actualCount}')` @@ -115,30 +115,30 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ async assertFieldsSummaryExist() { await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail(`mlDataVisualizerFieldsSummary`); + await testSubjects.existOrFail(`dataVisualizerFieldsSummary`); }); }, async assertDataVisualizerTableExist() { await retry.tryForTime(5000, async () => { - await testSubjects.existOrFail(`mlDataVisualizerTable`); + await testSubjects.existOrFail(`dataVisualizerTable`); }); }, async assertActionsPanelExists() { - await testSubjects.existOrFail('mlDataVisualizerActionsPanel'); + await testSubjects.existOrFail('dataVisualizerActionsPanel'); }, async assertActionsPanelNotExists() { - await testSubjects.missingOrFail('mlDataVisualizerActionsPanel'); + await testSubjects.missingOrFail('dataVisualizerActionsPanel'); }, async assertCreateAdvancedJobCardExists() { - await testSubjects.existOrFail('mlDataVisualizerCreateAdvancedJobCard'); + await testSubjects.existOrFail('dataVisualizerCreateAdvancedJobCard'); }, async assertCreateAdvancedJobCardNotExists() { - await testSubjects.missingOrFail('mlDataVisualizerCreateAdvancedJobCard'); + await testSubjects.missingOrFail('dataVisualizerCreateAdvancedJobCard'); }, async assertRecognizerCardExists(moduleId: string) { @@ -150,15 +150,15 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ }, async clickCreateAdvancedJobButton() { - await testSubjects.clickWhenNotDisabled('mlDataVisualizerCreateAdvancedJobCard'); + await testSubjects.clickWhenNotDisabled('dataVisualizerCreateAdvancedJobCard'); }, async assertCreateDataFrameAnalyticsCardExists() { - await testSubjects.existOrFail('mlDataVisualizerCreateDataFrameAnalyticsCard'); + await testSubjects.existOrFail('dataVisualizerCreateDataFrameAnalyticsCard'); }, async assertCreateDataFrameAnalyticsCardNotExists() { - await testSubjects.missingOrFail('mlDataVisualizerCreateDataFrameAnalyticsCard'); + await testSubjects.missingOrFail('dataVisualizerCreateDataFrameAnalyticsCard'); }, async assertViewInDiscoverCard(shouldExist: boolean) { @@ -170,16 +170,16 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ }, async assertViewInDiscoverCardExists() { - await testSubjects.existOrFail('mlDataVisualizerViewInDiscoverCard'); + await testSubjects.existOrFail('dataVisualizerViewInDiscoverCard'); }, async assertViewInDiscoverCardNotExists() { - await testSubjects.missingOrFail('mlDataVisualizerViewInDiscoverCard'); + await testSubjects.missingOrFail('dataVisualizerViewInDiscoverCard'); }, async clickViewInDiscoverButton() { await retry.tryForTime(5000, async () => { - await testSubjects.clickWhenNotDisabled('mlDataVisualizerViewInDiscoverCard'); + await testSubjects.clickWhenNotDisabled('dataVisualizerViewInDiscoverCard'); await PageObjects.discover.waitForDiscoverAppOnScreen(); }); }, diff --git a/x-pack/test/functional/services/ml/data_visualizer_table.ts b/x-pack/test/functional/services/ml/data_visualizer_table.ts index cdd91da8ff9e6..1eb0edbe01c8e 100644 --- a/x-pack/test/functional/services/ml/data_visualizer_table.ts +++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts @@ -21,36 +21,36 @@ export function MachineLearningDataVisualizerTableProvider( return new (class DataVisualizerTable { public async parseDataVisualizerTable() { - const table = await testSubjects.find('~mlDataVisualizerTable'); + const table = await testSubjects.find('~dataVisualizerTable'); const $ = await table.parseDomContent(); const rows = []; - for (const tr of $.findTestSubjects('~mlDataVisualizerRow').toArray()) { + for (const tr of $.findTestSubjects('~dataVisualizerRow').toArray()) { const $tr = $(tr); rows.push({ type: $tr - .findTestSubject('mlDataVisualizerTableColumnType') + .findTestSubject('dataVisualizerTableColumnType') .find('.euiTableCellContent') .text() .trim(), fieldName: $tr - .findTestSubject('mlDataVisualizerTableColumnName') + .findTestSubject('dataVisualizerTableColumnName') .find('.euiTableCellContent') .text() .trim(), documentsCount: $tr - .findTestSubject('mlDataVisualizerTableColumnDocumentsCount') + .findTestSubject('dataVisualizerTableColumnDocumentsCount') .find('.euiTableCellContent') .text() .trim(), distinctValues: $tr - .findTestSubject('mlDataVisualizerTableColumnDistinctValues') + .findTestSubject('dataVisualizerTableColumnDistinctValues') .find('.euiTableCellContent') .text() .trim(), distribution: $tr - .findTestSubject('mlDataVisualizerTableColumnDistribution') + .findTestSubject('dataVisualizerTableColumnDistribution') .find('.euiTableCellContent') .text() .trim(), @@ -71,7 +71,7 @@ export function MachineLearningDataVisualizerTableProvider( } public rowSelector(fieldName: string, subSelector?: string) { - const row = `~mlDataVisualizerTable > ~row-${fieldName}`; + const row = `~dataVisualizerTable > ~row-${fieldName}`; return !subSelector ? row : `${row} > ${subSelector}`; } @@ -80,7 +80,7 @@ export function MachineLearningDataVisualizerTableProvider( } public detailsSelector(fieldName: string, subSelector?: string) { - const row = `~mlDataVisualizerTable > ~mlDataVisualizerFieldExpandedRow-${fieldName}`; + const row = `~dataVisualizerTable > ~dataVisualizerFieldExpandedRow-${fieldName}`; return !subSelector ? row : `${row} > ${subSelector}`; } @@ -89,11 +89,11 @@ export function MachineLearningDataVisualizerTableProvider( if (!(await testSubjects.exists(this.detailsSelector(fieldName)))) { const selector = this.rowSelector( fieldName, - `mlDataVisualizerDetailsToggle-${fieldName}-arrowDown` + `dataVisualizerDetailsToggle-${fieldName}-arrowDown` ); await testSubjects.click(selector); await testSubjects.existOrFail( - this.rowSelector(fieldName, `mlDataVisualizerDetailsToggle-${fieldName}-arrowUp`), + this.rowSelector(fieldName, `dataVisualizerDetailsToggle-${fieldName}-arrowUp`), { timeout: 1000, } @@ -107,10 +107,10 @@ export function MachineLearningDataVisualizerTableProvider( await retry.tryForTime(10000, async () => { if (await testSubjects.exists(this.detailsSelector(fieldName))) { await testSubjects.click( - this.rowSelector(fieldName, `mlDataVisualizerDetailsToggle-${fieldName}-arrowUp`) + this.rowSelector(fieldName, `dataVisualizerDetailsToggle-${fieldName}-arrowUp`) ); await testSubjects.existOrFail( - this.rowSelector(fieldName, `mlDataVisualizerDetailsToggle-${fieldName}-arrowDown`), + this.rowSelector(fieldName, `dataVisualizerDetailsToggle-${fieldName}-arrowDown`), { timeout: 1000, } @@ -123,7 +123,7 @@ export function MachineLearningDataVisualizerTableProvider( public async assertFieldDocCount(fieldName: string, docCountFormatted: string) { const docCountFormattedSelector = this.rowSelector( fieldName, - 'mlDataVisualizerTableColumnDocumentsCount' + 'dataVisualizerTableColumnDocumentsCount' ); await testSubjects.existOrFail(docCountFormattedSelector); const docCount = await testSubjects.getVisibleText(docCountFormattedSelector); @@ -134,40 +134,40 @@ export function MachineLearningDataVisualizerTableProvider( } public async assertViewInLensActionEnabled(fieldName: string) { - const actionButton = this.rowSelector(fieldName, 'mlActionButtonViewInLens'); + const actionButton = this.rowSelector(fieldName, 'dataVisualizerActionViewInLensButton'); await testSubjects.existOrFail(actionButton); await testSubjects.isEnabled(actionButton); } public async assertViewInLensActionNotExists(fieldName: string) { - const actionButton = this.rowSelector(fieldName, 'mlActionButtonViewInLens'); + const actionButton = this.rowSelector(fieldName, 'dataVisualizerActionViewInLensButton'); await testSubjects.missingOrFail(actionButton); } public async assertFieldDistinctValuesExist(fieldName: string) { - const selector = this.rowSelector(fieldName, 'mlDataVisualizerTableColumnDistinctValues'); + const selector = this.rowSelector(fieldName, 'dataVisualizerTableColumnDistinctValues'); await testSubjects.existOrFail(selector); } public async assertFieldDistributionExist(fieldName: string) { - const selector = this.rowSelector(fieldName, 'mlDataVisualizerTableColumnDistribution'); + const selector = this.rowSelector(fieldName, 'dataVisualizerTableColumnDistribution'); await testSubjects.existOrFail(selector); } public async assertSearchPanelExist() { - await testSubjects.existOrFail(`mlDataVisualizerSearchPanel`); + await testSubjects.existOrFail(`dataVisualizerSearchPanel`); } public async assertFieldNameInputExists() { - await testSubjects.existOrFail('mlDataVisualizerFieldNameSelect'); + await testSubjects.existOrFail('dataVisualizerFieldNameSelect'); } public async assertFieldTypeInputExists() { - await testSubjects.existOrFail('mlDataVisualizerFieldTypeSelect'); + await testSubjects.existOrFail('dataVisualizerFieldTypeSelect'); } public async assertSampleSizeInputExists() { - await testSubjects.existOrFail('mlDataVisualizerShardSizeSelect'); + await testSubjects.existOrFail('dataVisualizerShardSizeSelect'); } public async setSampleSizeInputValue( @@ -176,9 +176,9 @@ export function MachineLearningDataVisualizerTableProvider( docCountFormatted: string ) { await this.assertSampleSizeInputExists(); - await testSubjects.clickWhenNotDisabled('mlDataVisualizerShardSizeSelect'); - await testSubjects.existOrFail(`mlDataVisualizerShardSizeOption ${sampleSize}`); - await testSubjects.click(`mlDataVisualizerShardSizeOption ${sampleSize}`); + await testSubjects.clickWhenNotDisabled('dataVisualizerShardSizeSelect'); + await testSubjects.existOrFail(`dataVisualizerShardSizeOption ${sampleSize}`); + await testSubjects.click(`dataVisualizerShardSizeOption ${sampleSize}`); await retry.tryForTime(5000, async () => { await this.assertFieldDocCount(fieldName, docCountFormatted); @@ -187,38 +187,36 @@ export function MachineLearningDataVisualizerTableProvider( public async setFieldTypeFilter(fieldTypes: string[], expectedRowCount = 1) { await this.assertFieldTypeInputExists(); - await mlCommonUI.setMultiSelectFilter('mlDataVisualizerFieldTypeSelect', fieldTypes); + await mlCommonUI.setMultiSelectFilter('dataVisualizerFieldTypeSelect', fieldTypes); await this.assertTableRowCount(expectedRowCount); } async removeFieldTypeFilter(fieldTypes: string[], expectedRowCount = 1) { await this.assertFieldTypeInputExists(); - await mlCommonUI.removeMultiSelectFilter('mlDataVisualizerFieldTypeSelect', fieldTypes); + await mlCommonUI.removeMultiSelectFilter('dataVisualizerFieldTypeSelect', fieldTypes); await this.assertTableRowCount(expectedRowCount); } public async setFieldNameFilter(fieldNames: string[], expectedRowCount = 1) { await this.assertFieldNameInputExists(); - await mlCommonUI.setMultiSelectFilter('mlDataVisualizerFieldNameSelect', fieldNames); + await mlCommonUI.setMultiSelectFilter('dataVisualizerFieldNameSelect', fieldNames); await this.assertTableRowCount(expectedRowCount); } public async removeFieldNameFilter(fieldNames: string[], expectedRowCount: number) { await this.assertFieldNameInputExists(); - await mlCommonUI.removeMultiSelectFilter('mlDataVisualizerFieldNameSelect', fieldNames); + await mlCommonUI.removeMultiSelectFilter('dataVisualizerFieldNameSelect', fieldNames); await this.assertTableRowCount(expectedRowCount); } public async assertShowEmptyFieldsSwitchExists() { - await testSubjects.existOrFail('mlDataVisualizerShowEmptyFieldsSwitch'); + await testSubjects.existOrFail('dataVisualizerShowEmptyFieldsSwitch'); } public async assertShowEmptyFieldsCheckState(expectedCheckState: boolean) { const actualCheckState = - (await testSubjects.getAttribute( - 'mlDataVisualizerShowEmptyFieldsSwitch', - 'aria-checked' - )) === 'true'; + (await testSubjects.getAttribute('dataVisualizerShowEmptyFieldsSwitch', 'aria-checked')) === + 'true'; expect(actualCheckState).to.eql( expectedCheckState, `Show empty fields check state should be '${expectedCheckState}' (got '${actualCheckState}')` @@ -230,7 +228,7 @@ export function MachineLearningDataVisualizerTableProvider( await this.assertShowEmptyFieldsSwitchExists(); await retry.tryForTime(5000, async () => { if (await this.assertShowEmptyFieldsCheckState(!checkState)) { - await testSubjects.click('mlDataVisualizerShowEmptyFieldsSwitch'); + await testSubjects.click('dataVisualizerShowEmptyFieldsSwitch'); } await this.assertShowEmptyFieldsCheckState(checkState); for (const field of expectedEmptyFields) { @@ -240,9 +238,11 @@ export function MachineLearningDataVisualizerTableProvider( } public async assertTopValuesContents(fieldName: string, expectedTopValuesCount: number) { - const selector = this.detailsSelector(fieldName, 'mlFieldDataTopValues'); + const selector = this.detailsSelector(fieldName, 'dataVisualizerFieldDataTopValuesContent'); const topValuesElement = await testSubjects.find(selector); - const topValuesBars = await topValuesElement.findAllByTestSubject('mlFieldDataTopValueBar'); + const topValuesBars = await topValuesElement.findAllByTestSubject( + 'dataVisualizerFieldDataTopValueBar' + ); expect(topValuesBars).to.have.length( expectedTopValuesCount, `Expected top values count for field '${fieldName}' to be '${expectedTopValuesCount}' (got '${topValuesBars.length}')` @@ -250,9 +250,11 @@ export function MachineLearningDataVisualizerTableProvider( } public async assertDistributionPreviewExist(fieldName: string) { - await testSubjects.existOrFail(this.rowSelector(fieldName, `mlDataGridChart-${fieldName}`)); await testSubjects.existOrFail( - this.rowSelector(fieldName, `mlDataGridChart-${fieldName}-histogram`) + this.rowSelector(fieldName, `dataVisualizerDataGridChart-${fieldName}`) + ); + await testSubjects.existOrFail( + this.rowSelector(fieldName, `dataVisualizerDataGridChart-${fieldName}-histogram`) ); } @@ -267,9 +269,13 @@ export function MachineLearningDataVisualizerTableProvider( await this.assertFieldDocCount(fieldName, docCountFormatted); await this.ensureDetailsOpen(fieldName); - await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlNumberSummaryTable')); + await testSubjects.existOrFail( + this.detailsSelector(fieldName, 'dataVisualizerNumberSummaryTable') + ); - await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlTopValues')); + await testSubjects.existOrFail( + this.detailsSelector(fieldName, 'dataVisualizerFieldDataTopValues') + ); await this.assertTopValuesContents(fieldName, topValuesCount); if (checkDistributionPreviewExist) { @@ -289,7 +295,9 @@ export function MachineLearningDataVisualizerTableProvider( await this.assertFieldDocCount(fieldName, docCountFormatted); await this.ensureDetailsOpen(fieldName); - await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlDateSummaryTable')); + await testSubjects.existOrFail( + this.detailsSelector(fieldName, 'dataVisualizerDateSummaryTable') + ); await this.ensureDetailsClosed(fieldName); } @@ -302,14 +310,16 @@ export function MachineLearningDataVisualizerTableProvider( await this.assertFieldDocCount(fieldName, docCountFormatted); await this.ensureDetailsOpen(fieldName); - await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlFieldDataTopValues')); + await testSubjects.existOrFail( + this.detailsSelector(fieldName, 'dataVisualizerFieldDataTopValuesContent') + ); await this.assertTopValuesContents(fieldName, topValuesCount); await this.ensureDetailsClosed(fieldName); } public async assertExamplesList(fieldName: string, expectedExamplesCount: number) { const examplesList = await testSubjects.find( - this.detailsSelector(fieldName, 'mlFieldDataExamplesList') + this.detailsSelector(fieldName, 'dataVisualizerFieldDataExamplesList') ); const examplesListItems = await examplesList.findAllByTagName('li'); expect(examplesListItems).to.have.length( @@ -343,7 +353,9 @@ export function MachineLearningDataVisualizerTableProvider( await this.assertExamplesList(fieldName, expectedExamplesCount); - await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlEmbeddedMapContent')); + await testSubjects.existOrFail( + this.detailsSelector(fieldName, 'dataVisualizerEmbeddedMapContent') + ); await this.ensureDetailsClosed(fieldName); } @@ -354,7 +366,9 @@ export function MachineLearningDataVisualizerTableProvider( await this.ensureDetailsOpen(fieldName); - await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlDVDocumentStatsContent')); + await testSubjects.existOrFail( + this.detailsSelector(fieldName, 'dataVisualizerDocumentStatsContent') + ); await this.ensureDetailsClosed(fieldName); } @@ -387,7 +401,7 @@ export function MachineLearningDataVisualizerTableProvider( } public async ensureNumRowsPerPage(n: 10 | 25 | 50) { - const paginationButton = 'mlDataVisualizerTable > tablePaginationPopoverButton'; + const paginationButton = 'dataVisualizerTable > tablePaginationPopoverButton'; await retry.tryForTime(10000, async () => { await testSubjects.existOrFail(paginationButton); await testSubjects.click(paginationButton); diff --git a/x-pack/test/functional/services/ml/job_source_selection.ts b/x-pack/test/functional/services/ml/job_source_selection.ts index e5e9a68b95f8e..e215f9b857435 100644 --- a/x-pack/test/functional/services/ml/job_source_selection.ts +++ b/x-pack/test/functional/services/ml/job_source_selection.ts @@ -40,7 +40,7 @@ export function MachineLearningJobSourceSelectionProvider({ getService }: FtrPro }, async selectSourceForIndexBasedDataVisualizer(sourceName: string) { - await this.selectSource(sourceName, 'mlPageIndexDataVisualizer'); + await this.selectSource(sourceName, 'dataVisualizerIndexPage'); }, }; } diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts index 4869237eb7db4..c8b3cd3cf5049 100644 --- a/x-pack/test/functional/services/transform/wizard.ts +++ b/x-pack/test/functional/services/transform/wizard.ts @@ -255,10 +255,10 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi for (const expected of expectedHistogramCharts.values()) { const id = expected.id; - await testSubjects.existOrFail(`mlDataGridChart-${id}`); + await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}`); if (expected.chartAvailable) { - await testSubjects.existOrFail(`mlDataGridChart-${id}-histogram`); + await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}-histogram`); if (expected.colorStats !== undefined) { const sortedExpectedColorStats = [...expected.colorStats].sort((a, b) => @@ -266,7 +266,7 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi ); const actualColorStats = await canvasElement.getColorStats( - `[data-test-subj="mlDataGridChart-${id}-histogram"] .echCanvasRenderer`, + `[data-test-subj="dataVisualizerDataGridChart-${id}-histogram"] .echCanvasRenderer`, sortedExpectedColorStats, undefined, 10 @@ -292,18 +292,22 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi ); } } else { - await testSubjects.missingOrFail(`mlDataGridChart-${id}-histogram`); + await testSubjects.missingOrFail(`dataVisualizerDataGridChart-${id}-histogram`); } if (expected.legend !== undefined) { - const actualLegend = await testSubjects.getVisibleText(`mlDataGridChart-${id}-legend`); + const actualLegend = await testSubjects.getVisibleText( + `dataVisualizerDataGridChart-${id}-legend` + ); expect(actualLegend).to.eql( expected.legend, `Legend text for column '${expected.id}' should be '${expected.legend}' (got '${actualLegend}')` ); } - const actualId = await testSubjects.getVisibleText(`mlDataGridChart-${id}-id`); + const actualId = await testSubjects.getVisibleText( + `dataVisualizerDataGridChart-${id}-id` + ); expect(actualId).to.eql( expected.id, `Id text for column '${id}' should be '${expected.id}' (got '${actualId}')` From 99993399ef22d56af1b8871aec7416698d65b1b8 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Thu, 3 Jun 2021 14:57:36 -0500 Subject: [PATCH 37/53] [ML] Fix settings and docs --- ...ata_visualizer.mdx => data_visualizer.mdx} | 0 api_docs/file_data_visualizer.json | 84 +++++++++---------- packages/kbn-optimizer/limits.yml | 2 +- x-pack/plugins/data_visualizer/jest.config.js | 2 +- .../index_based/data_loader/data_loader.ts | 4 - 5 files changed, 44 insertions(+), 48 deletions(-) rename api_docs/{file_data_visualizer.mdx => data_visualizer.mdx} (100%) diff --git a/api_docs/file_data_visualizer.mdx b/api_docs/data_visualizer.mdx similarity index 100% rename from api_docs/file_data_visualizer.mdx rename to api_docs/data_visualizer.mdx diff --git a/api_docs/file_data_visualizer.json b/api_docs/file_data_visualizer.json index c536acd5f4997..b4544a0381790 100644 --- a/api_docs/file_data_visualizer.json +++ b/api_docs/file_data_visualizer.json @@ -1,5 +1,5 @@ { - "id": "fileDataVisualizer", + "id": "dataVisualizer", "client": { "classes": [], "functions": [], @@ -8,17 +8,17 @@ "misc": [], "objects": [], "start": { - "parentPluginId": "fileDataVisualizer", - "id": "def-public.FileDataVisualizerPluginStart", + "parentPluginId": "dataVisualizer", + "id": "def-public.DataVisualizerPluginStart", "type": "Type", "tags": [], - "label": "FileDataVisualizerPluginStart", + "label": "DataVisualizerPluginStart", "description": [], "signature": [ "{ getFileDataVisualizerComponent: () => Promise>; getMaxBytesFormatted: () => string; }" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/public/plugin.ts", + "path": "x-pack/plugins/data_visualizer/public/plugin.ts", "lineNumber": 33 }, "deprecated": false, @@ -39,72 +39,72 @@ "functions": [], "interfaces": [ { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState", "type": "Interface", "tags": [], "label": "DataVisualizerTableState", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 14 }, "deprecated": false, "children": [ { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.pageSize", "type": "number", "tags": [], "label": "pageSize", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 15 }, "deprecated": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.pageIndex", "type": "number", "tags": [], "label": "pageIndex", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 16 }, "deprecated": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.sortField", "type": "string", "tags": [], "label": "sortField", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 17 }, "deprecated": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.sortDirection", "type": "string", "tags": [], "label": "sortDirection", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 18 }, "deprecated": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.visibleFieldTypes", "type": "Array", "tags": [], @@ -114,13 +114,13 @@ "string[]" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 19 }, "deprecated": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.visibleFieldNames", "type": "Array", "tags": [], @@ -130,20 +130,20 @@ "string[]" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 20 }, "deprecated": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.DataVisualizerTableState.showDistributions", "type": "boolean", "tags": [], "label": "showDistributions", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 21 }, "deprecated": false @@ -155,7 +155,7 @@ "enums": [], "misc": [ { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.ABSOLUTE_MAX_FILE_SIZE_BYTES", "type": "number", "tags": [], @@ -165,14 +165,14 @@ "1073741274" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 14 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.FILE_SIZE_DISPLAY_FORMAT", "type": "string", "tags": [], @@ -182,14 +182,14 @@ "\"0,0.[0] b\"" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 15 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.INDEX_META_DATA_CREATED_BY", "type": "string", "tags": [], @@ -199,14 +199,14 @@ "\"file-data-visualizer\"" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 19 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.InputData", "type": "Type", "tags": [], @@ -216,14 +216,14 @@ "any[]" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 10 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.JobFieldType", "type": "Type", "tags": [], @@ -233,14 +233,14 @@ "\"number\" | \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"ip\" | \"geo_point\" | \"geo_shape\" | \"unknown\"" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/types.ts", + "path": "x-pack/plugins/data_visualizer/common/types.ts", "lineNumber": 12 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.MAX_FILE_SIZE", "type": "string", "tags": [], @@ -250,14 +250,14 @@ "\"100MB\"" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 11 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.MAX_FILE_SIZE_BYTES", "type": "number", "tags": [], @@ -267,28 +267,28 @@ "104857600" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 12 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.MB", "type": "number", "tags": [], "label": "MB", "description": [], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 10 }, "deprecated": false, "initialIsOpen": false }, { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.UI_SETTING_MAX_FILE_SIZE", "type": "string", "tags": [], @@ -298,7 +298,7 @@ "\"fileUpload:maxFileSize\"" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 8 }, "deprecated": false, @@ -307,7 +307,7 @@ ], "objects": [ { - "parentPluginId": "fileDataVisualizer", + "parentPluginId": "dataVisualizer", "id": "def-common.JOB_FIELD_TYPES", "type": "Object", "tags": [], @@ -317,7 +317,7 @@ "{ readonly BOOLEAN: \"boolean\"; readonly DATE: \"date\"; readonly GEO_POINT: \"geo_point\"; readonly GEO_SHAPE: \"geo_shape\"; readonly IP: \"ip\"; readonly KEYWORD: \"keyword\"; readonly NUMBER: \"number\"; readonly TEXT: \"text\"; readonly UNKNOWN: \"unknown\"; }" ], "source": { - "path": "x-pack/plugins/file_data_visualizer/common/constants.ts", + "path": "x-pack/plugins/data_visualizer/common/constants.ts", "lineNumber": 21 }, "deprecated": false, @@ -325,4 +325,4 @@ } ] } -} \ No newline at end of file +} diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index 6ccf6269751b1..58fde1a31dc34 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -104,7 +104,7 @@ pageLoadAssetSize: indexPatternFieldEditor: 90489 osquery: 107090 fileUpload: 25664 - fileDataVisualizer: 27530 + dataVisualizer: 27530 banners: 17946 mapsEms: 26072 timelines: 28613 diff --git a/x-pack/plugins/data_visualizer/jest.config.js b/x-pack/plugins/data_visualizer/jest.config.js index 90d4cfb81f11f..1c4974471bd79 100644 --- a/x-pack/plugins/data_visualizer/jest.config.js +++ b/x-pack/plugins/data_visualizer/jest.config.js @@ -8,5 +8,5 @@ module.exports = { preset: '@kbn/test', rootDir: '../../..', - roots: ['/x-pack/plugins/file_data_visualizer'], + roots: ['/x-pack/plugins/data_visualizer'], }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts index e58f803b88922..a5fabc12c83df 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts @@ -17,10 +17,6 @@ import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../common/constants/fiel import { ml } from '../../../services/ml_api_service'; import { FieldHistogramRequestConfig } from '../common/request'; import { RuntimeMappings } from '../../../../../common/types/fields'; -import { - ToastNotificationService, - toastNotificationServiceProvider, -} from '../../../services/toast_notification_service'; // Maximum number of examples to obtain for text type fields. const MAX_EXAMPLES_DEFAULT: number = 10; From 434595190f85c32d4888028c7e7829749e8c8aa0 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 4 Jun 2021 11:33:31 -0500 Subject: [PATCH 38/53] [ML] Update plugin description --- docs/developer/plugin-list.asciidoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 087626240ff33..68bbcd866aab2 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -365,6 +365,10 @@ The client-side plugin configures following values: |The data_enhanced plugin is the x-pack counterpart to the src/plguins/data plugin. +|{kib-repo}blob/{branch}/x-pack/plugins/data_visualizer[dataVisualizer] +|The data_visualizer plugin enables you to explore the fields in your data. + + |{kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced] |Contains the enhancements to the OSS discover app. @@ -392,10 +396,6 @@ actitivies. |The features plugin enhance Kibana with a per-feature privilege system. -|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer] -|WARNING: Missing README. - - |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload] |WARNING: Missing README. From 30b0f775f91fb51925f20f898520ada84a9d5455 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 4 Jun 2021 13:09:16 -0500 Subject: [PATCH 39/53] [ML] Remove mlContext dependency completely --- x-pack/plugins/data_visualizer/kibana.json | 3 +- .../data_visualizer_stats_table.tsx | 1 + .../application/common/util/index_utils.ts | 17 --- .../file_data_visualizer.tsx | 21 +++- .../index_data_visualizer_view.tsx | 52 +++----- .../components/search_panel/search_panel.tsx | 9 +- .../index_data_visualizer.tsx | 95 +++++++++++++- .../utils/saved_search_utils.ts | 119 ++++++++++++++++++ .../plugins/data_visualizer/public/plugin.ts | 4 +- .../index_based/index_data_visualizer.tsx | 18 +-- 10 files changed, 262 insertions(+), 77 deletions(-) delete mode 100644 x-pack/plugins/data_visualizer/public/application/common/util/index_utils.ts create mode 100644 x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json index 3934f0ee3417f..7d4887912ac9e 100644 --- a/x-pack/plugins/data_visualizer/kibana.json +++ b/x-pack/plugins/data_visualizer/kibana.json @@ -16,7 +16,8 @@ "security", "maps", "home", - "lens" + "lens", + "indexPatternFieldEditor" ], "requiredBundles": [ "kibanaReact", diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx index afadc5c5ae4a4..fc6928ccd20a4 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx @@ -36,6 +36,7 @@ import { } from './types/field_vis_config'; import { FileBasedNumberContentPreview } from '../field_data_row'; import { BooleanContentPreview } from './components/field_data_row'; +import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public'; const FIELD_NAME = 'fieldName'; diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/index_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/index_utils.ts deleted file mode 100644 index ecb673351f017..0000000000000 --- a/x-pack/plugins/data_visualizer/public/application/common/util/index_utils.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { Query } from '../../../../../../../src/plugins/data/common/query'; -import { SavedSearchSavedObject } from '../../../../common/types'; - -export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) { - const search = savedSearch.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string }; - return JSON.parse(search.searchSourceJSON) as { - query: Query; - filter: any[]; - }; -} diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx index 729f0b1254457..ca5565d809dc1 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx @@ -15,8 +15,25 @@ import { FileDataVisualizerView } from './components/file_data_visualizer_view/i export type FileDataVisualizerSpec = typeof FileDataVisualizer; export const FileDataVisualizer: FC = () => { const coreStart = getCoreStart(); - const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); - const services = { data, maps, embeddable, share, security, fileUpload, ...coreStart }; + const { + data, + maps, + embeddable, + share, + security, + fileUpload, + indexPatternFieldEditor, + } = getPluginsStart(); + const services = { + data, + maps, + embeddable, + share, + security, + fileUpload, + indexPatternFieldEditor, + ...coreStart, + }; return ( diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx index d2fe10c1f8bc6..a3a996fda707f 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -26,14 +26,11 @@ import { i18n } from '@kbn/i18n'; import { IndexPatternField, KBN_FIELD_TYPES, - esQuery, - esKuery, UI_SETTINGS, Query, IndexPattern, } from '../../../../../../../../src/plugins/data/public'; import { FullTimeRangeSelector } from '../full_time_range_selector'; -import { getQueryFromSavedSearch } from '../../../common/util/index_utils'; import { usePageUrlState, useUrlState } from '../../../common/util/url_state'; import { DataVisualizerTable, @@ -68,6 +65,7 @@ import { DatePickerWrapper } from '../../../common/components/date_picker_wrappe import { dataVisualizerTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; import { HelpMenu } from '../../../common/components/help_menu'; import { TimeBuckets } from '../../services/time_buckets'; +import { extractSearchData } from '../../utils/saved_search_utils'; interface DataVisualizerPageState { overallStats: OverallStats; @@ -120,7 +118,7 @@ export const getDefaultDataVisualizerListState = (): Required = (dataVi DATA_VISUALIZER_INDEX_VIEWER, restorableDefaults ); + const [globalState, setGlobalState] = useUrlState('_g'); + const [currentSavedSearch, setCurrentSavedSearch] = useState( dataVisualizerProps.currentSavedSearch ); const { query, currentIndexPattern } = dataVisualizerProps; + useEffect(() => { + if (dataVisualizerProps?.currentSavedSearch !== undefined) { + setCurrentSavedSearch(dataVisualizerProps?.currentSavedSearch); + } + }, [dataVisualizerProps?.currentSavedSearch]); + const getTimeBuckets = useCallback(() => { return new TimeBuckets({ [UI_SETTINGS.HISTOGRAM_MAX_BARS]: uiSettings.get(UI_SETTINGS.HISTOGRAM_MAX_BARS), @@ -151,7 +157,7 @@ export const IndexDataVisualizerView: FC = (dataVi }, [uiSettings]); const timefilter = useTimefilter({ - timeRangeSelector: currentIndexPattern.timeFieldName !== undefined, + timeRangeSelector: currentIndexPattern?.timeFieldName !== undefined, autoRefreshSelector: true, }); @@ -160,7 +166,6 @@ export const IndexDataVisualizerView: FC = (dataVi toasts, ]); - const [globalState, setGlobalState] = useUrlState('_g'); useEffect(() => { if (globalState?.time !== undefined) { timefilter.setTime({ @@ -214,7 +219,11 @@ export const IndexDataVisualizerView: FC = (dataVi const defaults = getDefaultPageState(); const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => { - const searchData = extractSearchData(currentSavedSearch); + const searchData = extractSearchData( + currentSavedSearch, + currentIndexPattern, + uiSettings.get(UI_SETTINGS.QUERY_STRING_OPTIONS) + ); if (searchData === undefined || dataVisualizerListState.searchString !== '') { return { @@ -230,7 +239,7 @@ export const IndexDataVisualizerView: FC = (dataVi }; } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [currentSavedSearch, dataVisualizerListState]); + }, [currentSavedSearch, currentIndexPattern, dataVisualizerListState]); const setSearchParams = (searchParams: { searchQuery: Query['query']; @@ -335,33 +344,6 @@ export const IndexDataVisualizerView: FC = (dataVi // eslint-disable-next-line react-hooks/exhaustive-deps }, [nonMetricsLoaded]); - /** - * Extract query data from the saved search object. - */ - function extractSearchData(savedSearch: SavedSearchSavedObject | null) { - if (!savedSearch) { - return undefined; - } - - const { query: extractedQuery } = getQueryFromSavedSearch(savedSearch); - const queryLanguage = extractedQuery.language as SearchQueryLanguage; - const qryString = extractedQuery.query; - let qry; - if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { - const ast = esKuery.fromKueryExpression(qryString); - qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); - } else { - qry = esQuery.luceneStringToDsl(qryString); - esQuery.decorateQuery(qry, uiSettings.get(UI_SETTINGS.QUERY_STRING_OPTIONS)); - } - - return { - searchQuery: qry, - searchString: qryString, - queryLanguage, - }; - } - async function loadOverallStats() { const tf = timefilter as any; let earliest; diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx index 5f4a57ee2eb09..8694e1c952dcc 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { FC, useState } from 'react'; +import React, { FC, useEffect, useState } from 'react'; import { EuiCode, EuiFlexItem, EuiFlexGroup, EuiInputPopover } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { @@ -72,6 +72,13 @@ export const SearchPanel: FC = ({ }); const [errorMessage, setErrorMessage] = useState(undefined); + useEffect(() => { + setSearchInput({ + query: searchString || '', + language: searchQueryLanguage, + }); + }, [searchQueryLanguage, searchString]); + const searchHandler = (query: Query) => { let filterQuery; try { diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index d0970725b3bf3..74994465b41f6 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -5,12 +5,14 @@ * 2.0. */ import '../_index.scss'; -import React, { FC, useCallback } from 'react'; +import React, { FC, useCallback, useEffect, useState } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import { parse, stringify } from 'query-string'; import { isEqual } from 'lodash'; // @ts-ignore import { encode } from 'rison-node'; +import { SimpleSavedObject } from 'kibana/public'; +import { i18n } from '@kbn/i18n'; import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public'; import { getCoreStart, getPluginsStart } from '../../kibana_services'; import { @@ -26,19 +28,79 @@ import { getNestedProperty, isRisonSerializationRequired, } from '../common/util/url_state'; +import { useDataVisualizerKibana } from '../kibana_context'; +import { IndexPattern } from '../../../../../../src/plugins/data/common/index_patterns/index_patterns'; export type IndexDataVisualizerSpec = typeof IndexDataVisualizer; export interface DataVisualizerUrlStateContextProviderProps extends IndexDataVisualizerViewProps { IndexDataVisualizerComponent: FC; } + export const DataVisualizerUrlStateContextProvider: FC = ({ IndexDataVisualizerComponent, ...restProps }) => { + const { + services: { + data: { indexPatterns }, + savedObjects: { client: savedObjectsClient }, + notifications: { toasts }, + }, + } = useDataVisualizerKibana(); const history = useHistory(); + + const [currentIndexPattern, setCurrentIndexPattern] = useState( + undefined + ); + const [currentSavedSearch, setCurrentSavedSearch] = useState | null>( + null + ); const { search: searchString } = useLocation(); + useEffect(() => { + const prevSearchString = searchString; + const parsedQueryString = parse(prevSearchString, { sort: false }); + + const getIndexPattern = async () => { + if (typeof parsedQueryString?.index === 'string') { + const indexPattern = await indexPatterns.get(parsedQueryString.index); + setCurrentIndexPattern(indexPattern); + } + + if (typeof parsedQueryString?.savedSearchId === 'string') { + const savedSearchId = parsedQueryString.savedSearchId; + try { + const savedSearch = await savedObjectsClient.get('search', savedSearchId); + const indexPatternId = savedSearch.references.find((ref) => ref.type === 'index-pattern') + ?.id; + if (indexPatternId !== undefined) { + try { + const indexPattern = await indexPatterns.get(indexPatternId); + setCurrentIndexPattern(indexPattern); + } catch (e) { + toasts.addError(e, { + title: i18n.translate('xpack.dataVisualizer.index.indexPatternErrorMessage', { + defaultMessage: 'Error finding index pattern', + }), + }); + } + } + setCurrentSavedSearch(savedSearch); + } catch (e) { + toasts.addError(e, { + title: i18n.translate('xpack.dataVisualizer.index.indexPatternErrorMessage', { + defaultMessage: 'Error retrieving saved search {savedSearchId}', + values: { savedSearchId }, + }), + }); + } + } + }; + getIndexPattern(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [savedObjectsClient, toasts, indexPatterns]); + const setUrlState: SetUrlState = useCallback( ( accessor: Accessor, @@ -103,15 +165,40 @@ export const DataVisualizerUrlStateContextProvider: FC - + {currentIndexPattern ? ( + + ) : ( +
+ )} ); }; export const IndexDataVisualizer: FC = (props) => { const coreStart = getCoreStart(); - const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); - const services = { data, maps, embeddable, share, security, fileUpload, ...coreStart }; + const { + data, + maps, + embeddable, + share, + security, + fileUpload, + indexPatternFieldEditor, + } = getPluginsStart(); + const services = { + data, + maps, + embeddable, + share, + security, + fileUpload, + indexPatternFieldEditor, + ...coreStart, + }; return ( diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts new file mode 100644 index 0000000000000..a04795ceb9d7d --- /dev/null +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts @@ -0,0 +1,119 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { cloneDeep } from 'lodash'; +import { IUiSettingsClient } from 'kibana/public'; +import { SavedSearchSavedObject } from '../../../../common/types'; +import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../types/combined_query'; +import { esKuery, esQuery, Query } from '../../../../../../../src/plugins/data/public'; + +export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) { + const search = savedSearch.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string }; + return JSON.parse(search.searchSourceJSON) as { + query: Query; + filter: any[]; + }; +} + +/** + * Extract query data from the saved search object. + */ +export function extractSearchData( + savedSearch: SavedSearchSavedObject | null, + currentIndexPattern: IndexPattern, + queryStringOptions: Record | string +) { + if (!savedSearch) { + return undefined; + } + + const { query: extractedQuery } = getQueryFromSavedSearch(savedSearch); + const queryLanguage = extractedQuery.language as SearchQueryLanguage; + const qryString = extractedQuery.query; + let qry; + if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) { + const ast = esKuery.fromKueryExpression(qryString); + qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern); + } else { + qry = esQuery.luceneStringToDsl(qryString); + esQuery.decorateQuery(qry, queryStringOptions); + } + return { + searchQuery: qry, + searchString: qryString, + queryLanguage, + }; +} + +const DEFAULT_QUERY = { + bool: { + must: [ + { + match_all: {}, + }, + ], + }, +}; + +export function getDefaultDatafeedQuery() { + return cloneDeep(DEFAULT_QUERY); +} + +export function createSearchItems( + kibanaConfig: IUiSettingsClient, + indexPattern: IndexPattern | undefined, + savedSearch: SavedSearchSavedObject | null +) { + // query is only used by the data visualizer as it needs + // a lucene query_string. + // Using a blank query will cause match_all:{} to be used + // when passed through luceneStringToDsl + let query: Query = { + query: '', + language: 'lucene', + }; + + let combinedQuery: any = getDefaultDatafeedQuery(); + if (savedSearch !== null) { + const data = getQueryFromSavedSearch(savedSearch); + + query = data.query; + const filter = data.filter; + + const filters = Array.isArray(filter) ? filter : []; + + if (query.language === SEARCH_QUERY_LANGUAGE.KUERY) { + const ast = esKuery.fromKueryExpression(query.query); + if (query.query !== '') { + combinedQuery = esKuery.toElasticsearchQuery(ast, indexPattern); + } + const filterQuery = esQuery.buildQueryFromFilters(filters, indexPattern); + + if (Array.isArray(combinedQuery.bool.filter) === false) { + combinedQuery.bool.filter = + combinedQuery.bool.filter === undefined ? [] : [combinedQuery.bool.filter]; + } + + if (Array.isArray(combinedQuery.bool.must_not) === false) { + combinedQuery.bool.must_not = + combinedQuery.bool.must_not === undefined ? [] : [combinedQuery.bool.must_not]; + } + + combinedQuery.bool.filter = [...combinedQuery.bool.filter, ...filterQuery.filter]; + combinedQuery.bool.must_not = [...combinedQuery.bool.must_not, ...filterQuery.must_not]; + } else { + const esQueryConfigs = esQuery.getEsQueryConfig(kibanaConfig); + combinedQuery = esQuery.buildEsQuery(indexPattern, [query], filters, esQueryConfigs); + } + } + + return { + query, + combinedQuery, + }; +} diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts index 6f078c073e75d..477c0b5273e42 100644 --- a/x-pack/plugins/data_visualizer/public/plugin.ts +++ b/x-pack/plugins/data_visualizer/public/plugin.ts @@ -17,6 +17,7 @@ import type { FileUploadPluginStart } from '../../file_upload/public'; import type { MapsStartApi } from '../../maps/public'; import type { SecurityPluginSetup } from '../../security/public'; import type { LensPublicStart } from '../../lens/public'; +import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/index_pattern_field_editor/public'; import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api'; import { getMaxBytesFormatted } from './application/common/util/get_max_bytes'; import { registerHomeAddData } from './register_home'; @@ -31,7 +32,8 @@ export interface DataVisualizerStartDependencies { embeddable: EmbeddableStart; security?: SecurityPluginSetup; share: SharePluginStart; - lens: LensPublicStart; + lens?: LensPublicStart; + indexPatternFieldEditor?: IndexPatternFieldEditorStart; } export type DataVisualizerPluginSetup = ReturnType; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx index 1ba017bba8064..af803d32e5139 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx @@ -9,12 +9,8 @@ import React, { FC, Fragment, useEffect, useState } from 'react'; import { useMlKibana, useTimefilter } from '../../contexts/kibana'; import { NavigationMenu } from '../../components/navigation_menu'; import { HelpMenu } from '../../components/help_menu'; -import { useMlContext } from '../../contexts/ml'; -import { IndexDataVisualizerViewProps } from '../../../../../data_visualizer/public'; +import type { IndexDataVisualizerViewProps } from '../../../../../data_visualizer/public'; export const IndexDataVisualizerPage: FC = () => { - const mlContext = useMlContext(); - const { currentIndexPattern, combinedQuery, currentSavedSearch } = mlContext; - useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); const { services: { docLinks, dataVisualizer }, @@ -33,17 +29,7 @@ export const IndexDataVisualizerPage: FC = () => { return IndexDataVisualizer ? ( - { - // Need to inject required props from ml context - // @ts-ignore FC IndexDataVisualizer does have props type - React.Children.map(IndexDataVisualizer.props.children, (child) => { - return React.cloneElement(child, { - query: combinedQuery, - currentIndexPattern, - currentSavedSearch, - }); - }) - } + {IndexDataVisualizer} ) : ( From 862dfded243590092a5ed4b02be34a925235dec4 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 4 Jun 2021 13:46:57 -0500 Subject: [PATCH 40/53] [ML] Set query to optional --- .../full_time_range_selector/full_time_range_selector.tsx | 2 +- .../full_time_range_selector_service.ts | 2 +- .../index_data_visualizer_view.tsx | 5 ++--- .../index_data_visualizer/index_data_visualizer.tsx | 7 ++----- .../index_data_visualizer/services/time_field_range.ts | 3 ++- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index 93e5ca3a3260d..b09ba6efd959b 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -17,8 +17,8 @@ import { useDataVisualizerKibana } from '../../../kibana_context'; interface Props { timefilter: TimefilterContract; indexPattern: IndexPattern; - query: Query; disabled: boolean; + query?: Query; callback?: (a: any) => void; } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts index 3ad8d3a01f20a..298ab4ff54984 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts @@ -22,7 +22,7 @@ export interface TimeRange { export async function setFullTimeRange( timefilter: TimefilterContract, indexPattern: IndexPattern, - query: Query + query?: Query ): Promise { const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields; const resp = await getTimeFieldRange({ diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx index a3a996fda707f..12441bcfbbb23 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -117,7 +117,6 @@ export const getDefaultDataVisualizerListState = (): Required = (dataVi dataVisualizerProps.currentSavedSearch ); - const { query, currentIndexPattern } = dataVisualizerProps; + const { currentIndexPattern } = dataVisualizerProps; useEffect(() => { if (dataVisualizerProps?.currentSavedSearch !== undefined) { @@ -776,7 +775,7 @@ export const IndexDataVisualizerView: FC = (dataVi diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index 74994465b41f6..468405cd297c3 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -33,13 +33,12 @@ import { IndexPattern } from '../../../../../../src/plugins/data/common/index_pa export type IndexDataVisualizerSpec = typeof IndexDataVisualizer; -export interface DataVisualizerUrlStateContextProviderProps extends IndexDataVisualizerViewProps { +export interface DataVisualizerUrlStateContextProviderProps { IndexDataVisualizerComponent: FC; } export const DataVisualizerUrlStateContextProvider: FC = ({ IndexDataVisualizerComponent, - ...restProps }) => { const { services: { @@ -167,7 +166,6 @@ export const DataVisualizerUrlStateContextProvider: FC {currentIndexPattern ? ( @@ -178,7 +176,7 @@ export const DataVisualizerUrlStateContextProvider: FC = (props) => { +export const IndexDataVisualizer: FC = () => { const coreStart = getCoreStart(); const { data, @@ -204,7 +202,6 @@ export const IndexDataVisualizer: FC = (props) => ); diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts index 089e815cffe89..ad831e447419c 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts @@ -8,6 +8,7 @@ import { estypes } from '@elastic/elasticsearch'; import { lazyLoadModules } from '../../../lazy_load_bundle'; import { GetTimeFieldRangeResponse } from '../../../../common/types/time_field_request'; +import { Query } from '../../../../../../../src/plugins/data/common/query'; export async function getTimeFieldRange({ index, @@ -17,7 +18,7 @@ export async function getTimeFieldRange({ }: { index: string; timeFieldName?: string; - query: any; + query?: Query; runtimeMappings?: estypes.RuntimeFields; }) { const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings }); From 82b97e085d88237301ecf4fa0d72ada60e05a602 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 4 Jun 2021 15:09:01 -0500 Subject: [PATCH 41/53] Revert "[ML] Update plugin description" This reverts commit 4ab1a25c --- docs/developer/plugin-list.asciidoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 68bbcd866aab2..087626240ff33 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -365,10 +365,6 @@ The client-side plugin configures following values: |The data_enhanced plugin is the x-pack counterpart to the src/plguins/data plugin. -|{kib-repo}blob/{branch}/x-pack/plugins/data_visualizer[dataVisualizer] -|The data_visualizer plugin enables you to explore the fields in your data. - - |{kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced] |Contains the enhancements to the OSS discover app. @@ -396,6 +392,10 @@ actitivies. |The features plugin enhance Kibana with a per-feature privilege system. +|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer] +|WARNING: Missing README. + + |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload] |WARNING: Missing README. From 893c4abe30d02dba0686c91c5bc3b86fa9305a15 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 4 Jun 2021 15:10:01 -0500 Subject: [PATCH 42/53] [ML] Update plugins list docs --- docs/developer/plugin-list.asciidoc | 8 ++++---- x-pack/plugins/data_visualizer/README.md | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 x-pack/plugins/data_visualizer/README.md diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 087626240ff33..898bf529067a7 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -365,6 +365,10 @@ The client-side plugin configures following values: |The data_enhanced plugin is the x-pack counterpart to the src/plguins/data plugin. +|{kib-repo}blob/{branch}/x-pack/plugins/data_visualizer/README.md[dataVisualizer] +|The data_visualizer plugin enables you to explore the fields in your data. + + |{kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced] |Contains the enhancements to the OSS discover app. @@ -392,10 +396,6 @@ actitivies. |The features plugin enhance Kibana with a per-feature privilege system. -|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer] -|WARNING: Missing README. - - |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload] |WARNING: Missing README. diff --git a/x-pack/plugins/data_visualizer/README.md b/x-pack/plugins/data_visualizer/README.md new file mode 100644 index 0000000000000..2bd11b369e785 --- /dev/null +++ b/x-pack/plugins/data_visualizer/README.md @@ -0,0 +1 @@ +The data_visualizer plugin enables you to explore the fields in your data. \ No newline at end of file From e1ab287a7cee90d243dd5028abcf2c06f479a1fd Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Fri, 4 Jun 2021 15:14:06 -0500 Subject: [PATCH 43/53] [ML] Fix types and i18n --- .../components/stats_table/data_visualizer_stats_table.tsx | 1 - .../full_time_range_selector/full_time_range_selector.tsx | 2 +- .../application/index_data_visualizer/index_data_visualizer.tsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx index fc6928ccd20a4..afadc5c5ae4a4 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx @@ -36,7 +36,6 @@ import { } from './types/field_vis_config'; import { FileBasedNumberContentPreview } from '../field_data_row'; import { BooleanContentPreview } from './components/field_data_row'; -import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public'; const FIELD_NAME = 'fieldName'; diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index b09ba6efd959b..59f00bf00c270 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -38,7 +38,7 @@ export const FullTimeRangeSelector: FC = ({ } = useDataVisualizerKibana(); // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop - async function setRange(i: IndexPattern, q: Query) { + async function setRange(i: IndexPattern, q?: Query) { try { const fullTimeRange = await setFullTimeRange(timefilter, i, q); if (typeof callback === 'function') { diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index 468405cd297c3..78a486e15bea7 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -88,7 +88,7 @@ export const DataVisualizerUrlStateContextProvider: FC Date: Mon, 7 Jun 2021 11:13:39 -0500 Subject: [PATCH 44/53] [ML] Revert ml data test subj/class name changes --- .../components/data_grid/column_chart.scss | 8 ++++---- .../components/data_grid/column_chart.tsx | 9 +++------ .../components/data_grid/use_column_chart.tsx | 2 +- .../components/data_grid/use_data_grid.tsx | 2 +- .../ml_embedded_map/_ml_embedded_map.scss | 2 +- .../ml_embedded_map/ml_embedded_map.tsx | 4 ++-- .../datavisualizer/datavisualizer_selector.tsx | 12 ++++++------ .../functional/services/ml/data_visualizer.ts | 16 ++++++++-------- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss index e5f70ba5926c6..756804a0e6aa0 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss +++ b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.scss @@ -1,9 +1,9 @@ -.dataVisualizerDataGridChart__histogram { +.mlDataGridChart__histogram { width: 100%; height: $euiSizeXL + $euiSizeXXL; } -.dataVisualizerDataGridChart__legend { +.mlDataGridChart__legend { @include euiTextTruncate; @include euiFontSizeXS; @@ -16,11 +16,11 @@ text-align: left; } -.dataVisualizerDataGridChart__legend--numeric { +.mlDataGridChart__legend--numeric { text-align: right; } -.dataVisualizerDataGridChart__legendBoolean { +.mlDataGridChart__legendBoolean { width: 100%; min-width: $euiButtonMinWidth; td { text-align: center } diff --git a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx index c864c63e0d9e4..3800256927d54 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx @@ -53,10 +53,7 @@ export const ColumnChart: FC = ({ return (
{!isUnsupportedChartData(chartData) && data.length > 0 && ( -
+
= ({
)}
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx index 43dd018d72c29..4764a1674df2f 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx @@ -94,7 +94,7 @@ export const getLegendText = ( if (chartData.type === 'boolean') { return ( -
{chartData.data[0].key_as_string}
+
{chartData.data[0] !== undefined && } diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx index a4ea9916d3a98..633c3d9aab002 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/use_data_grid.tsx @@ -113,7 +113,7 @@ export const useDataGrid = ( ) : undefined, }; diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss index 4dfd1c8a866bd..495fc40ddb27c 100644 --- a/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss +++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/_ml_embedded_map.scss @@ -1,4 +1,4 @@ -.dataVisualizerEmbeddedMapContent { +.mlEmbeddedMapContent { width: 100%; height: 100%; display: flex; diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx index 1911a232102e2..0ca5389f1d423 100644 --- a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx +++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx @@ -147,8 +147,8 @@ export function MlEmbeddedMapComponent({ return (
); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx index dd3db6914d251..3b3b1af30610d 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx @@ -138,7 +138,7 @@ export const DatavisualizerSelector: FC = () => { navigateToPath('/filedatavisualizer')} - data-test-subj="dataVisualizerUploadFileButton" + data-test-subj="mlDataVisualizerUploadFileButton" > { /> } - data-test-subj="dataVisualizerCardImportData" + data-test-subj="mlDataVisualizerCardImportData" /> @@ -168,7 +168,7 @@ export const DatavisualizerSelector: FC = () => { navigateToPath('/datavisualizer_index_select')} - data-test-subj="dataVisualizerSelectIndexButton" + data-test-subj="mlDataVisualizerSelectIndexButton" > { /> } - data-test-subj="dataVisualizerCardIndexData" + data-test-subj="mlDataVisualizerCardIndexData" /> @@ -198,7 +198,7 @@ export const DatavisualizerSelector: FC = () => { { /> } - data-test-subj="dataVisualizerCardStartTrial" + data-test-subj="mlDataVisualizerCardStartTrial" /> diff --git a/x-pack/test/functional/services/ml/data_visualizer.ts b/x-pack/test/functional/services/ml/data_visualizer.ts index 2ca10d799122f..3571f9193e6b3 100644 --- a/x-pack/test/functional/services/ml/data_visualizer.ts +++ b/x-pack/test/functional/services/ml/data_visualizer.ts @@ -14,19 +14,19 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide return { async assertDataVisualizerImportDataCardExists() { - await testSubjects.existOrFail('dataVisualizerCardImportData'); + await testSubjects.existOrFail('mlDataVisualizerCardImportData'); }, async assertDataVisualizerIndexDataCardExists() { - await testSubjects.existOrFail('dataVisualizerCardIndexData'); + await testSubjects.existOrFail('mlDataVisualizerCardIndexData'); }, async assertDataVisualizerStartTrialCardExists() { - await testSubjects.existOrFail('dataVisualizerCardStartTrial'); + await testSubjects.existOrFail('mlDataVisualizerCardStartTrial'); }, async assertSelectIndexButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('dataVisualizerSelectIndexButton'); + const isEnabled = await testSubjects.isEnabled('mlDataVisualizerSelectIndexButton'); expect(isEnabled).to.eql( expectedValue, `Expected "select index" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -36,7 +36,7 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide }, async assertUploadFileButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('dataVisualizerUploadFileButton'); + const isEnabled = await testSubjects.isEnabled('mlDataVisualizerUploadFileButton'); expect(isEnabled).to.eql( expectedValue, `Expected "upload file" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -46,7 +46,7 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide }, async assertStartTrialButtonEnabled(expectedValue: boolean) { - const isEnabled = await testSubjects.isEnabled('dataVisualizerStartTrialButton'); + const isEnabled = await testSubjects.isEnabled('mlDataVisualizerStartTrialButton'); expect(isEnabled).to.eql( expectedValue, `Expected "start trial" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${ @@ -56,12 +56,12 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide }, async navigateToIndexPatternSelection() { - await testSubjects.click('dataVisualizerSelectIndexButton'); + await testSubjects.click('mlDataVisualizerSelectIndexButton'); await testSubjects.existOrFail('mlPageSourceSelection'); }, async navigateToFileUpload() { - await testSubjects.click('dataVisualizerUploadFileButton'); + await testSubjects.click('mlDataVisualizerUploadFileButton'); await testSubjects.existOrFail('dataVisualizerPageFileUpload'); }, }; From 403a8e38d5d2af99f3081e68294c9ad35dfe270b Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 13:00:14 -0500 Subject: [PATCH 45/53] [ML] Split up data visualizer model, remove Logger --- .../data_visualizer/check_fields_exist.ts | 183 +++ .../models/data_visualizer/constants.ts} | 9 +- .../models/data_visualizer/data_visualizer.ts | 1124 ++--------------- .../data_visualizer/get_field_examples.ts | 80 ++ .../data_visualizer/get_fields_stats.ts | 478 +++++++ .../get_histogram_for_fields.ts | 188 +++ .../process_distribution_data.ts | 108 ++ .../plugins/data_visualizer/server/plugin.ts | 18 +- .../data_visualizer/server/routes/routes.ts | 11 +- .../server/types/chart_data.ts | 168 +++ .../data_visualizer/server/types/deps.ts | 6 +- .../data_visualizer/server/types/index.ts | 4 +- x-pack/plugins/file_upload/server/plugin.ts | 6 +- 13 files changed, 1337 insertions(+), 1046 deletions(-) create mode 100644 x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts rename x-pack/plugins/{file_upload/server/types.ts => data_visualizer/server/models/data_visualizer/constants.ts} (51%) create mode 100644 x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts create mode 100644 x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts create mode 100644 x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts create mode 100644 x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts create mode 100644 x-pack/plugins/data_visualizer/server/types/chart_data.ts diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts new file mode 100644 index 0000000000000..20fe7c5bc3029 --- /dev/null +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts @@ -0,0 +1,183 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { get } from 'lodash'; +import { IScopedClusterClient } from 'kibana/server'; +import { AggCardinality, Aggs, FieldData } from '../../types'; +import { + buildBaseFilterCriteria, + buildSamplerAggregation, + getSafeAggregationName, + getSamplerAggregationsResponsePath, +} from '../../../common/utils/query_utils'; +import { getDatafeedAggregations } from '../../../common/utils/datafeed_utils'; +import { isPopulatedObject } from '../../../common/utils/object_utils'; + +export const checkAggregatableFieldsExist = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + aggregatableFields: string[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs?: number, + latestMs?: number, + datafeedConfig?: estypes.Datafeed, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + const datafeedAggregations = getDatafeedAggregations(datafeedConfig); + + // Value count aggregation faster way of checking if field exists than using + // filter aggregation with exists query. + const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {}; + + // Combine runtime fields from the index pattern as well as the datafeed + const combinedRuntimeMappings: estypes.RuntimeFields = { + ...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}), + ...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings) + ? datafeedConfig.runtime_mappings + : {}), + }; + + aggregatableFields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field, i); + aggs[`${safeFieldName}_count`] = { + filter: { exists: { field } }, + }; + + let cardinalityField: AggCardinality; + if (datafeedConfig?.script_fields?.hasOwnProperty(field)) { + cardinalityField = aggs[`${safeFieldName}_cardinality`] = { + cardinality: { script: datafeedConfig?.script_fields[field].script }, + }; + } else { + cardinalityField = { + cardinality: { field }, + }; + } + aggs[`${safeFieldName}_cardinality`] = cardinalityField; + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + ...(isPopulatedObject(aggs) ? { aggs: buildSamplerAggregation(aggs, samplerShardSize) } : {}), + ...(isPopulatedObject(combinedRuntimeMappings) + ? { runtime_mappings: combinedRuntimeMappings } + : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + track_total_hits: true, + size, + body: searchBody, + }); + + const aggregations = body.aggregations; + // @ts-expect-error incorrect search response type + const totalCount = body.hits.total.value; + const stats = { + totalCount, + aggregatableExistsFields: [] as FieldData[], + aggregatableNotExistsFields: [] as FieldData[], + }; + + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const sampleCount = + samplerShardSize > 0 ? get(aggregations, ['sample', 'doc_count'], 0) : totalCount; + aggregatableFields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field, i); + const count = get(aggregations, [...aggsPath, `${safeFieldName}_count`, 'doc_count'], 0); + if (count > 0) { + const cardinality = get( + aggregations, + [...aggsPath, `${safeFieldName}_cardinality`, 'value'], + 0 + ); + stats.aggregatableExistsFields.push({ + fieldName: field, + existsInDocs: true, + stats: { + sampleCount, + count, + cardinality, + }, + }); + } else { + if ( + datafeedConfig?.script_fields?.hasOwnProperty(field) || + datafeedConfig?.runtime_mappings?.hasOwnProperty(field) + ) { + const cardinality = get( + aggregations, + [...aggsPath, `${safeFieldName}_cardinality`, 'value'], + 0 + ); + stats.aggregatableExistsFields.push({ + fieldName: field, + existsInDocs: true, + stats: { + sampleCount, + count, + cardinality, + }, + }); + } else { + stats.aggregatableNotExistsFields.push({ + fieldName: field, + existsInDocs: false, + }); + } + } + }); + + return stats; +}; + +export const checkNonAggregatableFieldExists = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + field: string, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + filterCriteria.push({ exists: { field } }); + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + // @ts-expect-error incorrect search response type + return body.hits.total.value > 0; +}; diff --git a/x-pack/plugins/file_upload/server/types.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/constants.ts similarity index 51% rename from x-pack/plugins/file_upload/server/types.ts rename to x-pack/plugins/data_visualizer/server/models/data_visualizer/constants.ts index d23661ebae711..91bd394aee797 100644 --- a/x-pack/plugins/file_upload/server/types.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/constants.ts @@ -5,8 +5,9 @@ * 2.0. */ -import { SecurityPluginStart } from '../..//security/server'; +export const SAMPLER_TOP_TERMS_THRESHOLD = 100000; +export const SAMPLER_TOP_TERMS_SHARD_SIZE = 5000; +export const AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE = 200; +export const FIELDS_REQUEST_BATCH_SIZE = 10; -export interface StartDeps { - security?: SecurityPluginStart; -} +export const MAX_CHART_COLUMNS = 20; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts index 83454e98a310f..3d73ad923e535 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts @@ -6,365 +6,36 @@ */ import { IScopedClusterClient } from 'kibana/server'; -import { get, each, last, find } from 'lodash'; +import { each, last } from 'lodash'; import { estypes } from '@elastic/elasticsearch'; -import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/server'; import { JOB_FIELD_TYPES } from '../../../common'; +import type { + BatchStats, + FieldData, + HistogramField, + Field, + DocumentCountStats, + FieldExamples, +} from '../../types'; +import { getHistogramsForFields } from './get_histogram_for_fields'; import { - buildBaseFilterCriteria, - buildSamplerAggregation, - getSamplerAggregationsResponsePath, - getSafeAggregationName, -} from '../../../common/utils/query_utils'; -import { isPopulatedObject } from '../../../common/utils/object_utils'; -import { stringHash } from '../../../common/utils/string_utils'; -import { getDatafeedAggregations } from '../../../common/utils/datafeed_utils'; - -const SAMPLER_TOP_TERMS_THRESHOLD = 100000; -const SAMPLER_TOP_TERMS_SHARD_SIZE = 5000; -const AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE = 200; -const FIELDS_REQUEST_BATCH_SIZE = 10; - -const MAX_CHART_COLUMNS = 20; - -interface FieldData { - fieldName: string; - existsInDocs: boolean; - stats?: { - sampleCount?: number; - count?: number; - cardinality?: number; - }; -} - -export interface Field { - fieldName: string; - type: string; - cardinality: number; -} - -export interface HistogramField { - fieldName: string; - type: string; -} - -interface Distribution { - percentiles: any[]; - minPercentile: number; - maxPercentile: number; -} - -interface Aggs { - [key: string]: any; -} - -interface Bucket { - doc_count: number; -} - -interface NumericFieldStats { - fieldName: string; - count: number; - min: number; - max: number; - avg: number; - isTopValuesSampled: boolean; - topValues: Bucket[]; - topValuesSampleSize: number; - topValuesSamplerShardSize: number; - median?: number; - distribution?: Distribution; -} - -interface StringFieldStats { - fieldName: string; - isTopValuesSampled: boolean; - topValues: Bucket[]; - topValuesSampleSize: number; - topValuesSamplerShardSize: number; -} - -interface DateFieldStats { - fieldName: string; - count: number; - earliest: number; - latest: number; -} - -interface BooleanFieldStats { - fieldName: string; - count: number; - trueCount: number; - falseCount: number; - [key: string]: number | string; -} - -interface DocumentCountStats { - documentCounts: { - interval: number; - buckets: { [key: string]: number }; - }; -} - -interface FieldExamples { - fieldName: string; - examples: any[]; -} - -interface NumericColumnStats { - interval: number; - min: number; - max: number; -} -type NumericColumnStatsMap = Record; - -interface AggHistogram { - histogram: { - field: string; - interval: number; - }; -} - -interface AggTerms { - terms: { - field: string; - size: number; - }; -} - -interface NumericDataItem { - key: number; - key_as_string?: string; - doc_count: number; -} - -interface NumericChartData { - data: NumericDataItem[]; - id: string; - interval: number; - stats: [number, number]; - type: 'numeric'; -} - -interface OrdinalDataItem { - key: string; - key_as_string?: string; - doc_count: number; -} - -interface OrdinalChartData { - type: 'ordinal' | 'boolean'; - cardinality: number; - data: OrdinalDataItem[]; - id: string; -} - -interface UnsupportedChartData { - id: string; - type: 'unsupported'; -} - -export interface FieldAggCardinality { - field: string; - percent?: any; -} - -export interface ScriptAggCardinality { - script: any; -} - -export interface AggCardinality { - cardinality: FieldAggCardinality | ScriptAggCardinality; -} - -type ChartRequestAgg = AggHistogram | AggCardinality | AggTerms; - -type ChartData = NumericChartData | OrdinalChartData | UnsupportedChartData; - -type BatchStats = - | NumericFieldStats - | StringFieldStats - | BooleanFieldStats - | DateFieldStats - | DocumentCountStats - | FieldExamples; - -const getAggIntervals = async ( - { asCurrentUser }: IScopedClusterClient, - indexPatternTitle: string, - query: any, - fields: HistogramField[], - samplerShardSize: number, - runtimeMappings?: estypes.RuntimeFields -): Promise => { - const numericColumns = fields.filter((field) => { - return field.type === KBN_FIELD_TYPES.NUMBER || field.type === KBN_FIELD_TYPES.DATE; - }); - - if (numericColumns.length === 0) { - return {}; - } - - const minMaxAggs = numericColumns.reduce((aggs, c) => { - const id = stringHash(c.fieldName); - aggs[id] = { - stats: { - field: c.fieldName, - }, - }; - return aggs; - }, {} as Record); - - const { body } = await asCurrentUser.search({ - index: indexPatternTitle, - size: 0, - body: { - query, - aggs: buildSamplerAggregation(minMaxAggs, samplerShardSize), - size: 0, - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }, - }); - - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations; - - return Object.keys(aggregations).reduce((p, aggName) => { - const stats = [aggregations[aggName].min, aggregations[aggName].max]; - if (!stats.includes(null)) { - const delta = aggregations[aggName].max - aggregations[aggName].min; - - let aggInterval = 1; - - if (delta > MAX_CHART_COLUMNS || delta <= 1) { - aggInterval = delta / (MAX_CHART_COLUMNS - 1); - } - - p[aggName] = { interval: aggInterval, min: stats[0], max: stats[1] }; - } - - return p; - }, {} as NumericColumnStatsMap); -}; - -// export for re-use by transforms plugin -export const getHistogramsForFields = async ( - client: IScopedClusterClient, - indexPatternTitle: string, - query: any, - fields: HistogramField[], - samplerShardSize: number, - runtimeMappings?: estypes.RuntimeFields -) => { - const { asCurrentUser } = client; - const aggIntervals = await getAggIntervals( - client, - indexPatternTitle, - query, - fields, - samplerShardSize, - runtimeMappings - ); - - const chartDataAggs = fields.reduce((aggs, field) => { - const fieldName = field.fieldName; - const fieldType = field.type; - const id = stringHash(fieldName); - if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) { - if (aggIntervals[id] !== undefined) { - aggs[`${id}_histogram`] = { - histogram: { - field: fieldName, - interval: aggIntervals[id].interval !== 0 ? aggIntervals[id].interval : 1, - }, - }; - } - } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) { - if (fieldType === KBN_FIELD_TYPES.STRING) { - aggs[`${id}_cardinality`] = { - cardinality: { - field: fieldName, - }, - }; - } - aggs[`${id}_terms`] = { - terms: { - field: fieldName, - size: MAX_CHART_COLUMNS, - }, - }; - } - return aggs; - }, {} as Record); - - if (Object.keys(chartDataAggs).length === 0) { - return []; - } - - const { body } = await asCurrentUser.search({ - index: indexPatternTitle, - size: 0, - body: { - query, - aggs: buildSamplerAggregation(chartDataAggs, samplerShardSize), - size: 0, - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }, - }); - - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations; - - const chartsData: ChartData[] = fields.map( - (field): ChartData => { - const fieldName = field.fieldName; - const fieldType = field.type; - const id = stringHash(field.fieldName); - - if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) { - if (aggIntervals[id] === undefined) { - return { - type: 'numeric', - data: [], - interval: 0, - stats: [0, 0], - id: fieldName, - }; - } - - return { - data: aggregations[`${id}_histogram`].buckets, - interval: aggIntervals[id].interval, - stats: [aggIntervals[id].min, aggIntervals[id].max], - type: 'numeric', - id: fieldName, - }; - } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) { - return { - type: fieldType === KBN_FIELD_TYPES.STRING ? 'ordinal' : 'boolean', - cardinality: - fieldType === KBN_FIELD_TYPES.STRING ? aggregations[`${id}_cardinality`].value : 2, - data: aggregations[`${id}_terms`].buckets, - id: fieldName, - }; - } - - return { - type: 'unsupported', - id: fieldName, - }; - } - ); - - return chartsData; -}; + checkAggregatableFieldsExist, + checkNonAggregatableFieldExists, +} from './check_fields_exist'; +import { AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE, FIELDS_REQUEST_BATCH_SIZE } from './constants'; +import { getFieldExamples } from './get_field_examples'; +import { + getBooleanFieldsStats, + getDateFieldsStats, + getDocumentCountStats, + getNumericFieldsStats, + getStringFieldsStats, +} from './get_fields_stats'; export class DataVisualizer { private _client: IScopedClusterClient; - private _asCurrentUser: IScopedClusterClient['asCurrentUser']; constructor(client: IScopedClusterClient) { - this._asCurrentUser = client.asCurrentUser; this._client = client; } @@ -631,120 +302,18 @@ export class DataVisualizer { datafeedConfig?: estypes.Datafeed, runtimeMappings?: estypes.RuntimeFields ) { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - const datafeedAggregations = getDatafeedAggregations(datafeedConfig); - - // Value count aggregation faster way of checking if field exists than using - // filter aggregation with exists query. - const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {}; - - // Combine runtime fields from the index pattern as well as the datafeed - const combinedRuntimeMappings: estypes.RuntimeFields = { - ...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}), - ...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings) - ? datafeedConfig.runtime_mappings - : {}), - }; - - aggregatableFields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field, i); - aggs[`${safeFieldName}_count`] = { - filter: { exists: { field } }, - }; - - let cardinalityField: AggCardinality; - if (datafeedConfig?.script_fields?.hasOwnProperty(field)) { - cardinalityField = aggs[`${safeFieldName}_cardinality`] = { - cardinality: { script: datafeedConfig?.script_fields[field].script }, - }; - } else { - cardinalityField = { - cardinality: { field }, - }; - } - aggs[`${safeFieldName}_cardinality`] = cardinalityField; - }); - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - ...(isPopulatedObject(aggs) ? { aggs: buildSamplerAggregation(aggs, samplerShardSize) } : {}), - ...(isPopulatedObject(combinedRuntimeMappings) - ? { runtime_mappings: combinedRuntimeMappings } - : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - track_total_hits: true, - size, - body: searchBody, - }); - - const aggregations = body.aggregations; - // @ts-expect-error incorrect search response type - const totalCount = body.hits.total.value; - const stats = { - totalCount, - aggregatableExistsFields: [] as FieldData[], - aggregatableNotExistsFields: [] as FieldData[], - }; - - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const sampleCount = - samplerShardSize > 0 ? get(aggregations, ['sample', 'doc_count'], 0) : totalCount; - aggregatableFields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field, i); - const count = get(aggregations, [...aggsPath, `${safeFieldName}_count`, 'doc_count'], 0); - if (count > 0) { - const cardinality = get( - aggregations, - [...aggsPath, `${safeFieldName}_cardinality`, 'value'], - 0 - ); - stats.aggregatableExistsFields.push({ - fieldName: field, - existsInDocs: true, - stats: { - sampleCount, - count, - cardinality, - }, - }); - } else { - if ( - datafeedConfig?.script_fields?.hasOwnProperty(field) || - datafeedConfig?.runtime_mappings?.hasOwnProperty(field) - ) { - const cardinality = get( - aggregations, - [...aggsPath, `${safeFieldName}_cardinality`, 'value'], - 0 - ); - stats.aggregatableExistsFields.push({ - fieldName: field, - existsInDocs: true, - stats: { - sampleCount, - count, - cardinality, - }, - }); - } else { - stats.aggregatableNotExistsFields.push({ - fieldName: field, - existsInDocs: false, - }); - } - } - }); - - return stats; + return await checkAggregatableFieldsExist( + this._client, + indexPatternTitle, + query, + aggregatableFields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + datafeedConfig, + runtimeMappings + ); } async checkNonAggregatableFieldExists( @@ -756,27 +325,16 @@ export class DataVisualizer { latestMs: number | undefined, runtimeMappings?: estypes.RuntimeFields ) { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - filterCriteria.push({ exists: { field } }); - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - // @ts-expect-error incorrect search response type - return body.hits.total.value > 0; + return await checkNonAggregatableFieldExists( + this._client, + indexPatternTitle, + query, + field, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); } async getDocumentCountStats( @@ -788,56 +346,16 @@ export class DataVisualizer { intervalMs: number, runtimeMappings: estypes.RuntimeFields ): Promise { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - // Don't use the sampler aggregation as this can lead to some potentially - // confusing date histogram results depending on the date range of data amongst shards. - - const aggs = { - eventRate: { - date_histogram: { - field: timeFieldName, - fixed_interval: `${intervalMs}ms`, - min_doc_count: 1, - }, - }, - }; - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - aggs, - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - - const buckets: { [key: string]: number } = {}; - const dataByTimeBucket: Array<{ key: string; doc_count: number }> = get( - body, - ['aggregations', 'eventRate', 'buckets'], - [] + return await getDocumentCountStats( + this._client, + indexPatternTitle, + query, + timeFieldName, + earliestMs, + latestMs, + intervalMs, + runtimeMappings ); - each(dataByTimeBucket, (dataForTime) => { - const time = dataForTime.key; - buckets[time] = dataForTime.doc_count; - }); - - return { - documentCounts: { - interval: intervalMs, - buckets, - }, - }; } async getNumericFieldsStats( @@ -850,144 +368,17 @@ export class DataVisualizer { latestMs: number | undefined, runtimeMappings?: estypes.RuntimeFields ) { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - // Build the percents parameter which defines the percentiles to query - // for the metric distribution data. - // Use a fixed percentile spacing of 5%. - const MAX_PERCENT = 100; - const PERCENTILE_SPACING = 5; - let count = 0; - const percents = Array.from( - Array(MAX_PERCENT / PERCENTILE_SPACING), - () => (count += PERCENTILE_SPACING) + return await getNumericFieldsStats( + this._client, + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings ); - - const aggs: { [key: string]: any } = {}; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - aggs[`${safeFieldName}_field_stats`] = { - filter: { exists: { field: field.fieldName } }, - aggs: { - actual_stats: { - stats: { field: field.fieldName }, - }, - }, - }; - aggs[`${safeFieldName}_percentiles`] = { - percentiles: { - field: field.fieldName, - percents, - keyed: false, - }, - }; - - const top = { - terms: { - field: field.fieldName, - size: 10, - order: { - _count: 'desc', - }, - }, - }; - - // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation - // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1). - if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { - aggs[`${safeFieldName}_top`] = { - sampler: { - shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE, - }, - aggs: { - top, - }, - }; - } else { - aggs[`${safeFieldName}_top`] = top; - } - }); - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - aggs: buildSamplerAggregation(aggs, samplerShardSize), - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - const aggregations = body.aggregations; - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const batchStats: NumericFieldStats[] = []; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - const docCount = get( - aggregations, - [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'], - 0 - ); - const fieldStatsResp = get( - aggregations, - [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'], - {} - ); - - const topAggsPath = [...aggsPath, `${safeFieldName}_top`]; - if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { - topAggsPath.push('top'); - } - - const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []); - - const stats: NumericFieldStats = { - fieldName: field.fieldName, - count: docCount, - min: get(fieldStatsResp, 'min', 0), - max: get(fieldStatsResp, 'max', 0), - avg: get(fieldStatsResp, 'avg', 0), - isTopValuesSampled: - field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0, - topValues, - topValuesSampleSize: topValues.reduce( - (acc, curr) => acc + curr.doc_count, - get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0) - ), - topValuesSamplerShardSize: - field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD - ? SAMPLER_TOP_TERMS_SHARD_SIZE - : samplerShardSize, - }; - - if (stats.count > 0) { - const percentiles = get( - aggregations, - [...aggsPath, `${safeFieldName}_percentiles`, 'values'], - [] - ); - const medianPercentile: { value: number; key: number } | undefined = find(percentiles, { - key: 50, - }); - stats.median = medianPercentile !== undefined ? medianPercentile!.value : 0; - stats.distribution = this.processDistributionData( - percentiles, - PERCENTILE_SPACING, - stats.min - ); - } - - batchStats.push(stats); - }); - - return batchStats; } async getStringFieldsStats( @@ -1000,86 +391,17 @@ export class DataVisualizer { latestMs: number | undefined, runtimeMappings?: estypes.RuntimeFields ) { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - const aggs: Aggs = {}; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - const top = { - terms: { - field: field.fieldName, - size: 10, - order: { - _count: 'desc', - }, - }, - }; - - // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation - // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1). - if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { - aggs[`${safeFieldName}_top`] = { - sampler: { - shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE, - }, - aggs: { - top, - }, - }; - } else { - aggs[`${safeFieldName}_top`] = top; - } - }); - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - aggs: buildSamplerAggregation(aggs, samplerShardSize), - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - const aggregations = body.aggregations; - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const batchStats: StringFieldStats[] = []; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - - const topAggsPath = [...aggsPath, `${safeFieldName}_top`]; - if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { - topAggsPath.push('top'); - } - - const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []); - - const stats = { - fieldName: field.fieldName, - isTopValuesSampled: - field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0, - topValues, - topValuesSampleSize: topValues.reduce( - (acc, curr) => acc + curr.doc_count, - get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0) - ), - topValuesSamplerShardSize: - field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD - ? SAMPLER_TOP_TERMS_SHARD_SIZE - : samplerShardSize, - }; - - batchStats.push(stats); - }); - - return batchStats; + return await getStringFieldsStats( + this._client, + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); } async getDateFieldsStats( @@ -1092,62 +414,17 @@ export class DataVisualizer { latestMs: number | undefined, runtimeMappings?: estypes.RuntimeFields ) { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - const aggs: Aggs = {}; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - aggs[`${safeFieldName}_field_stats`] = { - filter: { exists: { field: field.fieldName } }, - aggs: { - actual_stats: { - stats: { field: field.fieldName }, - }, - }, - }; - }); - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - aggs: buildSamplerAggregation(aggs, samplerShardSize), - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - const aggregations = body.aggregations; - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const batchStats: DateFieldStats[] = []; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - const docCount = get( - aggregations, - [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'], - 0 - ); - const fieldStatsResp = get( - aggregations, - [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'], - {} - ); - batchStats.push({ - fieldName: field.fieldName, - count: docCount, - earliest: get(fieldStatsResp, 'min', 0), - latest: get(fieldStatsResp, 'max', 0), - }); - }); - - return batchStats; + return await getDateFieldsStats( + this._client, + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); } async getBooleanFieldsStats( @@ -1160,64 +437,17 @@ export class DataVisualizer { latestMs: number | undefined, runtimeMappings?: estypes.RuntimeFields ) { - const index = indexPatternTitle; - const size = 0; - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - const aggs: Aggs = {}; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - aggs[`${safeFieldName}_value_count`] = { - filter: { exists: { field: field.fieldName } }, - }; - aggs[`${safeFieldName}_values`] = { - terms: { - field: field.fieldName, - size: 2, - }, - }; - }); - - const searchBody = { - query: { - bool: { - filter: filterCriteria, - }, - }, - aggs: buildSamplerAggregation(aggs, samplerShardSize), - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - const aggregations = body.aggregations; - const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); - const batchStats: BooleanFieldStats[] = []; - fields.forEach((field, i) => { - const safeFieldName = getSafeAggregationName(field.fieldName, i); - const stats: BooleanFieldStats = { - fieldName: field.fieldName, - count: get(aggregations, [...aggsPath, `${safeFieldName}_value_count`, 'doc_count'], 0), - trueCount: 0, - falseCount: 0, - }; - - const valueBuckets: Array<{ [key: string]: number }> = get( - aggregations, - [...aggsPath, `${safeFieldName}_values`, 'buckets'], - [] - ); - valueBuckets.forEach((bucket) => { - stats[`${bucket.key_as_string}Count`] = bucket.doc_count; - }); - - batchStats.push(stats); - }); - - return batchStats; + return await getBooleanFieldsStats( + this._client, + indexPatternTitle, + query, + fields, + samplerShardSize, + timeFieldName, + earliestMs, + latestMs, + runtimeMappings + ); } async getFieldExamples( @@ -1230,156 +460,16 @@ export class DataVisualizer { maxExamples: number, runtimeMappings?: estypes.RuntimeFields ): Promise { - const index = indexPatternTitle; - - // Request at least 100 docs so that we have a chance of obtaining - // 'maxExamples' of the field. - const size = Math.max(100, maxExamples); - const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); - - // Use an exists filter to return examples of the field. - filterCriteria.push({ - exists: { field }, - }); - - const searchBody = { - fields: [field], - _source: false, - query: { - bool: { - filter: filterCriteria, - }, - }, - ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), - }; - - const { body } = await this._asCurrentUser.search({ - index, - size, - body: searchBody, - }); - const stats = { - fieldName: field, - examples: [] as any[], - }; - // @ts-expect-error incorrect search response type - if (body.hits.total.value > 0) { - const hits = body.hits.hits; - for (let i = 0; i < hits.length; i++) { - // Use lodash get() to support field names containing dots. - const doc: object[] | undefined = get(hits[i].fields, field); - // the results from fields query is always an array - if (Array.isArray(doc) && doc.length > 0) { - const example = doc[0]; - if (example !== undefined && stats.examples.indexOf(example) === -1) { - stats.examples.push(example); - if (stats.examples.length === maxExamples) { - break; - } - } - } - } - } - - return stats; - } - - processDistributionData( - percentiles: Array<{ value: number }>, - percentileSpacing: number, - minValue: number - ): Distribution { - const distribution: Distribution = { percentiles: [], minPercentile: 0, maxPercentile: 100 }; - if (percentiles.length === 0) { - return distribution; - } - - let percentileBuckets: Array<{ value: number }> = []; - let lowerBound = minValue; - if (lowerBound >= 0) { - // By default return results for 0 - 90% percentiles. - distribution.minPercentile = 0; - distribution.maxPercentile = 90; - percentileBuckets = percentiles.slice(0, percentiles.length - 2); - - // Look ahead to the last percentiles and process these too if - // they don't add more than 50% to the value range. - const lastValue = (last(percentileBuckets) as any).value; - const upperBound = lowerBound + 1.5 * (lastValue - lowerBound); - const filteredLength = percentileBuckets.length; - for (let i = filteredLength; i < percentiles.length; i++) { - if (percentiles[i].value < upperBound) { - percentileBuckets.push(percentiles[i]); - distribution.maxPercentile += percentileSpacing; - } else { - break; - } - } - } else { - // By default return results for 5 - 95% percentiles. - const dataMin = lowerBound; - lowerBound = percentiles[0].value; - distribution.minPercentile = 5; - distribution.maxPercentile = 95; - percentileBuckets = percentiles.slice(1, percentiles.length - 1); - - // Add in 0-5 and 95-100% if they don't add more - // than 25% to the value range at either end. - const lastValue: number = (last(percentileBuckets) as any).value; - const maxDiff = 0.25 * (lastValue - lowerBound); - if (lowerBound - dataMin < maxDiff) { - percentileBuckets.splice(0, 0, percentiles[0]); - distribution.minPercentile = 0; - lowerBound = dataMin; - } - - if (percentiles[percentiles.length - 1].value - lastValue < maxDiff) { - percentileBuckets.push(percentiles[percentiles.length - 1]); - distribution.maxPercentile = 100; - } - } - - // Combine buckets with the same value. - const totalBuckets = percentileBuckets.length; - let lastBucketValue = lowerBound; - let numEqualValueBuckets = 0; - for (let i = 0; i < totalBuckets; i++) { - const bucket = percentileBuckets[i]; - - // Results from the percentiles aggregation can have precision rounding - // artifacts e.g returning 200 and 200.000000000123, so check for equality - // around double floating point precision i.e. 15 sig figs. - if (bucket.value.toPrecision(15) !== lastBucketValue.toPrecision(15)) { - // Create a bucket for any 'equal value' buckets which had a value <= last bucket - if (numEqualValueBuckets > 0) { - distribution.percentiles.push({ - percent: numEqualValueBuckets * percentileSpacing, - minValue: lastBucketValue, - maxValue: lastBucketValue, - }); - } - - distribution.percentiles.push({ - percent: percentileSpacing, - minValue: lastBucketValue, - maxValue: bucket.value, - }); - - lastBucketValue = bucket.value; - numEqualValueBuckets = 0; - } else { - numEqualValueBuckets++; - if (i === totalBuckets - 1) { - // If at the last bucket, create a final bucket for the equal value buckets. - distribution.percentiles.push({ - percent: numEqualValueBuckets * percentileSpacing, - minValue: lastBucketValue, - maxValue: lastBucketValue, - }); - } - } - } - - return distribution; + return await getFieldExamples( + this._client, + indexPatternTitle, + query, + field, + timeFieldName, + earliestMs, + latestMs, + maxExamples, + runtimeMappings + ); } } diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts new file mode 100644 index 0000000000000..060434123bfeb --- /dev/null +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts @@ -0,0 +1,80 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { get } from 'lodash'; +import { IScopedClusterClient } from 'kibana/server'; +import { buildBaseFilterCriteria } from '../../../common/utils/query_utils'; +import { isPopulatedObject } from '../../../common/utils/object_utils'; +import { FieldExamples } from '../../types/chart_data'; + +export const getFieldExamples = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + field: string, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + maxExamples: number, + runtimeMappings?: estypes.RuntimeFields +): Promise => { + const { asCurrentUser } = client; + + const index = indexPatternTitle; + + // Request at least 100 docs so that we have a chance of obtaining + // 'maxExamples' of the field. + const size = Math.max(100, maxExamples); + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + // Use an exists filter to return examples of the field. + filterCriteria.push({ + exists: { field }, + }); + + const searchBody = { + fields: [field], + _source: false, + query: { + bool: { + filter: filterCriteria, + }, + }, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const stats = { + fieldName: field, + examples: [] as any[], + }; + // @ts-expect-error incorrect search response type + if (body.hits.total.value > 0) { + const hits = body.hits.hits; + for (let i = 0; i < hits.length; i++) { + // Use lodash get() to support field names containing dots. + const doc: object[] | undefined = get(hits[i].fields, field); + // the results from fields query is always an array + if (Array.isArray(doc) && doc.length > 0) { + const example = doc[0]; + if (example !== undefined && stats.examples.indexOf(example) === -1) { + stats.examples.push(example); + if (stats.examples.length === maxExamples) { + break; + } + } + } + } + } + + return stats; +}; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts new file mode 100644 index 0000000000000..3305f8ebda45a --- /dev/null +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts @@ -0,0 +1,478 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { estypes } from '@elastic/elasticsearch'; +import { each, find, get } from 'lodash'; +import { IScopedClusterClient } from 'kibana/server'; +import { + Aggs, + BooleanFieldStats, + Bucket, + DateFieldStats, + DocumentCountStats, + Field, + NumericFieldStats, + StringFieldStats, +} from '../../types'; +import { + buildBaseFilterCriteria, + buildSamplerAggregation, + getSafeAggregationName, + getSamplerAggregationsResponsePath, +} from '../../../common/utils/query_utils'; +import { isPopulatedObject } from '../../../common/utils/object_utils'; +import { processDistributionData } from './process_distribution_data'; +import { SAMPLER_TOP_TERMS_SHARD_SIZE, SAMPLER_TOP_TERMS_THRESHOLD } from './constants'; + +export const getDocumentCountStats = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + intervalMs: number, + runtimeMappings: estypes.RuntimeFields +): Promise => { + const { asCurrentUser } = client; + + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + // Don't use the sampler aggregation as this can lead to some potentially + // confusing date histogram results depending on the date range of data amongst shards. + + const aggs = { + eventRate: { + date_histogram: { + field: timeFieldName, + fixed_interval: `${intervalMs}ms`, + min_doc_count: 1, + }, + }, + }; + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + + const buckets: { [key: string]: number } = {}; + const dataByTimeBucket: Array<{ key: string; doc_count: number }> = get( + body, + ['aggregations', 'eventRate', 'buckets'], + [] + ); + each(dataByTimeBucket, (dataForTime) => { + const time = dataForTime.key; + buckets[time] = dataForTime.doc_count; + }); + + return { + documentCounts: { + interval: intervalMs, + buckets, + }, + }; +}; + +export const getNumericFieldsStats = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + // Build the percents parameter which defines the percentiles to query + // for the metric distribution data. + // Use a fixed percentile spacing of 5%. + const MAX_PERCENT = 100; + const PERCENTILE_SPACING = 5; + let count = 0; + const percents = Array.from( + Array(MAX_PERCENT / PERCENTILE_SPACING), + () => (count += PERCENTILE_SPACING) + ); + + const aggs: { [key: string]: any } = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + aggs[`${safeFieldName}_field_stats`] = { + filter: { exists: { field: field.fieldName } }, + aggs: { + actual_stats: { + stats: { field: field.fieldName }, + }, + }, + }; + aggs[`${safeFieldName}_percentiles`] = { + percentiles: { + field: field.fieldName, + percents, + keyed: false, + }, + }; + + const top = { + terms: { + field: field.fieldName, + size: 10, + order: { + _count: 'desc', + }, + }, + }; + + // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation + // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1). + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + aggs[`${safeFieldName}_top`] = { + sampler: { + shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE, + }, + aggs: { + top, + }, + }; + } else { + aggs[`${safeFieldName}_top`] = top; + } + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: NumericFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const docCount = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'], + 0 + ); + const fieldStatsResp = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'], + {} + ); + + const topAggsPath = [...aggsPath, `${safeFieldName}_top`]; + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + topAggsPath.push('top'); + } + + const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []); + + const stats: NumericFieldStats = { + fieldName: field.fieldName, + count: docCount, + min: get(fieldStatsResp, 'min', 0), + max: get(fieldStatsResp, 'max', 0), + avg: get(fieldStatsResp, 'avg', 0), + isTopValuesSampled: field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0, + topValues, + topValuesSampleSize: topValues.reduce( + (acc, curr) => acc + curr.doc_count, + get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0) + ), + topValuesSamplerShardSize: + field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD + ? SAMPLER_TOP_TERMS_SHARD_SIZE + : samplerShardSize, + }; + + if (stats.count > 0) { + const percentiles = get( + aggregations, + [...aggsPath, `${safeFieldName}_percentiles`, 'values'], + [] + ); + const medianPercentile: { value: number; key: number } | undefined = find(percentiles, { + key: 50, + }); + stats.median = medianPercentile !== undefined ? medianPercentile!.value : 0; + stats.distribution = processDistributionData(percentiles, PERCENTILE_SPACING, stats.min); + } + + batchStats.push(stats); + }); + + return batchStats; +}; + +export const getStringFieldsStats = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const aggs: Aggs = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const top = { + terms: { + field: field.fieldName, + size: 10, + order: { + _count: 'desc', + }, + }, + }; + + // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation + // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1). + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + aggs[`${safeFieldName}_top`] = { + sampler: { + shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE, + }, + aggs: { + top, + }, + }; + } else { + aggs[`${safeFieldName}_top`] = top; + } + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: StringFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + + const topAggsPath = [...aggsPath, `${safeFieldName}_top`]; + if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) { + topAggsPath.push('top'); + } + + const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []); + + const stats = { + fieldName: field.fieldName, + isTopValuesSampled: field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0, + topValues, + topValuesSampleSize: topValues.reduce( + (acc, curr) => acc + curr.doc_count, + get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0) + ), + topValuesSamplerShardSize: + field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD + ? SAMPLER_TOP_TERMS_SHARD_SIZE + : samplerShardSize, + }; + + batchStats.push(stats); + }); + + return batchStats; +}; + +export const getDateFieldsStats = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const aggs: Aggs = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + aggs[`${safeFieldName}_field_stats`] = { + filter: { exists: { field: field.fieldName } }, + aggs: { + actual_stats: { + stats: { field: field.fieldName }, + }, + }, + }; + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: DateFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const docCount = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'], + 0 + ); + const fieldStatsResp = get( + aggregations, + [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'], + {} + ); + batchStats.push({ + fieldName: field.fieldName, + count: docCount, + earliest: get(fieldStatsResp, 'min', 0), + latest: get(fieldStatsResp, 'max', 0), + }); + }); + + return batchStats; +}; + +export const getBooleanFieldsStats = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: object, + fields: Field[], + samplerShardSize: number, + timeFieldName: string | undefined, + earliestMs: number | undefined, + latestMs: number | undefined, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + + const index = indexPatternTitle; + const size = 0; + const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query); + + const aggs: Aggs = {}; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + aggs[`${safeFieldName}_value_count`] = { + filter: { exists: { field: field.fieldName } }, + }; + aggs[`${safeFieldName}_values`] = { + terms: { + field: field.fieldName, + size: 2, + }, + }; + }); + + const searchBody = { + query: { + bool: { + filter: filterCriteria, + }, + }, + aggs: buildSamplerAggregation(aggs, samplerShardSize), + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }; + + const { body } = await asCurrentUser.search({ + index, + size, + body: searchBody, + }); + const aggregations = body.aggregations; + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const batchStats: BooleanFieldStats[] = []; + fields.forEach((field, i) => { + const safeFieldName = getSafeAggregationName(field.fieldName, i); + const stats: BooleanFieldStats = { + fieldName: field.fieldName, + count: get(aggregations, [...aggsPath, `${safeFieldName}_value_count`, 'doc_count'], 0), + trueCount: 0, + falseCount: 0, + }; + + const valueBuckets: Array<{ [key: string]: number }> = get( + aggregations, + [...aggsPath, `${safeFieldName}_values`, 'buckets'], + [] + ); + valueBuckets.forEach((bucket) => { + stats[`${bucket.key_as_string}Count`] = bucket.doc_count; + }); + + batchStats.push(stats); + }); + + return batchStats; +}; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts new file mode 100644 index 0000000000000..c630c0ad5c1e4 --- /dev/null +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts @@ -0,0 +1,188 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { IScopedClusterClient } from 'kibana/server'; +import { estypes } from '@elastic/elasticsearch'; +import { get } from 'lodash'; +import { ChartData, ChartRequestAgg, HistogramField, NumericColumnStatsMap } from '../../types'; +import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common'; +import { stringHash } from '../../../common/utils/string_utils'; +import { + buildSamplerAggregation, + getSamplerAggregationsResponsePath, +} from '../../../common/utils/query_utils'; +import { isPopulatedObject } from '../../../common/utils/object_utils'; +import { MAX_CHART_COLUMNS } from './constants'; + +export const getAggIntervals = async ( + { asCurrentUser }: IScopedClusterClient, + indexPatternTitle: string, + query: any, + fields: HistogramField[], + samplerShardSize: number, + runtimeMappings?: estypes.RuntimeFields +): Promise => { + const numericColumns = fields.filter((field) => { + return field.type === KBN_FIELD_TYPES.NUMBER || field.type === KBN_FIELD_TYPES.DATE; + }); + + if (numericColumns.length === 0) { + return {}; + } + + const minMaxAggs = numericColumns.reduce((aggs, c) => { + const id = stringHash(c.fieldName); + aggs[id] = { + stats: { + field: c.fieldName, + }, + }; + return aggs; + }, {} as Record); + + const { body } = await asCurrentUser.search({ + index: indexPatternTitle, + size: 0, + body: { + query, + aggs: buildSamplerAggregation(minMaxAggs, samplerShardSize), + size: 0, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }, + }); + + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations; + + return Object.keys(aggregations).reduce((p, aggName) => { + const stats = [aggregations[aggName].min, aggregations[aggName].max]; + if (!stats.includes(null)) { + const delta = aggregations[aggName].max - aggregations[aggName].min; + + let aggInterval = 1; + + if (delta > MAX_CHART_COLUMNS || delta <= 1) { + aggInterval = delta / (MAX_CHART_COLUMNS - 1); + } + + p[aggName] = { interval: aggInterval, min: stats[0], max: stats[1] }; + } + + return p; + }, {} as NumericColumnStatsMap); +}; + +export const getHistogramsForFields = async ( + client: IScopedClusterClient, + indexPatternTitle: string, + query: any, + fields: HistogramField[], + samplerShardSize: number, + runtimeMappings?: estypes.RuntimeFields +) => { + const { asCurrentUser } = client; + const aggIntervals = await getAggIntervals( + client, + indexPatternTitle, + query, + fields, + samplerShardSize, + runtimeMappings + ); + + const chartDataAggs = fields.reduce((aggs, field) => { + const fieldName = field.fieldName; + const fieldType = field.type; + const id = stringHash(fieldName); + if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) { + if (aggIntervals[id] !== undefined) { + aggs[`${id}_histogram`] = { + histogram: { + field: fieldName, + interval: aggIntervals[id].interval !== 0 ? aggIntervals[id].interval : 1, + }, + }; + } + } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) { + if (fieldType === KBN_FIELD_TYPES.STRING) { + aggs[`${id}_cardinality`] = { + cardinality: { + field: fieldName, + }, + }; + } + aggs[`${id}_terms`] = { + terms: { + field: fieldName, + size: MAX_CHART_COLUMNS, + }, + }; + } + return aggs; + }, {} as Record); + + if (Object.keys(chartDataAggs).length === 0) { + return []; + } + + const { body } = await asCurrentUser.search({ + index: indexPatternTitle, + size: 0, + body: { + query, + aggs: buildSamplerAggregation(chartDataAggs, samplerShardSize), + size: 0, + ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}), + }, + }); + + const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize); + const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations; + + const chartsData: ChartData[] = fields.map( + (field): ChartData => { + const fieldName = field.fieldName; + const fieldType = field.type; + const id = stringHash(field.fieldName); + + if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) { + if (aggIntervals[id] === undefined) { + return { + type: 'numeric', + data: [], + interval: 0, + stats: [0, 0], + id: fieldName, + }; + } + + return { + data: aggregations[`${id}_histogram`].buckets, + interval: aggIntervals[id].interval, + stats: [aggIntervals[id].min, aggIntervals[id].max], + type: 'numeric', + id: fieldName, + }; + } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) { + return { + type: fieldType === KBN_FIELD_TYPES.STRING ? 'ordinal' : 'boolean', + cardinality: + fieldType === KBN_FIELD_TYPES.STRING ? aggregations[`${id}_cardinality`].value : 2, + data: aggregations[`${id}_terms`].buckets, + id: fieldName, + }; + } + + return { + type: 'unsupported', + id: fieldName, + }; + } + ); + + return chartsData; +}; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts new file mode 100644 index 0000000000000..4e40c2baaf701 --- /dev/null +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts @@ -0,0 +1,108 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { last } from 'lodash'; +import { Distribution } from '../../types'; + +export const processDistributionData = ( + percentiles: Array<{ value: number }>, + percentileSpacing: number, + minValue: number +): Distribution => { + const distribution: Distribution = { percentiles: [], minPercentile: 0, maxPercentile: 100 }; + if (percentiles.length === 0) { + return distribution; + } + + let percentileBuckets: Array<{ value: number }> = []; + let lowerBound = minValue; + if (lowerBound >= 0) { + // By default return results for 0 - 90% percentiles. + distribution.minPercentile = 0; + distribution.maxPercentile = 90; + percentileBuckets = percentiles.slice(0, percentiles.length - 2); + + // Look ahead to the last percentiles and process these too if + // they don't add more than 50% to the value range. + const lastValue = (last(percentileBuckets) as any).value; + const upperBound = lowerBound + 1.5 * (lastValue - lowerBound); + const filteredLength = percentileBuckets.length; + for (let i = filteredLength; i < percentiles.length; i++) { + if (percentiles[i].value < upperBound) { + percentileBuckets.push(percentiles[i]); + distribution.maxPercentile += percentileSpacing; + } else { + break; + } + } + } else { + // By default return results for 5 - 95% percentiles. + const dataMin = lowerBound; + lowerBound = percentiles[0].value; + distribution.minPercentile = 5; + distribution.maxPercentile = 95; + percentileBuckets = percentiles.slice(1, percentiles.length - 1); + + // Add in 0-5 and 95-100% if they don't add more + // than 25% to the value range at either end. + const lastValue: number = (last(percentileBuckets) as any).value; + const maxDiff = 0.25 * (lastValue - lowerBound); + if (lowerBound - dataMin < maxDiff) { + percentileBuckets.splice(0, 0, percentiles[0]); + distribution.minPercentile = 0; + lowerBound = dataMin; + } + + if (percentiles[percentiles.length - 1].value - lastValue < maxDiff) { + percentileBuckets.push(percentiles[percentiles.length - 1]); + distribution.maxPercentile = 100; + } + } + + // Combine buckets with the same value. + const totalBuckets = percentileBuckets.length; + let lastBucketValue = lowerBound; + let numEqualValueBuckets = 0; + for (let i = 0; i < totalBuckets; i++) { + const bucket = percentileBuckets[i]; + + // Results from the percentiles aggregation can have precision rounding + // artifacts e.g returning 200 and 200.000000000123, so check for equality + // around double floating point precision i.e. 15 sig figs. + if (bucket.value.toPrecision(15) !== lastBucketValue.toPrecision(15)) { + // Create a bucket for any 'equal value' buckets which had a value <= last bucket + if (numEqualValueBuckets > 0) { + distribution.percentiles.push({ + percent: numEqualValueBuckets * percentileSpacing, + minValue: lastBucketValue, + maxValue: lastBucketValue, + }); + } + + distribution.percentiles.push({ + percent: percentileSpacing, + minValue: lastBucketValue, + maxValue: bucket.value, + }); + + lastBucketValue = bucket.value; + numEqualValueBuckets = 0; + } else { + numEqualValueBuckets++; + if (i === totalBuckets - 1) { + // If at the last bucket, create a final bucket for the equal value buckets. + distribution.percentiles.push({ + percent: numEqualValueBuckets * percentileSpacing, + minValue: lastBucketValue, + maxValue: lastBucketValue, + }); + } + } + } + + return distribution; +}; diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts index 1931535871db6..3c0f2daed7b36 100644 --- a/x-pack/plugins/data_visualizer/server/plugin.ts +++ b/x-pack/plugins/data_visualizer/server/plugin.ts @@ -5,26 +5,16 @@ * 2.0. */ -import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server'; -import { Logger } from 'kibana/server'; -import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server'; -import { StartDeps } from './types'; +import { CoreSetup, CoreStart, Plugin } from 'src/core/server'; +import { StartDeps, SetupDeps } from './types'; import { dataVisualizerRoutes } from './routes'; import { setupCapabilities } from './capabilities'; -interface SetupDeps { - usageCollection: UsageCollectionSetup; -} - export class DataVisualizerPlugin implements Plugin { - private readonly _logger: Logger; - - constructor(initializerContext: PluginInitializerContext) { - this._logger = initializerContext.logger.get(); - } + constructor() {} async setup(coreSetup: CoreSetup, plugins: SetupDeps) { - dataVisualizerRoutes(coreSetup, this._logger); + dataVisualizerRoutes(coreSetup); setupCapabilities(coreSetup); } diff --git a/x-pack/plugins/data_visualizer/server/routes/routes.ts b/x-pack/plugins/data_visualizer/server/routes/routes.ts index 0488fc5efe288..8f6bee79c77a9 100644 --- a/x-pack/plugins/data_visualizer/server/routes/routes.ts +++ b/x-pack/plugins/data_visualizer/server/routes/routes.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { CoreSetup, IScopedClusterClient, Logger } from 'kibana/server'; +import type { CoreSetup, IScopedClusterClient } from 'kibana/server'; import { estypes } from '@elastic/elasticsearch'; import { dataVisualizerFieldHistogramsSchema, @@ -13,8 +13,8 @@ import { dataVisualizerOverallStatsSchema, indexPatternTitleSchema, } from './schemas'; -import { DataVisualizer, Field, HistogramField } from '../models/data_visualizer'; -import type { StartDeps } from '../types'; +import type { Field, StartDeps, HistogramField } from '../types'; +import { DataVisualizer } from '../models/data_visualizer'; import { wrapError } from '../utils/error_wrapper'; function getOverallStats( @@ -91,7 +91,7 @@ function getHistogramsForFields( /** * Routes for the index data visualizer. */ -export function dataVisualizerRoutes(coreSetup: CoreSetup, logger: Logger) { +export function dataVisualizerRoutes(coreSetup: CoreSetup) { const router = coreSetup.http.createRouter(); /** @@ -134,7 +134,6 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: results, }); } catch (e) { - logger.warn(e); return response.customError(wrapError(e)); } } @@ -194,7 +193,6 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: results, }); } catch (e) { - logger.warn(e); return response.customError(wrapError(e)); } } @@ -257,7 +255,6 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup, l body: results, }); } catch (e) { - logger.warn(e); return response.customError(wrapError(e)); } } diff --git a/x-pack/plugins/data_visualizer/server/types/chart_data.ts b/x-pack/plugins/data_visualizer/server/types/chart_data.ts new file mode 100644 index 0000000000000..99c23cf88b5ba --- /dev/null +++ b/x-pack/plugins/data_visualizer/server/types/chart_data.ts @@ -0,0 +1,168 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface FieldData { + fieldName: string; + existsInDocs: boolean; + stats?: { + sampleCount?: number; + count?: number; + cardinality?: number; + }; +} + +export interface Field { + fieldName: string; + type: string; + cardinality: number; +} + +export interface HistogramField { + fieldName: string; + type: string; +} + +export interface Distribution { + percentiles: any[]; + minPercentile: number; + maxPercentile: number; +} + +export interface Aggs { + [key: string]: any; +} + +export interface Bucket { + doc_count: number; +} + +export interface NumericFieldStats { + fieldName: string; + count: number; + min: number; + max: number; + avg: number; + isTopValuesSampled: boolean; + topValues: Bucket[]; + topValuesSampleSize: number; + topValuesSamplerShardSize: number; + median?: number; + distribution?: Distribution; +} + +export interface StringFieldStats { + fieldName: string; + isTopValuesSampled: boolean; + topValues: Bucket[]; + topValuesSampleSize: number; + topValuesSamplerShardSize: number; +} + +export interface DateFieldStats { + fieldName: string; + count: number; + earliest: number; + latest: number; +} + +export interface BooleanFieldStats { + fieldName: string; + count: number; + trueCount: number; + falseCount: number; + [key: string]: number | string; +} + +export interface DocumentCountStats { + documentCounts: { + interval: number; + buckets: { [key: string]: number }; + }; +} + +export interface FieldExamples { + fieldName: string; + examples: any[]; +} + +export interface NumericColumnStats { + interval: number; + min: number; + max: number; +} +export type NumericColumnStatsMap = Record; + +export interface AggHistogram { + histogram: { + field: string; + interval: number; + }; +} + +export interface AggTerms { + terms: { + field: string; + size: number; + }; +} + +export interface NumericDataItem { + key: number; + key_as_string?: string; + doc_count: number; +} + +export interface NumericChartData { + data: NumericDataItem[]; + id: string; + interval: number; + stats: [number, number]; + type: 'numeric'; +} + +export interface OrdinalDataItem { + key: string; + key_as_string?: string; + doc_count: number; +} + +export interface OrdinalChartData { + type: 'ordinal' | 'boolean'; + cardinality: number; + data: OrdinalDataItem[]; + id: string; +} + +export interface UnsupportedChartData { + id: string; + type: 'unsupported'; +} + +export interface FieldAggCardinality { + field: string; + percent?: any; +} + +export interface ScriptAggCardinality { + script: any; +} + +export interface AggCardinality { + cardinality: FieldAggCardinality | ScriptAggCardinality; +} + +export type ChartRequestAgg = AggHistogram | AggCardinality | AggTerms; + +export type ChartData = NumericChartData | OrdinalChartData | UnsupportedChartData; + +export type BatchStats = + | NumericFieldStats + | StringFieldStats + | BooleanFieldStats + | DateFieldStats + | DocumentCountStats + | FieldExamples; diff --git a/x-pack/plugins/data_visualizer/server/types/deps.ts b/x-pack/plugins/data_visualizer/server/types/deps.ts index 9dec735123ad1..fe982b1fa5e1a 100644 --- a/x-pack/plugins/data_visualizer/server/types/deps.ts +++ b/x-pack/plugins/data_visualizer/server/types/deps.ts @@ -5,8 +5,12 @@ * 2.0. */ -import { SecurityPluginStart } from '../../../security/server'; +import type { SecurityPluginStart } from '../../../security/server'; +import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server'; export interface StartDeps { security?: SecurityPluginStart; } +export interface SetupDeps { + usageCollection: UsageCollectionSetup; +} diff --git a/x-pack/plugins/data_visualizer/server/types/index.ts b/x-pack/plugins/data_visualizer/server/types/index.ts index 4897886976175..e0379b514de32 100644 --- a/x-pack/plugins/data_visualizer/server/types/index.ts +++ b/x-pack/plugins/data_visualizer/server/types/index.ts @@ -4,5 +4,5 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ - -export { StartDeps } from './deps'; +export * from './deps'; +export * from './chart_data'; diff --git a/x-pack/plugins/file_upload/server/plugin.ts b/x-pack/plugins/file_upload/server/plugin.ts index aaf21ed2aa2ec..36e00d56a8f68 100644 --- a/x-pack/plugins/file_upload/server/plugin.ts +++ b/x-pack/plugins/file_upload/server/plugin.ts @@ -12,8 +12,12 @@ import { fileUploadRoutes } from './routes'; import { initFileUploadTelemetry } from './telemetry'; import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server'; import { UI_SETTING_MAX_FILE_SIZE, MAX_FILE_SIZE } from '../common'; -import { StartDeps } from './types'; import { setupCapabilities } from './capabilities'; +import { SecurityPluginStart } from '../../security/server'; + +export interface StartDeps { + security?: SecurityPluginStart; +} interface SetupDeps { usageCollection: UsageCollectionSetup; From 76a7b5be53d35a278864f9cd7ba3612196daa73a Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 13:04:04 -0500 Subject: [PATCH 46/53] [ML] Remove empty file and indexPatternFieldEditor --- x-pack/plugins/data_visualizer/kibana.json | 1 - .../common/components/expanded_row/types.ts | 6 ------ .../file_data_visualizer/file_data_visualizer.tsx | 11 +---------- .../index_data_visualizer/index_data_visualizer.tsx | 11 +---------- x-pack/plugins/data_visualizer/public/plugin.ts | 1 - 5 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/types.ts diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json index 7d4887912ac9e..76a5e976d5260 100644 --- a/x-pack/plugins/data_visualizer/kibana.json +++ b/x-pack/plugins/data_visualizer/kibana.json @@ -17,7 +17,6 @@ "maps", "home", "lens", - "indexPatternFieldEditor" ], "requiredBundles": [ "kibanaReact", diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/types.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/types.ts deleted file mode 100644 index 1fec1c76430eb..0000000000000 --- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/types.ts +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx index ca5565d809dc1..b3f7e8531ebf5 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx @@ -15,15 +15,7 @@ import { FileDataVisualizerView } from './components/file_data_visualizer_view/i export type FileDataVisualizerSpec = typeof FileDataVisualizer; export const FileDataVisualizer: FC = () => { const coreStart = getCoreStart(); - const { - data, - maps, - embeddable, - share, - security, - fileUpload, - indexPatternFieldEditor, - } = getPluginsStart(); + const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); const services = { data, maps, @@ -31,7 +23,6 @@ export const FileDataVisualizer: FC = () => { share, security, fileUpload, - indexPatternFieldEditor, ...coreStart, }; diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index 78a486e15bea7..a14d2145f2d8b 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -178,15 +178,7 @@ export const DataVisualizerUrlStateContextProvider: FC { const coreStart = getCoreStart(); - const { - data, - maps, - embeddable, - share, - security, - fileUpload, - indexPatternFieldEditor, - } = getPluginsStart(); + const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); const services = { data, maps, @@ -194,7 +186,6 @@ export const IndexDataVisualizer: FC = () => { share, security, fileUpload, - indexPatternFieldEditor, ...coreStart, }; diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts index 477c0b5273e42..bf262486ec620 100644 --- a/x-pack/plugins/data_visualizer/public/plugin.ts +++ b/x-pack/plugins/data_visualizer/public/plugin.ts @@ -33,7 +33,6 @@ export interface DataVisualizerStartDependencies { security?: SecurityPluginSetup; share: SharePluginStart; lens?: LensPublicStart; - indexPatternFieldEditor?: IndexPatternFieldEditorStart; } export type DataVisualizerPluginSetup = ReturnType; From 836b5eb714e2d9edd5c83be475b59c1bda1395f0 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 14:27:28 -0500 Subject: [PATCH 47/53] [ML] Move imports of file_upload --- x-pack/plugins/file_upload/server/plugin.ts | 11 +---------- x-pack/plugins/file_upload/server/types.ts | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 x-pack/plugins/file_upload/server/types.ts diff --git a/x-pack/plugins/file_upload/server/plugin.ts b/x-pack/plugins/file_upload/server/plugin.ts index 36e00d56a8f68..c729afec92f94 100644 --- a/x-pack/plugins/file_upload/server/plugin.ts +++ b/x-pack/plugins/file_upload/server/plugin.ts @@ -10,18 +10,9 @@ import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from ' import { schema } from '@kbn/config-schema'; import { fileUploadRoutes } from './routes'; import { initFileUploadTelemetry } from './telemetry'; -import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server'; import { UI_SETTING_MAX_FILE_SIZE, MAX_FILE_SIZE } from '../common'; import { setupCapabilities } from './capabilities'; -import { SecurityPluginStart } from '../../security/server'; - -export interface StartDeps { - security?: SecurityPluginStart; -} - -interface SetupDeps { - usageCollection: UsageCollectionSetup; -} +import { StartDeps, SetupDeps } from './types'; export class FileUploadPlugin implements Plugin { private readonly _logger: Logger; diff --git a/x-pack/plugins/file_upload/server/types.ts b/x-pack/plugins/file_upload/server/types.ts new file mode 100644 index 0000000000000..241abadaf750f --- /dev/null +++ b/x-pack/plugins/file_upload/server/types.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { SecurityPluginStart } from '../..//security/server'; +import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server'; + +export interface StartDeps { + security?: SecurityPluginStart; +} + +export interface SetupDeps { + usageCollection: UsageCollectionSetup; +} From 267d3b701da550f763fb42718aaa1716f2a8d6a5 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 14:31:03 -0500 Subject: [PATCH 48/53] [ML] Update plugin dependencies --- x-pack/plugins/data_visualizer/kibana.json | 2 +- .../index_data_visualizer/index_data_visualizer.tsx | 3 ++- x-pack/plugins/data_visualizer/public/plugin.ts | 1 - x-pack/plugins/data_visualizer/server/index.ts | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json index 76a5e976d5260..3934f0ee3417f 100644 --- a/x-pack/plugins/data_visualizer/kibana.json +++ b/x-pack/plugins/data_visualizer/kibana.json @@ -16,7 +16,7 @@ "security", "maps", "home", - "lens", + "lens" ], "requiredBundles": [ "kibanaReact", diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index a14d2145f2d8b..82a9b93b31a71 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -178,7 +178,7 @@ export const DataVisualizerUrlStateContextProvider: FC { const coreStart = getCoreStart(); - const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); + const { data, maps, embeddable, share, security, fileUpload, lens } = getPluginsStart(); const services = { data, maps, @@ -186,6 +186,7 @@ export const IndexDataVisualizer: FC = () => { share, security, fileUpload, + lens, ...coreStart, }; diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts index bf262486ec620..20d2e93fd6879 100644 --- a/x-pack/plugins/data_visualizer/public/plugin.ts +++ b/x-pack/plugins/data_visualizer/public/plugin.ts @@ -17,7 +17,6 @@ import type { FileUploadPluginStart } from '../../file_upload/public'; import type { MapsStartApi } from '../../maps/public'; import type { SecurityPluginSetup } from '../../security/public'; import type { LensPublicStart } from '../../lens/public'; -import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/index_pattern_field_editor/public'; import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api'; import { getMaxBytesFormatted } from './application/common/util/get_max_bytes'; import { registerHomeAddData } from './register_home'; diff --git a/x-pack/plugins/data_visualizer/server/index.ts b/x-pack/plugins/data_visualizer/server/index.ts index 2d7449a0c5a48..f88303829c558 100644 --- a/x-pack/plugins/data_visualizer/server/index.ts +++ b/x-pack/plugins/data_visualizer/server/index.ts @@ -8,5 +8,4 @@ import { PluginInitializerContext } from 'kibana/server'; import { DataVisualizerPlugin } from './plugin'; -export const plugin = (initializerContext: PluginInitializerContext) => - new DataVisualizerPlugin(initializerContext); +export const plugin = (initializerContext: PluginInitializerContext) => new DataVisualizerPlugin(); From 5149bf57c5a7fee391f773c0320b4993ac27bbf4 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 14:52:49 -0500 Subject: [PATCH 49/53] Re-add missing data_visualizer.json --- api_docs/{file_data_visualizer.json => data_visualizer.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename api_docs/{file_data_visualizer.json => data_visualizer.json} (100%) diff --git a/api_docs/file_data_visualizer.json b/api_docs/data_visualizer.json similarity index 100% rename from api_docs/file_data_visualizer.json rename to api_docs/data_visualizer.json From b043d6e98d44e5338aa44065d48328e38e3bbb11 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 15:23:56 -0500 Subject: [PATCH 50/53] Remove capabilities in data_visualizer --- .../data_visualizer/server/capabilities.ts | 25 ------------------- .../plugins/data_visualizer/server/plugin.ts | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 x-pack/plugins/data_visualizer/server/capabilities.ts diff --git a/x-pack/plugins/data_visualizer/server/capabilities.ts b/x-pack/plugins/data_visualizer/server/capabilities.ts deleted file mode 100644 index 9fb8eef3ed0d8..0000000000000 --- a/x-pack/plugins/data_visualizer/server/capabilities.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { CoreSetup } from 'kibana/server'; -import { StartDeps } from './types'; - -export const setupCapabilities = ( - core: Pick, 'capabilities' | 'getStartServices'> -) => { - core.capabilities.registerProvider(() => { - return { - dataVisualizer: { - show: true, - }, - }; - }); - - core.capabilities.registerSwitcher(async (request, capabilities, useDefaultCapabilities) => { - return capabilities; - }); -}; diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts index 3c0f2daed7b36..4ae695b05b81f 100644 --- a/x-pack/plugins/data_visualizer/server/plugin.ts +++ b/x-pack/plugins/data_visualizer/server/plugin.ts @@ -8,14 +8,12 @@ import { CoreSetup, CoreStart, Plugin } from 'src/core/server'; import { StartDeps, SetupDeps } from './types'; import { dataVisualizerRoutes } from './routes'; -import { setupCapabilities } from './capabilities'; export class DataVisualizerPlugin implements Plugin { constructor() {} async setup(coreSetup: CoreSetup, plugins: SetupDeps) { dataVisualizerRoutes(coreSetup); - setupCapabilities(coreSetup); } start(core: CoreStart) {} From ee5f8ab3f405715b86d4dd1be23aadba9b767af0 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Mon, 7 Jun 2021 16:26:31 -0500 Subject: [PATCH 51/53] Fix test subjs --- .../services/ml/data_frame_analytics_creation.ts | 14 +++++--------- .../test/functional/services/transform/wizard.ts | 16 ++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts index 1fe07955a02e2..b22748608589e 100644 --- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts +++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts @@ -146,25 +146,21 @@ export function MachineLearningDataFrameAnalyticsCreationProvider( await retry.tryForTime(5000, async () => { for (const expected of expectedHistogramCharts.values()) { const id = expected.id; - await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}`); + await testSubjects.existOrFail(`mlDataGridChart-${id}`); if (expected.chartAvailable) { - await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}-histogram`); + await testSubjects.existOrFail(`mlDataGridChart-${id}-histogram`); } else { - await testSubjects.missingOrFail(`dataVisualizerDataGridChart-${id}-histogram`); + await testSubjects.missingOrFail(`mlDataGridChart-${id}-histogram`); } - const actualLegend = await testSubjects.getVisibleText( - `dataVisualizerDataGridChart-${id}-legend` - ); + const actualLegend = await testSubjects.getVisibleText(`mlDataGridChart-${id}-legend`); expect(actualLegend).to.eql( expected.legend, `Legend text for column '${id}' should be '${expected.legend}' (got '${actualLegend}')` ); - const actualId = await testSubjects.getVisibleText( - `dataVisualizerDataGridChart-${id}-id` - ); + const actualId = await testSubjects.getVisibleText(`mlDataGridChart-${id}-id`); expect(actualId).to.eql( expected.id, `Id text for column '${id}' should be '${expected.id}' (got '${actualId}')` diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts index c8b3cd3cf5049..4869237eb7db4 100644 --- a/x-pack/test/functional/services/transform/wizard.ts +++ b/x-pack/test/functional/services/transform/wizard.ts @@ -255,10 +255,10 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi for (const expected of expectedHistogramCharts.values()) { const id = expected.id; - await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}`); + await testSubjects.existOrFail(`mlDataGridChart-${id}`); if (expected.chartAvailable) { - await testSubjects.existOrFail(`dataVisualizerDataGridChart-${id}-histogram`); + await testSubjects.existOrFail(`mlDataGridChart-${id}-histogram`); if (expected.colorStats !== undefined) { const sortedExpectedColorStats = [...expected.colorStats].sort((a, b) => @@ -266,7 +266,7 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi ); const actualColorStats = await canvasElement.getColorStats( - `[data-test-subj="dataVisualizerDataGridChart-${id}-histogram"] .echCanvasRenderer`, + `[data-test-subj="mlDataGridChart-${id}-histogram"] .echCanvasRenderer`, sortedExpectedColorStats, undefined, 10 @@ -292,22 +292,18 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi ); } } else { - await testSubjects.missingOrFail(`dataVisualizerDataGridChart-${id}-histogram`); + await testSubjects.missingOrFail(`mlDataGridChart-${id}-histogram`); } if (expected.legend !== undefined) { - const actualLegend = await testSubjects.getVisibleText( - `dataVisualizerDataGridChart-${id}-legend` - ); + const actualLegend = await testSubjects.getVisibleText(`mlDataGridChart-${id}-legend`); expect(actualLegend).to.eql( expected.legend, `Legend text for column '${expected.id}' should be '${expected.legend}' (got '${actualLegend}')` ); } - const actualId = await testSubjects.getVisibleText( - `dataVisualizerDataGridChart-${id}-id` - ); + const actualId = await testSubjects.getVisibleText(`mlDataGridChart-${id}-id`); expect(actualId).to.eql( expected.id, `Id text for column '${id}' should be '${expected.id}' (got '${actualId}')` From d978ee2c9d29cf0026bf7abfa091f71bd0e208a6 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Tue, 8 Jun 2021 10:23:18 -0500 Subject: [PATCH 52/53] Update ownership for data_visualizer and file_upload code to be ml --- .github/CODEOWNERS | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0cf5fc4e0dfd0..a017c79309a56 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -130,6 +130,8 @@ # ML team owns and maintains the transform plugin despite it living in the Data management section. /x-pack/plugins/transform/ @elastic/ml-ui +/x-pack/plugins/data_visualizer/ @elastic/ml-ui +/x-pack/plugins/file_upload/ @elastic/ml-ui /x-pack/test/accessibility/apps/transform.ts @elastic/ml-ui /x-pack/test/api_integration/apis/transform/ @elastic/ml-ui /x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui @@ -306,28 +308,28 @@ /x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend # Stack Management -/src/plugins/dev_tools/ @elastic/kibana-stack-management -/src/plugins/console/ @elastic/kibana-stack-management -/src/plugins/es_ui_shared/ @elastic/kibana-stack-management -/x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management -/x-pack/plugins/index_lifecycle_management/ @elastic/kibana-stack-management -/x-pack/plugins/console_extensions/ @elastic/kibana-stack-management -/x-pack/plugins/grokdebugger/ @elastic/kibana-stack-management -/x-pack/plugins/index_management/ @elastic/kibana-stack-management -/x-pack/plugins/license_api_guard/ @elastic/kibana-stack-management -/x-pack/plugins/license_management/ @elastic/kibana-stack-management -/x-pack/plugins/painless_lab/ @elastic/kibana-stack-management -/x-pack/plugins/remote_clusters/ @elastic/kibana-stack-management -/x-pack/plugins/rollup/ @elastic/kibana-stack-management -/x-pack/plugins/searchprofiler/ @elastic/kibana-stack-management -/x-pack/plugins/snapshot_restore/ @elastic/kibana-stack-management -/x-pack/plugins/upgrade_assistant/ @elastic/kibana-stack-management -/x-pack/plugins/watcher/ @elastic/kibana-stack-management -/x-pack/plugins/ingest_pipelines/ @elastic/kibana-stack-management -/packages/kbn-ace/ @elastic/kibana-stack-management -/packages/kbn-monaco/ @elastic/kibana-stack-management -#CC# /x-pack/plugins/console_extensions/ @elastic/kibana-stack-management -#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management +/src/plugins/dev_tools/ @elastic/kibana-stack-management +/src/plugins/console/ @elastic/kibana-stack-management +/src/plugins/es_ui_shared/ @elastic/kibana-stack-management +/x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management +/x-pack/plugins/index_lifecycle_management/ @elastic/kibana-stack-management +/x-pack/plugins/console_extensions/ @elastic/kibana-stack-management +/x-pack/plugins/grokdebugger/ @elastic/kibana-stack-management +/x-pack/plugins/index_management/ @elastic/kibana-stack-management +/x-pack/plugins/license_api_guard/ @elastic/kibana-stack-management +/x-pack/plugins/license_management/ @elastic/kibana-stack-management +/x-pack/plugins/painless_lab/ @elastic/kibana-stack-management +/x-pack/plugins/remote_clusters/ @elastic/kibana-stack-management +/x-pack/plugins/rollup/ @elastic/kibana-stack-management +/x-pack/plugins/searchprofiler/ @elastic/kibana-stack-management +/x-pack/plugins/snapshot_restore/ @elastic/kibana-stack-management +/x-pack/plugins/upgrade_assistant/ @elastic/kibana-stack-management +/x-pack/plugins/watcher/ @elastic/kibana-stack-management +/x-pack/plugins/ingest_pipelines/ @elastic/kibana-stack-management +/packages/kbn-ace/ @elastic/kibana-stack-management +/packages/kbn-monaco/ @elastic/kibana-stack-management +#CC# /x-pack/plugins/console_extensions/ @elastic/kibana-stack-management +#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management # Security Solution /x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution From 71e4db8574a0509c8f6fed0532233d6991861a5c Mon Sep 17 00:00:00 2001 From: Quynh Nguyen Date: Tue, 8 Jun 2021 12:32:17 -0500 Subject: [PATCH 53/53] Update estypes after 98266 --- .../common/utils/datafeed_utils.ts | 4 ++-- .../common/utils/query_utils.ts | 2 +- .../common/utils/runtime_field_utils.ts | 4 ++-- .../full_time_range_selector_service.ts | 3 ++- .../data_loader/data_loader.ts | 4 ++-- .../services/time_field_range.ts | 2 +- .../services/visualizer_stats.ts | 4 ++-- .../data_visualizer/check_fields_exist.ts | 8 +++---- .../models/data_visualizer/data_visualizer.ts | 24 +++++++++---------- .../data_visualizer/get_field_examples.ts | 2 +- .../data_visualizer/get_fields_stats.ts | 10 ++++---- .../get_histogram_for_fields.ts | 4 ++-- .../data_visualizer/server/routes/routes.ts | 6 ++--- .../server/get_time_field_range.ts | 2 +- .../server/utils/runtime_field_utils.ts | 4 ++-- 15 files changed, 42 insertions(+), 41 deletions(-) diff --git a/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts b/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts index 14e679c519ce4..bccd40ed43b0c 100644 --- a/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts +++ b/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts @@ -7,8 +7,8 @@ import { estypes } from '@elastic/elasticsearch'; -export type Datafeed = estypes.Datafeed; -export type Aggregation = Record; +export type Datafeed = estypes.MlDatafeed; +export type Aggregation = Record; export function getAggregations(obj: any): T | undefined { if (obj?.aggregations !== undefined) return obj.aggregations; diff --git a/x-pack/plugins/data_visualizer/common/utils/query_utils.ts b/x-pack/plugins/data_visualizer/common/utils/query_utils.ts index 50f9b24373922..d2785072f419d 100644 --- a/x-pack/plugins/data_visualizer/common/utils/query_utils.ts +++ b/x-pack/plugins/data_visualizer/common/utils/query_utils.ts @@ -44,7 +44,7 @@ export function buildBaseFilterCriteria( export function buildSamplerAggregation( aggs: any, samplerShardSize: number -): Record { +): Record { if (samplerShardSize < 1) { return aggs; } diff --git a/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts index 1ddaca7fe2069..fbe4ae5c6faf1 100644 --- a/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts +++ b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts @@ -10,7 +10,7 @@ import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common'; type RuntimeType = typeof RUNTIME_FIELD_TYPES[number]; -export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField { +export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField { return ( ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) || (isPopulatedObject(arg, ['type', 'script']) && @@ -23,6 +23,6 @@ export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField { ); } -export function isRuntimeMappings(arg: unknown): arg is estypes.RuntimeFields { +export function isRuntimeMappings(arg: unknown): arg is estypes.MappingRuntimeFields { return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d)); } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts index 298ab4ff54984..198079c6ec9de 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts @@ -24,7 +24,8 @@ export async function setFullTimeRange( indexPattern: IndexPattern, query?: Query ): Promise { - const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields; + const runtimeMappings = indexPattern.getComputedFields() + .runtimeFields as estypes.MappingRuntimeFields; const resp = await getTimeFieldRange({ index: indexPattern.title, timeFieldName: indexPattern.timeFieldName, diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts index a41ae75031124..3cb0d4d672f48 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts @@ -22,7 +22,7 @@ const MAX_EXAMPLES_DEFAULT: number = 10; export class DataLoader { private _indexPattern: IndexPattern; - private _runtimeMappings: estypes.RuntimeFields; + private _runtimeMappings: estypes.MappingRuntimeFields; private _indexPatternTitle: IndexPatternTitle = ''; private _maxExamples: number = MAX_EXAMPLES_DEFAULT; private _toastNotifications: CoreSetup['notifications']['toasts']; @@ -33,7 +33,7 @@ export class DataLoader { ) { this._indexPattern = indexPattern; this._runtimeMappings = this._indexPattern.getComputedFields() - .runtimeFields as estypes.RuntimeFields; + .runtimeFields as estypes.MappingRuntimeFields; this._indexPatternTitle = indexPattern.title; this._toastNotifications = toastNotifications; } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts index ad831e447419c..87d4a3b7fb711 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts @@ -19,7 +19,7 @@ export async function getTimeFieldRange({ index: string; timeFieldName?: string; query?: Query; - runtimeMappings?: estypes.RuntimeFields; + runtimeMappings?: estypes.MappingRuntimeFields; }) { const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings }); const fileUploadModules = await lazyLoadModules(); diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts index c6a4c6537f3b7..8db267a1dc837 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts @@ -33,7 +33,7 @@ export async function getVisualizerOverallStats({ samplerShardSize?: number; aggregatableFields: string[]; nonAggregatableFields: string[]; - runtimeMappings?: estypes.RuntimeFields; + runtimeMappings?: estypes.MappingRuntimeFields; }) { const body = JSON.stringify({ query, @@ -75,7 +75,7 @@ export async function getVisualizerFieldStats({ interval?: number; fields?: FieldRequestConfig[]; maxExamples?: number; - runtimeMappings?: estypes.RuntimeFields; + runtimeMappings?: estypes.MappingRuntimeFields; }) { const body = JSON.stringify({ query, diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts index 20fe7c5bc3029..ca7287394b8e3 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts @@ -27,8 +27,8 @@ export const checkAggregatableFieldsExist = async ( timeFieldName: string | undefined, earliestMs?: number, latestMs?: number, - datafeedConfig?: estypes.Datafeed, - runtimeMappings?: estypes.RuntimeFields + datafeedConfig?: estypes.MlDatafeed, + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; @@ -42,7 +42,7 @@ export const checkAggregatableFieldsExist = async ( const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {}; // Combine runtime fields from the index pattern as well as the datafeed - const combinedRuntimeMappings: estypes.RuntimeFields = { + const combinedRuntimeMappings: estypes.MappingRuntimeFields = { ...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}), ...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings) ? datafeedConfig.runtime_mappings @@ -156,7 +156,7 @@ export const checkNonAggregatableFieldExists = async ( timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; const index = indexPatternTitle; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts index 3d73ad923e535..27c09c889deb7 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts @@ -52,7 +52,7 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) { const stats = { totalCount: 0, @@ -134,7 +134,7 @@ export class DataVisualizer { query: any, fields: HistogramField[], samplerShardSize: number, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ): Promise { return await getHistogramsForFields( this._client, @@ -159,7 +159,7 @@ export class DataVisualizer { latestMs: number | undefined, intervalMs: number | undefined, maxExamples: number, - runtimeMappings: estypes.RuntimeFields + runtimeMappings: estypes.MappingRuntimeFields ): Promise { // Batch up fields by type, getting stats for multiple fields at a time. const batches: Field[][] = []; @@ -299,8 +299,8 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs?: number, latestMs?: number, - datafeedConfig?: estypes.Datafeed, - runtimeMappings?: estypes.RuntimeFields + datafeedConfig?: estypes.MlDatafeed, + runtimeMappings?: estypes.MappingRuntimeFields ) { return await checkAggregatableFieldsExist( this._client, @@ -323,7 +323,7 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) { return await checkNonAggregatableFieldExists( this._client, @@ -344,7 +344,7 @@ export class DataVisualizer { earliestMs: number | undefined, latestMs: number | undefined, intervalMs: number, - runtimeMappings: estypes.RuntimeFields + runtimeMappings: estypes.MappingRuntimeFields ): Promise { return await getDocumentCountStats( this._client, @@ -366,7 +366,7 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) { return await getNumericFieldsStats( this._client, @@ -389,7 +389,7 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) { return await getStringFieldsStats( this._client, @@ -412,7 +412,7 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) { return await getDateFieldsStats( this._client, @@ -435,7 +435,7 @@ export class DataVisualizer { timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) { return await getBooleanFieldsStats( this._client, @@ -458,7 +458,7 @@ export class DataVisualizer { earliestMs: number | undefined, latestMs: number | undefined, maxExamples: number, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ): Promise { return await getFieldExamples( this._client, diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts index 060434123bfeb..69476e254068f 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts @@ -21,7 +21,7 @@ export const getFieldExamples = async ( earliestMs: number | undefined, latestMs: number | undefined, maxExamples: number, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ): Promise => { const { asCurrentUser } = client; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts index 3305f8ebda45a..6968aa97ab938 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts @@ -36,7 +36,7 @@ export const getDocumentCountStats = async ( earliestMs: number | undefined, latestMs: number | undefined, intervalMs: number, - runtimeMappings: estypes.RuntimeFields + runtimeMappings: estypes.MappingRuntimeFields ): Promise => { const { asCurrentUser } = client; @@ -101,7 +101,7 @@ export const getNumericFieldsStats = async ( timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; const index = indexPatternTitle; @@ -248,7 +248,7 @@ export const getStringFieldsStats = async ( timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; @@ -342,7 +342,7 @@ export const getDateFieldsStats = async ( timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; @@ -413,7 +413,7 @@ export const getBooleanFieldsStats = async ( timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts index c630c0ad5c1e4..b8f6e2f538180 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts @@ -24,7 +24,7 @@ export const getAggIntervals = async ( query: any, fields: HistogramField[], samplerShardSize: number, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ): Promise => { const numericColumns = fields.filter((field) => { return field.type === KBN_FIELD_TYPES.NUMBER || field.type === KBN_FIELD_TYPES.DATE; @@ -82,7 +82,7 @@ export const getHistogramsForFields = async ( query: any, fields: HistogramField[], samplerShardSize: number, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ) => { const { asCurrentUser } = client; const aggIntervals = await getAggIntervals( diff --git a/x-pack/plugins/data_visualizer/server/routes/routes.ts b/x-pack/plugins/data_visualizer/server/routes/routes.ts index 8f6bee79c77a9..13a0031a25dfd 100644 --- a/x-pack/plugins/data_visualizer/server/routes/routes.ts +++ b/x-pack/plugins/data_visualizer/server/routes/routes.ts @@ -27,7 +27,7 @@ function getOverallStats( timeFieldName: string | undefined, earliestMs: number | undefined, latestMs: number | undefined, - runtimeMappings: estypes.RuntimeFields + runtimeMappings: estypes.MappingRuntimeFields ) { const dv = new DataVisualizer(client); return dv.getOverallStats( @@ -54,7 +54,7 @@ function getStatsForFields( latestMs: number | undefined, interval: number | undefined, maxExamples: number, - runtimeMappings: estypes.RuntimeFields + runtimeMappings: estypes.MappingRuntimeFields ) { const dv = new DataVisualizer(client); return dv.getStatsForFields( @@ -77,7 +77,7 @@ function getHistogramsForFields( query: any, fields: HistogramField[], samplerShardSize: number, - runtimeMappings: estypes.RuntimeFields + runtimeMappings: estypes.MappingRuntimeFields ) { const dv = new DataVisualizer(client); return dv.getHistogramsForFields( diff --git a/x-pack/plugins/file_upload/server/get_time_field_range.ts b/x-pack/plugins/file_upload/server/get_time_field_range.ts index 988622335a939..0e8358f1671d0 100644 --- a/x-pack/plugins/file_upload/server/get_time_field_range.ts +++ b/x-pack/plugins/file_upload/server/get_time_field_range.ts @@ -13,7 +13,7 @@ export async function getTimeFieldRange( index: string[] | string, timeFieldName: string, query: any, - runtimeMappings?: estypes.RuntimeFields + runtimeMappings?: estypes.MappingRuntimeFields ): Promise<{ success: boolean; start: { epoch: number; string: string }; diff --git a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts index 7742918ac66e6..921741110d2a3 100644 --- a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts +++ b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts @@ -23,7 +23,7 @@ export const isPopulatedObject = ( ); }; -export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField { +export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField { return ( ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) || (isPopulatedObject(arg, ['type', 'script']) && @@ -36,6 +36,6 @@ export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField { ); } -export function isRuntimeMappings(arg: unknown): arg is estypes.RuntimeFields { +export function isRuntimeMappings(arg: unknown): arg is estypes.MappingRuntimeFields { return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d)); }
{chartData.data[0].key_as_string}