[8.6] [Discover] Fix crash when navigating from saved search with time field to saved search without time field (#146478) (#146488)

# Backport This will backport the following commits from `main` to `8.6`: - [[Discover] Fix crash when navigating from saved search with time field to saved search without time field (#146478)](https://github.com/elastic/kibana/pull/146478)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Davis McPhee <davis.mcphee@elastic.co>
2025-04-23 01:13:23 -04:00 · 2022-11-28 20:35:59 -05:00 · 2022-11-28 20:35:59 -05:00 · 6c144c2e1c
commit 6c144c2e1c
parent 5f8b171ee3
3 changed files with 56 additions and 8 deletions
--- a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.test.ts
+++ b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.test.ts
@ -33,6 +33,7 @@ import {
 } from './use_discover_histogram';
 import { setTimeout } from 'timers/promises';
 import { calculateBounds } from '@kbn/data-plugin/public';
+import { buildChartData } from '@kbn/unified-histogram-plugin/public';

 const mockData = dataPluginMock.createStartContract();

@ -62,6 +63,16 @@ jest.mock('@kbn/unified-field-list-plugin/public', () => {
  };
 });

+const mockBuildChartData = buildChartData as jest.MockedFunction<typeof buildChartData>;
+
+jest.mock('@kbn/unified-histogram-plugin/public', () => {
+  const originalModule = jest.requireActual('@kbn/unified-histogram-plugin/public');
+  return {
+    ...originalModule,
+    buildChartData: jest.fn(originalModule.buildChartData),
+  };
+});
+
 describe('useDiscoverHistogram', () => {
  const renderUseDiscoverHistogram = async ({
    isPlainRecord = false,
@ -294,4 +305,24 @@ describe('useDiscoverHistogram', () => {
      expect(stateContainer.setAppState).toHaveBeenCalledWith({ interval: 'auto' });
    });
  });
+
+  describe('buildChartData', () => {
+    it('should call buildChartData when isPlainRecord is false and isTimeBased is true', async () => {
+      mockBuildChartData.mockClear();
+      await renderUseDiscoverHistogram();
+      expect(mockBuildChartData).toHaveBeenCalled();
+    });
+
+    it('should not call buildChartData when isPlainRecord is true', async () => {
+      mockBuildChartData.mockClear();
+      await renderUseDiscoverHistogram({ isPlainRecord: true });
+      expect(mockBuildChartData).not.toHaveBeenCalled();
+    });
+
+    it('should not call buildChartData when isTimeBased is false', async () => {
+      mockBuildChartData.mockClear();
+      await renderUseDiscoverHistogram({ isTimeBased: false });
+      expect(mockBuildChartData).not.toHaveBeenCalled();
+    });
+  });
 });
--- a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
+++ b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
@ -137,13 +137,15 @@ export const useDiscoverHistogram = ({

  const { bucketInterval, chartData } = useMemo(
    () =>
-      buildChartData({
-        data,
-        dataView,
-        timeInterval: state.interval,
-        response,
-      }),
-    [data, dataView, response, state.interval]
+      isPlainRecord || !isTimeBased
+        ? { bucketInterval: undefined, chartData: undefined }
+        : buildChartData({
+            data,
+            dataView,
+            timeInterval: state.interval,
+            response,
+          }),
+    [data, dataView, isPlainRecord, isTimeBased, response, state.interval]
  );

  const chart = useMemo(
--- a/test/functional/apps/discover/group2/_indexpattern_without_timefield.ts
+++ b/test/functional/apps/discover/group2/_indexpattern_without_timefield.ts
@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  const kibanaServer = getService('kibanaServer');
  const security = getService('security');
  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'timePicker', 'discover']);
+  const PageObjects = getPageObjects(['common', 'timePicker', 'discover', 'header']);

  describe('indexpattern without timefield', () => {
    before(async () => {
@ -114,5 +114,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
      url = await browser.getCurrentUrl();
      expect(url).to.contain(`refreshInterval:(pause:!t,value:${autoRefreshInterval * 1000})`);
    });
+
+    it('should allow switching from a saved search with a time field to a saved search without a time field', async () => {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.selectIndexPattern('with-timefield');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.discover.saveSearch('with-timefield');
+      await PageObjects.discover.selectIndexPattern('without-timefield');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.discover.saveSearch('without-timefield', true);
+      await PageObjects.discover.loadSavedSearch('with-timefield');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.discover.loadSavedSearch('without-timefield');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.discover.assertHitCount('1');
+    });
  });
 }