[Security Solution]Error coming up on clicking create timeline templa…

…te (#111856) (#112005) * do not call addErrorHash if it is timeline template * unit test * fix types * trim kqlQueryExpression * revert change Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Angela Chuang <[email protected]>
elastic · Sep 13, 2021 · 4e6c280 · 4e6c280
1 parent e77e072
commit 4e6c280
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/.../public/timelines/components/timeline/query_tab_content/__snapshots__/index.test.tsx.snap b/.../public/timelines/components/timeline/query_tab_content/__snapshots__/index.test.tsx.snap
diff --git a/...s/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx b/...s/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
@@ -25,6 +25,7 @@ import { useTimelineEventsDetails } from '../../../containers/details/index';
 import { useSourcererScope } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
 import { Direction } from '../../../../../common/search_strategy';
+import * as helpers from '../helpers';
 
 jest.mock('../../../containers/index', () => ({
   useTimelineEvents: jest.fn(),
@@ -116,7 +117,7 @@ describe('Timeline', () => {
       itemsPerPage: 5,
       itemsPerPageOptions: [5, 10, 20],
       kqlMode: 'search' as QueryTabContentComponentProps['kqlMode'],
-      kqlQueryExpression: '',
+      kqlQueryExpression: ' ',
       onEventClosed: jest.fn(),
       renderCellValue: DefaultCellRenderer,
       rowRenderers: defaultRowRenderers,
@@ -133,6 +134,27 @@ describe('Timeline', () => {
   });
 
   describe('rendering', () => {
+    let spyCombineQueries: jest.SpyInstance;
+
+    beforeEach(() => {
+      spyCombineQueries = jest.spyOn(helpers, 'combineQueries');
+    });
+    afterEach(() => {
+      spyCombineQueries.mockClear();
+    });
+
+    test('should trim kqlQueryExpression', () => {
+      mount(
+        <TestProviders>
+          <QueryTabContentComponent {...props} />
+        </TestProviders>
+      );
+
+      expect(spyCombineQueries.mock.calls[0][0].kqlQuery.query).toEqual(
+        props.kqlQueryExpression.trim()
+      );
+    });
+
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(
         <TestProviders>

diff --git a/...lugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx b/...lugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
@@ -209,7 +209,9 @@ export const QueryTabContentComponent: React.FC<Props> = ({
   const kqlQuery: {
     query: string;
     language: KueryFilterQueryKind;
-  } = useMemo(() => ({ query: kqlQueryExpression, language: 'kuery' }), [kqlQueryExpression]);
+  } = useMemo(() => ({ query: kqlQueryExpression.trim(), language: 'kuery' }), [
+    kqlQueryExpression,
+  ]);
 
   const combinedQueries = combineQueries({
     config: esQueryConfig,