From eb3cd0cb0b69417c4c48b8ce90f614b12a5afdd1 Mon Sep 17 00:00:00 2001
From: Rob Gaston <rgaston@fargeo.com>
Date: Mon, 8 Jul 2019 11:25:03 -0700
Subject: [PATCH] map popup and workflow step style fixes, re: #4670

---
 arches/app/media/css/arches.css                             | 6 +++++-
 arches/app/media/js/views/components/cards/map.js           | 3 +++
 arches/app/media/js/views/components/map.js                 | 5 ++++-
 .../app/templates/views/components/workflows/final-step.htm | 2 +-
 .../views/components/workflows/new-multi-tile-step.htm      | 2 ++
 .../templates/views/components/workflows/new-tile-step.htm  | 2 ++
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css
index 5acf5e1dfb8..61d050c0bab 100644
--- a/arches/app/media/css/arches.css
+++ b/arches/app/media/css/arches.css
@@ -531,10 +531,14 @@ input[type="checkbox"] {
 .workflow-step-body {
     background-color: #eee;
     height: 100%;
-    padding: 20px 35px 300px 40px;
+    padding: 0 0 218px 0;
     overflow-y: auto;
 }
 
+.padded-workflow-step {
+    padding: 35px;
+}
+
 .wf-multi-tile-step-container {
     display: flex;
     flex-direction: row;
diff --git a/arches/app/media/js/views/components/cards/map.js b/arches/app/media/js/views/components/cards/map.js
index a4e4c95973d..dc6f7af3d22 100644
--- a/arches/app/media/js/views/components/cards/map.js
+++ b/arches/app/media/js/views/components/cards/map.js
@@ -153,6 +153,9 @@ define([
                         type: 'FeatureCollection',
                         features: getDrawFeatures()
                     });
+                    _.each(self.featureLookup, function(value) {
+                        if (value.selectedTool()) value.selectedTool('');
+                    });
                 });
             });
         },
diff --git a/arches/app/media/js/views/components/map.js b/arches/app/media/js/views/components/map.js
index 6580e0f6113..bec4a4fd774 100644
--- a/arches/app/media/js/views/components/map.js
+++ b/arches/app/media/js/views/components/map.js
@@ -35,6 +35,7 @@ define([
         var mapLayers = params.mapLayers || arches.mapLayers;
 
         this.map = ko.isObservable(params.map) ? params.map : ko.observable();
+        this.popupTemplate = popupTemplate;
         this.basemaps = [];
         this.overlays = ko.observableArray();
         this.activeBasemap = ko.observable();
@@ -204,6 +205,8 @@ define([
             resourceData['graph_name'] = '';
             resourceData.featureCollections = [];
             resourceData = ko.mapping.fromJS(resourceData);
+            resourceData.reportURL = arches.urls.resource_report;
+            resourceData.editURL = arches.urls.resource_editor;
             resourceLookup[resourceId] = resourceData;
             $.get(arches.urls.resource_descriptors + resourceId, function(data) {
                 resourceLookup[resourceId].displaydescription(data.displaydescription);
@@ -247,7 +250,7 @@ define([
                 if (hoverFeature) {
                     var p = new mapboxgl.Popup()
                         .setLngLat(e.lngLat)
-                        .setHTML(popupTemplate)
+                        .setHTML(self.popupTemplate)
                         .addTo(map);
                     ko.applyBindingsToDescendants(
                         self.getPopupData(hoverFeature),
diff --git a/arches/app/templates/views/components/workflows/final-step.htm b/arches/app/templates/views/components/workflows/final-step.htm
index f98a052d1c9..f58a60ef430 100644
--- a/arches/app/templates/views/components/workflows/final-step.htm
+++ b/arches/app/templates/views/components/workflows/final-step.htm
@@ -1,4 +1,4 @@
-<div class="workflows-get-tile-value">
+<div class="workflows-get-tile-value padded-workflow-step">
     <div style='display:flex; justify-content: space-between;'>
         <h4>Workflow Complete</h4>
         <div>
diff --git a/arches/app/templates/views/components/workflows/new-multi-tile-step.htm b/arches/app/templates/views/components/workflows/new-multi-tile-step.htm
index 1aa5f55f081..5066f19b0fc 100644
--- a/arches/app/templates/views/components/workflows/new-multi-tile-step.htm
+++ b/arches/app/templates/views/components/workflows/new-multi-tile-step.htm
@@ -1,4 +1,5 @@
 <!-- ko let: { self: $data } -->
+<div class="padded-workflow-step">
     <!-- ko if: !loading() -->
     <div data-bind="" class="wf-multi-tile-step-container">
         <!-- ko if: tile() && card() -->
@@ -46,4 +47,5 @@ <h3>Add Reference Number</h3>
         <!-- /ko -->
     </div>
     <!-- /ko -->
+</div>
 <!-- /ko -->
diff --git a/arches/app/templates/views/components/workflows/new-tile-step.htm b/arches/app/templates/views/components/workflows/new-tile-step.htm
index 10ef7b0ad9c..ac586bd5079 100644
--- a/arches/app/templates/views/components/workflows/new-tile-step.htm
+++ b/arches/app/templates/views/components/workflows/new-tile-step.htm
@@ -1,3 +1,4 @@
+<div class="padded-workflow-step">
 <!-- ko if: tile() && card() -->
     <!-- ko component: {
         name: cardComponentLookup[card().model.component_id()].componentname,
@@ -11,3 +12,4 @@
         }
     } --><!-- /ko -->
 <!-- /ko -->
+</div>