From b490e81b3615680a084180cb966ace6ee115a268 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 24 Jul 2018 11:14:50 -0400
Subject: [PATCH 1/3] add EMS hot link

---
 .../region_map/public/region_map_vis.js           |  3 ++-
 .../region_map/public/region_map_vis_params.html  |  6 ++++++
 .../region_map/public/region_map_vis_params.js    | 15 ++++++++++++++-
 src/core_plugins/region_map/public/util.js        |  3 ++-
 src/server/config/schema.js                       |  1 +
 src/ui/public/vis/map/service_settings.js         |  5 +++++
 6 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/core_plugins/region_map/public/region_map_vis.js b/src/core_plugins/region_map/public/region_map_vis.js
index d29fb6eaae893..ed97e2403c8c8 100644
--- a/src/core_plugins/region_map/public/region_map_vis.js
+++ b/src/core_plugins/region_map/public/region_map_vis.js
@@ -33,7 +33,7 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps
   const VisFactory = Private(VisFactoryProvider);
   const RegionMapsVisualization = Private(RegionMapsVisualizationProvider);
 
-  const vectorLayers = regionmapsConfig.layers.map(mapToLayerWithId.bind(null, 'self_hosted'));
+  const vectorLayers = regionmapsConfig.layers.map(mapToLayerWithId.bind(null, 'self_hosted', false));
   const selectedLayer = vectorLayers[0];
   const selectedJoinField = selectedLayer ? vectorLayers[0].fields[0] : null;
 
@@ -50,6 +50,7 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps
         addTooltip: true,
         colorSchema: 'Yellow to Red',
         selectedLayer: selectedLayer,
+        emsHotLink: '',
         selectedJoinField: selectedJoinField,
         isDisplayWarning: true,
         wms: config.get('visualization:tileMap:WMSdefaults'),
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 678412959550a..dec499e78cdb1 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -21,6 +21,12 @@
       </div>
     </div>
 
+    <div class="kuiSideBarFormRow" ng-hide="!editorState.params.emsHotLink">
+      <div class="kuiSideBarFormRow__control">
+        Preview <a ng-href="{{editorState.params.emsHotLink}}" target="_">{{editorState.params.selectedLayer.name}} on the Elastic Maps Service</a>
+      </div>
+    </div>
+
     <div class="kuiSideBarFormRow">
       <label class="kuiSideBarFormRow__label" for="joinField">
         Join field
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.js b/src/core_plugins/region_map/public/region_map_vis_params.js
index 26dfc2a572325..16d2e46ab5050 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.js
+++ b/src/core_plugins/region_map/public/region_map_vis_params.js
@@ -38,7 +38,7 @@ uiModules.get('kibana/region_map')
           serviceSettings.getFileLayers()
             .then(function (layersFromService) {
 
-              layersFromService = layersFromService.map(mapToLayerWithId.bind(null, 'elastic_maps_service'));
+              layersFromService = layersFromService.map(mapToLayerWithId.bind(null, 'elastic_maps_service', true));
               const newVectorLayers = $scope.collections.vectorLayers.slice();
               for (let i = 0; i < layersFromService.length; i += 1) {
                 const layerFromService = layersFromService[i];
@@ -87,9 +87,22 @@ uiModules.get('kibana/region_map')
         }
 
         function onLayerChange() {
+
+          if (!$scope.editorState.params.selectedLayer) {
+            return;
+          }
+
           $scope.editorState.params.selectedJoinField = $scope.editorState.params.selectedLayer.fields[0];
+
+          if ($scope.editorState.params.selectedLayer.isEMS) {
+            $scope.editorState.params.emsHotLink = serviceSettings.getEMSHotLink($scope.editorState.params.selectedLayer);
+          } else {
+            $scope.editorState.params.emsHotLink = null;
+          }
         }
 
+        onLayerChange();
+
       }
     };
   });
diff --git a/src/core_plugins/region_map/public/util.js b/src/core_plugins/region_map/public/util.js
index 9702f31352351..990fde4808ad3 100644
--- a/src/core_plugins/region_map/public/util.js
+++ b/src/core_plugins/region_map/public/util.js
@@ -19,8 +19,9 @@
 
 import _ from 'lodash';
 
