AMBARI-14336. When upgrade method is not available, it shows Checking... with a spinner forever (and other UI issues).(xiwang)

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

@@ -675,6 +675,13 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
           label: version.get('displayName'),
           type: method.get('type')
         });
+      } else {
+        //if method not supported in current stack version, mark as check completed
+        method.setProperties({
+          isCheckComplete: false,
+          isCheckRequestInProgress: false,
+          action: ''
+        });
       }
     }, this);
   },
@@ -743,15 +750,15 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
             placement: "top",
             title: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.tolerance.tooltip')
           });
-          App.tooltip($(".not-allowed-by-version"), {
-            placement: "bottom",
-            title: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.notAllowed')
-          });
           Em.run.later(this, function () {
             App.tooltip($(".thumbnail.check-failed"), {
               placement: "bottom",
               title: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.preCheck.failed.tooltip')
             });
+            App.tooltip($(".not-allowed-by-version"), {
+              placement: "bottom",
+              title: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.notAllowed')
+            });
           }, 1000);
         },
         upgradeMethods: function () {

ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs

@@ -272,14 +272,14 @@
         {{#if App.upgradeAborted}}
           <div class="box details-box">
             <label class="message">
-            {{#if view.isDowngradeAvailable}}
+            {{#if isDowngrade}}
               {{t admin.stackUpgrade.dialog.suspended.downgrade}}
             {{else}}
               {{t admin.stackUpgrade.dialog.suspended}}
             {{/if}}
             </label>
             <div class="button-row">
-              {{#if view.isDowngradeAvailable}}
+              {{#if isDowngrade}}
                 <button class="btn btn-primary" {{action resumeUpgrade target="controller"}}>
                   {{t admin.stackUpgrade.dialog.resume.downgrade}}
                 </button>

ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs

@@ -30,7 +30,6 @@
       <th>{{t popup.clusterCheck.Upgrade.configsMerge.configType}}</th>
       <th>{{t popup.clusterCheck.Upgrade.configsMerge.propertyName}}</th>
       <th>{{t popup.clusterCheck.Upgrade.configsMerge.currentValue}}</th>
-      <th><span class="recommended-value">{{t popup.clusterCheck.Upgrade.configsMerge.recommendedValue}}</span></th>
       <th>{{t popup.clusterCheck.Upgrade.configsMerge.resultingValue}}</th>
     </tr>
     </thead>
@@ -44,7 +43,6 @@
         <td>{{type}}</td>
         <td>{{name}}</td>
         <td>{{currentValue}}</td>
-        <td {{bindAttr class="isDeprecated:no-value"}}>{{recommendedValue}}</td>
         <td {{bindAttr class="willBeRemoved:no-value"}}>{{resultingValue}}</td>
       </tr>
     {{/each}}