[Discover] Save and load Discover session tabs

packages/kbn-optimizer/limits.yml

@@ -134,7 +134,7 @@ pageLoadAssetSize:
   savedObjectsManagement: 22426
   savedObjectsTagging: 23144
   savedObjectsTaggingOss: 2163
-  savedSearch: 12662
+  savedSearch: 11000
   screenshotMode: 2351
   screenshotting: 8417
   searchAssistant: 6150

src/platform/plugins/shared/dashboard/public/services/dashboard_content_management_service/lib/load_dashboard_state.ts

@@ -57,7 +57,7 @@ export const loadDashboardState = async ({
       })
       .catch((e) => {
         if (e.response?.status === 404) {
-          throw new SavedObjectNotFound(DASHBOARD_CONTENT_ID, id);
+          throw new SavedObjectNotFound({ type: DASHBOARD_CONTENT_ID, id });
         }
         const message = (e.body as { message?: string })?.message ?? e.message;
         throw new Error(message);

src/platform/plugins/shared/data/common/search/search_source/extract_references.test.ts

@@ -0,0 +1,121 @@
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { extractReferences } from './extract_references';
+import type { SerializedSearchSourceFields } from './types';
+
+describe('extractReferences', () => {
+  it('should extract reference for data view ID', () => {
+    const searchSource: SerializedSearchSourceFields = {
+      index: 'test-index',
+    };
+    const result = extractReferences(searchSource);
+    expect(result).toEqual([
+      {
+        indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+      },
+      [
+        {
+          id: 'test-index',
+          name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+          type: 'index-pattern',
+        },
+      ],
+    ]);
+  });
+
+  it('should not extract reference for data view spec', () => {
+    const searchSource: SerializedSearchSourceFields = {
+      index: {
+        id: 'test-id',
+        title: 'test-title',
+      },
+    };
+    const result = extractReferences(searchSource);
+    expect(result).toEqual([
+      {
+        index: {
+          id: 'test-id',
+          title: 'test-title',
+        },
+      },
+      [],
+    ]);
+  });
+
+  it('should extract reference for filter', () => {
+    const searchSource: SerializedSearchSourceFields = {
+      filter: [
+        {
+          meta: {
+            index: 'test-index',
+          },
+        },
+      ],
+    };
+    const result = extractReferences(searchSource);
+    expect(result).toEqual([
+      {
+        filter: [
+          {
+            meta: {
+              indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
+            },
+          },
+        ],
+      },
+      [
+        {
+          id: 'test-index',
+          name: 'kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
+          type: 'index-pattern',
+        },
+      ],
+    ]);
+  });
+
+  it('should apply prefix to references', () => {
+    const searchSource: SerializedSearchSourceFields = {
+      index: 'test-index',
+      filter: [
+        {
+          meta: {
+            index: 'test-index',
+          },
+        },
+      ],
+    };
+    const result = extractReferences(searchSource, { refNamePrefix: 'testPrefix' });
+    expect(result).toEqual([
+      {
+        indexRefName: 'testPrefix.kibanaSavedObjectMeta.searchSourceJSON.index',
+        filter: [
+          {
+            meta: {
+              indexRefName:
+                'testPrefix.kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
+            },
+          },
+        ],
+      },
+      [
+        {
+          id: 'test-index',
+          name: 'testPrefix.kibanaSavedObjectMeta.searchSourceJSON.index',
+          type: 'index-pattern',
+        },
+        {
+          id: 'test-index',
+          name: 'testPrefix.kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
+          type: 'index-pattern',
+        },
+      ],
+    ]);
+  });
+});

src/platform/plugins/shared/data/common/search/search_source/extract_references.ts

@@ -14,14 +14,16 @@ import type { SerializedSearchSourceFields } from './types';
 import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../..';
 
 export const extractReferences = (
-  state: SerializedSearchSourceFields
+  state: SerializedSearchSourceFields,
+  options?: { refNamePrefix?: string }
 ): [SerializedSearchSourceFields, SavedObjectReference[]] => {
+  const refNamePrefix = options?.refNamePrefix ? `${options.refNamePrefix}.` : '';
   let searchSourceFields: SerializedSearchSourceFields & { indexRefName?: string } = { ...state };
   const references: SavedObjectReference[] = [];
   if (searchSourceFields.index) {
     if (typeof searchSourceFields.index === 'string') {
       const indexId = searchSourceFields.index;
-      const refName = 'kibanaSavedObjectMeta.searchSourceJSON.index';
+      const refName = `${refNamePrefix}kibanaSavedObjectMeta.searchSourceJSON.index`;
       references.push({
         name: refName,
         type: DATA_VIEW_SAVED_OBJECT_TYPE,
@@ -47,7 +49,7 @@ export const extractReferences = (
         if (!filterRow.meta || !filterRow.meta.index) {
           return filterRow;
         }
-        const refName = `kibanaSavedObjectMeta.searchSourceJSON.filter[${i}].meta.index`;
+        const refName = `${refNamePrefix}kibanaSavedObjectMeta.searchSourceJSON.filter[${i}].meta.index`;
         references.push({
           name: refName,
           type: DATA_VIEW_SAVED_OBJECT_TYPE,

src/platform/plugins/shared/data_views/common/data_views/data_views.test.ts

@@ -419,7 +419,7 @@ describe('IndexPatterns', () => {
   test('savedObjectCache pre-fetches title, type, typeMeta', async () => {
     expect(await indexPatterns.getIds()).toEqual(['id']);
     expect(savedObjectsClient.find).toHaveBeenCalledWith({
-      fields: ['title', 'type', 'typeMeta', 'name'],
+      fields: ['title', 'type', 'typeMeta', 'name', 'timeFieldName'],
       perPage: 10000,
     });
   });

src/platform/plugins/shared/data_views/common/data_views/data_views.ts

@@ -55,12 +55,7 @@ const createFetchFieldErrorTitle = ({ id, title }: { id?: string; title?: string
  */
 export type DataViewSavedObjectAttrs = Pick<
   DataViewAttributes,
-  'title' | 'type' | 'typeMeta' | 'name'
->;
-
-export type IndexPatternListSavedObjectAttrs = Pick<
-  DataViewAttributes,
-  'title' | 'type' | 'typeMeta' | 'name'
+  'title' | 'type' | 'typeMeta' | 'name' | 'timeFieldName'
 >;
 
 /**
@@ -87,7 +82,14 @@ export interface DataViewListItem {
    * Data view type meta
    */
   typeMeta?: TypeMeta;
+  /**
+   * Human-readable name
+   */
   name?: string;
+  /**
+   * Time field name if applicable
+   */
+  timeFieldName?: string;
 }
 
 /**
@@ -404,7 +406,7 @@ export class DataViewsService {
    */
   private async refreshSavedObjectsCache() {
     const so = await this.savedObjectsClient.find({
-      fields: ['title', 'type', 'typeMeta', 'name'],
+      fields: ['title', 'type', 'typeMeta', 'name', 'timeFieldName'],
       perPage: 10000,
     });
     this.savedObjectsCache = so;
@@ -494,6 +496,7 @@ export class DataViewsService {
       type: obj?.attributes?.type,
       typeMeta: obj?.attributes?.typeMeta && JSON.parse(obj?.attributes?.typeMeta),
       name: obj?.attributes?.name,
+      timeFieldName: obj?.attributes?.timeFieldName,
     }));
   };
 
@@ -1269,7 +1272,7 @@ export class DataViewsService {
     })) as SavedObject<DataViewAttributes>;
 
     if (this.savedObjectsCache) {
-      this.savedObjectsCache.push(response as SavedObject<IndexPatternListSavedObjectAttrs>);
+      this.savedObjectsCache.push(response);
     }
     dataView.version = response.version;
     dataView.namespaces = response.namespaces || [];

src/platform/plugins/shared/data_views/public/content_management_wrapper.ts

@@ -58,7 +58,12 @@ export class ContentMagementWrapper implements PersistenceAPI {
       });
     } catch (e) {
       if (e.body?.statusCode === 404) {
-        throw new SavedObjectNotFound('data view', id, 'management/kibana/dataViews');
+        throw new SavedObjectNotFound({
+          type: DataViewSOType,
+          typeDisplayName: 'data view',
+          id,
+          link: '/app/management/kibana/dataViews',
+        });
       } else {
         throw e;
       }

src/platform/plugins/shared/discover/common/data_sources/utils.test.ts

@@ -32,4 +32,10 @@ describe('createDataSource', () => {
     const result = createDataSource({ dataView, query });
     expect(result).toEqual(undefined);
   });
+
+  it('should return data view source when not ES|QL query and passed a dataView id directly', () => {
+    const query = { language: 'kql', query: 'test' };
+    const result = createDataSource({ dataView: 'test', query });
+    expect(result).toEqual(createDataViewDataSource({ dataViewId: 'test' }));
+  });
 });

src/platform/plugins/shared/discover/common/data_sources/utils.ts

@@ -8,7 +8,7 @@
  */
 
 import { isOfAggregateQueryType, type AggregateQuery, type Query } from '@kbn/es-query';
-import type { DataView } from '@kbn/data-views-plugin/common';
+import type { DataView, DataViewSpec } from '@kbn/data-views-plugin/common';
 import {
   DataSourceType,
   type DataViewDataSource,
@@ -33,14 +33,19 @@ export const createDataSource = ({
   dataView,
   query,
 }: {
-  dataView: DataView | undefined;
+  dataView: DataView | DataViewSpec | string | undefined;
   query: Query | AggregateQuery | undefined;
 }) => {
-  return isOfAggregateQueryType(query)
-    ? createEsqlDataSource()
-    : dataView?.id
-    ? createDataViewDataSource({ dataViewId: dataView.id })
-    : undefined;
+  if (isOfAggregateQueryType(query)) {
+    return createEsqlDataSource();
+  }
+  if (typeof dataView === 'string') {
+    return createDataViewDataSource({ dataViewId: dataView });
+  }
+  if (dataView?.id) {
+    return createDataViewDataSource({ dataViewId: dataView.id });
+  }
+  return undefined;
 };
 
 export const isDataSourceType = <T extends DataSourceType>(