fixing cluster and scope filtration

zalando-stups · Apr 18, 2018 · 7fd3ba9 · 7fd3ba9
1 parent d4fea94
commit 7fd3ba9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/client/lib/application/src/cluster-list.jsx b/client/lib/application/src/cluster-list.jsx
@@ -7,7 +7,7 @@ class ClusterList extends React.Component {
         super();
         this.state = {
             term: '',
-            filtered: props.clusters,
+            filtered: props.clusters || [],
             selected: props.selected || []
         };
     }
@@ -42,7 +42,7 @@ class ClusterList extends React.Component {
         this.setState({
             term: term,
             filtered: term.length ?
-                        this.props.clusters.filter(c => c.alias.indexOf(term) >= 0 || this.state.selected.some(s => s === c.id)) :
+                        this.props.clusters.filter(c => c.alias.indexOf(term) >= 0 || (this.state.selected && this.state.selected.some(s => s === c.id))) :
                         this.props.clusters
         });
     }

diff --git a/client/lib/application/src/folded-scope-list.jsx b/client/lib/application/src/folded-scope-list.jsx
@@ -25,13 +25,11 @@ class OwnerScopeList extends ScopeList {
       }
 
     componentWillReceiveProps(nextProps) {
-        if (!this.state.term.length) {
-            this.setState({
-                filtered: nextProps.scopes,
-                selected: nextProps.selected,
-                allResources: nextProps.allResources
-            });
-        }
+      this.setState({
+          filtered: nextProps.scopes,
+          selected: nextProps.selected,
+          allResources: nextProps.allResources
+      });
     }
 
     toggleFolding(resourceType) {