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

NIFI-3244: 

- Updating Controller Service scope header.
- Rendering the name of the parent when possible.
- Fixing the check if the parent Process Group is write-able when the parent is selected on the current canvas.

This closes #1590

Signed-off-by: Scott Aslan <scottyaslan@gmail.com>
This commit is contained in:
Matt Gilman 2017-03-13 11:36:42 -04:00 committed by Scott Aslan
parent a61f353051
commit 620c572703
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
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

@ -558,7 +558,31 @@
}
if (nfCommon.isDefinedAndNotNull(dataContext.component.parentGroupId)) {
return dataContext.component.parentGroupId;
// see if this listing is based off a selected process group
var selection = nfCanvasUtils.getSelection();
if (selection.empty() === false) {
var selectedData = selection.datum();
if (selectedData.id === dataContext.component.parentGroupId) {
if (selectedData.permissions.canRead) {
return selectedData.component.name;
} else {
return selectedData.id;
}
}
}
// there's either no selection or the service is defined in an ancestor component
var breadcrumbs = nfNgBridge.injector.get('breadcrumbsCtrl').getBreadcrumbs();
var processGroupLabel = dataContext.component.parentGroupId;
$.each(breadcrumbs, function (_, breadcrumbEntity) {
if (breadcrumbEntity.id === dataContext.component.parentGroupId) {
processGroupLabel = breadcrumbEntity.label;
return false;
}
});
return processGroupLabel;
} else {
return 'Controller';
}
@ -571,9 +595,18 @@
* @returns {boolean} whether the user has write permissions for the parent of the controller service
*/
var canWriteControllerServiceParent = function (dataContext) {
// we know the process group for this controller service is part
// of the current breadcrumb trail
// we know the process group for this controller service is part of the current breadcrumb trail
var canWriteProcessGroupParent = function (processGroupId) {
// see if this listing is based off a selected process group
var selection = nfCanvasUtils.getSelection();
if (selection.empty() === false) {
var datum = selection.datum();
if (datum.id === processGroupId) {
return datum.permissions.canWrite;
}
}
// there's either no selection or the service is defined in an ancestor component
var breadcrumbs = nfNgBridge.injector.get('breadcrumbsCtrl').getBreadcrumbs();
var isAuthorized = false;
@ -783,7 +816,7 @@
},
{
id: 'parentGroupId',
name: 'Process Group',
name: 'Scope',
formatter: groupIdFormatter,
sortable: true,
resizeable: true