AMBARI-9522. NameNode HA step1 page refresh (alexantonenko)

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

@@ -49,8 +49,8 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     var serviceName = this.get('selectedService');
     var loadedClusterSiteToTagMap = {};
 
-    for (var site in data.Clusters.desired_configs) {
-      if (!!serviceConfigsDef.configTypes[site]) {
+    for (var site in Em.get(data, 'Clusters.desired_configs')) {
+      if (serviceConfigsDef.configTypes.hasOwnProperty(site)) {
         loadedClusterSiteToTagMap[site] = data.Clusters.desired_configs[site]['tag'];
       }
     }

ambari-web/app/routes/high_availability_routes.js

@@ -100,10 +100,10 @@ module.exports = App.WizardRoute.extend({
     route: '/step1',
     connectOutlets: function (router) {
       var controller = router.get('highAvailabilityWizardController');
-      controller.usersLoading().done(function () {
-        controller.saveHdfsUser();
+      controller.dataLoading().done(function () {
         controller.setCurrentStep('1');
-        controller.dataLoading().done(function () {
+        controller.usersLoading().done(function () {
+          controller.saveHdfsUser();
           controller.loadAllPriorSteps();
           controller.connectOutlet('highAvailabilityWizardStep1', controller.get('content'));
         })