[Code] search experience fixes (#38617) (#38718)

elastic · Jun 11, 2019 · 2777036 · 2777036
1 parent d48e164
commit 2777036
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/x-pack/plugins/code/public/actions/search.ts b/x-pack/plugins/code/public/actions/search.ts
@@ -31,6 +31,8 @@ export const repositorySearchFailed = createAction<Error>('REPOSITORY SEARCH FAI
 
 export const changeSearchScope = createAction<SearchScope>('CHANGE SEARCH SCOPE');
 
+export const suggestionSearch = createAction<string>('SUGGESTION SEARCH');
+
 // For repository search typeahead
 export const repositorySearchQueryChanged = createAction<RepositorySearchPayload>(
   'REPOSITORY SEARCH QUERY CHANGED'

diff --git a/x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx b/x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx
@@ -9,7 +9,7 @@ import React, { Component } from 'react';
 
 import { EuiFieldText, EuiFlexGroup, EuiFlexItem, EuiOutsideClickDetector } from '@elastic/eui';
 import { connect } from 'react-redux';
-import { saveSearchOptions, searchReposForScope } from '../../../actions';
+import { saveSearchOptions, searchReposForScope, suggestionSearch } from '../../../actions';
 import { matchPairs } from '../lib/match_pairs';
 import { SuggestionsComponent } from './typeahead/suggestions_component';
 
@@ -39,7 +39,8 @@ const KEY_CODES = {
 interface Props {
   query: string;
   onSubmit: (query: string) => void;
-  onSelect: (item: AutocompleteSuggestion) => void;
+  onSelect: (item: AutocompleteSuggestion, query: string) => void;
+  onSuggestionQuerySubmitted?: (query: string) => void;
   disableAutoFocus?: boolean;
   appName: string;
   suggestionProviders: SuggestionsProvider[];
@@ -188,6 +189,10 @@ export class CodeQueryBar extends Component<Props, State> {
       return;
     }
 
+    if (this.props.onSuggestionQuerySubmitted) {
+      this.props.onSuggestionQuerySubmitted(query);
+    }
+
     const res = await Promise.all(
       this.props.suggestionProviders.map((provider: SuggestionsProvider) => {
         // Merge the default repository scope if necessary.
@@ -214,17 +219,16 @@ export class CodeQueryBar extends Component<Props, State> {
     if (selectionStart === null || selectionEnd === null) {
       return;
     }
-
     this.setState(
       {
-        query: '',
+        query: this.state.query,
         groupIndex: null,
         itemIndex: null,
         isSuggestionsVisible: false,
       },
       () => {
         if (item) {
-          this.props.onSelect(item);
+          this.props.onSelect(item, this.state.query);
         }
       }
     );
@@ -505,6 +509,7 @@ const mapStateToProps = (state: RootState) => ({
 const mapDispatchToProps = {
   repositorySearch: searchReposForScope,
   saveSearchOptions,
+  onSuggestionQuerySubmitted: suggestionSearch,
 };
 
 export const QueryBar = connect(

diff --git a/x-pack/plugins/code/public/components/search_bar/search_bar.tsx b/x-pack/plugins/code/public/components/search_bar/search_bar.tsx
@@ -66,7 +66,10 @@ export class SearchBar extends React.PureComponent<Props> {
   }
 
   public onSubmit = (q: string) => {
-    this.onSearchChanged(q);
+    // ignore empty query
+    if (q.trim().length > 0) {
+      this.onSearchChanged(q);
+    }
   };
 
   public onSelect = (item: AutocompleteSuggestion) => {

diff --git a/x-pack/plugins/code/public/reducers/search.ts b/x-pack/plugins/code/public/reducers/search.ts
@@ -22,6 +22,7 @@ import {
   saveSearchOptions,
   searchReposForScope,
   searchReposForScopeSuccess,
+  suggestionSearch,
   turnOffDefaultRepoScope,
   turnOnDefaultRepoScope,
 } from '../actions';
@@ -137,6 +138,12 @@ export const search = handleActions<SearchState, any>(
         return state;
       }
     },
+    [String(suggestionSearch)]: (state: SearchState, action: Action<string>) =>
+      produce<SearchState>(state, draft => {
+        if (action.payload) {
+          draft.query = action.payload;
+        }
+      }),
     [String(repositorySearchAction)]: (
       state: SearchState,
       action: Action<RepositorySearchPayload>