From 84e56f2ef500ce5fdd12db7eca9eeedf77745c0f Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Mon, 1 Jun 2015 17:23:13 -0400 Subject: [PATCH] NIFI-630: - Adding the component id to the configuration/detail dialogs for [remote] process groups. - Allowing text to be selected in the stats history dialog. - Remove connection source/destination id from the stats history dialog. - Introducing more spacing to the stat history dialog details on the left. --- .../VolatileComponentStatusRepository.java | 2 -- .../canvas/process-group-configuration.jsp | 13 +++++++++---- .../partials/canvas/process-group-details.jsp | 12 +++++++++--- .../remote-process-group-configuration.jsp | 8 ++++++-- .../canvas/remote-process-group-details.jsp | 6 ++++++ .../WEB-INF/partials/status-history-dialog.jsp | 2 +- .../webapp/css/process-group-configuration.css | 11 +---------- .../main/webapp/css/process-group-details.css | 6 +----- .../css/remote-process-group-configuration.css | 4 ++-- .../src/main/webapp/css/status-history.css | 11 +++++------ .../js/nf/canvas/nf-process-group-details.js | 2 ++ .../canvas/nf-remote-process-group-details.js | 18 ++++++++++-------- .../src/main/webapp/js/nf/nf-status-history.js | 2 +- 13 files changed, 53 insertions(+), 44 deletions(-) diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java index d2a983a08b..02f7d6b6c7 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java @@ -151,9 +151,7 @@ public class VolatileComponentStatusRepository implements ComponentStatusReposit history.setComponentDetail("Group Id", status.getGroupId()); history.setComponentDetail("Name", status.getName()); - history.setComponentDetail("Source Id", status.getSourceId()); history.setComponentDetail("Source Name", status.getSourceName()); - history.setComponentDetail("Destination Id", status.getDestinationId()); history.setComponentDetail("Destination Name", status.getDestinationName()); final StandardStatusSnapshot snapshot = new StandardStatusSnapshot(); diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp index d85cd863c5..0140000163 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp @@ -17,14 +17,19 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
- -
-
Process group name
+
+
Name
-
+
+
Id
+
+ +
+
+
Comments
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp index edd1085a22..6aed45e452 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp @@ -17,13 +17,19 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-
-
Process group name
+
+
Name
-
+
+
Id
+
+ +
+
+
Comments
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp index bdd64cf128..57a5612b77 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp @@ -17,14 +17,18 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-
Name
-
+
+
Id
+
+ +
+
URL
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp index 67b40d42fd..8b2adde346 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp @@ -23,6 +23,12 @@
+
+
Id
+
+ +
+
URL
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp index 28e34695b0..bd0c60f37c 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -
+
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css index f0d781dab9..ee06152180 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css @@ -18,11 +18,7 @@ z-index: 1301; display: none; width: 400px; - height: 300px; -} - -#process-group-configuration div.dialog-content { - margin-top: -10px; + height: 320px; } .process-group-field { @@ -31,9 +27,4 @@ textarea.process-group-field { height: 100px; -} - -div.process-group-setting { - margin-top: 7px; - width: 380px; } \ No newline at end of file diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css index af7c38299f..a19791a6d5 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css @@ -18,9 +18,5 @@ z-index: 1301; display: none; width: 400px; - height: 270px; -} - -#process-group-details div.dialog-content { - margin-top: -10px; + height: 290px; } \ No newline at end of file diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css index ead571429d..ca0a5dc558 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css @@ -22,7 +22,7 @@ position: absolute; overflow: hidden; width: 400px; - height: 280px; + height: 315px; font-size: 10px; z-index: 1201; display: none; @@ -32,7 +32,7 @@ position: absolute; overflow: hidden; width: 400px; - height: 280px; + height: 315px; font-size: 10px; z-index: 1201; display: none; diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css index e6d477cd06..41018b570b 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css @@ -45,8 +45,6 @@ font-weight: normal; margin-top: 6px; margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; } #status-history-loading-container { @@ -110,24 +108,25 @@ #status-history-details { float: left; width: 275px; + padding-top: 8px; padding: 3px; overflow: auto; - cursor: default; } div.status-history-detail { - margin-bottom: 8px; + margin-bottom: 12px; + cursor: auto; } div.detail-container-label { color: #333; font-size: 12px; font-weight: bold; - margin-bottom: 4px; + margin-bottom: 8px; } div.detail-item { - margin-bottom: 5px; + margin-bottom: 8px; } div.detail-item-label { diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js index d1cec362e0..473ca9c640 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js @@ -37,6 +37,7 @@ nf.ProcessGroupDetails = (function () { handler: { close: function () { // clear the processor details + nf.Common.clearField('read-only-process-group-id'); nf.Common.clearField('read-only-process-group-name'); nf.Common.clearField('read-only-process-group-comments'); } @@ -53,6 +54,7 @@ nf.ProcessGroupDetails = (function () { var selectionData = selection.datum(); // populate the port settings + nf.Common.populateField('read-only-process-group-id', selectionData.component.id); nf.Common.populateField('read-only-process-group-name', selectionData.component.name); nf.Common.populateField('read-only-process-group-comments', selectionData.component.comments); diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js index c572d29bae..b74628a614 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js @@ -34,10 +34,11 @@ nf.RemoteProcessGroupDetails = (function () { handler: { close: function () { // clear the remote process group details - $('#read-only-remote-process-group-name').text(''); - $('#read-only-remote-process-group-url').text(''); - $('#read-only-remote-process-group-timeout').val(''); - $('#read-only-remote-process-group-yield-duration').val(''); + nf.Common.clearField('read-only-remote-process-group-id'); + nf.Common.clearField('read-only-remote-process-group-name'); + nf.Common.clearField('read-only-remote-process-group-url'); + nf.Common.clearField('read-only-remote-process-group-timeout'); + nf.Common.clearField('read-only-remote-process-group-yield-duration'); } } }).draggable({ @@ -57,10 +58,11 @@ nf.RemoteProcessGroupDetails = (function () { var selectionData = selection.datum(); // populate the port settings - $('#read-only-remote-process-group-name').text(selectionData.component.name); - $('#read-only-remote-process-group-url').text(selectionData.component.targetUri); - $('#read-only-remote-process-group-timeout').text(selectionData.component.communicationsTimeout); - $('#read-only-remote-process-group-yield-duration').text(selectionData.component.yieldDuration); + nf.Common.populateField('read-only-remote-process-group-id', selectionData.component.id); + nf.Common.populateField('read-only-remote-process-group-name', selectionData.component.name); + nf.Common.populateField('read-only-remote-process-group-url', selectionData.component.targetUri); + nf.Common.populateField('read-only-remote-process-group-timeout', selectionData.component.communicationsTimeout); + nf.Common.populateField('read-only-remote-process-group-yield-duration', selectionData.component.yieldDuration); // show the details $('#remote-process-group-details').modal('show'); diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js index 5229398982..ac23e9d924 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js @@ -1165,7 +1165,7 @@ nf.StatusHistory = (function () { // make the new property dialog draggable $('#status-history-dialog').draggable({ - cancel: '#status-history-chart-container, #status-history-chart-control-container, #status-history-details, div.detail-item-value', + cancel: '#status-history-chart-container, #status-history-chart-control-container, div.status-history-detail, div.button, div.combo, div.summary-refresh', containment: 'parent' }).on('click', '#status-history-close', function () { // remove the current status history