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

[NIFI-3360] inject nf.ControllerServices into nf.ControllerService. This closes #1685

This commit is contained in:
Scott Aslan 2017-04-20 16:52:28 -04:00 committed by Matt Gilman
parent 1c9ea249f7
commit 2f928490e3
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,7 @@
// initialize the connection config and invert control of the birdseye and graph // initialize the connection config and invert control of the birdseye and graph
nfConnectionConfiguration.init(nfBirdseye, nfGraph); nfConnectionConfiguration.init(nfBirdseye, nfGraph);
nfControllerService.init(); nfControllerService.init(nfControllerServices);
nfReportingTask.init(nfSettings); nfReportingTask.init(nfSettings);
nfPolicyManagement.init(); nfPolicyManagement.init();
nfProcessorConfiguration.init(); nfProcessorConfiguration.init();

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
View File

@ -25,15 +25,14 @@
'nf.Common', 'nf.Common',
'nf.Dialog', 'nf.Dialog',
'nf.Client', 'nf.Client',
'nf.ControllerServices',
'nf.Settings', 'nf.Settings',
'nf.UniversalCapture', 'nf.UniversalCapture',
'nf.CustomUi', 'nf.CustomUi',
'nf.CanvasUtils', 'nf.CanvasUtils',
'nf.ReportingTask', 'nf.ReportingTask',
'nf.Processor'], 'nf.Processor'],
function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfControllerServices, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) {
return (nf.ControllerService = factory($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfControllerServices, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor)); return (nf.ControllerService = factory($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor));
}); });
} else if (typeof exports === 'object' && typeof module === 'object') { } else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.ControllerService = module.exports = (nf.ControllerService =
@ -43,7 +42,6 @@
require('nf.Common'), require('nf.Common'),
require('nf.Dialog'), require('nf.Dialog'),
require('nf.Client'), require('nf.Client'),
require('nf.ControllerServices'),
require('nf.Settings'), require('nf.Settings'),
require('nf.UniversalCapture'), require('nf.UniversalCapture'),
require('nf.CustomUi'), require('nf.CustomUi'),
@ -57,7 +55,6 @@
root.nf.Common, root.nf.Common,
root.nf.Dialog, root.nf.Dialog,
root.nf.Client, root.nf.Client,
root.nf.ControllerServices,
root.nf.Settings, root.nf.Settings,
root.nf.UniversalCapture, root.nf.UniversalCapture,
root.nf.CustomUi, root.nf.CustomUi,
@ -65,9 +62,11 @@
root.nf.ReportingTask, root.nf.ReportingTask,
root.nf.Processor); root.nf.Processor);
} }
}(this, function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfControllerServices, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { }(this, function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) {
'use strict'; 'use strict';
var nfControllerServices;
var config = { var config = {
edit: 'edit', edit: 'edit',
readOnly: 'read-only', readOnly: 'read-only',
@ -1625,7 +1624,9 @@
/** /**
* Initializes the controller service configuration dialog. * Initializes the controller service configuration dialog.
*/ */
init: function () { init: function (nfControllerServicesRef) {
nfControllerServices = nfControllerServicesRef;
// initialize the configuration dialog tabs // initialize the configuration dialog tabs
$('#controller-service-configuration-tabs').tabbs({ $('#controller-service-configuration-tabs').tabbs({
tabStyle: 'tab', tabStyle: 'tab',
@ -1795,7 +1796,6 @@
descriptorDeferred: getControllerServicePropertyDescriptor, descriptorDeferred: getControllerServicePropertyDescriptor,
controllerServiceCreatedDeferred: function (response) { controllerServiceCreatedDeferred: function (response) {
var controllerServicesUri; var controllerServicesUri;
var createdControllerServicesTable;
// calculate the correct uri // calculate the correct uri
var createdControllerService = response.component; var createdControllerService = response.component;