github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Code] Reset the default search scope (#37014) (#37169)

Browse source
This commit is contained in:
Mengwei Ding 2019-05-26 22:16:14 -07:00 • committed by GitHub
parent f71384e9f9
commit 677b102f7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/code/public/actions/search.ts
View file

@ -41,6 +41,7 @@ export const repositoryTypeaheadSearchFailed = createAction<string>('REPOSITORY
export const saveSearchOptions = createAction<SearchOptions>('SAVE SEARCH OPTIONS');
export const turnOnDefaultRepoScope = createAction<Repository>('TURN ON DEFAULT REPO SCOPE');
export const turnOffDefaultRepoScope = createAction('TURN OFF DEFAULT REPO SCOPE');
export const searchReposForScope = createAction<RepositorySearchPayload>('SEARCH REPOS FOR SCOPE');
export const searchReposForScopeSuccess = createAction<any>('SEARCH REPOS FOR SCOPE SUCCESS');

3
x-pack/plugins/code/public/components/query_bar/components/options.tsx
View file

@ -51,8 +51,7 @@ export class SearchOptions extends Component<Props, State> {
componentDidUpdate(prevProps: Props) {
if (
this.props.searchOptions.defaultRepoScopeOn &&
!prevProps.searchOptions.defaultRepoScopeOn
this.props.searchOptions.defaultRepoScopeOn !== prevProps.searchOptions.defaultRepoScopeOn
) {
this.setState({ defaultRepoScopeOn: this.props.searchOptions.defaultRepoScopeOn });
}

6
x-pack/plugins/code/public/reducers/search.ts
View file

@ -22,6 +22,7 @@ import {
saveSearchOptions,
searchReposForScope,
searchReposForScopeSuccess,
turnOffDefaultRepoScope,
turnOnDefaultRepoScope,
} from '../actions';
@ -179,6 +180,11 @@ export const search = handleActions<SearchState, any>(
draft.searchOptions.defaultRepoScope = action.payload;
draft.searchOptions.defaultRepoScopeOn = true;
}),
[String(turnOffDefaultRepoScope)]: (state: SearchState, action: Action<any>) =>
produce<SearchState>(state, draft => {
delete draft.searchOptions.defaultRepoScope;
draft.searchOptions.defaultRepoScopeOn = false;
}),
},
initialState
);

9
x-pack/plugins/code/public/sagas/search.ts
View file

@ -25,8 +25,9 @@ import {
searchReposForScope,
searchReposForScopeFailed,
searchReposForScopeSuccess,
turnOffDefaultRepoScope,
} from '../actions';
import { searchRoutePattern } from './patterns';
import { adminRoutePattern, searchRoutePattern } from './patterns';
function requestDocumentSearch(payload: DocumentSearchPayload) {
const { query, page, languages, repositories, repoScope } = payload;
@ -123,8 +124,14 @@ function* handleSearchRouteChange(action: Action<Match>) {
}
}
function* resetDefaultRepoScope() {
yield put(turnOffDefaultRepoScope());
}
export function* watchSearchRouteChange() {
yield takeLatest(searchRoutePattern, handleSearchRouteChange);
// Reset the default search scope if enters the admin page.
yield takeLatest(adminRoutePattern, resetDefaultRepoScope);
}
function* handleReposSearchForScope(action: Action<RepositorySearchPayload>) {