From 51738ca44aee4c085d3f508b762f2298ab484eb1 Mon Sep 17 00:00:00 2001
From: Maxym Borodenko <m.borodenko@aimprosoft.com>
Date: Thu, 2 May 2019 12:22:03 +0300
Subject: [PATCH] Map filtering errors

---
 src/ui/common/filter/AutocompleteFilter.tsx | 6 +++---
 src/ui/common/filter/StringArrFilter.tsx    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ui/common/filter/AutocompleteFilter.tsx b/src/ui/common/filter/AutocompleteFilter.tsx
index 5cb5569c..ab242ea2 100644
--- a/src/ui/common/filter/AutocompleteFilter.tsx
+++ b/src/ui/common/filter/AutocompleteFilter.tsx
@@ -129,7 +129,7 @@ class AutocompleteFilterInternal extends React.Component<IAutocompleteFilterInte
     const values = _.get(props, `${props.names[1]}.input.value`);
 
     this.state = {
-      excludedValues: null,
+      excludedValues: [],
       values,
       notValues,
       text: '',
@@ -143,7 +143,7 @@ class AutocompleteFilterInternal extends React.Component<IAutocompleteFilterInte
     const notValue = _.get(this.props, `${this.props.names[1]}.input.value`);
 
     this.setState({
-      excludedValues: null,
+      excludedValues: [],
       values: [ ...value ],
       notValues: [ ...notValue ],
       text: '',
@@ -274,7 +274,7 @@ class AutocompleteFilterInternal extends React.Component<IAutocompleteFilterInte
         { terms &&
           <Properties>
             <h5 className="pl-10 pt-1rem mb-10">{ t('common:f.suggestedFilters') }</h5>
-            { terms && Array.from(terms).slice(0, 10).filter(([key, value]) => !excludedValues || !excludedValues.includes(key)).map(([key, value]) => (
+            { terms && Array.from(terms).slice(0, 10).filter(([key, value]) => excludedValues.length === 0 || !excludedValues.includes(key)).map(([key, value]) => (
               <PropertiesItem key={ key } title={ key }  onClick={ () => input.onChange(this.maybeAdd(key)) } classes={ {...classes, propertiesRow: 'cursor-pointer'} }>
                   <span className="float-right">
                     <Number value={ value }/>
diff --git a/src/ui/common/filter/StringArrFilter.tsx b/src/ui/common/filter/StringArrFilter.tsx
index 2c0cc34b..d38671f1 100644
--- a/src/ui/common/filter/StringArrFilter.tsx
+++ b/src/ui/common/filter/StringArrFilter.tsx
@@ -138,7 +138,7 @@ class InternalStringArrField extends React.Component<IStringArrFilterInternal &
         const values = _.get(props, `${props.names[1]}.input.value`);
 
         this.state = {
-            excludedValues: null,
+            excludedValues: [],
             values,
             notValues,
             text: '',
@@ -151,7 +151,7 @@ class InternalStringArrField extends React.Component<IStringArrFilterInternal &
         const notValue = _.get(this.props, `${this.props.names[1]}.input.value`);
 
         this.setState({
-            excludedValues: null,
+            excludedValues: [],
             values: [ ...value ],
             notValues: [ ...notValue ],
             text: '',
@@ -402,7 +402,7 @@ class InternalStringArrField extends React.Component<IStringArrFilterInternal &
                 { !withOptions && terms &&
                 <Properties>
                     <h5 className="pl-10 pt-1rem mb-10">{ t('common:f.suggestedFilters') }</h5>
-                    { terms && Array.from(terms).slice(0, 10).filter(([key, value]) => !excludedValues || !excludedValues.includes(key)).map(([key, value]) => (
+                    { terms && Array.from(terms).slice(0, 10).filter(([key, value]) => excludedValues.length === 0 || !excludedValues.includes(key)).map(([key, value]) => (
                         <PropertiesItem key={ key } title={ key }  onClick={ () => input.onChange(this.maybeAdd(key)) } classes={ {...classes, propertiesRow: 'cursor-pointer'} }>
                             <span className="float-right">
                                 <Number value={ value }/>
-- 
GitLab