AMBARI-6744. 'Select Host' page on Resource Manager HA Enabling wizard does not save selected values after next/back steps. (akovalenko)

ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js

@@ -29,10 +29,12 @@ App.RMHighAvailabilityWizardStep2Controller = App.WizardStep5Controller.extend({
   renderComponents: function (masterComponents) {
     var existedRM = masterComponents.findProperty('component_name', 'RESOURCEMANAGER');
     existedRM.isAdditional = false;
+    var additionalRMSelectedHost = this.get('content.rmHosts.additionalRM') ||
+        this.get('hosts').mapProperty('host_name').without(existedRM.selectedHost)[0];
     var additionalRM = $.extend({}, existedRM, {
       isInstalled: false,
       isAdditional: true,
-      selectedHost: this.get('hosts').mapProperty('host_name').without(existedRM.selectedHost)[0]
+      selectedHost: additionalRMSelectedHost
     });
     masterComponents.push(additionalRM);
     this._super(masterComponents);

ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js

@@ -115,8 +115,8 @@ App.RMHighAvailabilityWizardController = App.WizardController.extend({
         this.loadRequestIds();
         this.loadConfigs();
       case '3':
-        this.loadRmHosts();
       case '2':
+        this.loadRmHosts();
         this.loadServicesFromServer();
         this.loadMasterComponentHosts();
         this.loadConfirmedHosts();

ambari-web/app/controllers/wizard/step5_controller.js

@@ -567,11 +567,10 @@ App.WizardStep5Controller = Em.Controller.extend({
   },
 
   sortComponentsByServiceName: function(components) {
-    var _components = components.sortPropertyLight('selectedHost');
     var displayOrder = App.StackService.displayOrder;
-    return _components.sort(function (a, b) {
-      var aValue = displayOrder.indexOf(a.serviceId) != -1 ? displayOrder.indexOf(a.serviceId) : _components.length;
-      var bValue = displayOrder.indexOf(b.serviceId) != -1 ? displayOrder.indexOf(b.serviceId) : _components.length;
+    return components.sort(function (a, b) {
+      var aValue = displayOrder.indexOf(a.serviceId) != -1 ? displayOrder.indexOf(a.serviceId) : components.length;
+      var bValue = displayOrder.indexOf(b.serviceId) != -1 ? displayOrder.indexOf(b.serviceId) : components.length;
       return aValue - bValue;
     });
   },

ambari-web/app/routes/rm_high_availability_routes.js

@@ -94,6 +94,7 @@ module.exports = App.WizardRoute.extend({
       return false;
     },
     next: function (router) {
+      router.get('rMHighAvailabilityWizardController').setDBProperty('rmHosts', undefined);
       router.transitionTo('step2');
     }
   }),