null/undefined cleanup

Author: mbondyra

src/platform/plugins/private/presentation_panel/public/panel_actions/customize_panel_action/cps_usage_overrides_badge.tsx

@@ -33,8 +33,6 @@ export class CpsUsageOverridesBadge
   public order = 8;
 
   public getDisplayName({ embeddable }: EmbeddableApiContext) {
-    if (!this.hasOverride(embeddable)) throw new IncompatibleActionError();
-
     if (!apiPublishesProjectRouting(embeddable)) {
       throw new IncompatibleActionError();
     }
@@ -100,13 +98,13 @@ export class CpsUsageOverridesBadge
     return (
       <EuiPopover
         button={
-          <span
+          <button
             onClick={() => setIsPopoverOpen(!isPopoverOpen)}
             style={{ cursor: 'pointer' }}
             data-test-subj="cpsUsageOverridesBadgeButton"
           >
             {badgeLabel}
-          </span>
+          </button>
         }
         isOpen={isPopoverOpen}
         closePopover={() => setIsPopoverOpen(false)}
@@ -196,20 +194,9 @@ export class CpsUsageOverridesBadge
   }
 
   private hasOverride(embeddable: unknown): boolean {
-    if (
-      !apiPublishesProjectRouting(embeddable) ||
-      !apiHasParentApi(embeddable) ||
-      !apiPublishesProjectRouting(embeddable.parentApi)
-    ) {
+    if (!apiPublishesProjectRouting(embeddable)) {
       return false;
     }
-
-    const embeddableProjectRouting = embeddable.projectRouting$.value;
-    const parentProjectRouting = embeddable.parentApi.projectRouting$.value;
-
-    // Only show badge if embeddable has an explicit (non-undefined) override that differs from dashboard
-    return (
-      embeddableProjectRouting !== undefined && embeddableProjectRouting !== parentProjectRouting
-    );
+    return embeddable.projectRouting$.value !== undefined;
   }
 }

src/platform/plugins/shared/discover/public/__mocks__/discover_state.mock.ts

@@ -289,8 +289,6 @@ export function getDiscoverStateMock({
           }),
           ...additionalPersistedTabs,
         ],
-        projectRouting:
-          finalSavedSearch.projectRouting === null ? undefined : finalSavedSearch.projectRouting,
       }
     : undefined;
   const mockUserId = 'mockUserId';

src/platform/plugins/shared/discover/public/application/main/state_management/discover_state.test.ts

@@ -909,10 +909,7 @@ describe('Discover state', () => {
             services: mockServices,
           }),
         ],
-        projectRouting:
-          savedSearchWithDefaults.projectRouting === null
-            ? undefined
-            : savedSearchWithDefaults.projectRouting,
+        projectRouting: savedSearchWithDefaults.projectRouting ?? undefined,
       });
       await state.internalState.dispatch(
         internalStateActions.initializeTabs({ discoverSessionId: savedSearchWithDefaults.id })
@@ -967,10 +964,7 @@ describe('Discover state', () => {
             services: mockServices,
           }),
         ],
-        projectRouting:
-          savedSearchWithDefaults.projectRouting === null
-            ? undefined
-            : savedSearchWithDefaults.projectRouting,
+        projectRouting: savedSearchWithDefaults.projectRouting ?? undefined,
       });
       await state.internalState.dispatch(
         internalStateActions.initializeTabs({ discoverSessionId: savedSearchWithDefaults.id })

src/platform/plugins/shared/discover/public/application/main/state_management/redux/actions/save_discover_session.test.ts

@@ -53,8 +53,7 @@ const setup = ({
         ...discoverSession,
         id: discoverSession.id ?? 'new-session',
         managed: false,
-        projectRouting:
-          discoverSession.projectRouting === null ? undefined : discoverSession.projectRouting,
+        projectRouting: discoverSession.projectRouting ?? undefined,
       })
     );
   const dataViewCreateSpy = jest.spyOn(services.dataViews, 'create');

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

@@ -153,65 +153,6 @@ describe('Serialization utils', () => {
       expect(deserializedState.title).toEqual('test panel title');
       expect(deserializedState.sort).toEqual([['order_date', 'asc']]);
     });
-
-    test('by reference with null projectRouting should transform to undefined', async () => {
-      const baseSearch = await discoverServiceMock.savedSearch.byValueToSavedSearch(
-        {
-          attributes: mockedSavedSearchAttributes,
-        },
-        true
-      );
-
-      discoverServiceMock.savedSearch.get = jest.fn().mockResolvedValue({
-        ...baseSearch,
-        savedObjectId: 'savedSearch',
-        projectRouting: null,
-      });
-
-      const serializedState: SerializedPanelState<SearchEmbeddableState> = {
-        rawState: {
-          savedObjectId: 'savedSearch',
-        },
-        references: [],
-      };
-
-      const deserializedState = await deserializeState({
-        serializedState,
-        discoverServices: discoverServiceMock,
-      });
-
-      expect(deserializedState.projectRouting).toBeUndefined();
-      expect('projectRouting' in deserializedState).toBe(false);
-    });
-
-    test('by reference with projectRouting should preserve it', async () => {
-      const baseSearch = await discoverServiceMock.savedSearch.byValueToSavedSearch(
-        {
-          attributes: mockedSavedSearchAttributes,
-        },
-        true
-      );
-
-      discoverServiceMock.savedSearch.get = jest.fn().mockResolvedValue({
-        ...baseSearch,
-        savedObjectId: 'savedSearch',
-        projectRouting: 'ALL',
-      });
-
-      const serializedState: SerializedPanelState<SearchEmbeddableState> = {
-        rawState: {
-          savedObjectId: 'savedSearch',
-        },
-        references: [],
-      };
-
-      const deserializedState = await deserializeState({
-        serializedState,
-        discoverServices: discoverServiceMock,
-      });
-
-      expect(deserializedState.projectRouting).toBe('ALL');
-    });
   });
 
   describe('serialize state', () => {
@@ -223,6 +164,7 @@ describe('Serialization utils', () => {
         ...mockedSavedSearchAttributes,
         managed: false,
         searchSource,
+        projectRouting: undefined,
       };
 
       const serializedState = serializeState({
@@ -269,6 +211,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,
             },
           },
         ],