AMBARI-9321. Missing smoke test user + hadoop group (alexantonenko)

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

@@ -79,7 +79,7 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     var configSet = App.config.mergePreDefinedWithLoaded(serverConfigs, advancedConfigs, this.get('serviceConfigTags'), this.get('selectedService'));
     var miscConfigs = configSet.configs.filterProperty('serviceName', this.get('selectedService')).filterProperty('category', 'Users and Groups').filterProperty('isVisible', true).rejectProperty('displayType', 'password').rejectProperty('displayType', 'checkbox');
 
-    miscConfigs = App.config.miscConfigVisibleProperty(miscConfigs, App.Service.find().mapProperty('serviceName'));
+    miscConfigs = App.config.miscConfigVisibleProperty(miscConfigs, App.Service.find().mapProperty('serviceName').concat('MISC'));
 
     this.set('users', miscConfigs.filterProperty('isVisible'));
     this.set('dataIsLoaded', true);

ambari-web/app/controllers/wizard/step7_controller.js

@@ -1147,12 +1147,13 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
    */
   activateSpecialConfigs: function () {
     if (this.get('addMiscTabToPage')) {
+      var serviceToShow = this.get('selectedServiceNames').concat('MISC');
       var miscConfigs = this.get('stepConfigs').findProperty('serviceName', 'MISC').configs;
       if (this.get('wizardController.name') == "addServiceController") {
         miscConfigs.findProperty('name', 'smokeuser').set('value', this.get('content.smokeuser')).set('isEditable', false);
         miscConfigs.findProperty('name', 'user_group').set('value', this.get('content.group')).set('isEditable', false);
       }
-      App.config.miscConfigVisibleProperty(miscConfigs, this.get('selectedServiceNames'));
+      App.config.miscConfigVisibleProperty(miscConfigs, serviceToShow);
     }
     var wizardController = this.get('wizardController');
     if (wizardController.get('name') === "kerberosWizardController")  {

ambari-web/app/utils/config.js

@@ -968,7 +968,12 @@ App.config = Em.Object.create({
   advancedConfigIdentityData: function(config) {
     var propertyData = {};
     var proxyUserGroupServices = ['HIVE', 'OOZIE', 'FALCON'];
-
+    var nameToDisplayNameMap = {
+      'smokeuser': 'Smoke Test User',
+      'user_group': 'Hadoop Group',
+      'mapred_user': 'MapReduce User',
+      'zk_user': 'ZooKeeper User'
+    };
     if (config.property_type.contains('USER') || config.property_type.contains('GROUP')) {
       propertyData.id = "puppet var";
       propertyData.category = 'Users and Groups';
@@ -976,7 +981,7 @@ App.config = Em.Object.create({
       propertyData.serviceName = 'MISC';
       propertyData.isOverridable = false;
       propertyData.isReconfigurable = false;
-      propertyData.displayName = App.format.normalizeName(config.property_name);
+      propertyData.displayName = nameToDisplayNameMap[config.property_name] || App.format.normalizeName(config.property_name);
       propertyData.displayType = 'user';
       if (config.service_name) {
         var propertyIndex = config.service_name == 'MISC' ? 30 : App.StackService.find().mapProperty('serviceName').indexOf(config.service_name);

ambari-web/test/mock_data_setup/configs_mock_data.js

@@ -495,6 +495,48 @@ module.exports = {
           "stack_version" : "2.2",
           "type" : "cluster-env.xml"
         }
+      },
+      {
+        "StackLevelConfigurations" : {
+          "final" : "false",
+          "property_description" : "",
+          "property_name" : "smokeuser",
+          "property_type" : [
+            "USER"
+          ],
+          "property_value" : "ambari-qa",
+          "stack_name" : "HDP",
+          "stack_version" : "2.2",
+          "type" : "cluster-env.xml"
+        }
+      },
+      {
+        "StackLevelConfigurations" : {
+          "final" : "false",
+          "property_description" : "",
+          "property_name" : "zk_user",
+          "property_type" : [
+            "USER"
+          ],
+          "property_value" : "zookeeper",
+          "stack_name" : "HDP",
+          "stack_version" : "2.2",
+          "type" : "cluster-env.xml"
+        }
+      },
+      {
+        "StackLevelConfigurations" : {
+          "final" : "false",
+          "property_description" : "",
+          "property_name" : "mapred_user",
+          "property_type" : [
+            "USER"
+          ],
+          "property_value" : "mapreduce",
+          "stack_name" : "HDP",
+          "stack_version" : "2.2",
+          "type" : "cluster-env.xml"
+        }
       }
     ]
   }

ambari-web/test/utils/config_test.js

@@ -668,6 +668,37 @@ describe('App.config', function () {
           {
             key: 'index',
             e: 30
+          },
+          {
+            key: 'displayName',
+            e: 'Hadoop Group'
+          }
+        ]
+      },
+      {
+        name: 'zk_user',
+        cases: [
+          {
+            key: 'displayName',
+            e: 'ZooKeeper User'
+          }
+        ]
+      },
+      {
+        name: 'mapred_user',
+        cases: [
+          {
+            key: 'displayName',
+            e: 'MapReduce User'
+          }
+        ]
+      },
+      {
+        name: 'smokeuser',
+        cases: [
+          {
+            key: 'displayName',
+            e: 'Smoke Test User'
           }
         ]
       }