Fix: UI - Not all calls to nfCanvasUtil.reloadConnectionSourceAndDestination are made with the proper component IDs
This closes
var removeConnections = function (removed) {
// consider reloading source/destination of connection being removed
removed.each(function (d) {
- nfCanvasUtils.reloadConnectionSourceAndDestination(d.sourceId, d.destinationId);
+ var sourceComponentId = nfCanvasUtils.getConnectionSourceComponentId(d);
+ var destinationComponentId = nfCanvasUtils.getConnectionDestinationComponentId(d);
+ nfCanvasUtils.reloadConnectionSourceAndDestination(sourceComponentId, destinationComponentId);
});
// remove the connection
// get the corresponding connection
var connection = d3.select(this.parentNode);
var connectionData = connection.datum();
- var previousDestinationId = connectionData.destinationId;
+ var previousDestinationComponentId = nfCanvasUtils.getConnectionDestinationComponentId(connectionData);
// attempt to select a new destination
var destination = d3.select('g.connectable-destination');
// user will select new port and updated connect details will be set accordingly
nfConnectionConfiguration.showConfiguration(connection, destination).done(function () {
// reload the previous destination
- nfCanvasUtils.reloadConnectionSourceAndDestination(null, previousDestinationId);
+ nfCanvasUtils.reloadConnectionSourceAndDestination(null, previousDestinationComponentId);
}).fail(function () {
// reset the connection
connection.call(updateConnections, {
nfConnection.set(response);
// reload the previous destination and the new source/destination
- nfCanvasUtils.reloadConnectionSourceAndDestination(null, previousDestinationId);
- nfCanvasUtils.reloadConnectionSourceAndDestination(response.sourceId, response.destinationId);
+ nfCanvasUtils.reloadConnectionSourceAndDestination(null, previousDestinationComponentId);
+
+ var sourceComponentId = nfCanvasUtils.getConnectionSourceComponentId(response);
+ var destinationComponentId = nfCanvasUtils.getConnectionSourceComponentId(response);
+ nfCanvasUtils.reloadConnectionSourceAndDestination(sourceComponentId, destinationComponentId);
}).fail(function (xhr, status, error) {
if (xhr.status === 400 || xhr.status === 401 || xhr.status === 403 || xhr.status === 404 || xhr.status === 409) {
nfDialog.showOkDialog({
