AMBARI-8203. Add Service service accounts look incorrect (alexantonenko)

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

@@ -28,7 +28,7 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     serviceName: 'MISC'
   }),
   loadUsers: function () {
-    this.set('selectedService', this.get('content.serviceName'));
+    this.set('selectedService', this.get('content.serviceName') ? this.get('content.serviceName') : "MISC");
     this.loadServiceConfig();
   },
   loadServiceConfig: function () {
@@ -36,8 +36,8 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
       name: 'config.tags',
       sender: this,
       data: {
-        serviceName: this.get('content.serviceName'),
-        serviceConfigsDef: this.get('serviceConfigs').findProperty('serviceName', this.get('content.serviceName'))
+        serviceName: this.get('selectedService'),
+        serviceConfigsDef: this.get('serviceConfigs').findProperty('serviceName', this.get('selectedService'))
       },
       success: 'loadServiceTagSuccess'
     });
@@ -46,7 +46,7 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     var self = this;
     var installedServices = App.Service.find().mapProperty("serviceName");
     var serviceConfigsDef = params.serviceConfigsDef;
-    var serviceName = this.get('content.serviceName');
+    var serviceName = this.get('selectedService');
     var loadedClusterSiteToTagMap = {};
 
     for (var site in data.Clusters.desired_configs) {
@@ -71,6 +71,7 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
 
       self.setContentProperty('hdfsUser', 'hdfs_user', misc_configs);
       self.setContentProperty('group', 'user_group', misc_configs);
+      self.setContentProperty('smokeuser', 'smokeuser', misc_configs);
 
       self.set('dataIsLoaded', true);
     });

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

@@ -52,7 +52,9 @@ App.AddServiceController = App.WizardController.extend({
     controllerName: 'addServiceController',
     configGroups: [],
     clients: [],
-    additionalClients: []
+    additionalClients: [],
+    smokeuser: "ambari-qa",
+    group: "hadoop"
   }),
 
   setCurrentStep: function (currentStep, completed) {

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

@@ -1236,6 +1236,10 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
    */
   activateSpecialConfigs: function () {
     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'));
   },
 

ambari-web/app/routes/add_service_routes.js

@@ -188,12 +188,14 @@ module.exports = App.WizardRoute.extend({
       var controller = router.get('addServiceController');
       controller.setCurrentStep('4');
       controller.dataLoading().done(function () {
-        var wizardStep7Controller = router.get('wizardStep7Controller');
-        controller.loadAllPriorSteps();
-        controller.loadAdvancedConfigs(wizardStep7Controller);
-        wizardStep7Controller.getConfigTags();
-        wizardStep7Controller.set('wizardController', controller);
-        controller.connectOutlet('wizardStep7', controller.get('content'));
+        controller.usersLoading().done(function () {
+          var wizardStep7Controller = router.get('wizardStep7Controller');
+          controller.loadAllPriorSteps();
+          controller.loadAdvancedConfigs(wizardStep7Controller);
+          wizardStep7Controller.getConfigTags();
+          wizardStep7Controller.set('wizardController', controller);
+            controller.connectOutlet('wizardStep7', controller.get('content'));
+        });
       })
     },
     back: function(router){