AMBARI-9267 Versions: missing string on Hosts page and service versions incorrect. (ababiichuk)

ambari-web/app/assets/test/tests.js

@@ -50,7 +50,7 @@ var files = ['test/init_model_test',
   'test/controllers/main/alerts/add_alert_definition/step1_controller_test',
   'test/controllers/main/alerts/manage_alert_notifications_controller_test',
   'test/controllers/main/admin/kerberos_test',
-  'test/controllers/main/admin/kerberos/kerberos_wizard_controler_tets',
+  'test/controllers/main/admin/kerberos/kerberos_wizard_controler_test',
   'test/controllers/main/admin/kerberos/step4_controller_test',
   'test/controllers/main/admin/stack_and_upgrade_controller_test',
   'test/controllers/main/admin/serviceAccounts_controller_test',

ambari-web/app/messages.js

@@ -1989,6 +1989,8 @@ Em.I18n.translations = {
   'hosts.host.stackVersions.status.installing': 'Installing',
   'hosts.host.stackVersions.status.current': 'Current',
   'hosts.host.stackVersions.status.out_of_sync': 'Out of sync',
+  'hosts.host.stackVersions.status.upgrading': 'Upgrading',
+  'hosts.host.stackVersions.status.upgrade_failed': 'Upgrade Failed',
 
   'hosts.host.metrics.dataUnavailable':'Data Unavailable',
   'hosts.host.metrics.cpu':'CPU Usage',

ambari-web/app/models/host.js

@@ -60,7 +60,8 @@ App.Host = DS.Model.extend({
   isRequested: DS.attr('boolean'),
 
   currentVersion: function () {
-    return this.get('stackVersions').findProperty('isCurrent').get('repoVersion');
+    var current = this.get('stackVersions').findProperty('isCurrent');
+    return current ? current.get('repoVersion') : null;
   }.property('stackVersions.@each.isCurrent'),
 
   /**

ambari-web/app/models/host_stack_version.js

@@ -53,7 +53,9 @@ App.HostStackVersion.statusDefinition = [
   "INSTALLING",
   "INSTALL_FAILED",
   "OUT_OF_SYNC",
-  "CURRENT"
+  "CURRENT",
+  "UPGRADING",
+  "UPGRADE_FAILED"
 ];
 
 /**
@@ -62,7 +64,7 @@ App.HostStackVersion.statusDefinition = [
  * @return {string}
  */
 App.HostStackVersion.formatStatus = function (status) {
-  return status ?
+  return App.HostStackVersion.statusDefinition.contains(status) ?
     Em.I18n.t('hosts.host.stackVersions.status.' + status.toLowerCase()) :
-    Em.I18n.t('common.unknown');
+    status.toCapital();
 };

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

@@ -30,7 +30,7 @@
   {{#each service in view.services}}
     <tr>
       <td class="service-display-name">{{service.displayName}}</td>
-      <td class="service-stack-version">{{service.stackVersion}}</td>
+      <td class="service-stack-version">{{service.serviceVersion}}</td>
       <td class="stack-version-state">
         {{#if service.isInstalled}}
           <span class="label label-success">{{t common.installed}}</span>

ambari-web/test/models/host_stack_version_test.js

@@ -25,8 +25,8 @@ describe('App.HostStackVersion', function () {
   describe("#displayStatus", function () {
     var testCases = [
       {
-        status: 'INIT',
-        result: Em.I18n.t('hosts.host.stackVersions.status.init')
+        status: 'OUT_OF_SYNC',
+        result: Em.I18n.t('hosts.host.stackVersions.status.out_of_sync')
       },
       {
         status: 'INSTALLED',
@@ -41,8 +41,20 @@ describe('App.HostStackVersion', function () {
         result: Em.I18n.t('hosts.host.stackVersions.status.install_failed')
       },
       {
-        status: '',
-        result: Em.I18n.t('common.unknown')
+        status: 'UPGRADE_FAILED',
+        result: Em.I18n.t('hosts.host.stackVersions.status.upgrade_failed')
+      },
+      {
+        status: 'UPGRADING',
+        result: Em.I18n.t('hosts.host.stackVersions.status.upgrading')
+      },
+      {
+        status: 'CURRENT',
+        result: Em.I18n.t('hosts.host.stackVersions.status.current')
+      },
+      {
+        status: 'ANY',
+        result: 'Any'
       }
     ];
     afterEach(function () {