maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix(code/frontend): fix search filter duplicate items (#38858)

Browse source
This commit is contained in:
WangQianliang 2019-06-14 10:12:52 +08:00 committed by GitHub
parent 9c57df5e3f
commit 3a9dd77293
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@ export class SearchOptions extends Component<Props, State> {
let optionsFlyout; let optionsFlyout;
const repoScope = const repoScope =
this.state.defaultRepoScopeOn && this.props.defaultSearchScope this.state.defaultRepoScopeOn && this.props.defaultSearchScope
? unique([...this.state.repoScope, this.props.defaultSearchScope], r => r.uri) ? unique([...this.state.repoScope, this.props.defaultSearchScope], (r: Repository) => r.uri)
: this.state.repoScope; : this.state.repoScope;
if (this.state.isFlyoutOpen) { if (this.state.isFlyoutOpen) {
const selectedRepos = repoScope.map(r => { const selectedRepos = repoScope.map(r => {
@ -197,14 +197,17 @@ export class SearchOptions extends Component<Props, State> {
private onRepoChange = (repos: any) => { private onRepoChange = (repos: any) => {
this.setState(prevState => ({ this.setState(prevState => ({
repoScope: unique([ repoScope: unique(
...prevState.repoScope, [
...repos.map((r: any) => ...prevState.repoScope,
[...this.props.repoSearchResults, ...this.props.defaultRepoOptions].find( ...repos.map((r: any) =>
rs => rs.name === r.label [...this.props.repoSearchResults, ...this.props.defaultRepoOptions].find(
) rs => rs.name === r.label
), )
]), ),
],
(r: Repository) => r.uri
),
})); }));
}; };