Przeglądaj źródła

AMBARI-12523. Incorrect ZooKeeper Server dropdown behaviour on step 5 of installer (akovalenko)

Aleksandr Kovalenko 10 lat temu
rodzic
commit
e58c811b65

+ 8 - 2
ambari-web/app/mixins/wizard/assign_master_components.js

@@ -1016,7 +1016,10 @@ App.AssignMasterComponents = Em.Mixin.create({
 
       this.get("selectedServicesMasters").insertAt(this.get("selectedServicesMasters").indexOf(lastMaster) + 1, newMaster);
 
-      this.set('componentToRebalance', componentName);
+      this.setProperties({
+        componentToRebalance: componentName,
+        lastChangedComponent: componentName
+      });
       this.incrementProperty('rebalanceComponentHostsCounter');
       this.toggleProperty('hostNameCheckTrigger');
       return true;
@@ -1050,7 +1053,10 @@ App.AssignMasterComponents = Em.Mixin.create({
       currentMasters.set("lastObject.showRemoveControl", false);
     }
 
-    this.set('componentToRebalance', componentName);
+    this.setProperties({
+      componentToRebalance: componentName,
+      lastChangedComponent: componentName
+    });
     this.incrementProperty('rebalanceComponentHostsCounter');
     this.toggleProperty('hostNameCheckTrigger');
     return true;

+ 6 - 0
ambari-web/test/controllers/wizard/step5_test.js

@@ -535,6 +535,8 @@ describe('App.WizardStep5Controller', function () {
         if (test.e) {
           expect(c.get('selectedServicesMasters.lastObject.showRemoveControl')).to.equal(test.showRemoveControl);
           expect(c.get('selectedServicesMasters.lastObject.showAddControl')).to.equal(test.showAddControl);
+          expect(c.get('componentToRebalance')).to.equal(test.componentName);
+          expect(c.get('lastChangedComponent')).to.equal(test.componentName);
         }
       })
     });
@@ -585,6 +587,10 @@ describe('App.WizardStep5Controller', function () {
         c.set('selectedServicesMasters', test.selectedServicesMasters);
         c.set('hosts', test.hosts);
         expect(c.addComponent(test.componentName)).to.equal(test.e);
+        if (test.e) {
+          expect(c.get('componentToRebalance')).to.equal(test.componentName);
+          expect(c.get('lastChangedComponent')).to.equal(test.componentName);
+        }
       });
     });
   });