Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Matt Gilman 2016-06-21 23:02:58 -04:00
parent 1eeef0e1c0
commit 27ff5f9a87
5 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
View File

@ -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">

18
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
View File

@ -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">

19
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
View File

@ -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 */

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
View File

@ -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 () {

7
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
View File

@ -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, ' '));