فهرست منبع

AMBARI-12496. Invalid Metrics Monitor issue message after page refresh on step 3 of Add Service Wizard (alexantonenko)

Alex Antonenko 10 سال پیش
والد
کامیت
c3017b90f1

+ 0 - 4
ambari-web/app/controllers/installer.js

@@ -441,10 +441,6 @@ App.InstallerController = App.WizardController.extend({
     this.set("content.masterComponentHosts", masterComponentHosts);
   },
 
-  loadRecommendations: function () {
-    this.set("content.recommendations", this.getDBProperty('recommendations'));
-  },
-
   loadCurrentHostGroups: function () {
     this.set("content.recommendationsHostGroups", this.getDBProperty('recommendationsHostGroups'));
   },

+ 1 - 0
ambari-web/app/controllers/main/service/add_controller.js

@@ -88,6 +88,7 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
           this.loadHosts().done(function () {
             self.loadMasterComponentHosts();
             self.load('hosts');
+            self.loadRecommendations();
             dfd.resolve();
           });
           return dfd.promise();

+ 4 - 0
ambari-web/app/controllers/wizard.js

@@ -1317,5 +1317,9 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
   loadRequestIds: function() {
     var requestIds = this.getDBProperty('requestIds');
     this.set('content.requestIds', requestIds);
+  },
+
+  loadRecommendations: function () {
+    this.set("content.recommendations", this.getDBProperty('recommendations'));
   }
 });

+ 2 - 0
ambari-web/app/routes/add_service_routes.js

@@ -131,6 +131,7 @@ module.exports = App.WizardRoute.extend({
 
       var wizardStep5Controller = router.get('wizardStep5Controller');
       wizardStep5Controller.clearRecommendations(); // Force reload recommendation between steps 1 and 2
+      addServiceController.setDBProperty('recommendations', undefined);
       router.transitionTo('step2');
     }
   }),
@@ -158,6 +159,7 @@ module.exports = App.WizardRoute.extend({
       var wizardStep6Controller = router.get('wizardStep6Controller');
       addServiceController.saveMasterComponentHosts(wizardStep5Controller);
       addServiceController.setDBProperty('slaveComponentHosts', undefined);
+      addServiceController.setDBProperty('recommendations', wizardStep5Controller.get('content.recommendations'));
       wizardStep6Controller.set('isClientsSet', false);
       router.transitionTo('step3');
     }

+ 17 - 0
ambari-web/test/controllers/wizard_test.js

@@ -1481,5 +1481,22 @@ describe('App.WizardController', function () {
 
   });
 
+  describe('#loadRecommendations', function () {
+
+    beforeEach(function () {
+      sinon.stub(c, 'getDBProperty').returns({});
+    });
+
+    afterEach(function () {
+      c.getDBProperty.restore();
+    });
+
+    it('should set recommendations', function () {
+      c.set('content', {});
+      c.loadRecommendations();
+      expect(c.get('content.recommendations')).to.eql({});
+    });
+
+  });
 
 });