From 27ff5f9a8734b535f3a34b257fd6b8dadc5d19f4 Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Tue, 21 Jun 2016 23:02:58 -0400
Subject: [PATCH] NIFI-2075: - Fixing issue rendering event rows while visible
 in the shell. - Fixing issue go to/from the event table and lineage graph. -
 Fixing visibility of the event table header, search, and filter controls. -
 This closes #559

---
 .../provenance/lineage-query-dialog.jsp       |  2 +-
 .../provenance/provenance-content.jsp         | 18 ++++++++----------
 .../src/main/webapp/css/provenance.css        | 19 +++++++++++++++----
 .../js/nf/provenance/nf-provenance-lineage.js |  4 ++--
 .../js/nf/provenance/nf-provenance-table.js   |  7 +++----
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
index 70b380947c..891d4b9707 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
@@ -15,7 +15,7 @@
   limitations under the License.
 --%>
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="lineage-query-dialog" class="hidden medium-dialog">
+<div id="lineage-query-dialog" class="hidden small-dialog">
     <div class="dialog-content">
         <div class="setting">
             <div class="setting-field">
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
index 5c2d8ed501..509f337e8b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
@@ -21,8 +21,8 @@
     <span id="intial-flowfile-query" class="hidden"><c:out value="${param.flowFileUuid}"/></span>
     <span id="nifi-controller-uri" class="hidden"></span>
     <span id="nifi-content-viewer-url" class="hidden"></span>
-    <div id="provenance-header-and-filter">
-        <div id="provenance-header-text">NiFi Data Provenance</div>
+    <div id="provenance-header-text">NiFi Data Provenance</div>
+    <div id="provenance-event-search" class="provenance-panel">
         <div id="provenance-filter-controls" class="filter-controls">
             <div id="provenance-filter-stats" class="filter-status">
                 Displaying&nbsp;<span id="displayed-events"></span>&nbsp;of&nbsp;<span id="total-events"></span>
@@ -42,16 +42,14 @@
             </div>
             <button id="provenance-search-button" class="fa fa-search"></button>
         </div>
-    </div>
-    <div id="provenance-event-search" class="provenance-panel">
         <div id="provenance-table"></div>
-    </div>
-    <div id="provenance-refresh-container" class="last-refreshed-container">
-        <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
-        <div id="provenance-last-refreshed-container" class="last-refreshed-container">
-            Last updated:&nbsp;<span id="provenance-last-refreshed" class="value-color"></span>
+        <div id="provenance-refresh-container" class="last-refreshed-container">
+            <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
+            <div id="provenance-last-refreshed-container" class="last-refreshed-container">
+                Last updated:&nbsp;<span id="provenance-last-refreshed" class="value-color"></span>
+            </div>
+            <div id="provenance-loading-container" class="loading-container"></div>
         </div>
-        <div id="provenance-loading-container" class="loading-container"></div>
     </div>
     <div id="provenance-lineage" class="provenance-panel hidden">
         <div id="provenance-lineage-loading-container">
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
index 16c07884f6..545d3a4198 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
@@ -57,6 +57,15 @@
     padding-top: 10px;
 }
 
+div.provenance-panel {
+    bottom: 0px;
+    left: 0px;
+    overflow: hidden;
+    position: absolute;
+    right: 0px;
+    top: 40px;
+}
+
 /* filter controls */
 
 #provenance-filter-controls {
@@ -84,7 +93,6 @@ input.provenance-filter-list {
 }
 
 #oldest-event-message {
-    display: none;
     font-family: Roboto;
     font-size: 13px;
     font-weight: normal;
@@ -337,10 +345,13 @@ div.content-detail-value {
 /* provenance table */
 
 #provenance-table {
+    position: absolute;
+    top: 78px;
+    left: 0px;
+    bottom: 35px;
+    right: 0px;
     overflow: hidden;
-    height: 80%;
-    width: 100%;
-    top: -38px;
+    background-color: #fff;
 }
 
 /* provenance lineage */
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
index 5bf38922c4..7c277465b4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
@@ -1228,7 +1228,7 @@ nf.ProvenanceLineage = (function () {
 
         // show the lineage pane and hide the event search results
         $('#provenance-lineage').show();
-        $('#provenance-event-search, #provenance-filter-controls, #oldest-event-message').hide();
+        $('#provenance-event-search').hide();
 
         // add the initial lineage
         addLineage(lineageResults.nodes, lineageResults.links);
@@ -1247,7 +1247,7 @@ nf.ProvenanceLineage = (function () {
                 $('#provenance-lineage-slider').slider('destroy');
 
                 // view the appropriate panel
-                $('#provenance-event-search, #provenance-filter-controls, #oldest-event-message').show();
+                $('#provenance-event-search').show();
                 $('#provenance-lineage').hide();
             });
             $('#provenance-lineage-downloader').on('click', function () {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
index 4cc9a57718..63d4ffd1ca 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
@@ -617,7 +617,7 @@ nf.ProvenanceTable = (function () {
 
         // define a custom formatter for the more details column
         var moreDetailsFormatter = function (row, cell, value, columnDef, dataContext) {
-            return '<div title="View Details" class="pointer show-event-details fa fa-info-circle" style="margin-top: 4px;"></div>';
+            return '<div title="View Details" class="pointer show-event-details fa fa-info-circle"></div>';
         };
 
         // define how general values are formatted
@@ -634,12 +634,12 @@ nf.ProvenanceTable = (function () {
 
             // conditionally include the cluster node id
             if (nf.Common.SUPPORTS_SVG) {
-                markup += '<div title="Show Lineage" class="pointer show-lineage icon icon-lineage" style="margin-top: 2px;"></div>';
+                markup += '<div title="Show Lineage" class="pointer show-lineage icon icon-lineage" style="margin-right: 3px;"></div>';
             }
 
             // conditionally support going to the component
             if (isInShell && nf.Common.isDefinedAndNotNull(dataContext.groupId)) {
-                markup += '&nbsp;<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-top: 2px;"/>';
+                markup += '&nbsp;<div class="pointer go-to fa fa-long-arrow-right" title="Go To"></div>';
             }
 
             return markup;
@@ -973,7 +973,6 @@ nf.ProvenanceTable = (function () {
 
             // update the oldest event available
             $('#oldest-event').html(nf.Common.formatValue(provenanceResults.oldestEvent));
-            $('#oldest-event-message').show();
 
             // set the timezone for the start and end time
             $('.timezone').text(nf.Common.substringAfterLast(provenanceResults.generated, ' '));