This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 9364f7d NIFI-6811: - Allowing enterGroup to complete prior to loading
the controller service table.
9364f7d is described below
commit 9364f7d2e80e7f3695f175d2d3c5d23883ad2ce4
Author: Matt Gilman <[email protected]>
AuthorDate: Thu Oct 24 22:51:46 2019 -0400
NIFI-6811:
- Allowing enterGroup to complete prior to loading the controller service
table.
This closes #3846.
---
.../jquery/propertytable/jquery.propertytable.js | 26 ++++++++++-----
.../webapp/js/nf/canvas/nf-controller-services.js | 38 +++++++++++-----------
2 files changed, 36 insertions(+), 28 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 369551b..4acaf94 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -29,6 +29,7 @@
'nf.Storage',
'nf.Client',
'nf.ErrorHandler',
+ 'nf.ProcessGroup',
'nf.ProcessGroupConfiguration',
'nf.Settings',
'nf.ParameterContexts',
@@ -41,6 +42,7 @@
nfStorage,
nfClient,
nfErrorHandler,
+ nfProcessGroup,
nfProcessGroupConfiguration,
nfSettings,
nfParameterContexts,
@@ -53,6 +55,7 @@
nfStorage,
nfClient,
nfErrorHandler,
+ nfProcessGroup,
nfProcessGroupConfiguration,
nfSettings,
nfParameterContexts,
@@ -67,6 +70,7 @@
require('nf.Storage'),
require('nf.Client'),
require('nf.ErrorHandler'),
+ require('nf.ProcessGroup'),
require('nf.ProcessGroupConfiguration'),
require('nf.Settings'),
recuire('nf.ParameterContexts'),
@@ -80,6 +84,7 @@
root.nf.Storage,
root.nf.Client,
root.nf.ErrorHandler,
+ root.nf.ProcessGroup,
root.nf.ProcessGroupConfiguration,
root.nf.Settings,
root.nf.ParameterContexts,
@@ -93,6 +98,7 @@
nfStorage,
nfClient,
nfErrorHandler,
+ nfProcessGroup,
nfProcessGroupConfiguration,
nfSettings,
nfParameterContexts,
@@ -1514,15 +1520,17 @@
var controllerService = controllerServiceEntity.component;
$.Deferred(function (deferred) {
if
(nfCommon.isDefinedAndNotNull(controllerService.parentGroupId)) {
- if ($('#process-group-configuration').is(':visible')) {
-
nfProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function
() {
- deferred.resolve();
- });
- } else {
-
nfProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function
() {
- deferred.resolve();
- });
- }
+
nfProcessGroup.enterGroup(controllerService.parentGroupId).done(function () {
+ if
($('#process-group-configuration').is(':visible')) {
+
nfProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function
() {
+ deferred.resolve();
+ });
+ } else {
+
nfProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function
() {
+ deferred.resolve();
+ });
+ }
+ });
} else {
if ($('#settings').is(':visible')) {
// reload the settings
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
index adf5bd1..fe53c09 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
@@ -704,7 +704,7 @@
if (!dataContext.permissions.canRead) {
return '<span class="blank">' +
nfCommon.escapeHtml(dataContext.id) + '</span>';
}
-
+
return nfCommon.escapeHtml(dataContext.component.name);
};
@@ -854,7 +854,7 @@
/**
* Initializes the controller services tab.
- *
+ *
* @param {jQuery} serviceTable
* @param {function} showSettings
*/
@@ -1096,21 +1096,21 @@
$('#shell-close-button').click();
} else if (target.hasClass('go-to-controller-service')) {
// load the parent group of the selected service
-
nfProcessGroup.enterGroup(controllerServiceEntity.parentGroupId);
-
- // open/select the specific service
- $.Deferred(function (deferred) {
- if ($('#process-group-configuration').is(':visible')) {
-
nfProcessGroupConfiguration.loadConfiguration(controllerServiceEntity.parentGroupId).done(function
() {
- deferred.resolve();
- });
- } else {
-
nfProcessGroupConfiguration.showConfiguration(controllerServiceEntity.parentGroupId).done(function
() {
- deferred.resolve();
- });
- }
- }).done(function () {
-
nfProcessGroupConfiguration.selectControllerService(controllerServiceEntity.id);
+
nfProcessGroup.enterGroup(controllerServiceEntity.parentGroupId).done(function
() {
+ // open/select the specific service
+ $.Deferred(function (deferred) {
+ if
($('#process-group-configuration').is(':visible')) {
+
nfProcessGroupConfiguration.loadConfiguration(controllerServiceEntity.parentGroupId).done(function
() {
+ deferred.resolve();
+ });
+ } else {
+
nfProcessGroupConfiguration.showConfiguration(controllerServiceEntity.parentGroupId).done(function
() {
+ deferred.resolve();
+ });
+ }
+ }).done(function () {
+
nfProcessGroupConfiguration.selectControllerService(controllerServiceEntity.id);
+ });
});
}
} else if (controllerServicesGrid.getColumns()[args.cell].id ===
'moreDetails') {
@@ -1379,7 +1379,7 @@
/**
* Update the size of the grid based on its container's current size.
- *
+ *
* @param {jQuery} serviceTable
*/
resetTableSize: function (serviceTable) {
@@ -1437,4 +1437,4 @@
controllerServicesData.endUpdate();
}
};
-}));
\ No newline at end of file
+}));
