Merge branch 'main' into rollups/fix-api-integration-tests

elastic · Jun 12, 2024 · 3db6a3f · 3db6a3f
2 parents 9bf6a0e + 4f8cc78
commit 3db6a3f
Show file tree

Hide file tree

Showing 14 changed files with 206 additions and 108 deletions.
diff --git a/packages/kbn-discover-utils/src/utils/build_data_record.test.ts b/packages/kbn-discover-utils/src/utils/build_data_record.test.ts
@@ -22,7 +22,10 @@ describe('Data table record utils', () => {
 
   describe('buildDataTableRecordList', () => {
     test('should return a list of DataTableRecord', () => {
-      const result = buildDataTableRecordList(esHitsMock, dataViewMock);
+      const result = buildDataTableRecordList({
+        records: esHitsMock,
+        dataView: dataViewMock,
+      });
       result.forEach((doc) => {
         expect(doc).toHaveProperty('id');
         expect(doc).toHaveProperty('raw');
@@ -32,7 +35,9 @@ describe('Data table record utils', () => {
     });
 
     test('should support processing each record', () => {
-      const result = buildDataTableRecordList(esHitsMock, dataViewMock, {
+      const result = buildDataTableRecordList({
+        records: esHitsMock,
+        dataView: dataViewMock,
         processRecord: (record) => ({ ...record, id: 'custom-id' }),
       });
       result.forEach((doc) => {

diff --git a/packages/kbn-discover-utils/src/utils/build_data_record.ts b/packages/kbn-discover-utils/src/utils/build_data_record.ts
@@ -32,15 +32,19 @@ export function buildDataTableRecord(
 
 /**
  * Helper to build multiple DataTableRecords at once, saved a bit of testing code lines
- * @param docs Array of documents returned from Elasticsearch
+ * @param records Array of documents returned from Elasticsearch
  * @param dataView this current data view
  */
-export function buildDataTableRecordList<T extends DataTableRecord = DataTableRecord>(
-  docs: EsHitRecord[],
-  dataView?: DataView,
-  { processRecord }: { processRecord?: (record: DataTableRecord) => T } = {}
-): DataTableRecord[] {
-  return docs.map((doc) => {
+export function buildDataTableRecordList<T extends DataTableRecord = DataTableRecord>({
+  records,
+  dataView,
+  processRecord,
+}: {
+  records: EsHitRecord[];
+  dataView?: DataView;
+  processRecord?: (record: DataTableRecord) => T;
+}): DataTableRecord[] {
+  return records.map((doc) => {
     const record = buildDataTableRecord(doc, dataView);
     return processRecord ? processRecord(record) : record;
   });

diff --git a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
@@ -104,7 +104,10 @@ describe('context predecessors', function () {
         ({ rows }) => {
           expect(mockSearchSource.fetch$.calledOnce).toBe(true);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(0, 3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(0, 3),
+              dataView,
+            })
           );
         }
       );
@@ -136,7 +139,10 @@ describe('context predecessors', function () {
           expect(Object.keys(last(intervals) ?? {})).toEqual(['format', 'gte']);
           expect(intervals.length).toBeGreaterThan(1);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(0, 3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(0, 3),
+              dataView,
+            })
           );
         }
       );
@@ -172,7 +178,10 @@ describe('context predecessors', function () {
           expect(intervals.length).toBeGreaterThan(1);
 
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(-3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(-3),
+              dataView,
+            })
           );
         }
       );
@@ -263,7 +272,10 @@ describe('context predecessors', function () {
           expect(removeFieldsSpy.calledOnce).toBe(true);
           expect(setFieldsSpy.calledOnce).toBe(true);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(0, 3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(0, 3),
+              dataView,
+            })
           );
         }
       );

diff --git a/src/plugins/discover/public/application/context/services/context.successors.test.ts b/src/plugins/discover/public/application/context/services/context.successors.test.ts
@@ -104,7 +104,10 @@ describe('context successors', function () {
         ({ rows }) => {
           expect(mockSearchSource.fetch$.calledOnce).toBe(true);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(-3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(-3),
+              dataView,
+            })
           );
         }
       );
@@ -136,7 +139,10 @@ describe('context successors', function () {
           expect(Object.keys(last(intervals) ?? {})).toEqual(['format', 'lte']);
           expect(intervals.length).toBeGreaterThan(1);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(-3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(-3),
+              dataView,
+            })
           );
         }
       );
@@ -166,7 +172,10 @@ describe('context successors', function () {
           expect(moment(last(intervals)?.gte).valueOf()).toBeGreaterThan(MS_PER_DAY * 2200);
           expect(intervals.length).toBeGreaterThan(1);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(0, 4), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(0, 4),
+              dataView,
+            })
           );
         }
       );
@@ -252,7 +261,10 @@ describe('context successors', function () {
         ({ rows, interceptedWarnings }) => {
           expect(mockSearchSource.fetch$.calledOnce).toBe(true);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(-3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(-3),
+              dataView,
+            })
           );
           const setFieldsSpy = mockSearchSource.setField.withArgs('fields');
           const removeFieldsSpy = mockSearchSource.removeField.withArgs('fieldsFromSource');
@@ -324,7 +336,10 @@ describe('context successors', function () {
         ({ rows, interceptedWarnings }) => {
           expect(mockSearchSource.fetch$.calledOnce).toBe(true);
           expect(rows).toEqual(
-            buildDataTableRecordList(mockSearchSource._stubHits.slice(-3), dataView)
+            buildDataTableRecordList({
+              records: mockSearchSource._stubHits.slice(-3),
+              dataView,
+            })
           );
           expect(dataPluginMock.search.showWarnings).toHaveBeenCalledTimes(1);
           expect(interceptedWarnings?.length).toBe(1);

diff --git a/src/plugins/discover/public/application/main/data_fetching/fetch_documents.ts b/src/plugins/discover/public/application/main/data_fetching/fetch_documents.ts
@@ -10,7 +10,6 @@ import { filter, map } from 'rxjs';
 import { lastValueFrom } from 'rxjs';
 import { isRunningResponse, ISearchSource } from '@kbn/data-plugin/public';
 import { buildDataTableRecordList } from '@kbn/discover-utils';
-import type { EsHitRecord } from '@kbn/discover-utils/types';
 import type { SearchResponseWarning } from '@kbn/search-response-warnings';
 import { DataViewType } from '@kbn/data-views-plugin/public';
 import type { RecordsFetchResponse } from '../../types';
@@ -67,7 +66,9 @@ export const fetchDocuments = (
     .pipe(
       filter((res) => !isRunningResponse(res)),
       map((res) => {
-        return buildDataTableRecordList(res.rawResponse.hits.hits as EsHitRecord[], dataView, {
+        return buildDataTableRecordList({
+          records: res.rawResponse.hits.hits,
+          dataView,
           processRecord: (record) => services.profilesManager.resolveDocumentProfile({ record }),
         });
       })

diff --git a/src/plugins/embeddable/public/react_embeddable_system/react_embeddable_renderer.test.tsx b/src/plugins/embeddable/public/react_embeddable_system/react_embeddable_renderer.test.tsx
@@ -212,6 +212,43 @@ describe('react embeddable renderer', () => {
       )
     );
   });
+
+  it('catches error when thrown in deserialize', async () => {
+    const buildEmbeddable = jest.fn();
+    const errorInInitializeFactory: ReactEmbeddableFactory<{ name: string; bork: string }> = {
+      ...testEmbeddableFactory,
+      type: 'errorInDeserialize',
+      buildEmbeddable,
+      deserializeState: (state) => {
+        throw new Error('error in deserialize');
+      },
+    };
+    registerReactEmbeddableFactory('errorInDeserialize', () =>
+      Promise.resolve(errorInInitializeFactory)
+    );
+    setupPresentationPanelServices();
+
+    const onApiAvailable = jest.fn();
+    const embeddable = render(
+      <ReactEmbeddableRenderer
+        type={'errorInDeserialize'}
+        maybeId={'12345'}
+        onApiAvailable={onApiAvailable}
+        getParentApi={() => ({
+          getSerializedStateForChild: () => ({
+            rawState: {},
+          }),
+        })}
+      />
+    );
+
+    await waitFor(() => expect(embeddable.getByTestId('errorMessageMarkdown')).toBeInTheDocument());
+    expect(onApiAvailable).not.toBeCalled();
+    expect(buildEmbeddable).not.toBeCalled();
+    expect(embeddable.getByTestId('errorMessageMarkdown')).toHaveTextContent(
+      'error in deserialize'
+    );
+  });
 });
 
 describe('reactEmbeddable phase events', () => {