nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marka...@apache.org
Subject [2/5] nifi git commit: NIFI-2007: - Restoring bulletin functionality. - Ensuring appropriate merging of bulletins in clustered responses.
Date Fri, 17 Jun 2016 17:21:43 GMT
http://git-wip-us.apache.org/repos/asf/nifi/blob/0b437e09/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
index 2b835e6..ceaddc2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
@@ -694,10 +694,10 @@ nf.RemoteProcessGroup = (function () {
         updated.select('text.remote-process-group-transmission-status')
             .text(function (d) {
                 var icon = '';
-                if (!nf.Common.isEmpty(d.status.aggregateSnapshot.authorizationIssues)) {
-                    icon = '\uf071';
-                } else if (d.accessPolicy.canRead) {
-                    if (d.component.transmitting === true) {
+                if (d.accessPolicy.canRead) {
+                    if (!nf.Common.isEmpty(d.component.authorizationIssues)) {
+                        icon = '\uf071';
+                    } else if (d.component.transmitting === true) {
                         icon = '\uf140';
                     } else {
                         icon = '\ue80a';
@@ -707,15 +707,17 @@ nf.RemoteProcessGroup = (function () {
             })
             .attr('font-family', function (d) {
                 var family = '';
-                if (!nf.Common.isEmpty(d.status.aggregateSnapshot.authorizationIssues) ||
(d.accessPolicy.canRead && d.component.transmitting)) {
-                    family = 'FontAwesome';
-                } else {
-                    family = 'flowfont';
+                if (d.accessPolicy.canRead) {
+                    if (!nf.Common.isEmpty(d.component.authorizationIssues) || d.component.transmitting)
{
+                        family = 'FontAwesome';
+                    } else {
+                        family = 'flowfont';
+                    }
                 }
                 return family;
             })
             .classed('has-authorization-errors', function (d) {
-                return !nf.Common.isEmpty(d.status.aggregateSnapshot.authorizationIssues);
+                return d.accessPolicy.canRead && !nf.Common.isEmpty(d.component.authorizationIssues);
             })
             .each(function (d) {
                 // remove the existing tip if necessary
@@ -725,14 +727,14 @@ nf.RemoteProcessGroup = (function () {
                 }
 
                 // if there are validation errors generate a tooltip
-                if (!nf.Common.isEmpty(d.status.aggregateSnapshot.authorizationIssues)) {
+                if (d.accessPolicy.canRead && !nf.Common.isEmpty(d.component.authorizationIssues))
{
                     tip = d3.select('#remote-process-group-tooltips').append('div')
                         .attr('id', function () {
                             return 'authorization-issues-' + d.id;
                         })
                         .attr('class', 'tooltip nifi-tooltip')
                         .html(function () {
-                            var list = nf.Common.formatUnorderedList(d.status.aggregateSnapshot.authorizationIssues);
+                            var list = nf.Common.formatUnorderedList(d.component.authorizationIssues);
                             if (list === null || list.length === 0) {
                                 return '';
                             } else {

http://git-wip-us.apache.org/repos/asf/nifi/blob/0b437e09/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 1d8d312..f802b85 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -582,7 +582,7 @@ nf.Settings = (function () {
             markup += '<img src="images/iconUsage.png" title="Usage" class="pointer reporting-task-usage"
style="margin-left: 6px; margin-top: 3px;"/>';
 
             var hasErrors = !nf.Common.isEmpty(dataContext.component.validationErrors);
-            var hasBulletins = !nf.Common.isEmpty(dataContext.component.bulletins);
+            var hasBulletins = !nf.Common.isEmpty(dataContext.bulletins);
 
             if (hasErrors) {
                 markup += '<img src="images/iconAlert.png" class="has-errors" style="margin-top:
4px; margin-left: 3px; float: left;" />';
@@ -775,7 +775,7 @@ nf.Settings = (function () {
                 var reportingTaskEntity = reportingTasksData.getItemById(taskId);
 
                 // format the tooltip
-                var bulletins = nf.Common.getFormattedBulletins(reportingTaskEntity.component.bulletins);
+                var bulletins = nf.Common.getFormattedBulletins(reportingTaskEntity.bulletins);
                 var tooltip = nf.Common.formatUnorderedList(bulletins);
 
                 // show the tooltip

http://git-wip-us.apache.org/repos/asf/nifi/blob/0b437e09/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 8c1a32d..f0ac03e 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
@@ -1464,14 +1464,12 @@ nf.SummaryTable = (function () {
             // determine what to put in the mark up
             var transmissionClass = 'invalid';
             var transmissionLabel = 'Invalid';
-            if (nf.Common.isEmpty(dataContext.authorizationIssues)) {
-                if (value === 'Transmitting') {
-                    transmissionClass = 'transmitting';
-                    transmissionLabel = value;
-                } else {
-                    transmissionClass = 'not-transmitting';
-                    transmissionLabel = 'Not Transmitting';
-                }
+            if (value === 'Transmitting') {
+                transmissionClass = 'transmitting';
+                transmissionLabel = value;
+            } else {
+                transmissionClass = 'not-transmitting';
+                transmissionLabel = 'Not Transmitting';
             }
 
             // generate the mark up
@@ -2423,8 +2421,7 @@ nf.SummaryTable = (function () {
                         transmissionStatus: snapshot.transmissionStatus,
                         sent: snapshot.sent,
                         received: snapshot.received,
-                        activeThreadCount: snapshot.activeThreadCount,
-                        authorizationIssues: snapshot.authorizationIssues
+                        activeThreadCount: snapshot.activeThreadCount
                     });
                 });
 


Mime
View raw message