Merge branch 'feat/4312-search-bar-replace-tablewzapi' of https://git…

…hub.com/wazuh/wazuh-kibana-app into feat/4312-replace-search-bar-agent-inventory
wazuh · Aug 10, 2023 · 97b590c · 97b590c
2 parents 8cda1d0 + 8ed6ae4
commit 97b590c
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 55 deletions.
diff --git a/plugins/main/common/constants.ts b/plugins/main/common/constants.ts
@@ -2256,3 +2256,6 @@ export const MODULE_SCA_CHECK_RESULT_LABEL = {
 export const SEARCH_BAR_WQL_VALUE_SUGGESTIONS_COUNT = 30;
 // This limits the suggestions for the token of type value displayed in the search bar
 export const SEARCH_BAR_WQL_VALUE_SUGGESTIONS_DISPLAY_COUNT = 10;
+/* Time in milliseconds to debounce the analysis of search bar. This mitigates some problems related
+to changes running in parallel */
+export const SEARCH_BAR_DEBOUNCE_UPDATE_TIME = 400;
diff --git a/plugins/main/public/components/search-bar/index.tsx b/plugins/main/public/components/search-bar/index.tsx
@@ -9,21 +9,22 @@ import {
   EuiSelect,
   EuiText,
   EuiFlexGroup,
-  EuiFlexItem
+  EuiFlexItem,
 } from '@elastic/eui';
 import { EuiSuggest } from '../eui-suggest';
 import { searchBarQueryLanguages } from './query-language';
 import _ from 'lodash';
 import { ISearchBarModeWQL } from './query-language/wql';
+import { SEARCH_BAR_DEBOUNCE_UPDATE_TIME } from '../../../common/constants';
 
-export interface SearchBarProps{
+export interface SearchBarProps {
   defaultMode?: string;
   modes: ISearchBarModeWQL[];
   onChange?: (params: any) => void;
   onSearch: (params: any) => void;
-  buttonsRender?: () => React.ReactNode
+  buttonsRender?: () => React.ReactNode;
   input?: string;
-};
+}
 
 export const SearchBar = ({
   defaultMode,
@@ -54,12 +55,16 @@ export const SearchBar = ({
     output: undefined,
   });
   // Cache the previous output
-  const queryLanguageOutputRunPreviousOutput = useRef(queryLanguageOutputRun.output);
+  const queryLanguageOutputRunPreviousOutput = useRef(
+    queryLanguageOutputRun.output,
+  );
   // Controls when the suggestion popover is open/close
   const [isOpenSuggestionPopover, setIsOpenSuggestionPopover] =
     useState<boolean>(false);
   // Reference to the input
   const inputRef = useRef();
+  // Debounce update timer
+  const debounceUpdateSearchBarTimer = useRef();
 
   // Handler when searching
   const _onSearch = (output: any) => {
@@ -79,55 +84,69 @@ export const SearchBar = ({
     }
   };
 
-  const selectedQueryLanguageParameters = modes.find(({ id }) => id === queryLanguage.id);
+  const selectedQueryLanguageParameters = modes.find(
+    ({ id }) => id === queryLanguage.id,
+  );
 
   useEffect(() => {
     // React to external changes and set the internal input text. Use the `transformInput` of
     // the query language in use
-    rest.input && searchBarQueryLanguages[queryLanguage.id]?.transformInput && setInput(
-      searchBarQueryLanguages[queryLanguage.id]?.transformInput?.(
-        rest.input,
-        {
-          configuration: queryLanguage.configuration,
-          parameters: selectedQueryLanguageParameters,
-        }
-      ),
-    );
+    rest.input &&
+      searchBarQueryLanguages[queryLanguage.id]?.transformInput &&
+      setInput(
+        searchBarQueryLanguages[queryLanguage.id]?.transformInput?.(
+          rest.input,
+          {
+            configuration: queryLanguage.configuration,
+            parameters: selectedQueryLanguageParameters,
+          },
+        ),
+      );
   }, [rest.input]);
 
   useEffect(() => {
     (async () => {
       // Set the query language output
-      const queryLanguageOutput = await searchBarQueryLanguages[queryLanguage.id].run(input, {
-        onSearch: _onSearch,
-        setInput,
-        closeSuggestionPopover: () => setIsOpenSuggestionPopover(false),
-        openSuggestionPopover: () => setIsOpenSuggestionPopover(true),
-        setQueryLanguageConfiguration: (configuration: any) =>
-          setQueryLanguage(state => ({
-            ...state,
-            configuration:
-              configuration?.(state.configuration) || configuration,
-          })),
-        setQueryLanguageOutput: setQueryLanguageOutputRun,
-        inputRef,
-        queryLanguage: {
-          configuration: queryLanguage.configuration,
-          parameters: selectedQueryLanguageParameters,
-        },
-      });
-      queryLanguageOutputRunPreviousOutput.current = {
-        ...queryLanguageOutputRun.output
-      };
-      setQueryLanguageOutputRun(queryLanguageOutput);
+      debounceUpdateSearchBarTimer.current &&
+        clearTimeout(debounceUpdateSearchBarTimer.current);
+      // Debounce the updating of the search bar state
+      debounceUpdateSearchBarTimer.current = setTimeout(async () => {
+        const queryLanguageOutput = await searchBarQueryLanguages[
+          queryLanguage.id
+        ].run(input, {
+          onSearch: _onSearch,
+          setInput,
+          closeSuggestionPopover: () => setIsOpenSuggestionPopover(false),
+          openSuggestionPopover: () => setIsOpenSuggestionPopover(true),
+          setQueryLanguageConfiguration: (configuration: any) =>
+            setQueryLanguage(state => ({
+              ...state,
+              configuration:
+                configuration?.(state.configuration) || configuration,
+            })),
+          setQueryLanguageOutput: setQueryLanguageOutputRun,
+          inputRef,
+          queryLanguage: {
+            configuration: queryLanguage.configuration,
+            parameters: selectedQueryLanguageParameters,
+          },
+        });
+        queryLanguageOutputRunPreviousOutput.current = {
+          ...queryLanguageOutputRun.output,
+        };
+        setQueryLanguageOutputRun(queryLanguageOutput);
+      }, SEARCH_BAR_DEBOUNCE_UPDATE_TIME);
     })();
   }, [input, queryLanguage, selectedQueryLanguageParameters?.options]);
 
   useEffect(() => {
-    onChange
-    // Ensure the previous output is different to the new one
-    && !_.isEqual(queryLanguageOutputRun.output, queryLanguageOutputRunPreviousOutput.current)
-    && onChange(queryLanguageOutputRun.output);
+    onChange &&
+      // Ensure the previous output is different to the new one
+      !_.isEqual(
+        queryLanguageOutputRun.output,
+        queryLanguageOutputRunPreviousOutput.current,
+      ) &&
+      onChange(queryLanguageOutputRun.output);
   }, [queryLanguageOutputRun.output]);
 
   const onQueryLanguagePopoverSwitch = () =>
@@ -163,7 +182,7 @@ export const SearchBar = ({
             closePopover={onQueryLanguagePopoverSwitch}
           >
             <EuiPopoverTitle>SYNTAX OPTIONS</EuiPopoverTitle>
-            <div style={{width: '350px'}}>
+            <div style={{ width: '350px' }}>
               <EuiText>
                 {searchBarQueryLanguages[queryLanguage.id].description}
               </EuiText>
@@ -173,7 +192,8 @@ export const SearchBar = ({
                   <div>
                     <EuiLink
                       href={
-                        searchBarQueryLanguages[queryLanguage.id].documentationLink
+                        searchBarQueryLanguages[queryLanguage.id]
+                          .documentationLink
                       }
                       target='__blank'
                       rel='noopener noreferrer'
@@ -194,7 +214,9 @@ export const SearchBar = ({
                         text: searchBarQueryLanguages[id].label,
                       }))}
                       value={queryLanguage.id}
-                      onChange={(event: React.ChangeEvent<HTMLSelectElement>) => {
+                      onChange={(
+                        event: React.ChangeEvent<HTMLSelectElement>,
+                      ) => {
                         const queryLanguageID: string = event.target.value;
                         setQueryLanguage({
                           id: queryLanguageID,
@@ -217,13 +239,19 @@ export const SearchBar = ({
       />
     </>
   );
-  return rest.buttonsRender || queryLanguageOutputRun.filterButtons
-    ? (
-      <EuiFlexGroup>
-        <EuiFlexItem>{searchBar}</EuiFlexItem>
-        {rest.buttonsRender && <EuiFlexItem grow={false}>{rest.buttonsRender()}</EuiFlexItem>}
-        {queryLanguageOutputRun.filterButtons && <EuiFlexItem grow={false}>{queryLanguageOutputRun.filterButtons}</EuiFlexItem>}
-      </EuiFlexGroup>
-    )
-    : searchBar;
+  return rest.buttonsRender || queryLanguageOutputRun.filterButtons ? (
+    <EuiFlexGroup>
+      <EuiFlexItem>{searchBar}</EuiFlexItem>
+      {rest.buttonsRender && (
+        <EuiFlexItem grow={false}>{rest.buttonsRender()}</EuiFlexItem>
+      )}
+      {queryLanguageOutputRun.filterButtons && (
+        <EuiFlexItem grow={false}>
+          {queryLanguageOutputRun.filterButtons}
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  ) : (
+    searchBar
+  );
 };
diff --git a/plugins/main/public/components/search-bar/query-language/wql.test.tsx b/plugins/main/public/components/search-bar/query-language/wql.test.tsx
@@ -303,7 +303,7 @@ describe('Query language - WQL', () => {
     ${'(field=value or field2>'}       | ${{ type: { iconType: 'kqlOperand', color: 'tint1' }, label: '~' }}            | ${'(field=value or field2~'}
     ${'(field=value or field2>'}       | ${{ type: { iconType: 'kqlValue', color: 'tint0' }, label: 'value2' }}         | ${'(field=value or field2>value2'}
     ${'(field=value or field2>value2'} | ${{ type: { iconType: 'kqlValue', color: 'tint0' }, label: 'value3' }}         | ${'(field=value or field2>value3'}
-    ${'(field=value or field2>value2'} | ${{ type: { iconType: 'tokenDenseVector', color: 'tint3' }, label: ')' }}      | ${'(field=value or field2>value2)'}
+    ${'(field=value or field2>value2'} | ${{ type: { iconType: 'tokenDenseVector', color: 'tint3' }, label: ')' }}      | ${'(field=value or field2>value2 )'}
   `(
     'click suggestion - WQL $WQL => $changedInput',
     async ({ WQL: currentInput, clikedSuggestion, changedInput }) => {

diff --git a/plugins/main/public/components/search-bar/query-language/wql.tsx b/plugins/main/public/components/search-bar/query-language/wql.tsx
@@ -1098,10 +1098,15 @@ export const WQL = {
                   : item.label;
             } else {
               // add a whitespace for conjunction <whitespace><conjunction>
+              // add a whitespace for grouping operator <whitespace>)
               !/\s$/.test(input) &&
                 (item.type.iconType ===
                   suggestionMappingLanguageTokenType.conjunction.iconType ||
-                  lastToken?.type === 'conjunction') &&
+                  lastToken?.type === 'conjunction' ||
+                  (item.type.iconType ===
+                    suggestionMappingLanguageTokenType.operator_group
+                      .iconType &&
+                    item.label === ')')) &&
                 tokens.push({
                   type: 'whitespace',
                   value: ' ',