From 9941755d2fc79107ca9efc12592dc5d6bd832897 Mon Sep 17 00:00:00 2001 From: Julia Rechkunova Date: Wed, 17 Aug 2022 14:21:52 +0200 Subject: [PATCH 1/2] [Discover] Remove usage of old API --- src/plugins/data_views/common/data_views/data_view.ts | 6 ++++++ src/plugins/data_views/common/data_views/data_views.ts | 4 ++++ src/plugins/data_views/common/types.ts | 4 ++++ .../public/application/view_alert/view_alert_route.tsx | 3 +-- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts index 29654c5d57847..e78721ec13c75 100644 --- a/src/plugins/data_views/common/data_views/data_view.ts +++ b/src/plugins/data_views/common/data_views/data_view.ts @@ -145,6 +145,10 @@ export class DataView implements DataViewBase { * Name of the data view. Human readable name used to differentiate data view. */ public name: string = ''; + /** + * Timestamp of the last time this data view was updated. + */ + public updatedAt: string | undefined; /** * constructor @@ -181,6 +185,7 @@ export class DataView implements DataViewBase { this.runtimeFieldMap = cloneDeep(spec.runtimeFieldMap) || {}; this.namespaces = spec.namespaces || []; this.name = spec.name || ''; + this.updatedAt = spec.updatedAt; } /** @@ -304,6 +309,7 @@ export class DataView implements DataViewBase { fieldAttrs: cloneDeep(this.fieldAttrs), allowNoIndex: this.allowNoIndex, name: this.name, + updatedAt: this.updatedAt, }; // Filter undefined values from the spec diff --git a/src/plugins/data_views/common/data_views/data_views.ts b/src/plugins/data_views/common/data_views/data_views.ts index aca409ea08624..b6d2324e46a21 100644 --- a/src/plugins/data_views/common/data_views/data_views.ts +++ b/src/plugins/data_views/common/data_views/data_views.ts @@ -625,6 +625,7 @@ export class DataViewsService { */ savedObjectToSpec = (savedObject: SavedObject): DataViewSpec => { + // @ts-ignore const { id, version, @@ -642,6 +643,8 @@ export class DataViewsService { allowNoIndex, name, }, + // @ts-ignore + updatedAt, } = savedObject; const parsedSourceFilters = sourceFilters ? JSON.parse(sourceFilters) : undefined; @@ -668,6 +671,7 @@ export class DataViewsService { allowNoIndex, runtimeFieldMap: parsedRuntimeFieldMap, name, + updatedAt, }; }; diff --git a/src/plugins/data_views/common/types.ts b/src/plugins/data_views/common/types.ts index 4fcacc01c3738..ec6dfb77568fc 100644 --- a/src/plugins/data_views/common/types.ts +++ b/src/plugins/data_views/common/types.ts @@ -506,6 +506,10 @@ export type DataViewSpec = { * Name of the data view. Human readable name used to differentiate data view. */ name?: string; + /** + * Timestamp of the last time this data view was updated. + */ + updatedAt?: string; }; // eslint-disable-next-line @typescript-eslint/consistent-type-definitions diff --git a/src/plugins/discover/public/application/view_alert/view_alert_route.tsx b/src/plugins/discover/public/application/view_alert/view_alert_route.tsx index 3efac8b504811..a69f7681960d2 100644 --- a/src/plugins/discover/public/application/view_alert/view_alert_route.tsx +++ b/src/plugins/discover/public/application/view_alert/view_alert_route.tsx @@ -104,9 +104,8 @@ export function ViewAlertRoute() { return; } - const dataViewSavedObject = await core.savedObjects.client.get('index-pattern', dataView.id!); const alertUpdatedAt = fetchedAlert.updatedAt; - const dataViewUpdatedAt = dataViewSavedObject.updatedAt!; + const dataViewUpdatedAt = dataView.updatedAt!; // data view updated after the last update of the alert rule if ( openActualAlert && From 0064150dae0f7096c59a5dea718ebf18d93209bf Mon Sep 17 00:00:00 2001 From: Julia Rechkunova Date: Wed, 17 Aug 2022 14:29:02 +0200 Subject: [PATCH 2/2] [Discover] Remove from spec --- src/plugins/data_views/common/data_views/data_view.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts index e78721ec13c75..e4bcf94b9624e 100644 --- a/src/plugins/data_views/common/data_views/data_view.ts +++ b/src/plugins/data_views/common/data_views/data_view.ts @@ -309,7 +309,6 @@ export class DataView implements DataViewBase { fieldAttrs: cloneDeep(this.fieldAttrs), allowNoIndex: this.allowNoIndex, name: this.name, - updatedAt: this.updatedAt, }; // Filter undefined values from the spec