COMPASS-4296 Do not let map filter override other filters (#157)

Author: addaleax

package.json

@@ -25,8 +25,8 @@
     "compile": "cross-env NODE_ENV=production webpack --config ./config/webpack.prod.config.js --progress",
     "start": "webpack-dev-server --config ./config/webpack.dev.config.js",
     "start:watch": "npm run clean && webpack --config ./config/webpack.watch.config.js",
-    "test": "cross-env NODE_ENV=test mocha-webpack \"./src/**/*.spec.js\"",
-    "test:watch": "cross-env NODE_ENV=test mocha-webpack \"./src/**/*.spec.js\" --watch",
+    "test": "cross-env NODE_ENV=test mocha-webpack \"./src/**/*.spec.js\" \"./test/**/*.js\"",
+    "test:watch": "cross-env NODE_ENV=test mocha-webpack \"./src/**/*.spec.js\" \"./test/**/*.js\" --watch",
     "test:karma": "xvfb-maybe cross-env NODE_ENV=test karma start",
     "cover": "nyc npm run test",
     "ci": "npm run cover && npm run test:karma && npm run compile && npm run check",

src/stores/query-bar-store.js

@@ -286,6 +286,25 @@ const configureStore = (options = {}) => {
       this.setQuery(query, true);
     },
 
+    /**
+     * Like `setQuery()`, but merge an existing query into the current one
+     * instead of overwriting it.
+     *
+     * @param {Object} query   a query object with some or all query properties set.
+     * @param {Boolean} autoPopulated - flag to indicate whether the query was auto-populated or not.
+     */
+    mergeQuery(query, autoPopulated) {
+      const cloned = this._cloneQuery();
+      for (const key of Object.keys(query)) {
+        if (typeof query[key] === 'object' && query[key] !== null) {
+          cloned[key] = { ...cloned[key], ...query[key] };
+        } else {
+          cloned[key] = query[key];
+        }
+      }
+      this.setQuery(cloned, autoPopulated);
+    },
+
     /**
      * set many/all properties of a query at once. The values are converted to
      * strings, and xxxString is set. The values are validated, and xxxValid is
@@ -713,8 +732,8 @@ const configureStore = (options = {}) => {
     localAppRegistry.on('subtab-changed', () => {
       options.actions.refreshEditor();
     });
-    localAppRegistry.on('compass:schema:geo-query', (query) => {
-      store.setQuery({ filter: query }, true);
+    localAppRegistry.on('compass:schema:geo-query', (filter) => {
+      store.mergeQuery({ filter }, true);
     });
     localAppRegistry.on('compass:query-history:run-query', (query) => {
       store.setQuery(query, true);

test/renderer/query-bar-store.spec.js

@@ -179,6 +179,61 @@ describe('QueryBarStore [Store]', function() {
     });
   });
 
+  describe('mergeQuery', function() {
+    afterEach(function() {
+      unsubscribe();
+    });
+
+    describe('when setting two query properties separately', function() {
+      it('composes them when it is an object`', function(done) {
+        let calls = 0;
+        unsubscribe = store.listen(state => {
+          switch (++calls) {
+            case 1:
+              expect(state.filter).to.be.deep.equal({ foo: 1 });
+              break;
+            case 2:
+              expect(state.filter).to.be.deep.equal({ foo: 1, bar: 1 });
+              done();
+              break;
+            default:
+              throw new Error('unreachable');
+          }
+        });
+
+        store.mergeQuery({ filter: { foo: 1 } });
+        store.mergeQuery({ filter: { bar: 1 } });
+      });
+
+      it('overrides them when it is a primtive`', function(done) {
+        let calls = 0;
+        unsubscribe = store.listen(state => {
+          switch (++calls) {
+            case 1:
+              expect(state.filter).to.be.deep.equal({ foo: 1 });
+              expect(state.maxTimeMS).to.not.equal(20);
+              break;
+            case 2:
+              expect(state.filter).to.be.deep.equal({ foo: 1, bar: 1 });
+              expect(state.maxTimeMS).to.equal(20);
+              break;
+            case 3:
+              expect(state.filter).to.be.deep.equal({ foo: 1, bar: 4 });
+              expect(state.maxTimeMS).to.equal(40);
+              done();
+              break;
+            default:
+              throw new Error('unreachable');
+          }
+        });
+
+        store.mergeQuery({ filter: { foo: 1 } });
+        store.mergeQuery({ filter: { bar: 1 }, maxTimeMS: 20 });
+        store.mergeQuery({ filter: { bar: 4 }, maxTimeMS: 40 });
+      });
+    });
+  });
+
   describe('setQuery', function() {
     afterEach(function() {
       unsubscribe();