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

NIFI-3780 - Should be able to specify Service... 

...name when I create a new Controller Service within a Processor/Service configuration dialog

I'm not sure how to integrate/style the text box. Suggestions are welcome.
This commit is contained in:
yuri1969 2017-08-13 20:15:38 +02:00 committed by Scott Aslan
parent abca9d1464
commit 79300de7a9
2 changed files with 14 additions and 1 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/css/controller-service.css
View File

@ -228,7 +228,7 @@ div.disable-referencing-components, div.enable-referencing-components {
New inline controller service dialog New inline controller service dialog
*/ */
div.new-inline-controller-service-requirement, div.new-inline-controller-service-combo, div.new-inline-controller-service-bundle, div.new-inline-controller-service-tags { div.new-inline-controller-service-requirement, div.new-inline-controller-service-combo, div.new-inline-controller-service-bundle, div.new-inline-controller-service-tags, div.new-inline-controller-service-description {
margin-bottom: 15px; margin-bottom: 15px;
} }

13
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
View File

@ -1014,6 +1014,12 @@
'<div class="new-inline-controller-service-description"></div>' + '<div class="new-inline-controller-service-description"></div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'<div>' +
'<div class="setting-name">Controller Service Name</div>' +
'<div class="setting-field">' +
'<input type="text" class="new-inline-controller-service-name"/>' +
'</div>' +
'</div>' +
'</div>' + '</div>' +
'</div>'; '</div>';
@ -1023,6 +1029,7 @@
var newControllerServiceBundle = newControllerServiceDialog.find('div.new-inline-controller-service-bundle'); var newControllerServiceBundle = newControllerServiceDialog.find('div.new-inline-controller-service-bundle');
var newControllerServiceTags = newControllerServiceDialog.find('div.new-inline-controller-service-tags'); var newControllerServiceTags = newControllerServiceDialog.find('div.new-inline-controller-service-tags');
var newControllerServiceDescription = newControllerServiceDialog.find('div.new-inline-controller-service-description'); var newControllerServiceDescription = newControllerServiceDialog.find('div.new-inline-controller-service-description');
var newControllerServiceNameInput = newControllerServiceDialog.find('input.new-inline-controller-service-name');
// include the required service // include the required service
var formattedType = nfCommon.formatType({ var formattedType = nfCommon.formatType({
@ -1089,6 +1096,7 @@
var create = function () { var create = function () {
var newControllerServiceKey = newControllerServiceCombo.combo('getSelectedOption').value; var newControllerServiceKey = newControllerServiceCombo.combo('getSelectedOption').value;
var newControllerServiceType = controllerServiceLookup.get(newControllerServiceKey); var newControllerServiceType = controllerServiceLookup.get(newControllerServiceKey);
var newControllerServiceName = newControllerServiceNameInput.val();
// build the controller service entity // build the controller service entity
var controllerServiceEntity = { var controllerServiceEntity = {
@ -1103,6 +1111,11 @@
} }
}; };
// set custom name when specified
if (newControllerServiceName.trim() !== '') {
controllerServiceEntity.component.name = newControllerServiceName.trim();
}
// determine the appropriate uri for creating the controller service // determine the appropriate uri for creating the controller service
var uri = '../nifi-api/controller/controller-services'; var uri = '../nifi-api/controller/controller-services';
if (nfCommon.isDefinedAndNotNull(groupId)) { if (nfCommon.isDefinedAndNotNull(groupId)) {