commit 098e93f3979943976d8163957a479d002c0f7178
author Dhruv Srivastava <dhruvsri@google.com> Sat Oct 12 13:33:09 2019 +0200
committer Dhruv Srivastava <dhruvsri@google.com> Wed Oct 16 12:30:05 2019 +0200
tree 937ad1bbae83ed0aa951bb9850ccc872c4abec25
parent bcd6dba57d2cef55afd49fda71367bd12c849a61

Stop query from executing if predicate is empty

If user types a query in the search bar with incomplete predicate then we do not
execute the query if it is one of the pre-defined ones.

Bug: Issue 7083
Change-Id: I5b29caf3a025f8b0282185133e18de1b6f21c859

polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js

diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js
index 5b9776b..7f8ee3b 100644
--- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js
+++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js
@@ -96,7 +96,7 @@
 
   // All of the ops, with corresponding negations.
   const SEARCH_OPERATORS_WITH_NEGATIONS =
-      SEARCH_OPERATORS.concat(SEARCH_OPERATORS.map(op => `-${op}`));
+    SEARCH_OPERATORS.concat(SEARCH_OPERATORS.map(op => `-${op}`));
 
   const MAX_AUTOCOMPLETE_RESULTS = 10;
 
@@ -191,7 +191,16 @@
       } else {
         target.blur();
       }
-      if (this._inputVal) {
+      const trimmedInput = this._inputVal && this._inputVal.trim();
+      if (trimmedInput) {
+        const predefinedOpOnlyQuery = SEARCH_OPERATORS_WITH_NEGATIONS.some(
+            op => {
+              return op.endsWith(':') && op === trimmedInput;
+            }
+        );
+        if (predefinedOpOnlyQuery) {
+          return;
+        }
         this.dispatchEvent(new CustomEvent('handle-search', {
           detail: {inputVal: this._inputVal},
         }));

polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html

diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html
index 1365c00..2fe940c 100644
--- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html
+++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.html
@@ -93,6 +93,42 @@
       assert.isFalse(searchSpy.called);
     });
 
+    test('Predefined query op with no predication doesnt trigger nav', () => {
+      const searchSpy = sandbox.spy();
+      element.addEventListener('handle-search', searchSpy);
+      element.value = 'added:';
+      MockInteractions.pressAndReleaseKeyOn(element.$.searchInput.$.input, 13,
+          null, 'enter');
+      assert.isFalse(searchSpy.called);
+    });
+
+    test('predefined predicate query triggers nav', () => {
+      const searchSpy = sandbox.spy();
+      element.addEventListener('handle-search', searchSpy);
+      element.value = 'age:1week';
+      MockInteractions.pressAndReleaseKeyOn(element.$.searchInput.$.input, 13,
+          null, 'enter');
+      assert.isTrue(searchSpy.called);
+    });
+
+    test('undefined predicate query triggers nav', () => {
+      const searchSpy = sandbox.spy();
+      element.addEventListener('handle-search', searchSpy);
+      element.value = 'random:1week';
+      MockInteractions.pressAndReleaseKeyOn(element.$.searchInput.$.input, 13,
+          null, 'enter');
+      assert.isTrue(searchSpy.called);
+    });
+
+    test('empty undefined predicate query triggers nav', () => {
+      const searchSpy = sandbox.spy();
+      element.addEventListener('handle-search', searchSpy);
+      element.value = 'random:';
+      MockInteractions.pressAndReleaseKeyOn(element.$.searchInput.$.input, 13,
+          null, 'enter');
+      assert.isTrue(searchSpy.called);
+    });
+
     test('keyboard shortcuts', () => {
       const focusSpy = sandbox.spy(element.$.searchInput, 'focus');
       const selectAllSpy = sandbox.spy(element.$.searchInput, 'selectAll');