Skip to content

Commit db6bc0a

Browse files
committed
[Code] apply repo search scope right away in search page (#34029)
1 parent 817f43e commit db6bc0a

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

x-pack/plugins/code/public/components/main/search_bar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ export class CodeSearchBar extends React.Component<Props> {
100100
appName="code"
101101
disableAutoFocus={true}
102102
suggestionProviders={this.suggestionProviders}
103+
enableSubmitWhenOptionsChanged={false}
103104
onSearchScopeChanged={this.props.onSearchScopeChanged}
104105
ref={instance => {
105106
if (instance) {

x-pack/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ exports[`render correctly with empty query string 1`] = `
44
<CodeQueryBar
55
appName="mockapp"
66
disableAutoFocus={false}
7+
enableSubmitWhenOptionsChanged={false}
78
onSearchScopeChanged={[Function]}
89
onSelect={[Function]}
910
onSubmit={[Function]}
@@ -727,6 +728,7 @@ exports[`render correctly with input query string changed 1`] = `
727728
<CodeQueryBar
728729
appName="mockapp"
729730
disableAutoFocus={false}
731+
enableSubmitWhenOptionsChanged={false}
730732
onSearchScopeChanged={[Function]}
731733
onSelect={[Function]}
732734
onSubmit={[Function]}

x-pack/plugins/code/public/components/query_bar/components/query_bar.test.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ test('render correctly with empty query string', () => {
3535
disableAutoFocus={false}
3636
appName="mockapp"
3737
suggestionProviders={[]}
38+
enableSubmitWhenOptionsChanged={false}
3839
onSubmit={emptyFn}
3940
onSelect={emptyFn}
4041
onSearchScopeChanged={emptyFn}
@@ -94,6 +95,7 @@ test('render correctly with input query string changed', done => {
9495
mockSymbolSuggestionsProvider,
9596
mockRepositorySuggestionsProvider,
9697
]}
98+
enableSubmitWhenOptionsChanged={false}
9799
onSubmit={submitSpy}
98100
onSelect={emptyFn}
99101
onSearchScopeChanged={emptyFn}

x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ interface Props {
4646
suggestionProviders: SuggestionsProvider[];
4747
repositorySearch: (p: { query: string }) => void;
4848
saveSearchOptions: (searchOptions: ISearchOptions) => void;
49+
enableSubmitWhenOptionsChanged: boolean;
4950
onSearchScopeChanged: (s: SearchScope) => void;
5051
repoSearchResults: any[];
5152
searchLoading: boolean;
@@ -373,6 +374,15 @@ export class CodeQueryBar extends Component<Props, State> {
373374
if (prevProps.query !== this.props.query) {
374375
this.updateSuggestions();
375376
}
377+
378+
// When search options (e.g. repository scopes) change,
379+
// submit the search query again to refresh the search result.
380+
if (
381+
this.props.enableSubmitWhenOptionsChanged &&
382+
!_.isEqual(prevProps.searchOptions, this.props.searchOptions)
383+
) {
384+
this.onSubmit();
385+
}
376386
}
377387

378388
public componentWillUnmount() {

x-pack/plugins/code/public/components/search_page/search_bar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ export class SearchBar extends React.PureComponent<Props> {
105105
appName="code"
106106
suggestionProviders={suggestionProviders}
107107
onSearchScopeChanged={this.props.onSearchScopeChanged}
108+
enableSubmitWhenOptionsChanged={true}
108109
ref={instance => {
109110
if (instance) {
110111
// @ts-ignore

0 commit comments

Comments
 (0)