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

NIFI-363: 

- Fixing 'Go to source' and 'Go to destination' when the component in question is a remote process group.
This commit is contained in:
Matt Gilman 2015-02-19 07:47:58 -05:00
parent d76fe229bb
commit 57b5d589ad
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
View File

@ -185,12 +185,17 @@ nf.Actions = (function () {
if (selection.size() === 1 && nf.CanvasUtils.isConnection(selection)) { if (selection.size() === 1 && nf.CanvasUtils.isConnection(selection)) {
var selectionData = selection.datum(); var selectionData = selection.datum();
// if the source is actually in another group // the source is in the current group
if (selectionData.component.source.groupId !== nf.Canvas.getGroupId()) { if (selectionData.component.source.groupId === nf.Canvas.getGroupId()) {
nf.CanvasUtils.showComponent(selectionData.component.source.groupId, selectionData.component.source.id);
} else {
var source = d3.select('#id-' + selectionData.component.source.id); var source = d3.select('#id-' + selectionData.component.source.id);
nf.Actions.show(source); nf.Actions.show(source);
} else if (selectionData.component.source.type === 'REMOTE_OUTPUT_PORT') {
// if the source is remote
var remoteSource = d3.select('#id-' + selectionData.component.source.groupId);
nf.Actions.show(remoteSource);
} else {
// if the source is local but in a sub group
nf.CanvasUtils.showComponent(selectionData.component.source.groupId, selectionData.component.source.id);
} }
} }
}, },
@ -204,12 +209,17 @@ nf.Actions = (function () {
if (selection.size() === 1 && nf.CanvasUtils.isConnection(selection)) { if (selection.size() === 1 && nf.CanvasUtils.isConnection(selection)) {
var selectionData = selection.datum(); var selectionData = selection.datum();
// if the destination is actually in another group // the destination is in the current group or its remote
if (selectionData.component.destination.groupId !== nf.Canvas.getGroupId()) { if (selectionData.component.destination.groupId === nf.Canvas.getGroupId()) {
nf.CanvasUtils.showComponent(selectionData.component.destination.groupId, selectionData.component.destination.id);
} else {
var destination = d3.select('#id-' + selectionData.component.destination.id); var destination = d3.select('#id-' + selectionData.component.destination.id);
nf.Actions.show(destination); nf.Actions.show(destination);
} else if (selectionData.component.destination.type === 'REMOTE_INPUT_PORT') {
// if the destination is remote
var remoteDestination = d3.select('#id-' + selectionData.component.destination.groupId);
nf.Actions.show(remoteDestination);
} else {
// if the destination is local but in a sub group
nf.CanvasUtils.showComponent(selectionData.component.destination.groupId, selectionData.component.destination.id);
} }
} }
}, },