This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch NIFI-6169-RC2 in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 884272859266e2d0255b91a8987f2fa1a54ea12b Author: Rob Fellows <[email protected]> AuthorDate: Wed Mar 13 13:07:15 2019 -0400 NIFI-6118 - Fix: UI - Not all calls to nfCanvasUtil.reloadConnectionSourceAndDestination are made with the proper component IDs This closes #3368 --- .../src/main/webapp/js/nf/canvas/nf-connection.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js index e6d7b7d..a1c3a78 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js @@ -1624,7 +1624,9 @@ 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 @@ -1760,7 +1762,7 @@ // 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'); @@ -1777,7 +1779,7 @@ // 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, { @@ -1836,8 +1838,11 @@ 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({
