AMBARI-14830. Clients names different on host details page and filter. (xiwang via yusaku)

ambari-web/app/models/service.js

@@ -22,7 +22,7 @@ require('utils/config');
 
 App.Service = DS.Model.extend({
   serviceName: DS.attr('string'),
-  displayName: Em.computed.formatRole('serviceName'),
+  displayName: Em.computed.formatRole('serviceName', 'SERVICE'),
   passiveState: DS.attr('string'),
   workStatus: DS.attr('string'),
   rand: DS.attr('string'),

ambari-web/app/utils/ember_computed.js

@@ -887,10 +887,10 @@ computed.percents = function (dependentKey1, dependentKey2, accuracy) {
  * @param {string} dependentKey
  * @returns {Ember.ComputedProperty}
  */
-computed.formatRole = function (dependentKey) {
+computed.formatRole = function (dependentKey, level) {
   return computed(dependentKey, function () {
     var value = get(this, dependentKey);
-    return App.format.role(value);
+    return App.format.role(value, level);
   });
 };
 

ambari-web/app/utils/helper.js

@@ -535,8 +535,17 @@ App.format = {
    * @param {string} role
    * return {string}
    */
-  role: function (role) {
-    var models = [App.StackService, App.StackServiceComponent];
+  role: function (role, level) {
+    switch (level) {
+      case 'SERVICE':
+        var models = [App.StackService];
+        break;
+      case 'COMPONENT':
+        var models = [App.StackServiceComponent];
+        break;
+      default:
+        var models = [App.StackService, App.StackServiceComponent];
+    }
 
     if (App.isEmptyObject(this.stackRolesMap)) {
       models.forEach(function (model) {