From f86ae06ed74f59df5020b60f4699e276711547f1 Mon Sep 17 00:00:00 2001 From: Yulia Cech Date: Thu, 26 Nov 2020 13:12:33 +0100 Subject: [PATCH] Renamed some data streams and added a default value for stats find --- .../common/types/data_streams.ts | 18 +++++++++--------- .../api/data_streams/register_get_route.ts | 7 ++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/x-pack/plugins/index_management/common/types/data_streams.ts b/x-pack/plugins/index_management/common/types/data_streams.ts index 06e4eb33c4760..fdfe6278eb985 100644 --- a/x-pack/plugins/index_management/common/types/data_streams.ts +++ b/x-pack/plugins/index_management/common/types/data_streams.ts @@ -10,19 +10,19 @@ interface TimestampFieldFromEs { type TimestampField = TimestampFieldFromEs; -interface MetaFieldFromEs { +interface MetaFromEs { managed_by: string; package: any; managed: boolean; } -interface PrivilegesFieldFromEs { +type Meta = MetaFromEs; + +interface PrivilegesFromEs { delete_index: boolean; } -type PrivilegesField = PrivilegesFieldFromEs; - -type MetaField = MetaFieldFromEs; +type Privileges = PrivilegesFromEs; export type HealthFromEs = 'GREEN' | 'YELLOW' | 'RED'; @@ -31,13 +31,13 @@ export interface DataStreamFromEs { timestamp_field: TimestampFieldFromEs; indices: DataStreamIndexFromEs[]; generation: number; - _meta?: MetaFieldFromEs; + _meta?: MetaFromEs; status: HealthFromEs; template: string; ilm_policy?: string; store_size?: string; maximum_timestamp?: number; - privileges: PrivilegesFieldFromEs; + privileges: PrivilegesFromEs; } export interface DataStreamIndexFromEs { @@ -57,8 +57,8 @@ export interface DataStream { ilmPolicyName?: string; storageSize?: string; maxTimeStamp?: number; - _meta?: MetaField; - privileges: PrivilegesField; + _meta?: Meta; + privileges: Privileges; } export interface DataStreamIndex { diff --git a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts index 48e1d51f011e8..d19383d892cbd 100644 --- a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts +++ b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts @@ -40,9 +40,10 @@ const enhanceDataStreams = ({ if (dataStreamsStats) { // eslint-disable-next-line @typescript-eslint/naming-convention - const { store_size, maximum_timestamp } = dataStreamsStats.find( - ({ data_stream: statsName }: { data_stream: string }) => statsName === dataStream.name - )!; + const { store_size, maximum_timestamp } = + dataStreamsStats.find( + ({ data_stream: statsName }: { data_stream: string }) => statsName === dataStream.name + ) || {}; enhancedDataStream = { ...enhancedDataStream,