瀏覽代碼

AMBARI-17821 Atlas: Add Service Customize Services Page Issues (rzang)

Richard Zang 9 年之前
父節點
當前提交
76aa496c47

+ 10 - 2
ambari-web/app/views/common/configs/service_config_container_view.js

@@ -96,7 +96,15 @@ App.ServiceConfigContainerView = Em.ContainerView.extend({
     }
     //terminate lazy loading when switch service
     if (this.get('lazyLoading')) lazyLoading.terminate(this.get('lazyLoading'));
-    this.pushView();
-  }.observes('controller.selectedService')
+    this.pushViewAfterRecommendation();
+  }.observes('controller.selectedService'),
+
+  pushViewAfterRecommendation: function() {
+    if (this.get('controller.isRecommendedLoaded')) {
+      this.pushView();
+    } else {
+      Em.run.later(this.pushViewAfterRecommendation.bind(this), 300);
+    }
+  }
 
 });

+ 6 - 3
ambari-web/test/views/common/configs/service_config_container_view_test.js

@@ -45,7 +45,8 @@ describe('App.ServiceConfigContainerView', function () {
         selectedService: {
           configCategories: [],
           configs: []
-        }
+        },
+        isRecommendedLoaded: true
       }));
       expect(view.get('childViews')).to.have.length(1);
     });
@@ -56,7 +57,8 @@ describe('App.ServiceConfigContainerView', function () {
         selectedService: {
           configCategories: [],
           configs: []
-        }
+        },
+        isRecommendedLoaded: true
       }));
       expect(view.get('childViews.firstObject.controller.name')).to.equal('controller');
     });
@@ -66,7 +68,8 @@ describe('App.ServiceConfigContainerView', function () {
         selectedService: {
           configCategories: [Em.Object.create(), Em.Object.create()],
           configs: []
-        }
+        },
+        isRecommendedLoaded: true
       }));
       expect(view.get('childViews.firstObject.serviceConfigsByCategoryView.childViews')).to.have.length(2);
     });