mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 09:19:04 -04:00
## Summary This removes all the areas marked as deprecated from `.../src/plugins/data/public` with their `@kbn/es-query` equivalent or it uses the directly exported version from `.../src/plugins/data/public`. Anywhere else this adds the `import type {` where it can to encourage the build system to do more type erasures. ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios Co-authored-by: Frank Hassanabad <frank.hassanabad@elastic.co>
This commit is contained in:
parent
3d8906ad58
commit
15a577dae3
30 changed files with 48 additions and 56 deletions
|
@ -10,9 +10,9 @@ import type { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesW
|
|||
import type {
|
||||
IEsSearchRequest,
|
||||
IEsSearchResponse,
|
||||
FieldSpec,
|
||||
} from '../../../../../../src/plugins/data/common';
|
||||
import type { DocValueFields, Maybe } from '../common';
|
||||
import { FieldSpec } from '../../../../../../src/plugins/data/common';
|
||||
|
||||
export type BeatFieldsFactoryQueryType = 'beatFields';
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
import { JsonObject } from '@kbn/utility-types';
|
||||
|
||||
import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
|
||||
import { Inspect, Maybe } from '../../../common';
|
||||
import { TimelineRequestOptionsPaginated } from '../..';
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
import { EuiComboBoxOptionOption } from '@elastic/eui';
|
||||
import {
|
||||
import type {
|
||||
EqlSearchStrategyRequest,
|
||||
EqlSearchStrategyResponse,
|
||||
} from '../../../../../../../../src/plugins/data/common';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
|
||||
import { Inspect, Maybe } from '../../../common';
|
||||
import { TimelineRequestBasicOptions } from '../..';
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
|
||||
import { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
|
||||
import { ESQuery } from '../../typed_json';
|
||||
import {
|
||||
TimelineEventsQueries,
|
||||
|
|
|
@ -6,9 +6,8 @@
|
|||
*/
|
||||
|
||||
import { EuiDataGridCellValueElementProps } from '@elastic/eui';
|
||||
import type { Filter } from '@kbn/es-query';
|
||||
import { RowRenderer } from '../../..';
|
||||
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
|
||||
import { Filter } from '../../../../../../../src/plugins/data/public';
|
||||
import { Ecs } from '../../../ecs';
|
||||
import { BrowserFields, TimelineNonEcsData } from '../../../search_strategy';
|
||||
import { ColumnHeaderOptions } from '../columns';
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
import { ReactNode } from 'react';
|
||||
|
||||
import { EuiDataGridColumn, EuiDataGridColumnCellActionProps } from '@elastic/eui';
|
||||
import { IFieldSubType } from '../../../../../../../src/plugins/data/common';
|
||||
import type { IFieldSubType } from '@kbn/es-query';
|
||||
import { BrowserFields } from '../../../search_strategy/index_fields';
|
||||
import { TimelineNonEcsData } from '../../../search_strategy/timeline';
|
||||
import { Ecs } from '../../../ecs';
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import type { Filter } from '@kbn/es-query';
|
||||
import {
|
||||
ColumnHeaderOptions,
|
||||
ColumnId,
|
||||
|
@ -13,8 +14,6 @@ import {
|
|||
TimelineExpandedDetail,
|
||||
TimelineTypeLiteral,
|
||||
} from '.';
|
||||
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
|
||||
import { Filter } from '../../../../../../src/plugins/data/public';
|
||||
|
||||
import { Direction } from '../../search_strategy';
|
||||
import { DataProvider } from './data_provider';
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
import { EuiButtonEmpty, EuiButtonIcon, EuiButtonIconPropsForButton } from '@elastic/eui';
|
||||
import { FilterManager } from '../../../../../../../src/plugins/data/public';
|
||||
import type { FilterManager } from '../../../../../../../src/plugins/data/public';
|
||||
|
||||
export interface FilterValueFnArgs {
|
||||
/** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { Filter } from '../../../../../../src/plugins/data/public';
|
||||
import type { Filter } from '@kbn/es-query';
|
||||
|
||||
export const getAdditionalScreenReaderOnlyContext = ({
|
||||
field,
|
||||
|
|
|
@ -36,6 +36,7 @@ import {
|
|||
ALERT_RULE_CONSUMER,
|
||||
ALERT_RULE_PRODUCER,
|
||||
} from '@kbn/rule-data-utils/technical_field_names';
|
||||
import { Filter } from '@kbn/es-query';
|
||||
import {
|
||||
TGridCellAction,
|
||||
BulkActionsProp,
|
||||
|
@ -76,7 +77,6 @@ import type { EuiTheme } from '../../../../../../../src/plugins/kibana_react/com
|
|||
import { ViewSelection } from '../event_rendered_view/selector';
|
||||
import { EventRenderedView } from '../event_rendered_view';
|
||||
import { useDataGridHeightHack } from './height_hack';
|
||||
import { Filter } from '../../../../../../../src/plugins/data/public';
|
||||
import { REMOVE_COLUMN } from './column_headers/translations';
|
||||
|
||||
const StatefulAlertStatusBulkActions = lazy(
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
import { cloneDeep } from 'lodash/fp';
|
||||
import { esFilters, EsQueryConfig, Filter } from '../../../../../../src/plugins/data/public';
|
||||
import { Filter, EsQueryConfig, FilterStateStore } from '@kbn/es-query';
|
||||
import { DataProviderType } from '../../../common/types/timeline';
|
||||
import { mockBrowserFields, mockDataProviders, mockIndexPattern } from '../../mock';
|
||||
|
||||
|
@ -267,7 +267,7 @@ describe('Combined Queries', () => {
|
|||
browserFields: mockBrowserFields,
|
||||
filters: [
|
||||
{
|
||||
$state: { store: esFilters.FilterStateStore.APP_STATE },
|
||||
$state: { store: FilterStateStore.APP_STATE },
|
||||
meta: {
|
||||
alias: null,
|
||||
disabled: false,
|
||||
|
@ -279,7 +279,7 @@ describe('Combined Queries', () => {
|
|||
query: { match_phrase: { 'event.category': 'file' } },
|
||||
},
|
||||
{
|
||||
$state: { store: esFilters.FilterStateStore.APP_STATE },
|
||||
$state: { store: FilterStateStore.APP_STATE },
|
||||
meta: {
|
||||
alias: null,
|
||||
disabled: false,
|
||||
|
@ -495,7 +495,7 @@ describe('Combined Queries', () => {
|
|||
},
|
||||
},
|
||||
$state: {
|
||||
store: esFilters.FilterStateStore.APP_STATE,
|
||||
store: FilterStateStore.APP_STATE,
|
||||
},
|
||||
} as Filter,
|
||||
],
|
||||
|
@ -517,7 +517,7 @@ describe('Combined Queries', () => {
|
|||
browserFields: mockBrowserFields,
|
||||
filters: [
|
||||
{
|
||||
$state: { store: esFilters.FilterStateStore.APP_STATE },
|
||||
$state: { store: FilterStateStore.APP_STATE },
|
||||
meta: {
|
||||
alias: null,
|
||||
disabled: false,
|
||||
|
|
|
@ -34,7 +34,9 @@ import type {
|
|||
RowRenderer,
|
||||
AlertStatus,
|
||||
} from '../../../../common/types/timeline';
|
||||
import { esQuery, DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
|
||||
|
||||
import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
|
||||
import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
|
||||
import { useDeepEqualSelector } from '../../../hooks/use_selector';
|
||||
import { defaultHeaders } from '../body/column_headers/default_headers';
|
||||
import { buildCombinedQuery, getCombinedFilterQuery, resolverIsShowing } from '../helpers';
|
||||
|
@ -187,7 +189,7 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
|
|||
const justTitle = useMemo(() => <TitleText data-test-subj="title">{title}</TitleText>, [title]);
|
||||
|
||||
const combinedQueries = buildCombinedQuery({
|
||||
config: esQuery.getEsQueryConfig(uiSettings),
|
||||
config: getEsQueryConfig(uiSettings),
|
||||
dataProviders,
|
||||
indexPattern,
|
||||
browserFields,
|
||||
|
@ -244,7 +246,7 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
|
|||
const filterQuery = useMemo(
|
||||
() =>
|
||||
getCombinedFilterQuery({
|
||||
config: esQuery.getEsQueryConfig(uiSettings),
|
||||
config: getEsQueryConfig(uiSettings),
|
||||
browserFields,
|
||||
dataProviders,
|
||||
filters,
|
||||
|
|
|
@ -10,6 +10,7 @@ import React, { useEffect, useMemo, useState, useRef } from 'react';
|
|||
import styled from 'styled-components';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
|
||||
import type { Filter, Query } from '@kbn/es-query';
|
||||
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
|
||||
import { Direction, EntityType } from '../../../../common/search_strategy';
|
||||
import type { CoreStart } from '../../../../../../../src/core/public';
|
||||
|
@ -25,12 +26,8 @@ import type {
|
|||
BulkActionsProp,
|
||||
AlertStatus,
|
||||
} from '../../../../common/types/timeline';
|
||||
import {
|
||||
esQuery,
|
||||
Filter,
|
||||
Query,
|
||||
DataPublicPluginStart,
|
||||
} from '../../../../../../../src/plugins/data/public';
|
||||
import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
|
||||
import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
|
||||
import { useDeepEqualSelector } from '../../../hooks/use_selector';
|
||||
import { defaultHeaders } from '../body/column_headers/default_headers';
|
||||
import { combineQueries, getCombinedFilterQuery } from '../helpers';
|
||||
|
@ -176,7 +173,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
|
|||
const combinedQueries = useMemo(
|
||||
() =>
|
||||
combineQueries({
|
||||
config: esQuery.getEsQueryConfig(uiSettings),
|
||||
config: getEsQueryConfig(uiSettings),
|
||||
dataProviders: EMPTY_DATA_PROVIDERS,
|
||||
indexPattern: indexPatterns,
|
||||
browserFields,
|
||||
|
@ -290,7 +287,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
|
|||
const filterQuery = useMemo(
|
||||
() =>
|
||||
getCombinedFilterQuery({
|
||||
config: esQuery.getEsQueryConfig(uiSettings),
|
||||
config: getEsQueryConfig(uiSettings),
|
||||
dataProviders: EMPTY_DATA_PROVIDERS,
|
||||
indexPattern: indexPatterns,
|
||||
browserFields,
|
||||
|
|
|
@ -14,11 +14,8 @@ import { Subscription } from 'rxjs';
|
|||
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
|
||||
import { tGridActions } from '..';
|
||||
|
||||
import {
|
||||
DataPublicPluginStart,
|
||||
isCompleteResponse,
|
||||
isErrorResponse,
|
||||
} from '../../../../../src/plugins/data/public';
|
||||
import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
|
||||
import { isCompleteResponse, isErrorResponse } from '../../../../../src/plugins/data/common';
|
||||
import {
|
||||
Direction,
|
||||
TimelineFactoryQueryTypes,
|
||||
|
|
|
@ -21,11 +21,9 @@ import {
|
|||
} from '../../../common';
|
||||
import * as i18n from './translations';
|
||||
|
||||
import {
|
||||
DataPublicPluginStart,
|
||||
isCompleteResponse,
|
||||
isErrorResponse,
|
||||
} from '../../../../../../src/plugins/data/public';
|
||||
import type { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
|
||||
import { isCompleteResponse, isErrorResponse } from '../../../../../../src/plugins/data/common';
|
||||
|
||||
import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
|
||||
import { useAppToasts } from '../../hooks/use_app_toasts';
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ import { isAppError, isKibanaError, isSecurityAppError } from '@kbn/securitysolu
|
|||
import type { AppError } from '@kbn/securitysolution-t-grid';
|
||||
|
||||
import { useKibana } from '../../../../../src/plugins/kibana_react/public';
|
||||
import {
|
||||
import type {
|
||||
ErrorToastOptions,
|
||||
ToastsStart,
|
||||
Toast,
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
*/
|
||||
|
||||
import type { EuiDataGridColumn } from '@elastic/eui';
|
||||
import type { Filter, FilterManager } from '../../../../../../src/plugins/data/public';
|
||||
import type { Filter } from '@kbn/es-query';
|
||||
import type { FilterManager } from '../../../../../../src/plugins/data/public';
|
||||
import type { TimelineNonEcsData } from '../../../common/search_strategy';
|
||||
import type {
|
||||
ColumnHeaderOptions,
|
||||
|
|
|
@ -9,7 +9,7 @@ import { ReactElement } from 'react';
|
|||
import type { SensorAPI } from 'react-beautiful-dnd';
|
||||
import { Store } from 'redux';
|
||||
import { CoreStart } from '../../../../src/core/public';
|
||||
import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
|
||||
import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
|
||||
import { CasesUiStart } from '../../cases/public';
|
||||
import type {
|
||||
LastUpdatedAtProps,
|
||||
|
|
|
@ -24,7 +24,7 @@ import {
|
|||
DELETED_SECURITY_SOLUTION_DATA_VIEW,
|
||||
} from '../../../common';
|
||||
import { StartPlugins } from '../../types';
|
||||
import { FieldSpec } from '../../../../../../src/plugins/data_views/common';
|
||||
import type { FieldSpec } from '../../../../../../src/plugins/data_views/common';
|
||||
|
||||
const apmIndexPattern = 'apm-*-transaction*';
|
||||
const apmDataStreamsPattern = 'traces-apm*';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { FieldDescriptor } from '../../../../../../src/plugins/data/server';
|
||||
import type { FieldDescriptor } from '../../../../../../src/plugins/data/server';
|
||||
|
||||
export const mockAuditbeatIndexField: FieldDescriptor[] = [
|
||||
{
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import { EqlSearchStrategyResponse } from '../../../../../../../../src/plugins/data/common';
|
||||
import type { EqlSearchStrategyResponse } from '../../../../../../../../src/plugins/data/common';
|
||||
import { EqlSearchResponse } from '../../../../../common';
|
||||
|
||||
export const sequenceResponse = {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
import { isEmpty } from 'lodash/fp';
|
||||
import { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
|
||||
import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
|
||||
import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants';
|
||||
import { EqlSearchResponse, EqlSequence, EventHit } from '../../../../common';
|
||||
import { TimelineEdges } from '../../../../common/search_strategy';
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
import { cloneDeep, getOr } from 'lodash/fp';
|
||||
import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
|
||||
import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import {
|
||||
EventHit,
|
||||
TimelineEventsQueries,
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
import { cloneDeep, merge, unionBy } from 'lodash/fp';
|
||||
|
||||
import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import {
|
||||
EventHit,
|
||||
TimelineEventsQueries,
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
import { getOr } from 'lodash/fp';
|
||||
|
||||
import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import {
|
||||
TimelineEventsQueries,
|
||||
TimelineRequestBasicOptions,
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
import { getOr } from 'lodash/fp';
|
||||
|
||||
import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
|
||||
import {
|
||||
TimelineEventsQueries,
|
||||
TimelineEventsLastEventTimeStrategyResponse,
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
import { isEmpty } from 'lodash/fp';
|
||||
import { ISearchRequestParams } from 'src/plugins/data/common';
|
||||
import type { ISearchRequestParams } from 'src/plugins/data/common';
|
||||
import {
|
||||
TimelineEventsLastEventTimeRequestOptions,
|
||||
LastEventIndexKey,
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
import {
|
||||
import type {
|
||||
IEsSearchResponse,
|
||||
ISearchRequestParams,
|
||||
} from '../../../../../../../src/plugins/data/common';
|
||||
|
|
|
@ -5,8 +5,7 @@
|
|||
* 2.0.
|
||||
*/
|
||||
|
||||
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
|
||||
import { DataPluginSetup, DataPluginStart } from '../../../../src/plugins/data/server/plugin';
|
||||
import type { PluginSetup, PluginStart } from '../../../../src/plugins/data/server';
|
||||
import { PluginStartContract as AlertingPluginStartContract } from '../../alerting/server';
|
||||
import { SecurityPluginSetup } from '../../security/server';
|
||||
|
||||
|
@ -16,11 +15,11 @@ export interface TimelinesPluginUI {}
|
|||
export interface TimelinesPluginStart {}
|
||||
|
||||
export interface SetupPlugins {
|
||||
data: DataPluginSetup;
|
||||
data: PluginSetup;
|
||||
security?: SecurityPluginSetup;
|
||||
}
|
||||
|
||||
export interface StartPlugins {
|
||||
data: DataPluginStart;
|
||||
data: PluginStart;
|
||||
alerting: AlertingPluginStartContract;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue