AMBARI-6799. NameNode HA wizard: Quitting the wizard on the initial pages did not dismiss the wizard popup. (jaimin)

ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js

@@ -120,20 +120,17 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
       primary: Em.I18n.t('yes'),
       showCloseButton: false,
       onPrimary: function () {
+        var self = this;
         var controller = App.router.get('highAvailabilityWizardController');
         controller.clearTasksData();
         controller.clearStorageData();
-        controller.setCurrentStep('1');
+        controller.finish();
         App.router.get('updateController').set('isWorking', true);
         App.clusterStatus.setClusterStatus({
           clusterName: App.router.get('content.cluster.name'),
           clusterState: 'DEFAULT',
-          wizardControllerName: App.router.get('highAvailabilityRollbackController.name'),
           localdb: App.db.data
-        });
-        this.hide();
-        App.router.transitionTo('main.admin.index');
-        location.reload();
+        },{alwaysCallback: function() {self.hide();App.router.transitionTo('main.index');location.reload();}});
       },
       secondary: Em.I18n.t('no'),
       onSecondary: function () {

ambari-web/app/routes/high_availability_routes.js

@@ -55,11 +55,10 @@ module.exports = App.WizardRoute.extend({
           var self = this;
           var currStep = App.router.get('highAvailabilityWizardController.currentStep');
           var highAvailabilityProgressPageController = App.router.get('highAvailabilityProgressPageController');
-
           if(parseInt(currStep) > 4){
             if(!App.supports.autoRollbackHA){
               highAvailabilityProgressPageController.manualRollback();
-            }else{
+            } else{
               this.hide();
               App.router.get('highAvailabilityWizardController').setCurrentStep('1');
               App.router.transitionTo('rollbackHighAvailability');
@@ -73,7 +72,7 @@ module.exports = App.WizardRoute.extend({
               clusterName: controller.get('content.cluster.name'),
               clusterState: 'DEFAULT',
               localdb: App.db.data
-            },{alwaysCallback: function() {self.hide();App.router.transitionTo('main.admin.adminHighAvailability');location.reload();}});
+            },{alwaysCallback: function() {self.hide();App.router.transitionTo('main.index');location.reload();}});
           }
         },
         didInsertElement: function () {
@@ -144,12 +143,7 @@ module.exports = App.WizardRoute.extend({
       if(sNN){
         App.db.setRollBackHighAvailabilityWizardSNNHost(sNN);
       }
-      App.clusterStatus.setClusterStatus({
-        clusterName: this.get('content.cluster.name'),
-        clusterState: 'HIGH_AVAILABILITY_DEPLOY',
-        wizardControllerName: this.get('content.controllerName'),
-        localdb: App.db.data
-      });
+
       controller.saveMasterComponentHosts(highAvailabilityWizardStep2Controller);
       controller.get('content').set('serviceConfigProperties', null);
       controller.setDBProperty('serviceConfigProperties', null);

ambari-web/app/routes/rm_high_availability_routes.js

@@ -21,7 +21,7 @@ var App = require('app');
 module.exports = App.WizardRoute.extend({
   route: '/highAvailability/ResourceManager/enable',
 
-  enter: function (router) {
+  enter: function (router,transition) {
     Em.run.next(function () {
       var rMHighAvailabilityWizardController = router.get('rMHighAvailabilityWizardController');
       App.router.get('updateController').set('isWorking', false);
@@ -49,7 +49,7 @@ module.exports = App.WizardRoute.extend({
                 localdb: App.db.data
               }, {alwaysCallback: function () {
                 self.hide();
-                router.transitionTo('main.admin.adminHighAvailability.index');
+                router.transitionTo('main.index');
                 location.reload();
               }});
             }, Em.I18n.t('admin.rm_highAvailability.closePopup'));
@@ -57,7 +57,7 @@ module.exports = App.WizardRoute.extend({
             this.hide();
             rMHighAvailabilityWizardController.setCurrentStep('1');
             router.get('updateController').set('isWorking', true);
-            router.transitionTo('main.admin.adminHighAvailability.index')
+            router.transitionTo('main.index')
           }
         },
         didInsertElement: function () {
@@ -175,7 +175,7 @@ module.exports = App.WizardRoute.extend({
         localdb: App.db.data
       }, {alwaysCallback: function () {
         controller.get('popup').hide();
-        router.transitionTo('main.admin.adminHighAvailability.index');
+        router.transitionTo('main.index');
         location.reload();
       }});
     }