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

NIFI-3781 - Controller Service Config Dialog... 

..'View Details' button feels confusing and inconsistent with Processors

* Merged 'View Details' and 'Edit' buttons to a single 'Configure'/'View Details' one.
* Fixed confusing 'View Details' modal's title.
This commit is contained in:
yuri1969 2017-08-19 20:49:33 +02:00 committed by Scott Aslan
parent 8cb501443b
commit a3401c3b95
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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

@ -1813,6 +1813,8 @@
currentTable = serviceTable;
}
var controllerServiceDialog = $('#controller-service-configuration');
controllerServiceDialog.find('.dialog-header .dialog-header-text').text('Configure Controller Service');
if (controllerServiceDialog.data('mode') !== config.edit || currentTable !== serviceTable) {
// update the visibility
$('#controller-service-configuration .controller-service-read-only').hide();
@ -2014,6 +2016,8 @@
*/
showDetails: function (serviceTable, controllerServiceEntity) {
var controllerServiceDialog = $('#controller-service-configuration');
controllerServiceDialog.find('.dialog-header .dialog-header-text').text('Controller Service Details');
if (controllerServiceDialog.data('mode') !== config.readOnly) {
// update the visibility
$('#controller-service-configuration .controller-service-read-only').show();

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

@ -783,11 +783,9 @@
if (!dataContext.permissions.canRead) {
return '';
}
var markup = '<div class="pointer view-controller-service fa fa-info-circle" title="View Details" style="margin-top: 5px; margin-right: 3px;" ></div>';
// always include a button to view the usage
markup += '<div title="Usage" class="pointer controller-service-usage fa fa-book" style="margin-top: 5px; margin-right: 3px;" ></div>';
var markup = '<div title="Usage" class="pointer controller-service-usage fa fa-book" style="margin-top: 5px; margin-right: 3px;" ></div>';
var hasErrors = !nfCommon.isEmpty(dataContext.component.validationErrors);
var hasBulletins = !nfCommon.isEmpty(dataContext.bulletins);
@ -855,9 +853,10 @@
if (definedByCurrentGroup === true) {
if (dataContext.component.state === 'ENABLED' || dataContext.component.state === 'ENABLING') {
markup += '<div class="pointer view-controller-service fa fa-gear" title="View Details" style="margin-top: 2px; margin-right: 3px;" ></div>';
markup += '<div class="pointer disable-controller-service icon icon-enable-false" title="Disable" style="margin-top: 2px; margin-right: 3px;" ></div>';
} else if (dataContext.component.state === 'DISABLED') {
markup += '<div class="pointer edit-controller-service fa fa-pencil" title="Edit" style="margin-top: 2px; margin-right: 3px;" ></div>';
markup += '<div class="pointer edit-controller-service fa fa-gear" title="Configure" style="margin-top: 2px; margin-right: 3px;" ></div>';
// if there are no validation errors allow enabling
if (nfCommon.isEmpty(dataContext.component.validationErrors)) {
@ -985,6 +984,8 @@
if (controllerServicesGrid.getColumns()[args.cell].id === 'actions') {
if (target.hasClass('edit-controller-service')) {
nfControllerService.showConfiguration(serviceTable, controllerServiceEntity);
} else if (target.hasClass('view-controller-service')) {
nfControllerService.showDetails(serviceTable, controllerServiceEntity);
} else if (target.hasClass('enable-controller-service')) {
nfControllerService.enable(serviceTable, controllerServiceEntity);
} else if (target.hasClass('disable-controller-service')) {
@ -1021,9 +1022,7 @@
});
}
} else if (controllerServicesGrid.getColumns()[args.cell].id === 'moreDetails') {
if (target.hasClass('view-controller-service')) {
nfControllerService.showDetails(serviceTable, controllerServiceEntity);
} else if (target.hasClass('controller-service-usage')) {
if (target.hasClass('controller-service-usage')) {
// close the settings dialog
$('#shell-close-button').click();
@ -1033,7 +1032,7 @@
group: controllerServiceEntity.component.bundle.group,
artifact: controllerServiceEntity.component.bundle.artifact,
version: controllerServiceEntity.component.bundle.version
})).done(function() {
})).done(function() {
if (nfCommon.isDefinedAndNotNull(controllerServiceEntity.component.parentGroupId)) {
var groupId;
var processGroup = nfProcessGroup.get(controllerServiceEntity.component.parentGroupId);
@ -1048,8 +1047,8 @@
} else {
showSettings();
}
});
}
});
}
}
});