nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbe...@apache.org
Subject [36/50] nifi git commit: NIFI-4436: - Code clean up. - Improved error handling. - Minor UX improvements. - Adding message to indicate that variables do not support sensitive values. - Preventing a user from changing the flow version to the current versio
Date Mon, 08 Jan 2018 18:14:24 GMT
http://git-wip-us.apache.org/repos/asf/nifi/blob/db2cc9fe/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-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-process-group.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
index 111636b..27004b4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
@@ -1095,6 +1095,7 @@
 
                     // up to date current
                     var upToDate = details.select('text.process-group-up-to-date')
+                        .style('visibility', 'visible')
                         .classed('up-to-date', function (d) {
                             return d.component.upToDateCount > 0;
                         })
@@ -1102,6 +1103,7 @@
                             return d.component.upToDateCount === 0;
                         });
                     var upToDateCount = details.select('text.process-group-up-to-date-count')
+                        .style('visibility', 'visible')
                         .attr('x', function () {
                             var updateToDateCountX = parseInt(upToDate.attr('x'), 10);
                             return updateToDateCountX + Math.round(upToDate.node().getComputedTextLength())
+ CONTENTS_VALUE_SPACER;
@@ -1112,6 +1114,7 @@
 
                     // update locally modified
                     var locallyModified = details.select('text.process-group-locally-modified')
+                        .style('visibility', 'visible')
                         .classed('locally-modified', function (d) {
                             return d.component.locallyModifiedCount > 0;
                         })
@@ -1123,6 +1126,7 @@
                             return upToDateX + Math.round(upToDateCount.node().getComputedTextLength())
+ CONTENTS_SPACER;
                         });
                     var locallyModifiedCount = details.select('text.process-group-locally-modified-count')
+                        .style('visibility', 'visible')
                         .attr('x', function () {
                             var locallyModifiedCountX = parseInt(locallyModified.attr('x'),
10);
                             return locallyModifiedCountX + Math.round(locallyModified.node().getComputedTextLength())
+ CONTENTS_VALUE_SPACER;
@@ -1133,6 +1137,7 @@
 
                     // update stale
                     var stale = details.select('text.process-group-stale')
+                        .style('visibility', 'visible')
                         .classed('stale', function (d) {
                             return d.component.staleCount > 0;
                         })
@@ -1144,6 +1149,7 @@
                             return locallyModifiedX + Math.round(locallyModifiedCount.node().getComputedTextLength())
+ CONTENTS_SPACER;
                         });
                     var staleCount = details.select('text.process-group-stale-count')
+                        .style('visibility', 'visible')
                         .attr('x', function () {
                             var staleCountX = parseInt(stale.attr('x'), 10);
                             return staleCountX + Math.round(stale.node().getComputedTextLength())
+ CONTENTS_VALUE_SPACER;
@@ -1154,6 +1160,7 @@
 
                     // update locally modified and stale
                     var locallyModifiedAndStale = details.select('text.process-group-locally-modified-and-stale')
+                        .style('visibility', 'visible')
                         .classed('locally-modified-and-stale', function (d) {
                             return d.component.locallyModifiedAndStaleCount > 0;
                         })
@@ -1165,6 +1172,7 @@
                             return staleX + Math.round(staleCount.node().getComputedTextLength())
+ CONTENTS_SPACER;
                         });
                     var locallyModifiedAndStaleCount = details.select('text.process-group-locally-modified-and-stale-count')
+                        .style('visibility', 'visible')
                         .attr('x', function () {
                             var locallyModifiedAndStaleCountX = parseInt(locallyModifiedAndStale.attr('x'),
10);
                             return locallyModifiedAndStaleCountX + Math.round(locallyModifiedAndStale.node().getComputedTextLength())
+ CONTENTS_VALUE_SPACER;
@@ -1175,6 +1183,7 @@
 
                     // update sync failure
                     var syncFailure = details.select('text.process-group-sync-failure')
+                        .style('visibility', 'visible')
                         .classed('sync-failure', function (d) {
                             return d.component.syncFailureCount > 0;
                         })
@@ -1186,6 +1195,7 @@
                             return syncFailureX + Math.round(locallyModifiedAndStaleCount.node().getComputedTextLength())
+ CONTENTS_SPACER - 2;
                         });
                     details.select('text.process-group-sync-failure-count')
+                        .style('visibility', 'visible')
                         .attr('x', function () {
                             var syncFailureCountX = parseInt(syncFailure.attr('x'), 10);
                             return syncFailureCountX + Math.round(syncFailure.node().getComputedTextLength())
+ CONTENTS_VALUE_SPACER;
@@ -1195,20 +1205,22 @@
                         });
                 } else {
                     // update version control information
-                    processGroup.select('text.version-control').style('visibility', false).text('');
+                    processGroup.select('text.version-control').style('visibility', 'hidden');
 
                     // clear the process group comments
-                    processGroup.select('path.component-comments').style('visibility', false);
+                    processGroup.select('path.component-comments').style('visibility', 'hidden');
 
                     // clear the encapsulate versioned pg counts
-                    details.select('text.process-group-up-to-date').style('visibility', false);
-                    details.select('text.process-group-up-to-date-count').style('visibility',
false);
-                    details.select('text.process-group-locally-modified').style('visibility',
false);
-                    details.select('text.process-group-locally-modified-count').style('visibility',
false);
-                    details.select('text.process-group-stale').style('visibility', false);
-                    details.select('text.process-group-stale-count').style('visibility',
false);
-                    details.select('text.process-group-locally-modified-and-stale').style('visibility',
false);
-                    details.select('text.process-group-locally-modified-and-stale-count').style('visibility',
false);
+                    details.select('text.process-group-up-to-date').style('visibility', 'hidden');
+                    details.select('text.process-group-up-to-date-count').style('visibility',
'hidden');
+                    details.select('text.process-group-locally-modified').style('visibility',
'hidden');
+                    details.select('text.process-group-locally-modified-count').style('visibility',
'hidden');
+                    details.select('text.process-group-stale').style('visibility', 'hidden');
+                    details.select('text.process-group-stale-count').style('visibility',
'hidden');
+                    details.select('text.process-group-locally-modified-and-stale').style('visibility',
'hidden');
+                    details.select('text.process-group-locally-modified-and-stale-count').style('visibility',
'hidden');
+                    details.select('text.process-group-sync-failure').style('visibility',
'hidden');
+                    details.select('text.process-group-sync-failure-count').style('visibility',
'hidden');
 
                     // clear the process group name
                     processGroup.select('text.process-group-name')


Mime
View raw message