-export function mapToLayerWithId(prefix, layer) {
+export function mapToLayerWithId(prefix, isEMS, layer) {
   const clonedLayer = _.cloneDeep(layer);
   clonedLayer.layerId = prefix + '.' + layer.name;
+  clonedLayer.isEMS = isEMS;
   return clonedLayer;
 }
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index 37df9fff22eef..42f6ffc41670f 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -228,6 +228,7 @@ export default async () => Joi.object({
       }))
     }).default(),
     manifestServiceUrl: Joi.string().default(' https://catalogue.maps.elastic.co/v2/manifest'),
+    emsLandingPageUrl: Joi.string().default('https://maps.elastic.co/v2'),
     includeElasticMapsService: Joi.boolean().default(true)
   }).default(),
   tilemap: Joi.object({
diff --git a/src/ui/public/vis/map/service_settings.js b/src/ui/public/vis/map/service_settings.js
index 542595e805ecb..1172dd04e38c1 100644
--- a/src/ui/public/vis/map/service_settings.js
+++ b/src/ui/public/vis/map/service_settings.js
@@ -183,6 +183,11 @@ uiModules.get('kibana')
           }
         }
       }
+
+      getEMSHotLink(fileLayer) {
+        const id = `file/${fileLayer.name}`;
+        return `${mapConfig.emsLandingPageUrl}#${id}`;
+      }
     }
 
     return new ServiceSettings();

From 52d790d5a8ad5939ad99ab5bf16eea8914aa739b Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 24 Jul 2018 13:50:00 -0400
Subject: [PATCH 2/3] wrap in class

---
 .../kibana/public/visualize/editor/styles/_editor.less |  3 +++
 .../region_map/public/region_map_vis_params.html       | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
index 55f2a17bb4aa5..84e7dbbce7b38 100644
--- a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -485,3 +485,6 @@ vis-editor-vis-options > * {
 .agg-select-help {
   float: right;
 }
+
+.ems-hotlink {
+}
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index dec499e78cdb1..5d5f18b5da759 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -22,9 +22,13 @@
     </div>
 
     <div class="kuiSideBarFormRow" ng-hide="!editorState.params.emsHotLink">
-      <div class="kuiSideBarFormRow__control">
-        Preview <a ng-href="{{editorState.params.emsHotLink}}" target="_">{{editorState.params.selectedLayer.name}} on the Elastic Maps Service</a>
-      </div>
+        <a
+          class="ems-hotlink"
+          target="_blank"
+          rel="noopener noreferrer"
+          ng-href="{{editorState.params.emsHotLink}}"
+          target="_blank">Preview {{editorState.params.selectedLayer.name}} on the Elastic Maps Service
+        </a>
     </div>
 
     <div class="kuiSideBarFormRow">

From 5d76d1f53be1751a3c6804a1efe182706b22e120 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Thu, 26 Jul 2018 12:14:46 -0400
Subject: [PATCH 3/3] design tweaks

---
 .../kibana/public/visualize/editor/styles/_editor.less     | 7 +++++--
 .../region_map/public/region_map_vis_params.html           | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
index 84e7dbbce7b38..6991ae34d6cb1 100644
--- a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -444,6 +444,10 @@ vis-editor-vis-options > * {
   .flex-parent();
 }
 
+.vis-editor-config .ems-hotlink {
+  font-size: 12px;
+}
+
 /**
    * 1. TODO: Override bootstrap styles. Remove !important once we're rid of bootstrap.
    */
@@ -486,5 +490,4 @@ vis-editor-vis-options > * {
   float: right;
 }
 
-.ems-hotlink {
-}
+
diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html
index 5d5f18b5da759..c846a0cfc6a29 100644
--- a/src/core_plugins/region_map/public/region_map_vis_params.html
+++ b/src/core_plugins/region_map/public/region_map_vis_params.html
@@ -27,7 +27,9 @@
           target="_blank"
           rel="noopener noreferrer"
           ng-href="{{editorState.params.emsHotLink}}"
-          target="_blank">Preview {{editorState.params.selectedLayer.name}} on the Elastic Maps Service
+          target="_blank"
+          title="Preview {{editorState.params.selectedLayer.name}} on the Elastic Maps Service"
+        >Preview on EMS
         </a>
     </div>