Skip to content

Commit 71e4db8

Browse files
qn895qn895
committed
Update estypes after 98266
1 parent a8e6fbd commit 71e4db8

15 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import { estypes } from '@elastic/elasticsearch';
99

10-
export type Datafeed = estypes.Datafeed;
11-
export type Aggregation = Record<string, estypes.AggregationContainer>;
10+
export type Datafeed = estypes.MlDatafeed;
11+
export type Aggregation = Record<string, estypes.AggregationsAggregationContainer>;
1212

1313
export function getAggregations<T>(obj: any): T | undefined {
1414
if (obj?.aggregations !== undefined) return obj.aggregations;

‎x-pack/plugins/data_visualizer/common/utils/query_utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function buildBaseFilterCriteria(
4444
export function buildSamplerAggregation(
4545
aggs: any,
4646
samplerShardSize: number
47-
): Record<string, estypes.AggregationContainer> {
47+
): Record<string, estypes.AggregationsAggregationContainer> {
4848
if (samplerShardSize < 1) {
4949
return aggs;
5050
}

‎x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
1010

1111
type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
1212

13-
export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField {
13+
export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField {
1414
return (
1515
((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) ||
1616
(isPopulatedObject(arg, ['type', 'script']) &&
@@ -23,6 +23,6 @@ export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField {
2323
);
2424
}
2525

26-
export function isRuntimeMappings(arg: unknown): arg is estypes.RuntimeFields {
26+
export function isRuntimeMappings(arg: unknown): arg is estypes.MappingRuntimeFields {
2727
return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d));
2828
}

‎x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export async function setFullTimeRange(
2424
indexPattern: IndexPattern,
2525
query?: Query
2626
): Promise<GetTimeFieldRangeResponse> {
27-
const runtimeMappings = indexPattern.getComputedFields().runtimeFields as estypes.RuntimeFields;
27+
const runtimeMappings = indexPattern.getComputedFields()
28+
.runtimeFields as estypes.MappingRuntimeFields;
2829
const resp = await getTimeFieldRange({
2930
index: indexPattern.title,
3031
timeFieldName: indexPattern.timeFieldName,

‎x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const MAX_EXAMPLES_DEFAULT: number = 10;
2222

2323
export class DataLoader {
2424
private _indexPattern: IndexPattern;
25-
private _runtimeMappings: estypes.RuntimeFields;
25+
private _runtimeMappings: estypes.MappingRuntimeFields;
2626
private _indexPatternTitle: IndexPatternTitle = '';
2727
private _maxExamples: number = MAX_EXAMPLES_DEFAULT;
2828
private _toastNotifications: CoreSetup['notifications']['toasts'];
@@ -33,7 +33,7 @@ export class DataLoader {
3333
) {
3434
this._indexPattern = indexPattern;
3535
this._runtimeMappings = this._indexPattern.getComputedFields()
36-
.runtimeFields as estypes.RuntimeFields;
36+
.runtimeFields as estypes.MappingRuntimeFields;
3737
this._indexPatternTitle = indexPattern.title;
3838
this._toastNotifications = toastNotifications;
3939
}

‎x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export async function getTimeFieldRange({
1919
index: string;
2020
timeFieldName?: string;
2121
query?: Query;
22-
runtimeMappings?: estypes.RuntimeFields;
22+
runtimeMappings?: estypes.MappingRuntimeFields;
2323
}) {
2424
const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings });
2525
const fileUploadModules = await lazyLoadModules();

‎x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export async function getVisualizerOverallStats({
3333
samplerShardSize?: number;
3434
aggregatableFields: string[];
3535
nonAggregatableFields: string[];
36-
runtimeMappings?: estypes.RuntimeFields;
36+
runtimeMappings?: estypes.MappingRuntimeFields;
3737
}) {
3838
const body = JSON.stringify({
3939
query,
@@ -75,7 +75,7 @@ export async function getVisualizerFieldStats({
7575
interval?: number;
7676
fields?: FieldRequestConfig[];
7777
maxExamples?: number;
78-
runtimeMappings?: estypes.RuntimeFields;
78+
runtimeMappings?: estypes.MappingRuntimeFields;
7979
}) {
8080
const body = JSON.stringify({
8181
query,

‎x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ export const checkAggregatableFieldsExist = async (
2727
timeFieldName: string | undefined,
2828
earliestMs?: number,
2929
latestMs?: number,
30-
datafeedConfig?: estypes.Datafeed,
31-
runtimeMappings?: estypes.RuntimeFields
30+
datafeedConfig?: estypes.MlDatafeed,
31+
runtimeMappings?: estypes.MappingRuntimeFields
3232
) => {
3333
const { asCurrentUser } = client;
3434

@@ -42,7 +42,7 @@ export const checkAggregatableFieldsExist = async (
4242
const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {};
4343

4444
// Combine runtime fields from the index pattern as well as the datafeed
45-
const combinedRuntimeMappings: estypes.RuntimeFields = {
45+
const combinedRuntimeMappings: estypes.MappingRuntimeFields = {
4646
...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}),
4747
...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings)
4848
? datafeedConfig.runtime_mappings
@@ -156,7 +156,7 @@ export const checkNonAggregatableFieldExists = async (
156156
timeFieldName: string | undefined,
157157
earliestMs: number | undefined,
158158
latestMs: number | undefined,
159-
runtimeMappings?: estypes.RuntimeFields
159+
runtimeMappings?: estypes.MappingRuntimeFields
160160
) => {
161161
const { asCurrentUser } = client;
162162
const index = indexPatternTitle;

‎x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class DataVisualizer {
5252
timeFieldName: string | undefined,
5353
earliestMs: number | undefined,
5454
latestMs: number | undefined,
55-
runtimeMappings?: estypes.RuntimeFields
55+
runtimeMappings?: estypes.MappingRuntimeFields
5656
) {
5757
const stats = {
5858
totalCount: 0,
@@ -134,7 +134,7 @@ export class DataVisualizer {
134134
query: any,
135135
fields: HistogramField[],
136136
samplerShardSize: number,
137-
runtimeMappings?: estypes.RuntimeFields
137+
runtimeMappings?: estypes.MappingRuntimeFields
138138
): Promise<any> {
139139
return await getHistogramsForFields(
140140
this._client,
@@ -159,7 +159,7 @@ export class DataVisualizer {
159159
latestMs: number | undefined,
160160
intervalMs: number | undefined,
161161
maxExamples: number,
162-
runtimeMappings: estypes.RuntimeFields
162+
runtimeMappings: estypes.MappingRuntimeFields
163163
): Promise<BatchStats[]> {
164164
// Batch up fields by type, getting stats for multiple fields at a time.
165165
const batches: Field[][] = [];
@@ -299,8 +299,8 @@ export class DataVisualizer {
299299
timeFieldName: string | undefined,
300300
earliestMs?: number,
301301
latestMs?: number,
302-
datafeedConfig?: estypes.Datafeed,
303-
runtimeMappings?: estypes.RuntimeFields
302+
datafeedConfig?: estypes.MlDatafeed,
303+
runtimeMappings?: estypes.MappingRuntimeFields
304304
) {
305305
return await checkAggregatableFieldsExist(
306306
this._client,
@@ -323,7 +323,7 @@ export class DataVisualizer {
323323
timeFieldName: string | undefined,
324324
earliestMs: number | undefined,
325325
latestMs: number | undefined,
326-
runtimeMappings?: estypes.RuntimeFields
326+
runtimeMappings?: estypes.MappingRuntimeFields
327327
) {
328328
return await checkNonAggregatableFieldExists(
329329
this._client,
@@ -344,7 +344,7 @@ export class DataVisualizer {
344344
earliestMs: number | undefined,
345345
latestMs: number | undefined,
346346
intervalMs: number,
347-
runtimeMappings: estypes.RuntimeFields
347+
runtimeMappings: estypes.MappingRuntimeFields
348348
): Promise<DocumentCountStats> {
349349
return await getDocumentCountStats(
350350
this._client,
@@ -366,7 +366,7 @@ export class DataVisualizer {
366366
timeFieldName: string | undefined,
367367
earliestMs: number | undefined,
368368
latestMs: number | undefined,
369-
runtimeMappings?: estypes.RuntimeFields
369+
runtimeMappings?: estypes.MappingRuntimeFields
370370
) {
371371
return await getNumericFieldsStats(
372372
this._client,
@@ -389,7 +389,7 @@ export class DataVisualizer {
389389
timeFieldName: string | undefined,
390390
earliestMs: number | undefined,
391391
latestMs: number | undefined,
392-
runtimeMappings?: estypes.RuntimeFields
392+
runtimeMappings?: estypes.MappingRuntimeFields
393393
) {
394394
return await getStringFieldsStats(
395395
this._client,
@@ -412,7 +412,7 @@ export class DataVisualizer {
412412
timeFieldName: string | undefined,
413413
earliestMs: number | undefined,
414414
latestMs: number | undefined,
415-
runtimeMappings?: estypes.RuntimeFields
415+
runtimeMappings?: estypes.MappingRuntimeFields
416416
) {
417417
return await getDateFieldsStats(
418418
this._client,
@@ -435,7 +435,7 @@ export class DataVisualizer {
435435
timeFieldName: string | undefined,
436436
earliestMs: number | undefined,
437437
latestMs: number | undefined,
438-
runtimeMappings?: estypes.RuntimeFields
438+
runtimeMappings?: estypes.MappingRuntimeFields
439439
) {
440440
return await getBooleanFieldsStats(
441441
this._client,
@@ -458,7 +458,7 @@ export class DataVisualizer {
458458
earliestMs: number | undefined,
459459
latestMs: number | undefined,
460460
maxExamples: number,
461-
runtimeMappings?: estypes.RuntimeFields
461+
runtimeMappings?: estypes.MappingRuntimeFields
462462
): Promise<FieldExamples> {
463463
return await getFieldExamples(
464464
this._client,

‎x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const getFieldExamples = async (
2121
earliestMs: number | undefined,
2222
latestMs: number | undefined,
2323
maxExamples: number,
24-
runtimeMappings?: estypes.RuntimeFields
24+
runtimeMappings?: estypes.MappingRuntimeFields
2525
): Promise<FieldExamples> => {
2626
const { asCurrentUser } = client;
2727

0 commit comments

Comments
 (0)