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

NIFI-2402: - Removing client side check component move eligibility and instead relaying on verification server side. Cannot check client side as the current user may not have permissions to inspect required fields. 

This closes #750

Signed-off-by: jpercivall <joepercivall@yahoo.com>
This commit is contained in:
Matt Gilman 2016-07-29 17:45:41 -04:00 committed by jpercivall
parent 83a23f90d4
commit c26398eaba
4 changed files with 42 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
View File

@ -2458,7 +2458,7 @@ public final class StandardProcessGroup implements ProcessGroup {
final String portName = port.getName();
if (newProcessGroup.getInputPortByName(portName) != null) {
throw new IllegalStateException("Cannot perform Move Operation because the destination Process Group already has an Input Port with the name " + portName);
throw new IllegalStateException("Cannot perform Move Operation because of a naming conflict with another port in the destination Process Group");
}
}
@ -2467,7 +2467,7 @@ public final class StandardProcessGroup implements ProcessGroup {
final String portName = port.getName();
if (newProcessGroup.getOutputPortByName(portName) != null) {
throw new IllegalStateException("Cannot perform Move Operation because the destination Process Group already has an Output Port with the name " + portName);
throw new IllegalStateException("Cannot perform Move Operation because of a naming conflict with another port in the destination Process Group");
}
}
} finally {

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardSnippetDAO.java
View File

@ -169,6 +169,10 @@ public class StandardSnippetDAO implements SnippetDAO {
@Override
public void deleteSnippetComponents(String snippetId) {
// verify the action
verifyDeleteSnippetComponents(snippetId);
// locate the snippet in question
final Snippet snippet = locateSnippet(snippetId);
// remove the contents
@ -223,6 +227,10 @@ public class StandardSnippetDAO implements SnippetDAO {
@Override
public Snippet updateSnippetComponents(final SnippetDTO snippetDTO) {
// verify the action
verifyUpdateSnippetComponent(snippetDTO);
// find the snippet in question
final StandardSnippet snippet = locateSnippet(snippetDTO.getId());
// if the group is changing move it

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

@ -1152,8 +1152,6 @@ nf.Actions = (function () {
return;
}
// ensure the selected components are eligible being moved into a new group
$.when(nf.CanvasUtils.eligibleForMove(selection)).done(function () {
// determine the origin of the bounding box for the selected components
var origin = nf.CanvasUtils.getOrigin(selection);
@ -1162,7 +1160,6 @@ nf.Actions = (function () {
var group = d3.select('#id-' + processGroup.id);
nf.CanvasUtils.moveComponents(selection, group);
});
});
},
/**

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

@ -53,8 +53,6 @@ nf.CanvasUtils = (function () {
var moveComponents = function (components, groupId) {
return $.Deferred(function (deferred) {
// ensure the current selection is eligible for move into the specified group
nf.CanvasUtils.eligibleForMove(components, groupId).done(function () {
// create a snippet for the specified components
var snippet = nf.Snippet.marshal(components);
nf.Snippet.create(snippet).done(function (response) {
@ -89,9 +87,6 @@ nf.CanvasUtils = (function () {
}).fail(nf.Common.handleAjaxError).fail(function () {
deferred.reject();
});
}).fail(function () {
deferred.reject();
});
}).promise();
};
@ -1459,157 +1454,6 @@ nf.CanvasUtils = (function () {
return isDisconnected;
},
/**
* Ensures components are eligible to be moved. The new group can be optionally specified.
*
* 1) Ensuring that the input and output ports are not connected outside of this group
* 2) If the target is specified; ensuring there are no port name conflicts in the target group
*
* @argument {selection} selection The selection being moved
* @argument {string} groupId The id of the new group
*/
eligibleForMove: function (selection, groupId) {
var inputPorts = [];
var outputPorts = [];
// separate out the component type accordingly
selection.each(function (d) {
var selected = d3.select(this);
if (nf.CanvasUtils.isInputPort(selected)) {
inputPorts.push(selected.datum());
} else if (nf.CanvasUtils.isOutputPort(selected)) {
outputPorts.push(selected.datum());
}
});
return $.Deferred(function (deferred) {
if (inputPorts.length > 0 || outputPorts.length > 0) {
// create a deferred for checking input port connection status
var portConnectionCheck = function () {
return $.Deferred(function (portConnectionDeferred) {
// ports in the root group cannot be moved
if (nf.Canvas.getParentGroupId() === null) {
nf.Dialog.showOkDialog({
headerText: 'Port',
dialogContent: 'Cannot move Ports out of the root group'
});
portConnectionDeferred.reject();
} else {
$.ajax({
type: 'GET',
url: config.urls.controller + '/process-groups/' + encodeURIComponent(nf.Canvas.getParentGroupId()) + '/connections',
dataType: 'json'
}).done(function (response) {
var connections = response.connections;
var conflictingPorts = [];
if (!nf.Common.isEmpty(connections)) {
// check the input ports
$.each(inputPorts, function (i, inputPort) {
$.each(connections, function (j, connection) {
if (inputPort.id === connection.destination.id) {
conflictingPorts.push(nf.Common.escapeHtml(inputPort.component.name));
}
});
});
// check the output ports
$.each(outputPorts, function (i, outputPort) {
$.each(connections, function (j, connection) {
if (outputPort.id === connection.source.id) {
conflictingPorts.push(nf.Common.escapeHtml(outputPort.component.name));
}
});
});
}
// inform the user of the conflicting ports
if (conflictingPorts.length > 0) {
nf.Dialog.showOkDialog({
headerText: 'Port',
dialogContent: 'The following ports are currently connected outside of this group: <b>' + conflictingPorts.join('</b>, <b>') + '</b>'
});
portConnectionDeferred.reject();
} else {
portConnectionDeferred.resolve();
}
}).fail(function () {
portConnectionDeferred.reject();
});
}
}).promise();
};
// create a deferred for checking port names in the target
var portNameCheck = function () {
return $.Deferred(function (portNameDeferred) {
// add the get request
$.ajax({
type: 'GET',
url: config.urls.controller + '/process-groups/' + encodeURIComponent(groupId),
data: {
verbose: true
},
dataType: 'json'
}).done(function (response) {
var processGroup = response.component;
var processGroupContents = processGroup.contents;
var conflictingPorts = [];
var getConflictingPorts = function (selectedPorts, ports) {
if (selectedPorts.length > 0 && !nf.Common.isEmpty(ports)) {
$.each(selectedPorts, function (i, selectedPort) {
$.each(ports, function (j, port) {
if (selectedPort.component.name === port.name) {
conflictingPorts.push(nf.Common.escapeHtml(port.name));
}
});
});
}
};
// check for conflicting ports
getConflictingPorts(inputPorts, processGroupContents.inputPorts);
getConflictingPorts(outputPorts, processGroupContents.outputPorts);
// inform the user of the conflicting ports
if (conflictingPorts.length > 0) {
nf.Dialog.showOkDialog({
headerText: 'Port',
dialogContent: 'The following ports already exist in the target process group: <b>' + conflictingPorts.join('</b>, <b>') + '</b>'
});
portNameDeferred.reject();
} else {
portNameDeferred.resolve();
}
}).fail(function () {
portNameDeferred.reject();
});
}).promise();
};
// execute the checks in order
portConnectionCheck().done(function () {
if (nf.Common.isDefinedAndNotNull(groupId)) {
$.when(portNameCheck()).done(function () {
deferred.resolve();
}).fail(function () {
deferred.reject();
});
} else {
deferred.resolve();
}
}).fail(function () {
deferred.reject();
});
} else {
deferred.resolve();
}
}).promise();
},
/**
* Determines if the component in the specified selection is a valid connection source.
*