Add null checks for user and source to UI search

cawallin · Oct 10, 2016 · 71ecf79 · 71ecf79
1 parent b07c228
commit 71ecf79
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/presto-main/src/main/resources/webapp/assets/query-list.js b/presto-main/src/main/resources/webapp/assets/query-list.js
@@ -249,11 +249,20 @@ var QueryList = React.createClass({
         else {
             return stateFilteredQueries.filter(function(query) {
                 var term = searchString.toLowerCase();
-                return (query.queryId.toLowerCase().indexOf(term) != -1 ||
-                    query.session.user.toLowerCase().indexOf(term) != -1  ||
-                    query.session.source.toLowerCase().indexOf(term) != -1  ||
+                if (query.queryId.toLowerCase().indexOf(term) != -1 ||
                     query.humanReadableState.toLowerCase().indexOf(term) != -1 ||
-                    query.query.toLowerCase().indexOf(term) != -1 );
+                    query.query.toLowerCase().indexOf(term) != -1) {
+                    return true;
+                }
+
+                if (query.session.user && query.session.user.toLowerCase().indexOf(term) != -1) {
+                    return true;
+                }
+
+                if (query.session.source && query.session.source.toLowerCase().indexOf(term) != -1) {
+                    return true;
+                }
+
             }, this);
         }
     },