Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Matt Gilman 2016-09-19 12:08:23 -04:00 committed by Bryan Bende
parent f11682202b
commit 0218bc61ef
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
4 changed files with 584 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Selected component</div> <div class="setting-name">Selected component</div>

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

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

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

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

992
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
View File

File diff suppressed because it is too large Load Diff