AMBARI-9831 Stack Versions page: disable controls while call in progress. (ababiichuk)

ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js

@@ -145,7 +145,6 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
     this.loadUpgradeData(true).done(function() {
       self.loadStackVersionsToModel(true).done(function () {
         self.loadRepoVersionsToModel().done(function() {
-          self.set('requestInProgress', false);
           var currentVersion = App.StackVersion.find().findProperty('state', 'CURRENT');
           if (currentVersion) {
             self.set('currentVersion', {
@@ -431,11 +430,13 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
     };
 
     if (App.get('supports.preUpgradeCheck')) {
+      this.set('requestInProgress', true);
       App.ajax.send({
         name: "admin.rolling_upgrade.pre_upgrade_check",
         sender: this,
         data: params,
-        success: "runPreUpgradeCheckSuccess"
+        success: "runPreUpgradeCheckSuccess",
+        error: "runPreUpgradeCheckError"
       });
     } else {
       this.upgrade(params);
@@ -452,6 +453,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
    */
   runPreUpgradeCheckSuccess: function (data, opt, params) {
     if (data.items.someProperty('UpgradeChecks.status', "FAIL")) {
+      this.set('requestInProgress', false);
       var header = Em.I18n.t('popup.clusterCheck.Upgrade.header').format(params.label);
       var title = Em.I18n.t('popup.clusterCheck.Upgrade.title');
       var alert = Em.I18n.t('popup.clusterCheck.Upgrade.alert');
@@ -461,6 +463,10 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
     }
   },
 
+  runPreUpgradeCheckError: function() {
+    this.set('requestInProgress', false);
+  },
+
   /**
    * confirmation popup before install repository version
    */

ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js

@@ -245,7 +245,8 @@ describe('App.MainAdminStackAndUpgradeController', function() {
           value: '2.2',
           label: 'HDP-2.2'
         },
-        success: "runPreUpgradeCheckSuccess"
+        success: "runPreUpgradeCheckSuccess",
+        error: "runPreUpgradeCheckError"
       });
     });
   });