Repository: nifi Updated Branches: refs/heads/master 4f1444c0e -> 22342a0e0
NIFI-5167: - Updating how the nf-reporting-task module is injected to the nf-controller-service module. This closes #2688 Signed-off-by: Scott Aslan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/22342a0e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/22342a0e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/22342a0e Branch: refs/heads/master Commit: 22342a0e0c426e0a784925ac59161cbf7eba0c42 Parents: 4f1444c Author: Matt Gilman <[email protected]> Authored: Tue May 8 11:00:43 2018 -0400 Committer: Scott Aslan <[email protected]> Committed: Wed May 9 14:06:19 2018 -0400 ---------------------------------------------------------------------- .../main/webapp/js/nf/canvas/nf-canvas-bootstrap.js | 2 +- .../main/webapp/js/nf/canvas/nf-controller-service.js | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/22342a0e/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js index 2eff7a5..4286bff 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js @@ -370,7 +370,7 @@ // initialize the connection config and invert control of the birdseye and graph nfConnectionConfiguration.init(nfBirdseye, nfGraph, configDetails.defaultBackPressureObjectThreshold, configDetails.defaultBackPressureDataSizeThreshold); - nfControllerService.init(nfControllerServices); + nfControllerService.init(nfControllerServices, nfReportingTask); nfReportingTask.init(nfSettings); nfPolicyManagement.init(); nfProcessorConfiguration.init(); http://git-wip-us.apache.org/repos/asf/nifi/blob/22342a0e/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index d576006..4622ddf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -29,10 +29,9 @@ 'nf.UniversalCapture', 'nf.CustomUi', 'nf.CanvasUtils', - 'nf.ReportingTask', 'nf.Processor'], - function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { - return (nf.ControllerService = factory($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor)); + function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfProcessor) { + return (nf.ControllerService = factory($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfProcessor)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.ControllerService = @@ -46,7 +45,6 @@ require('nf.UniversalCapture'), require('nf.CustomUi'), require('nf.CanvasUtils'), - require('nf.ReportingTask'), require('nf.Processor'))); } else { nf.ControllerService = factory(root.$, @@ -59,13 +57,12 @@ root.nf.UniversalCapture, root.nf.CustomUi, root.nf.CanvasUtils, - root.nf.ReportingTask, root.nf.Processor); } -}(this, function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { +}(this, function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfProcessor) { 'use strict'; - var nfControllerServices; + var nfControllerServices, nfReportingTask; var config = { edit: 'edit', @@ -1634,8 +1631,9 @@ /** * Initializes the controller service configuration dialog. */ - init: function (nfControllerServicesRef) { + init: function (nfControllerServicesRef, nfReportingTaskRef) { nfControllerServices = nfControllerServicesRef; + nfReportingTask = nfReportingTaskRef; // initialize the configuration dialog tabs $('#controller-service-configuration-tabs').tabbs({
