You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2020/09/14 14:51:21 UTC
[nifi] branch main updated (b5c3a2d -> dc4daa2)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from b5c3a2d NIFI-7802 Remove commons-configuration2 dependency from nifi-security-utils which ends up nifi-standard-services-api and on the classpath of any standard services
new e3d551e NIFI-7742: add case for controller service selections
new 80bc40a NIFI-7742: update case clause logic
new dc4daa2 NIFI-7742: remove defined and null check
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../nf-ng-canvas-flow-status-controller.js | 26 +++++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
[nifi] 01/03: NIFI-7742: add case for controller service selections
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e3d551e87d1de4e350772b3b8ac9fcef80bcdfcd
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Fri Sep 11 15:49:51 2020 -0400
NIFI-7742: add case for controller service selections
---
.../nf-ng-canvas-flow-status-controller.js | 39 ++++++++++++++++++----
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
index 8a338fa..2e2ebc5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
@@ -27,9 +27,11 @@
'nf.ClusterSummary',
'nf.ErrorHandler',
'nf.Settings',
- 'nf.ParameterContexts'],
- function ($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings, nfParameterContexts) {
- return (nf.ng.Canvas.FlowStatusCtrl = factory($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings, nfParameterContexts));
+ 'nf.ParameterContexts',
+ 'nf.ProcessGroup',
+ 'nf.ProcessGroupConfiguration'],
+ function ($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings, nfParameterContexts, nfProcessGroup, nfProcessGroupConfiguration) {
+ return (nf.ng.Canvas.FlowStatusCtrl = factory($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings, nfParameterContexts, nfProcessGroup, nfProcessGroupConfiguration));
});
} else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.ng.Canvas.FlowStatusCtrl =
@@ -41,7 +43,9 @@
require('nf.ClusterSummary'),
require('nf.ErrorHandler'),
require('nf.Settings'),
- require('nf.ParameterContexts')));
+ require('nf.ParameterContexts'),
+ require('nf.ProcessGroup'),
+ require('nf.ProcessGroupConfiguration')));
} else {
nf.ng.Canvas.FlowStatusCtrl = factory(root.$,
root.nf.Common,
@@ -51,9 +55,11 @@
root.nf.ClusterSummary,
root.nf.ErrorHandler,
root.nf.Settings,
- root.nf.ParameterContexts);
+ root.nf.ParameterContexts,
+ root.nf.ProcessGroup,
+ root.nf.ProcessGroupConfiguration);
}
-}(this, function ($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings, nfParameterContexts) {
+}(this, function ($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings, nfParameterContexts, nfProcessGroup, nfProcessGroupConfiguration) {
'use strict';
return function (serviceProvider) {
@@ -311,6 +317,27 @@
var paramContext = item.parentGroup;
nfParameterContexts.showParameterContext(paramContext.id, null, item.name);
break;
+ case 'controller service':
+ var group = item.parentGroup;
+ if (nfCommon.isDefinedAndNotNull(group.id)) {
+ nfProcessGroup.enterGroup(group.id).done(function () {
+ if ($('#process-group-configuration').is(':visible')) {
+ nfProcessGroupConfiguration.loadConfiguration(group.id).done(function () {
+ nfProcessGroupConfiguration.selectControllerService(item.id);
+ });
+ } else {
+ nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
+ nfSettings.selectControllerService(item.id);
+ });
+ }
+ });
+ } else {
+ // reload the settings and show
+ nfSettings.showSettings().done(function () {
+ nfSettings.selectControllerService(item.id);
+ });
+ }
+ break;
default:
var group = item.parentGroup;
[nifi] 02/03: NIFI-7742: update case clause logic
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 80bc40a9af3994c35d74fdbc5cb6d3c030e81037
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Fri Sep 11 16:43:24 2020 -0400
NIFI-7742: update case clause logic
---
.../controllers/nf-ng-canvas-flow-status-controller.js | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
index 2e2ebc5..5595803 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
@@ -321,20 +321,9 @@
var group = item.parentGroup;
if (nfCommon.isDefinedAndNotNull(group.id)) {
nfProcessGroup.enterGroup(group.id).done(function () {
- if ($('#process-group-configuration').is(':visible')) {
- nfProcessGroupConfiguration.loadConfiguration(group.id).done(function () {
- nfProcessGroupConfiguration.selectControllerService(item.id);
- });
- } else {
- nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
- nfSettings.selectControllerService(item.id);
- });
- }
- });
- } else {
- // reload the settings and show
- nfSettings.showSettings().done(function () {
- nfSettings.selectControllerService(item.id);
+ nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
+ nfProcessGroupConfiguration.selectControllerService(item.id);
+ });
});
}
break;
[nifi] 03/03: NIFI-7742: remove defined and null check
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit dc4daa29233a52e172b1e644ebda575b5f9e4679
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Fri Sep 11 17:21:20 2020 -0400
NIFI-7742: remove defined and null check
This closes #4524
Signed-off-by: Scott Aslan <sc...@gmail.com>
---
.../canvas/controllers/nf-ng-canvas-flow-status-controller.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
index 5595803..4de9712 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
@@ -319,13 +319,11 @@
break;
case 'controller service':
var group = item.parentGroup;
- if (nfCommon.isDefinedAndNotNull(group.id)) {
- nfProcessGroup.enterGroup(group.id).done(function () {
- nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
- nfProcessGroupConfiguration.selectControllerService(item.id);
- });
+ nfProcessGroup.enterGroup(group.id).done(function () {
+ nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
+ nfProcessGroupConfiguration.selectControllerService(item.id);
});
- }
+ });
break;
default:
var group = item.parentGroup;