[maps] fix fit to bounds for ES document layers with joins (elastic#7…

…3985)
nreese · Aug 1, 2020 · b8c52e6 · b8c52e6
1 parent 6e3675a
commit b8c52e6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js
@@ -158,7 +158,7 @@ export class VectorLayer extends AbstractLayer {
 
   async getBounds({ startLoading, stopLoading, registerCancelCallback, dataFilters }) {
     const isStaticLayer = !this.getSource().isBoundsAware();
-    if (isStaticLayer) {
+    if (isStaticLayer || this.hasJoins()) {
       return getFeatureCollectionBounds(this._getSourceFeatureCollection(), this.hasJoins());
     }
 

diff --git a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
@@ -25,10 +25,30 @@ export default function ({ getPageObjects }) {
         await PageObjects.maps.setAndSubmitQuery('machine.os.raw : "ios"');
         await PageObjects.maps.waitForMapPanAndZoom(origView);
 
-        const { lat, lon, zoom } = await PageObjects.maps.getView();
+        const { lat, lon } = await PageObjects.maps.getView();
         expect(Math.round(lat)).to.equal(43);
         expect(Math.round(lon)).to.equal(-102);
-        expect(Math.round(zoom)).to.equal(5);
+      });
+    });
+
+    describe('with joins', () => {
+      before(async () => {
+        await PageObjects.maps.loadSavedMap('join example');
+        await PageObjects.maps.enableAutoFitToBounds();
+      });
+
+      it('should automatically fit to bounds when query is applied', async () => {
+        // Set view to other side of world so no matching results
+        await PageObjects.maps.setView(0, 0, 6);
+
+        // Setting query should trigger fit to bounds and move map
+        const origView = await PageObjects.maps.getView();
+        await PageObjects.maps.setAndSubmitQuery('prop1 >= 11');
+        await PageObjects.maps.waitForMapPanAndZoom(origView);
+
+        const { lat, lon } = await PageObjects.maps.getView();
+        expect(Math.round(lat)).to.equal(0);
+        expect(Math.round(lon)).to.equal(60);
       });
     });
   });