[Discover sessions as Code] Remove internal references array

src/platform/plugins/shared/discover/common/embeddable/get_transform_in.ts

@@ -7,15 +7,16 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
+import { omit } from 'lodash';
 import { SavedSearchType } from '@kbn/saved-search-plugin/common';
 import type { SavedObjectReference } from '@kbn/core/server';
+import { extractReferences, parseSearchSourceJSON } from '@kbn/data-plugin/common';
 import type { DrilldownTransforms } from '@kbn/embeddable-plugin/common';
 import type {
   SearchEmbeddableByReferenceState,
   SearchEmbeddableState,
   StoredSearchEmbeddableState,
 } from './types';
-import { extract } from './search_inject_extract';
 
 export const SAVED_SEARCH_SAVED_OBJECT_REF_NAME = 'savedObjectRef';
 
@@ -47,22 +48,38 @@ export function getTransformIn(transformDrilldownsIn: DrilldownTransforms['trans
     }
 
     // by value
-    const { state: extractedState, references } = extract({
-      type: SavedSearchType,
-      attributes: storedState.attributes,
+    const tabReferences: SavedObjectReference[] = [];
+    const tabs = storedState.attributes.tabs.map((tab) => {
+      try {
+        const searchSourceValues = parseSearchSourceJSON(
+          tab.attributes.kibanaSavedObjectMeta.searchSourceJSON
+        );
+        const [searchSourceFields, searchSourceReferences] = extractReferences(searchSourceValues);
+        tabReferences.push(...searchSourceReferences);
+        return {
+          ...tab,
+          attributes: {
+            ...tab.attributes,
+            kibanaSavedObjectMeta: {
+              ...tab.attributes.kibanaSavedObjectMeta,
+              searchSourceJSON: JSON.stringify(searchSourceFields),
+            },
+          },
+        };
+      } catch (e) {
+        return tab;
+      }
     });
 
     return {
       state: {
         ...storedState,
         attributes: {
-          ...storedState.attributes,
-          ...extractedState.attributes,
-          // discover session stores references as part of attributes
-          references,
+          ...omit(storedState.attributes, 'references'),
+          tabs,
         },
       },
-      references: [...references, ...drilldownReferences],
+      references: [...tabReferences, ...drilldownReferences],
     };
   }
   return transformIn;

src/platform/plugins/shared/discover/common/embeddable/get_transform_out.ts

@@ -7,18 +7,18 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
+import { flow, omit } from 'lodash';
 import { extractTabs, SavedSearchType } from '@kbn/saved-search-plugin/common';
+import { injectReferences, parseSearchSourceJSON } from '@kbn/data-plugin/common';
 import type { DrilldownTransforms } from '@kbn/embeddable-plugin/common';
 import type { SavedObjectReference } from '@kbn/core/server';
 import { transformTitlesOut } from '@kbn/presentation-publishing';
-import { flow } from 'lodash';
 import type {
   SearchEmbeddableByReferenceState,
   SearchEmbeddableByValueState,
   StoredSearchEmbeddableByValueState,
   StoredSearchEmbeddableState,
 } from './types';
-import { inject } from './search_inject_extract';
 import { SAVED_SEARCH_SAVED_OBJECT_REF_NAME } from './get_transform_in';
 
 function isByValue(
@@ -42,14 +42,34 @@ export function getTransformOut(transformDrilldownsOut: DrilldownTransforms['tra
     const state = transformsFlow(storedState);
 
     if (isByValue(state)) {
-      const tabsState = {
-        ...state,
-        attributes: extractTabs(state.attributes),
-      };
-      const { attributes } = inject({ type: SavedSearchType, ...tabsState }, references ?? []);
+      const tabsState = { ...state, attributes: extractTabs(state.attributes) };
+      const tabs = tabsState.attributes.tabs.map((tab) => {
+        try {
+          const searchSourceValues = parseSearchSourceJSON(
+            tab.attributes.kibanaSavedObjectMeta.searchSourceJSON
+          );
+          const searchSourceFields = injectReferences(searchSourceValues, references ?? []);
+          return {
+            ...tab,
+            attributes: {
+              ...omit(tab.attributes, 'references'),
+              kibanaSavedObjectMeta: {
+                ...tab.attributes.kibanaSavedObjectMeta,
+                searchSourceJSON: JSON.stringify(searchSourceFields),
+              },
+            },
+          };
+        } catch (e) {
+          return tab;
+        }
+      });
+
       return {
         ...state,
-        attributes,
+        attributes: {
+          ...state.attributes,
+          tabs,
+        },
       } as SearchEmbeddableByValueState;
     }
 

src/platform/plugins/shared/discover/common/embeddable/index.ts

@@ -7,5 +7,4 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-export { inject, extract } from './search_inject_extract';
 export { getSearchEmbeddableTransforms } from './search_embeddable_transforms';

src/platform/plugins/shared/discover/common/embeddable/search_embeddable_transforms.test.ts

@@ -9,7 +9,6 @@
 
 import type { DrilldownTransforms } from '@kbn/embeddable-plugin/common';
 import { getSearchEmbeddableTransforms } from './search_embeddable_transforms';
-import { extract, inject } from './search_inject_extract';
 import type {
   SearchEmbeddableByValueState,
   StoredSearchEmbeddableByValueState,
@@ -18,13 +17,6 @@ import type {
   SearchEmbeddableState,
 } from './types';
 
-jest.mock('./search_inject_extract', () => {
-  return {
-    inject: jest.fn((state, references) => state),
-    extract: jest.fn((state) => ({ state, references: [] })),
-  };
-});
-
 const mockDrilldownTransforms = {
   transformIn: jest.fn().mockImplementation((state: SearchEmbeddableState) => ({
     state,
@@ -82,10 +74,6 @@ describe('searchEmbeddableTransforms', () => {
         state,
         references
       );
-      expect(inject).toHaveBeenCalledWith(
-        { type: 'search', ...{ ...state, attributes: expectedAttributes } },
-        references
-      );
       expect(result).toEqual({
         ...state,
         attributes: expectedAttributes,
@@ -204,18 +192,13 @@ describe('searchEmbeddableTransforms', () => {
               searchSourceJSON: '{"query":{"match_all":{}}}',
             },
             tabs: [],
-            references: [],
           },
           title: 'Panel Title',
         };
 
         const result =
           getSearchEmbeddableTransforms(mockDrilldownTransforms).transformIn!(serializedState);
 
-        expect(extract).toHaveBeenCalledWith({
-          type: 'search',
-          attributes: serializedState.attributes,
-        });
         expect(result.state as StoredSearchEmbeddableByValueState).toEqual(serializedState);
         expect(result.references).toEqual([]);
       });
@@ -244,10 +227,6 @@ describe('searchEmbeddableTransforms', () => {
 
         expect(result.references).toEqual([]);
         expect(mockDrilldownTransforms.transformIn).toHaveBeenCalledWith(serializedState);
-        expect(extract).toHaveBeenCalledWith({
-          type: 'search',
-          attributes: serializedState.attributes,
-        });
       });
     });
   });

src/platform/plugins/shared/discover/moon.yml

@@ -64,7 +64,6 @@ dependsOn:
   - '@kbn/unified-field-list'
   - '@kbn/cell-actions'
   - '@kbn/shared-ux-utility'
-  - '@kbn/core-saved-objects-server'
   - '@kbn/discover-utils'
   - '@kbn/search-errors'
   - '@kbn/search-response-warnings'

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

@@ -132,10 +132,8 @@ describe('Serialization utils', () => {
         serializeDynamicActions: jest.fn(),
       });
 
-      const attributes = toSavedSearchAttributes(
-        savedSearch,
-        searchSource.serialize().searchSourceJSON
-      );
+      const searchSourceJSON = JSON.stringify(searchSource.getSerializedFields());
+      const attributes = toSavedSearchAttributes(savedSearch, searchSourceJSON);
 
       expect(serializedState).toEqual({
         attributes: {
@@ -146,7 +144,6 @@ describe('Serialization utils', () => {
               id: expect.any(String),
             },
           ],
-          references: mockedSavedSearchAttributes.references,
         },
       });
     });

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

@@ -85,7 +85,7 @@ export const serializeState = ({
   savedObjectId?: string;
 }): SearchEmbeddableState => {
   const searchSource = savedSearch.searchSource;
-  const { searchSourceJSON, references: originalReferences } = searchSource.serialize();
+  const searchSourceJSON = JSON.stringify(searchSource.getSerializedFields());
   const savedSearchAttributes = toSavedSearchAttributes(savedSearch, searchSourceJSON);
 
   if (savedObjectId) {
@@ -110,17 +110,10 @@ export const serializeState = ({
     };
   }
 
-  const state = {
-    attributes: {
-      ...savedSearchAttributes,
-      references: originalReferences,
-    },
-  };
-
   return {
     ...serializeTitles(),
     ...serializeTimeRange(),
     ...serializeDynamicActions?.(),
-    ...state,
+    attributes: savedSearchAttributes,
   };
 };