You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2018/07/25 16:26:26 UTC
[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24350]
UI service configs page hangs.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by this push:
new f44fe6b [AMBARI-24350] UI service configs page hangs.
f44fe6b is described below
commit f44fe6bb9c25ce4c3d6ec621a92a11c92d72358a
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Tue Jul 24 11:46:17 2018 -0700
[AMBARI-24350] UI service configs page hangs.
---
ambari-web/app/controllers/global/update_controller.js | 10 +++++-----
ambari-web/app/controllers/main/service/item.js | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index 7dcac8c..c7a3e47 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -675,8 +675,8 @@ App.UpdateController = Em.Controller.extend({
//TODO - update service auto-start to use this
updateClusterEnv: function () {
- this.loadClusterSettings().then(function (settings) {
- App.router.get('clusterController').set('clusterEnv', { properties: settings });
+ return App.router.get('configurationController').getCurrentConfigsBySites(['cluster-env']).done(function (config) {
+ App.router.get('clusterController').set('clusterEnv', config[0]);
});
},
@@ -688,7 +688,7 @@ App.UpdateController = Em.Controller.extend({
sender: this
}).then(data => {
const settings = {};
-
+
if (data && data.items) {
data.items.forEach(item => {
const key = item.ClusterSettingInfo.cluster_setting_name;
@@ -696,10 +696,10 @@ App.UpdateController = Em.Controller.extend({
settings[key] = value;
});
}
-
+
dfd.resolve(settings);
}, dfd.reject);
-
+
return dfd.promise();
},
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 1200fde..6604143 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -210,6 +210,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
loadConfigs: function() {
this.set('isServiceConfigsLoaded', false);
this.set('stepConfigs', []);
+ let self = this;
App.get('router.mainController.isLoading').call(App.get('router.clusterController'), 'isConfigsPropertiesLoaded').done(() => {
App.router.get('configurationController').getCurrentConfigsBySites(this.get('sitesToLoad')).done((configs) => {
let allConfigs = [];