NIFI-1870: - Restoring the upstream/downstream connections dialog. - Correcting input port label when showing downstream components.

This closes #1028.

Signed-off-by: Bryan Bende <bbende@apache.org>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp

@@ -15,7 +15,7 @@
   limitations under the License.
 --%>
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="connections-dialog" layout="column" class="hidden large-dialog">
+<div id="connections-dialog" class="hidden">
     <div class="dialog-content">
         <div class="setting">
             <div class="setting-name">Selected component</div>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css

@@ -24,12 +24,12 @@
 
 #fill-color-dialog {
     display: none;
-    width: 215px;
+    width: 240px;
     height: 470px;
 }
 
 #fill-color-value {
-    width: 100%;
+    width: 175px;
 }
 
 #fill-color-processor-preview {
@@ -58,19 +58,26 @@ div.connections-component-name {
     text-overflow: ellipsis;
 }
 
+#connections-dialog {
+    height: 400px;
+    width: 680px;
+}
+
+#connections-context {
+    padding: 5px;
+}
+
 #connections-source {
     float: left;
 }
 
 #connections-destination {
     float: left;
-    margin-left: 370px;
+    margin-left: 360px;
 }
 
 #connections-container {
     width: 612px;
-    height: 190px;
-    border: 1px solid #aaa;
     padding: 5px;
     overflow-y: auto;
 }

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js

@@ -186,16 +186,14 @@ nf.ContextMenu = (function () {
      * @param {selection} selection         The selection
      */
     var hasDownstream = function (selection) {
-        // TODO
-        // // ensure the correct number of components are selected
-        // if (selection.size() !== 1) {
-        //     return false;
-        // }
-        //
-        // return nf.CanvasUtils.isFunnel(selection) || nf.CanvasUtils.isProcessor(selection) || nf.CanvasUtils.isProcessGroup(selection) ||
-        //         nf.CanvasUtils.isRemoteProcessGroup(selection) || nf.CanvasUtils.isInputPort(selection) ||
-        //         (nf.CanvasUtils.isOutputPort(selection) && nf.Canvas.getParentGroupId() !== null);
-        return false;
+        // ensure the correct number of components are selected
+        if (selection.size() !== 1) {
+            return false;
+        }
+
+        return nf.CanvasUtils.isFunnel(selection) || nf.CanvasUtils.isProcessor(selection) || nf.CanvasUtils.isProcessGroup(selection) ||
+                nf.CanvasUtils.isRemoteProcessGroup(selection) || nf.CanvasUtils.isInputPort(selection) ||
+                (nf.CanvasUtils.isOutputPort(selection) && nf.Canvas.getParentGroupId() !== null);
     };
 
     /**
@@ -204,16 +202,14 @@ nf.ContextMenu = (function () {
      * @param {selection} selection         The selection
      */
     var hasUpstream = function (selection) {
-        // TODO
-        // // ensure the correct number of components are selected
-        // if (selection.size() !== 1) {
-        //     return false;
-        // }
-        //
-        // return nf.CanvasUtils.isFunnel(selection) || nf.CanvasUtils.isProcessor(selection) || nf.CanvasUtils.isProcessGroup(selection) ||
-        //         nf.CanvasUtils.isRemoteProcessGroup(selection) || nf.CanvasUtils.isOutputPort(selection) ||
-        //         (nf.CanvasUtils.isInputPort(selection) && nf.Canvas.getParentGroupId() !== null);
-        return false;
+        // ensure the correct number of components are selected
+        if (selection.size() !== 1) {
+            return false;
+        }
+
+        return nf.CanvasUtils.isFunnel(selection) || nf.CanvasUtils.isProcessor(selection) || nf.CanvasUtils.isProcessGroup(selection) ||
+                nf.CanvasUtils.isRemoteProcessGroup(selection) || nf.CanvasUtils.isOutputPort(selection) ||
+                (nf.CanvasUtils.isInputPort(selection) && nf.Canvas.getParentGroupId() !== null);
     };
 
     /**