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

NIFI-699: 

- Removing the enabled checkbox from the controller service configuration dialog. This was originally added to be consistent with the processor configuration dialog. However, the action may be long running and needs a polling mechanism to indicate to the user once the action completes. This is currently built into the enable/disable dialog and that is the preferred mechanism for enabling/disabling.
This commit is contained in:
Matt Gilman 2015-06-19 08:51:22 -04:00
parent 64502d0e10
commit cef7206796
3 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
View File

@ -25,10 +25,6 @@
<div class="setting-name">Name</div>
<div class="controller-service-editable setting-field">
<input type="text" id="controller-service-name" name="controller-service-name" class="setting-input"/>
<div class="controller-service-enabled-container">
<div id="controller-service-enabled" class="nf-checkbox checkbox-unchecked"></div>
<span> Enabled</span>
</div>
</div>
<div class="controller-service-read-only setting-field hidden">
<span id="read-only-controller-service-name"></span>

13
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
View File

@ -79,19 +79,6 @@ div.controller-service-configuration-tab-container {
float: left;
}
#controller-service-enabled {
width: 12px;
height: 12px;
float: left;
margin-right: 4px;
}
div.controller-service-enabled-container {
float: left;
margin-top: 5px;
margin-left: 10px;
}
div.availability-setting {
float: left;
width: 140px;

20
nifi/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

@ -70,12 +70,6 @@ nf.ControllerService = (function () {
return true;
}
if ($('#controller-service-enabled').hasClass('checkbox-checked') && details['state'] === 'DISABLED') {
return true;
} else if ($('#controller-service-enabled').hasClass('checkbox-unchecked') && details['state'] === 'ENABLED') {
return true;
}
// defer to the properties
return $('#controller-service-properties').propertytable('isSaveRequired');
};
@ -98,13 +92,6 @@ nf.ControllerService = (function () {
controllerServiceDto['properties'] = properties;
}
// mark the controller service enabled if appropriate
if ($('#controller-service-enabled').hasClass('checkbox-unchecked')) {
controllerServiceDto['state'] = 'DISABLED';
} else if ($('#controller-service-enabled').hasClass('checkbox-checked')) {
controllerServiceDto['state'] = 'ENABLED';
}
// create the controller service entity
var controllerServiceEntity = {};
controllerServiceEntity['revision'] = nf.Client.getRevision();
@ -1438,17 +1425,10 @@ nf.ControllerService = (function () {
// record the controller service details
controllerServiceDialog.data('controllerServiceDetails', controllerService);
// determine if the enabled checkbox is checked or not
var controllerServiceEnableStyle = 'checkbox-checked';
if (controllerService['state'] === 'DISABLED') {
controllerServiceEnableStyle = 'checkbox-unchecked';
}
// populate the controller service settings
nf.Common.populateField('controller-service-id', controllerService['id']);
nf.Common.populateField('controller-service-type', nf.Common.substringAfterLast(controllerService['type'], '.'));
$('#controller-service-name').val(controllerService['name']);
$('#controller-service-enabled').removeClass('checkbox-checked checkbox-unchecked').addClass(controllerServiceEnableStyle);
$('#controller-service-comments').val(controllerService['comments']);
// select the availability when appropriate