Consume new tabs shape in Discover & saved search embeddable

src/platform/packages/shared/kbn-saved-search-component/src/components/saved_search.tsx

@@ -16,7 +16,7 @@ import type {
 } from '@kbn/discover-plugin/public';
 import { SerializedPanelState } from '@kbn/presentation-publishing';
 import { css } from '@emotion/react';
-import { SavedSearchAttributes } from '@kbn/saved-search-plugin/common';
+import { type SavedSearch, toSavedSearchAttributes } from '@kbn/saved-search-plugin/common';
 import { isOfAggregateQueryType } from '@kbn/es-query';
 import { SavedSearchComponentProps } from '../types';
 import { SavedSearchComponentErrorContent } from './error';
@@ -68,16 +68,21 @@ export const SavedSearchComponent: React.FC<SavedSearchComponentProps> = (props)
           searchSource.setField('filter', filters);
           const { searchSourceJSON, references } = searchSource.serialize();
           // By-value saved object structure
-          const attributes: Partial<SavedSearchAttributes> = {
+          const savedSearch: SavedSearch = {
+            searchSource,
             kibanaSavedObjectMeta: {
               searchSourceJSON,
             },
             columns,
             sort: getDefaultSort(dataView, undefined, undefined, isOfAggregateQueryType(query)),
+            managed: false,
           };
           setInitialSerializedState({
             rawState: {
-              attributes: { ...attributes, references },
+              attributes: {
+                ...toSavedSearchAttributes(savedSearch, searchSourceJSON),
+                references,
+              },
               timeRange,
               nonPersistedDisplayOptions: {
                 solutionNavIdOverride,

src/platform/plugins/shared/discover/public/embeddable/constants.ts

@@ -30,7 +30,7 @@ export const ACTION_VIEW_SAVED_SEARCH = 'ACTION_VIEW_SAVED_SEARCH';
 export const DEFAULT_HEADER_ROW_HEIGHT_LINES = 3;
 
 /** This constant refers to the parts of the saved search state that can be edited from a dashboard */
-export const EDITABLE_SAVED_SEARCH_KEYS: Readonly<Array<keyof SavedSearchAttributes>> = [
+export const EDITABLE_SAVED_SEARCH_KEYS = [
   'sort',
   'columns',
   'rowHeight',
@@ -39,7 +39,7 @@ export const EDITABLE_SAVED_SEARCH_KEYS: Readonly<Array<keyof SavedSearchAttribu
   'headerRowHeight',
   'density',
   'grid',
-] as const;
+] as const satisfies ReadonlyArray<keyof SavedSearchAttributes>;
 
 /** This constant refers to the dashboard panel specific state */
 export const EDITABLE_PANEL_KEYS: Readonly<Array<keyof SearchEmbeddableSerializedState>> = [

src/platform/plugins/shared/discover/public/embeddable/utils/serialization_utils.test.ts

@@ -16,10 +16,28 @@ import type { SavedSearchUnwrapResult } from '@kbn/saved-search-plugin/public';
 import { discoverServiceMock } from '../../__mocks__/services';
 import type { SearchEmbeddableSerializedState } from '../types';
 import { deserializeState, serializeState } from './serialization_utils';
+import type { DiscoverSessionTab } from '@kbn/saved-search-plugin/server';
 
 describe('Serialization utils', () => {
   const uuid = 'mySearchEmbeddable';
 
+  const tabs: DiscoverSessionTab[] = [
+    {
+      id: 'tab-1',
+      label: 'Tab 1',
+      attributes: {
+        kibanaSavedObjectMeta: {
+          searchSourceJSON: '{"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
+        },
+        sort: [['order_date', 'desc']],
+        columns: ['_source'],
+        grid: {},
+        hideChart: false,
+        sampleSize: 100,
+        isTextBasedQuery: false,
+      },
+    },
+  ];
   const mockedSavedSearchAttributes: SearchEmbeddableSerializedState['attributes'] = {
     kibanaSavedObjectMeta: {
       searchSourceJSON: '{"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
@@ -32,6 +50,7 @@ describe('Serialization utils', () => {
     hideChart: false,
     sampleSize: 100,
     isTextBasedQuery: false,
+    tabs,
     references: [
       {
         name: 'kibanaSavedObjectMeta.searchSourceJSON.index',

src/platform/plugins/shared/discover/public/embeddable/utils/serialization_utils.ts

@@ -106,13 +106,14 @@ export const serializeState = ({
 
   if (savedObjectId) {
     const editableAttributesBackup = initialState.rawSavedObjectAttributes ?? {};
+    const [{ attributes }] = savedSearchAttributes.tabs;
 
     // only save the current state that is **different** than the saved object state
     const overwriteState = EDITABLE_SAVED_SEARCH_KEYS.reduce((prev, key) => {
-      if (deepEqual(savedSearchAttributes[key], editableAttributesBackup[key])) {
+      if (deepEqual(attributes[key], editableAttributesBackup[key])) {
         return prev;
       }
-      return { ...prev, [key]: savedSearchAttributes[key] };
+      return { ...prev, [key]: attributes[key] };
     }, {});
 
     return {

src/platform/plugins/shared/discover/server/locator/columns_from_locator.test.ts

@@ -15,6 +15,7 @@ import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import type { DataView } from '@kbn/data-views-plugin/common';
 import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
 import type { SavedSearchAttributes } from '@kbn/saved-search-plugin/common';
+import type { DiscoverSessionTabAttributes } from '@kbn/saved-search-plugin/server';
 import type { LocatorServicesDeps as Services } from '.';
 import type { DiscoverAppLocatorParams } from '../../common';
 import { DOC_HIDE_TIME_COLUMN_SETTING } from '@kbn/discover-utils';
@@ -37,6 +38,20 @@ const defaultSavedSearch: SavedObject<SavedSearchAttributes> = {
       searchSourceJSON:
         '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"testIndexRefName"}',
     },
+    tabs: [
+      {
+        id: 'tab-1',
+        label: 'Tab 1',
+        attributes: {
+          columns: ['response', 'url', 'clientip', 'machine.os', 'tags'],
+          sort: [['test', '134']],
+          kibanaSavedObjectMeta: {
+            searchSourceJSON:
+              '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"testIndexRefName"}',
+          },
+        },
+      },
+    ],
   } as unknown as SavedSearchAttributes,
 };
 
@@ -135,7 +150,26 @@ test('with search source using columns when DOC_HIDE_TIME_COLUMN_SETTING is true
 });
 
 test('with saved search containing ["_source"]', async () => {
-  mockSavedSearch.attributes.columns = ['_source'];
+  mockSavedSearch = {
+    ...defaultSavedSearch,
+    attributes: {
+      ...defaultSavedSearch.attributes,
+      tabs: [
+        {
+          id: 'tab-1',
+          label: 'Tab 1',
+          attributes: {
+            columns: ['_source'],
+            sort: [['test', '134']],
+            kibanaSavedObjectMeta: {
+              searchSourceJSON:
+                '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"testIndexRefName"}',
+            },
+          } as DiscoverSessionTabAttributes,
+        },
+      ],
+    },
+  };
 
   const provider = columnsFromLocatorFactory(mockServices);
   const columns = await provider(mockPayload[0].params);

src/platform/plugins/shared/discover/server/locator/searchsource_from_locator.test.ts

@@ -15,6 +15,7 @@ import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import type { DataView } from '@kbn/data-views-plugin/common';
 import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
 import type { SavedSearchAttributes } from '@kbn/saved-search-plugin/common';
+import type { DiscoverSessionTabAttributes } from '@kbn/saved-search-plugin/server';
 import type { LocatorServicesDeps as Services } from '.';
 import type { DiscoverAppLocatorParams } from '../../common';
 import { DOC_HIDE_TIME_COLUMN_SETTING } from '@kbn/discover-utils';
@@ -37,6 +38,20 @@ const defaultSavedSearch: SavedObject<SavedSearchAttributes> = {
       searchSourceJSON:
         '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"testIndexRefName"}',
     },
+    tabs: [
+      {
+        id: 'tab-1',
+        label: 'Tab 1',
+        attributes: {
+          columns: ['response', 'url', 'clientip', 'machine.os', 'tags'],
+          sort: [['test', '134']],
+          kibanaSavedObjectMeta: {
+            searchSourceJSON:
+              '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"testIndexRefName"}',
+          },
+        },
+      },
+    ],
   } as unknown as SavedSearchAttributes,
 };
 
@@ -172,7 +187,26 @@ test('with locator params containing a timeRange', async () => {
 });
 
 test('with saved search containing ["_source"]', async () => {
-  mockSavedSearch.attributes.columns = ['_source'];
+  mockSavedSearch = {
+    ...defaultSavedSearch,
+    attributes: {
+      ...defaultSavedSearch.attributes,
+      tabs: [
+        {
+          id: 'tab-1',
+          label: 'Tab 1',
+          attributes: {
+            columns: ['_source'],
+            sort: [['test', '134']],
+            kibanaSavedObjectMeta: {
+              searchSourceJSON:
+                '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"testIndexRefName"}',
+            },
+          } as DiscoverSessionTabAttributes,
+        },
+      ],
+    },
+  };
 
   const provider = searchSourceFromLocatorFactory(mockServices);
   const searchSource = await provider(mockPayload[0].params);

src/platform/plugins/shared/saved_search/common/expressions/kibana_context.test.ts

@@ -13,7 +13,6 @@ import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import type { KibanaContext, ExpressionFunctionKibanaContext } from '@kbn/data-plugin/common';
 import { fromSavedSearchAttributes } from '../service/saved_searches_utils';
 import type { SavedSearchAttributes, SavedSearch } from '../types';
-
 import type { KibanaContextStartDependencies } from './kibana_context';
 import { getKibanaContextFn } from './kibana_context';
 
@@ -57,6 +56,19 @@ describe('kibanaContextFn', () => {
               query: [],
             }),
           },
+          tabs: [
+            {
+              id: 'test',
+              label: 'Test',
+              attributes: {
+                kibanaSavedObjectMeta: {
+                  searchSourceJSON: JSON.stringify({
+                    query: [],
+                  }),
+                },
+              },
+            },
+          ],
         } as SavedSearchAttributes,
         [],
         undefined,

src/platform/plugins/shared/saved_search/common/saved_searches_utils.ts

@@ -16,21 +16,22 @@ export const fromSavedSearchAttributes = <
   ReturnType = Serialized extends true ? SerializableSavedSearch : SavedSearch
 >(
   id: string | undefined,
-  attributes: SavedSearchAttributes,
+  { title, description, tabs }: SavedSearchAttributes,
   tags: string[] | undefined,
   searchSource: SavedSearch['searchSource'] | SerializedSearchSourceFields,
   managed: boolean,
   serialized: Serialized = false as Serialized
-) =>
-  ({
+) => {
+  const [{ attributes }] = tabs;
+  return {
     id,
     ...(serialized
       ? { serializedSearchSource: searchSource as SerializedSearchSourceFields }
       : { searchSource }),
-    title: attributes.title,
+    title,
     sort: attributes.sort,
     columns: attributes.columns,
-    description: attributes.description,
+    description,
     tags,
     grid: attributes.grid,
     hideChart: attributes.hideChart,
@@ -48,6 +49,7 @@ export const fromSavedSearchAttributes = <
     breakdownField: attributes.breakdownField,
     visContext: attributes.visContext,
     density: attributes.density,
-    tabs: attributes.tabs,
+    tabs,
     managed,
-  } as ReturnType);
+  } as ReturnType;
+};