From 16a27381dd0acdb290b33ce733046ed0eebc496f Mon Sep 17 00:00:00 2001 From: Alex P Date: Fri, 5 May 2017 09:53:46 -0700 Subject: [PATCH] Use modern js stuffs --- ui/src/shared/components/FunctionSelector.js | 4 ++-- ui/src/shared/components/MultiSelectDropdown.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/shared/components/FunctionSelector.js b/ui/src/shared/components/FunctionSelector.js index b13c06d49..d0dffb898 100644 --- a/ui/src/shared/components/FunctionSelector.js +++ b/ui/src/shared/components/FunctionSelector.js @@ -24,14 +24,14 @@ class FunctionSelector extends Component { if (this.isSelected(item)) { nextItems = localSelectedItems.filter(i => i !== item) } else { - nextItems = localSelectedItems.concat(item) + nextItems = [...localSelectedItems, item] } this.setState({localSelectedItems: nextItems}) } isSelected(item) { - return this.state.localSelectedItems.indexOf(item) > -1 + return !!this.state.localSelectedItems.find(text => text === item) } onApplyFunctions(e) { diff --git a/ui/src/shared/components/MultiSelectDropdown.js b/ui/src/shared/components/MultiSelectDropdown.js index f043bcb07..295ebf616 100644 --- a/ui/src/shared/components/MultiSelectDropdown.js +++ b/ui/src/shared/components/MultiSelectDropdown.js @@ -48,14 +48,14 @@ class MultiSelectDropdown extends Component { if (this.isSelected(item)) { nextItems = localSelectedItems.filter(i => i !== item) } else { - nextItems = localSelectedItems.concat(item) + nextItems = [...localSelectedItems, item] } this.setState({localSelectedItems: nextItems}) } isSelected(item) { - return this.state.localSelectedItems.indexOf(item) > -1 + return !!this.state.localSelectedItems.find(text => text === item) } onApplyFunctions(e) {