From a59b7ef7786cdcfda4ad021856c6186b8604e32f Mon Sep 17 00:00:00 2001
From: Thomas Rueckstiess <thomas@mongodb.com>
Date: Tue, 22 Nov 2016 15:41:40 +1100
Subject: [PATCH] COMPASS-291 only call setState once in apply/reset

---
 src/internal-packages/query/lib/store/query-store.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/internal-packages/query/lib/store/query-store.js b/src/internal-packages/query/lib/store/query-store.js
index c355465a974..fb9f47c603d 100644
--- a/src/internal-packages/query/lib/store/query-store.js
+++ b/src/internal-packages/query/lib/store/query-store.js
@@ -409,14 +409,13 @@ const QueryStore = Reflux.createStore({
       return;
     }
 
-    this.setState({queryState: APPLY_STATE});
-
     // empty string is interpreted as {}
     if (this.state.queryString === '') {
       this.setQuery({});
     }
     if (this.state.valid) {
       this.setState({
+        queryState: APPLY_STATE,
         lastExecutedQuery: _.clone(this.state.query)
       });
     }
@@ -426,12 +425,12 @@ const QueryStore = Reflux.createStore({
    * dismiss current changes to the query and restore `{}` as the query.
    */
   reset() {
-    this.setState({queryState: RESET_STATE});
     if (!_.isEqual(this.state.query, {})) {
       this.setQuery({});
       if (!_.isEqual(this.state.lastExecutedQuery, {})) {
         if (this.state.valid) {
           this.setState({
+            queryState: RESET_STATE,
             lastExecutedQuery: _.clone(this.state.query)
           });
         }