NIFI-5661: - Allowing load balance settings to be applied during creation. - Clearing the load balance settings when the dialog is closed.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8da403ce Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8da403ce Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8da403ce Branch: refs/heads/master Commit: 8da403ce9e8135ea7fc86fa7eb308ad5dda9dabd Parents: 79c03ca Author: Matt Gilman <[email protected]> Authored: Thu Oct 11 13:21:20 2018 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Oct 11 13:21:20 2018 -0400 ---------------------------------------------------------------------- .../js/nf/canvas/nf-connection-configuration.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/8da403ce/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js index 97af35d..1704fe5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js @@ -919,6 +919,10 @@ var backPressureObjectThreshold = $('#back-pressure-object-threshold').val(); var backPressureDataSizeThreshold = $('#back-pressure-data-size-threshold').val(); var prioritizers = $('#prioritizer-selected').sortable('toArray'); + var loadBalanceStrategy = $('#load-balance-strategy-combo').combo('getSelectedOption').value; + var shouldLoadBalance = 'DO_NOT_LOAD_BALANCE' !== loadBalanceStrategy; + var loadBalancePartitionAttribute = shouldLoadBalance && 'PARTITION_BY_ATTRIBUTE' === loadBalanceStrategy ? $('#load-balance-partition-attribute').val() : ''; + var loadBalanceCompression = shouldLoadBalance ? $('#load-balance-compression-combo').combo('getSelectedOption').value : 'DO_NOT_COMPRESS'; if (validateSettings()) { var connectionEntity = { @@ -945,7 +949,10 @@ 'backPressureDataSizeThreshold': backPressureDataSizeThreshold, 'backPressureObjectThreshold': backPressureObjectThreshold, 'bends': bends, - 'prioritizers': prioritizers + 'prioritizers': prioritizers, + 'loadBalanceStrategy': loadBalanceStrategy, + 'loadBalancePartitionAttribute': loadBalancePartitionAttribute, + 'loadBalanceCompression': loadBalanceCompression } }; @@ -1182,6 +1189,11 @@ $('#output-port-options').empty(); $('#input-port-options').empty(); + // clear load balance settings + $('#load-balance-strategy-combo').combo('setSelectedOption', nfCommon.loadBalanceStrategyOptions[0]); + $('#load-balance-partition-attribute').val(''); + $('#load-balance-compression-combo').combo('setSelectedOption', nfCommon.loadBalanceCompressionOptions[0]); + // see if the temp edge needs to be removed removeTempEdge(); };
