You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ym...@apache.org on 2016/12/21 17:07:42 UTC
nifi git commit: NIFI-3167: - Ensuring the DELETE button is visible
for cluster nodes. - Removing unecessary wrapper element and non breaking
spaces.
Repository: nifi
Updated Branches:
refs/heads/master 00149603c -> 721c9ee7f
NIFI-3167: - Ensuring the DELETE button is visible for cluster nodes. - Removing unecessary wrapper element and non breaking spaces.
Signed-off-by: Yolanda M. Davis <ym...@apache.org>
This closes #1319
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/721c9ee7
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/721c9ee7
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/721c9ee7
Branch: refs/heads/master
Commit: 721c9ee7f0095fee547bd3d384ffb94b82aa629f
Parents: 0014960
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 12 10:57:39 2016 -0500
Committer: Yolanda M. Davis <ym...@apache.org>
Committed: Wed Dec 21 12:02:44 2016 -0500
----------------------------------------------------------------------
.../webapp/js/nf/cluster/nf-cluster-table.js | 5 +-
.../src/main/webapp/js/nf/nf-common.js | 2 +-
.../js/nf/provenance/nf-provenance-table.js | 6 +--
.../webapp/js/nf/summary/nf-summary-table.js | 56 ++++++++------------
4 files changed, 26 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/721c9ee7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
index 689afa8..ff9768b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
@@ -282,9 +282,6 @@ nf.ClusterTable = (function () {
var canDisconnect = false;
var canConnect = false;
- // determine if this node is already the primary
- var isPrimary = dataContext.primary;
-
// determine the current status
if (dataContext.status === 'CONNECTED' || dataContext.status === 'CONNECTING') {
canDisconnect = true;
@@ -294,7 +291,7 @@ nf.ClusterTable = (function () {
// return the appropriate markup
if (canConnect) {
- return '<div title="Connect" class="pointer prompt-for-connect fa fa-plug" style="margin-top: 2px;"></div> <div title="Delete" class="pointer prompt-for-removal fa fa-trash" style="margin-top: 2px;"></div>';
+ return '<div title="Connect" class="pointer prompt-for-connect fa fa-plug" style="margin-top: 2px;"></div><div title="Delete" class="pointer prompt-for-removal fa fa-trash" style="margin-top: 2px;"></div>';
} else if (canDisconnect) {
return '<div title="Disconnect" class="pointer prompt-for-disconnect fa fa-power-off" style="margin-top: 2px;"></div>';
} else {
http://git-wip-us.apache.org/repos/asf/nifi/blob/721c9ee7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index b0fdb3e..868bbb0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -1333,7 +1333,7 @@ nf.Common = (function () {
// format the node address
var nodeAddress = '';
if (nf.Common.isDefinedAndNotNull(bulletin.nodeAddress)) {
- nodeAddress = '- ' + nf.Common.escapeHtml(bulletin.nodeAddress) + ' - ';
+ nodeAddress = '- ' + nf.Common.escapeHtml(bulletin.nodeAddress) + ' - ';
}
// set the bulletin message (treat as text)
http://git-wip-us.apache.org/repos/asf/nifi/blob/721c9ee7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
----------------------------------------------------------------------
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 46c1578..89440ec 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
@@ -606,7 +606,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) {
// define how the column is formatted
var showLineageFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
// conditionally include the cluster node id
if (nf.Common.SUPPORTS_SVG) {
@@ -616,11 +616,9 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) {
// conditionally support going to the component
var isRemotePort = dataContext.componentType === 'Remote Input Port' || dataContext.componentType === 'Remote Output Port';
if (isInShell && nf.Common.isDefinedAndNotNull(dataContext.groupId) && isRemotePort === false) {
- markup += ' <div class="pointer go-to fa fa-long-arrow-right" title="Go To"></div>';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To"></div>';
}
- markup += '</div>';
-
return markup;
};
http://git-wip-us.apache.org/repos/asf/nifi/blob/721c9ee7/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
index b72f5bd..aeaa295 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
@@ -369,22 +369,20 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var processorActionFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Processor" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Processor" style="margin-right: 3px;"></div>';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-processor-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-processor-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div>';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-processor-summary fa fa-cubes" title="View Processor Details"></div> ';
+ markup += '<div class="pointer show-cluster-processor-summary fa fa-cubes" title="View Processor Details"></div>';
}
- markup += '</div>';
-
return markup;
};
@@ -680,22 +678,20 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var connectionActionFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Connection" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Connection" style="margin-right: 3px;"></div>';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-connection-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-connection-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div>';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-connection-summary fa fa-cubes" title="View Connection Details"></div> ';
+ markup += '<div class="pointer show-cluster-connection-summary fa fa-cubes" title="View Connection Details"></div>';
}
- markup += '</div>';
-
return markup;
};
@@ -961,22 +957,20 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var processGroupActionFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
if (isInShell && dataContext.groupId !== null) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div>';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-process-group-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-process-group-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div>';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-process-group-summary fa fa-cubes" title="View Process Group Details"></div> ';
+ markup += '<div class="pointer show-cluster-process-group-summary fa fa-cubes" title="View Process Group Details"></div>';
}
- markup += '</div>';
-
return markup;
};
@@ -1216,18 +1210,16 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell) {
// define how the column is formatted
var inputPortActionFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Input Port" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Input Port" style="margin-right: 3px;"></div>';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-input-port-summary fa fa-cubes" title="View Input Port Details"></div> ';
+ markup += '<div class="pointer show-cluster-input-port-summary fa fa-cubes" title="View Input Port Details"></div>';
}
- markup += '</div>';
-
return markup;
};
@@ -1458,18 +1450,16 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell) {
// define how the column is formatted
var outputPortActionFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Output Port" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Output Port" style="margin-right: 3px;"></div>';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-output-port-summary fa fa-cubes" title="View Output Port Details"></div> ';
+ markup += '<div class="pointer show-cluster-output-port-summary fa fa-cubes" title="View Output Port Details"></div>';
}
- markup += '</div>';
-
return markup;
};
@@ -1751,22 +1741,20 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var remoteProcessGroupActionFormatter = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div style="white-space: normal;">';
+ var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div>';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-remote-process-group-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-remote-process-group-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div>';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-remote-process-group-summary fa fa-cubes" title="View Remote Process Group Details"></div> ';
+ markup += '<div class="pointer show-cluster-remote-process-group-summary fa fa-cubes" title="View Remote Process Group Details"></div>';
}
- markup += '</div>';
-
return markup;
};