From deb340afa29a8b48f47ffa69bba0e715c4dcc8d8 Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Wed, 19 Aug 2020 11:26:44 +0200 Subject: [PATCH 1/4] Convert ES body of discover doc request to use fields API --- .../public/application/components/doc/use_es_doc_search.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts index 522ebad1691a9e..8a20237b65708c 100644 --- a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts +++ b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts @@ -45,7 +45,7 @@ export function buildSearchBody(id: string, indexPattern: IndexPattern): Record< stored_fields: computedFields.storedFields, _source: true, script_fields: computedFields.scriptFields, - docvalue_fields: computedFields.docvalueFields, + fields: computedFields.docvalueFields, }; } From 08f3a9ea2bd6de81f04e18e7cb8c7b7ecd321f4d Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Mon, 31 Aug 2020 16:07:48 +0200 Subject: [PATCH 2/4] Add missing Jest test for in discover_field.test.tsx --- .../application/components/sidebar/discover_field.test.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx index a0d9e3c541e47e..38b1a4f8ab20da 100644 --- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx +++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx @@ -80,7 +80,7 @@ function getComponent(selected = false, showDetails = false, useShortDots = fals const props = { indexPattern, field, - getDetails: jest.fn(), + getDetails: jest.fn(() => ({ buckets: [], error: '', exists: 1, total: true, columns: [] })), onAddFilter: jest.fn(), onAddField: jest.fn(), onRemoveField: jest.fn(), @@ -104,4 +104,9 @@ describe('discover sidebar field', function () { findTestSubject(comp, 'fieldToggle-bytes').simulate('click'); expect(props.onRemoveField).toHaveBeenCalledWith('bytes'); }); + it('should trigger onShowDetails', function () { + const { comp, props } = getComponent(true); + findTestSubject(comp, 'field-bytes-showDetails').simulate('click'); + expect(props.onShowDetails).toHaveBeenCalledWith(true, props.field); + }); }); From fdc0f8cf1e8b1a90e3ce9f40fd627d39c8f2ea15 Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Mon, 31 Aug 2020 16:55:35 +0200 Subject: [PATCH 3/4] Undo es doc change --- .../public/application/components/doc/use_es_doc_search.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts index 8a20237b65708c..522ebad1691a9e 100644 --- a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts +++ b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts @@ -45,7 +45,7 @@ export function buildSearchBody(id: string, indexPattern: IndexPattern): Record< stored_fields: computedFields.storedFields, _source: true, script_fields: computedFields.scriptFields, - fields: computedFields.docvalueFields, + docvalue_fields: computedFields.docvalueFields, }; } From 315761b8e32b706675f9727273be9e33744d8d2c Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Mon, 31 Aug 2020 17:22:04 +0200 Subject: [PATCH 4/4] Fix test --- .../application/components/sidebar/discover_field.test.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx index 38b1a4f8ab20da..6d1238e02c7fb9 100644 --- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx +++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx @@ -84,7 +84,6 @@ function getComponent(selected = false, showDetails = false, useShortDots = fals onAddFilter: jest.fn(), onAddField: jest.fn(), onRemoveField: jest.fn(), - onShowDetails: jest.fn(), showDetails, selected, useShortDots, @@ -104,9 +103,9 @@ describe('discover sidebar field', function () { findTestSubject(comp, 'fieldToggle-bytes').simulate('click'); expect(props.onRemoveField).toHaveBeenCalledWith('bytes'); }); - it('should trigger onShowDetails', function () { + it('should trigger getDetails', function () { const { comp, props } = getComponent(true); findTestSubject(comp, 'field-bytes-showDetails').simulate('click'); - expect(props.onShowDetails).toHaveBeenCalledWith(true, props.field); + expect(props.getDetails).toHaveBeenCalledWith(props.field); }); });