null/undefined cleanup

Author: mbondyra

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

@@ -223,6 +223,7 @@ describe('Serialization utils', () => {
         ...mockedSavedSearchAttributes,
         managed: false,
         searchSource,
+        projectRouting: undefined,
       };
 
       const serializedState = serializeState({
@@ -269,6 +270,7 @@ describe('Serialization utils', () => {
         ...mockedSavedSearchAttributes,
         managed: false,
         searchSource,
+        projectRouting: undefined,
       };
 
       test('equal state', () => {

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

@@ -47,12 +47,8 @@ export const deserializeState = async ({
     // what is this??
     const rawSavedObjectAttributes = pick(so, EDITABLE_SAVED_SEARCH_KEYS);
     const savedObjectOverride = pick(serializedState.rawState, EDITABLE_SAVED_SEARCH_KEYS);
-    // Filter out null projectRouting for type safety (runtime already filtered by fromSavedSearchAttributes)
-    const { projectRouting, ...soWithoutTimeRangeAndProjectRouting } = omit(so, 'timeRange');
     return {
-      ...soWithoutTimeRangeAndProjectRouting,
-      // Only include projectRouting if it's not null (SearchEmbeddableRuntimeState doesn't allow null)
-      ...(projectRouting !== null && projectRouting !== undefined && { projectRouting }),
+      ...omit(so, 'timeRange'),
       savedObjectId,
       savedObjectTitle: so.title,
       savedObjectDescription: so.description,
@@ -71,12 +67,8 @@ export const deserializeState = async ({
       serializedState.rawState as SearchEmbeddableByValueState,
       true
     );
-    // Filter out null projectRouting for type safety (runtime already filtered by fromSavedSearchAttributes)
-    const { projectRouting, ...savedSearchWithoutProjectRouting } = savedSearch;
     return {
-      ...savedSearchWithoutProjectRouting,
-      // Only include projectRouting if it's not null (SearchEmbeddableRuntimeState doesn't allow null)
-      ...(projectRouting !== null && projectRouting !== undefined && { projectRouting }),
+      ...savedSearch,
       ...panelState,
       nonPersistedDisplayOptions: serializedState.rawState.nonPersistedDisplayOptions,
     };

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

@@ -50,8 +50,7 @@ export const fromSavedSearchAttributes = <
     visContext: attributes.visContext,
     controlGroupJson: attributes.controlGroupJson,
     density: attributes.density,
-    // Only include projectRouting if it's not null/undefined (saved state allows null, runtime doesn't)
-    ...(projectRouting !== null && projectRouting !== undefined && { projectRouting }),
+    projectRouting: projectRouting ?? undefined,
     tabs,
     managed,
   } as ReturnType;

src/platform/plugins/shared/saved_search/common/service/get_discover_session.ts

@@ -50,9 +50,7 @@ export const getDiscoverSession = async (
       visContext: tab.attributes.visContext,
       controlGroupJson: tab.attributes.controlGroupJson,
     })),
-    // Session-level projectRouting - normalize null to undefined for runtime usage
-    projectRouting:
-      so.item.attributes.projectRouting === null ? undefined : so.item.attributes.projectRouting,
+    projectRouting: so.item.attributes.projectRouting ?? undefined,
     managed: Boolean(so.item.managed),
     tags: deps.savedObjectsTagging
       ? deps.savedObjectsTagging.ui.getTagIdsFromReferences(so.item.references)

src/platform/plugins/shared/saved_search/common/service/get_saved_searches.test.ts

@@ -93,6 +93,7 @@ describe('getSavedSearch', () => {
         "id": "ccf1af80-2297-11ec-86e0-1155ffb9c7a7",
         "isTextBasedQuery": undefined,
         "managed": false,
+        "projectRouting": undefined,
         "references": Array [
           Object {
             "id": "ff959d40-b880-11e8-a6d9-e546fe2bba5f",
@@ -244,6 +245,7 @@ describe('getSavedSearch', () => {
         "id": "ccf1af80-2297-11ec-86e0-1155ffb9c7a7",
         "isTextBasedQuery": true,
         "managed": false,
+        "projectRouting": undefined,
         "references": Array [
           Object {
             "id": "ff959d40-b880-11e8-a6d9-e546fe2bba5f",

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

@@ -79,6 +79,7 @@ describe('saved_searches_utils', () => {
           "id": "id",
           "isTextBasedQuery": false,
           "managed": false,
+          "projectRouting": undefined,
           "references": Array [],
           "refreshInterval": undefined,
           "rowHeight": undefined,
@@ -165,7 +166,7 @@ describe('saved_searches_utils', () => {
       };
 
       const result = toSavedSearchAttributes(savedSearch, '{}');
-      expect(result).toEqual({
+      expect(result).toMatchObject({
         kibanaSavedObjectMeta: {
           searchSourceJSON: '{}',
         },
@@ -178,6 +179,7 @@ describe('saved_searches_utils', () => {
         isTextBasedQuery: true,
         usesAdHocDataView: false,
         timeRestore: false,
+        projectRouting: null,
         tabs: [
           {
             id: expect.any(String),
@@ -193,6 +195,7 @@ describe('saved_searches_utils', () => {
               isTextBasedQuery: true,
               usesAdHocDataView: false,
               timeRestore: false,
+              projectRouting: null,
             },
           },
         ],

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

@@ -52,7 +52,8 @@ export const toSavedSearchAttributes = (
     timeRestore: savedSearch.timeRestore ?? false,
     timeRange: savedSearch.timeRange ? pick(savedSearch.timeRange, ['from', 'to']) : undefined,
     refreshInterval: savedSearch.refreshInterval,
-    projectRouting: savedSearch.projectRouting ?? undefined,
+    // Convert undefined to null for storage (null explicitly signals "no value" in saved objects)
+    projectRouting: savedSearch.projectRouting ?? null,
     rowsPerPage: savedSearch.rowsPerPage,
     sampleSize: savedSearch.sampleSize,
     density: savedSearch.density,

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

@@ -98,6 +98,7 @@ export type SavedSearch = Partial<SavedSearchAttributes> & {
     aliasPurpose?: SavedObjectsResolveResponse['alias_purpose'];
     errorJSON?: string;
   };
+  projectRouting?: ProjectRouting;
 };
 
 /** @internal **/

src/platform/plugins/shared/saved_search/public/service/save_discover_session.ts

@@ -136,13 +136,9 @@ export const saveDiscoverSession = async (
     ...tabs[0].attributes,
     sort: tabs[0].attributes.sort as SortOrder[],
     density: tabs[0].attributes.density as DataGridDensity,
+    projectRouting: discoverSession.projectRouting ?? null,
   };
 
-  // Only include projectRouting if explicitly provided (even if null to clear)
-  if ('projectRouting' in discoverSession) {
-    attributes.projectRouting = discoverSession.projectRouting ?? null;
-  }
-
   const references = savedObjectsTagging
     ? savedObjectsTagging.ui.updateTagsReferences(tabReferences, discoverSession.tags ?? [])
     : tabReferences;
@@ -156,8 +152,7 @@ export const saveDiscoverSession = async (
 
   return {
     ...discoverSession,
-    projectRouting:
-      discoverSession.projectRouting === null ? undefined : discoverSession.projectRouting,
+    projectRouting: discoverSession.projectRouting ?? undefined,
     id,
     references,
     managed: false,