AMBARI-13941. Sorting works wrong on config history tab for config groups

ambari-web/app/controllers/main/host/add_controller.js

@@ -281,7 +281,7 @@ App.AddHostController = App.WizardController.extend({
             var serviceName = service.get('serviceName');
             var configGroups = this.get('content.configGroups').filterProperty('ConfigGroup.tag', serviceName);
             var configGroupsNames = configGroups.mapProperty('ConfigGroup.group_name');
-            var defaultGroupName = service.get('displayName') + ' Default';
+            var defaultGroupName = 'Default';
             var selectedService = selectedServices.findProperty('serviceId', serviceName);
             configGroupsNames.unshift(defaultGroupName);
             if (selectedService) {
@@ -324,7 +324,7 @@ App.AddHostController = App.WizardController.extend({
         } else {
           var configGroups = this.get('content.configGroups').filterProperty('ConfigGroup.tag', serviceName);
           var configGroupsNames = configGroups.mapProperty('ConfigGroup.group_name').sort();
-          var defaultGroupName = service.get('displayName') + ' Default';
+          var defaultGroupName = 'Default';
           configGroupsNames.unshift(defaultGroupName);
           selectedServices.push({
             serviceId: serviceName,
@@ -404,6 +404,8 @@ App.AddHostController = App.WizardController.extend({
   /**
    * send request to server in order to install services
    * @param isRetry
+   * @param callback
+   * @param errorCallback
    */
   installServices: function (isRetry, callback, errorCallback) {
     callback = callback || Em.K;

ambari-web/app/mappers/configs/config_groups_mapper.js

@@ -127,7 +127,7 @@ App.configGroupsMapper = App.QuickDataMapper.create({
     return {
       id: App.ServiceConfigGroup.getParentConfigGroupId(serviceName),
       config_group_id: '-1',
-      name: App.format.role(serviceName) + ' Default',
+      name: 'Default',
       service_name: serviceName,
       description: 'Default cluster level ' + App.format.role(serviceName) + ' configuration',
       hosts: hostNames ? hostNames.slice() : App.get('allHostNames').slice(),

ambari-web/app/models/configs/service_config_version.js

@@ -49,7 +49,7 @@ App.ServiceConfigVersion = DS.Model.extend({
     return Em.I18n.t('dashboard.configHistory.table.current.tooltip').format(this.get('displayName'), this.get('configGroupName'));
   }.property('displayName', 'configGroupName'),
   configGroupName: function () {
-    return this.get('isDefault') ? (this.get('displayName') + ' ' + Em.I18n.t('common.default')) : this.get('groupName');
+    return this.get('isDefault') ? Em.I18n.t('common.default') : this.get('groupName');
   }.property('groupName','isDefault'),
   authorFormatted: function () {
     var author = this.get('author');

ambari-web/test/controllers/main/host/add_controller_test.js

@@ -940,7 +940,7 @@ describe('App.AddHostController', function () {
             "host2"
           ],
           "configGroupsNames": [
-            "s1 Default",
+            "Default",
             "G1"
           ],
           "configGroups": [
@@ -951,7 +951,7 @@ describe('App.AddHostController', function () {
               }
             }
           ],
-          "selectedConfigGroup": "s1 Default"
+          "selectedConfigGroup": "Default"
         }
       ]);
     });
@@ -1048,7 +1048,7 @@ describe('App.AddHostController', function () {
             "host1"
           ],
           "configGroupsNames": [
-            "s1 Default",
+            "Default",
             "G1"
           ],
           "configGroups": [
@@ -1059,7 +1059,7 @@ describe('App.AddHostController', function () {
               }
             }
           ],
-          "selectedConfigGroup": "s1 Default"
+          "selectedConfigGroup": "Default"
         }
       ]);
     });