AMBARI-3553. NameNode HA wizard: Refreshing the wizard displays incorrect manual commands. (alexantonenko)

ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js

@@ -20,7 +20,7 @@ var App = require('app');
 
 require('controllers/main/admin/misc_controller');
 
-App.HighAvailabilityWizardStep1Controller = App.MainAdminMiscController.extend({
+App.HighAvailabilityWizardStep1Controller = Em.Controller.extend({
   name: "highAvailabilityWizardStep1Controller",
 
   isNameServiceIdValid: function () {

ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js

@@ -164,6 +164,10 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
     this.set('content.masterComponentHosts', masterComponentHosts);
   },
 
+  saveHdfsUser: function () {
+    App.db.setHighAvailabilityWizardHdfsUser(this.get('content.hdfsUser'));
+  },
+
   saveTasksStatuses: function(statuses){
     App.db.setHighAvailabilityWizardTasksStatuses(statuses);
     this.set('content.tasksStatuses', statuses);
@@ -192,6 +196,12 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
     this.set('content.'+tag, tagVal);
   },
 
+
+  loadHdfsUser: function(){
+    var hdfsUser = App.db.getHighAvailabilityWizardHdfsUser();
+    this.set('content.hdfsUser', hdfsUser);
+  },
+
   loadTasksStatuses: function(){
     var statuses = App.db.getHighAvailabilityWizardTasksStatuses();
     this.set('content.tasksStatuses', statuses);
@@ -248,6 +258,7 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
         this.loadServicesFromServer();
         this.loadMasterComponentHosts();
         this.loadConfirmedHosts();
+        this.loadHdfsUser();
       case '1':
         this.load('cluster');
     }

ambari-web/app/routes/high_availability_routes.js

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

ambari-web/app/utils/db.js

@@ -385,6 +385,12 @@ App.db.setHighAvailabilityWizardTasksStatuses = function (tasksStatuses) {
   localStorage.setObject('ambari', App.db.data);
 };
 
+App.db.setHighAvailabilityWizardHdfsUser = function (hdfsUser) {
+  App.db.data = localStorage.getObject('ambari');
+  App.db.data.HighAvailabilityWizard.hdfsUser = hdfsUser;
+  localStorage.setObject('ambari', App.db.data);
+};
+
 App.db.setHighAvailabilityWizardRequestIds = function (requestIds) {
   App.db.data = localStorage.getObject('ambari');
   App.db.data.HighAvailabilityWizard.requestIds = requestIds;
@@ -688,6 +694,11 @@ App.db.getStacks = function () {
   return App.db.data.app.stacksVersions;
 };
 
+App.db.getHighAvailabilityWizardHdfsUser = function () {
+  App.db.data = localStorage.getObject('ambari');
+  return App.db.data.HighAvailabilityWizard.hdfsUser;
+};
+
 App.db.getHighAvailabilityWizardTasksStatuses = function () {
   App.db.data = localStorage.getObject('ambari');
   return App.db.data.HighAvailabilityWizard.tasksStatuses;

ambari-web/app/views/main/admin/highAvailability/step1_view.js

@@ -25,7 +25,6 @@ App.HighAvailabilityWizardStep1View = Em.View.extend({
 
   didInsertElement: function() {
     App.popover($("div.controls input[type=text]"), {'placement': 'right', 'trigger': 'hover', 'title': this.t('admin.highAvailability.wizard.step1.nameserviceid.tooltip.title'), 'content': this.t('admin.highAvailability.wizard.step1.nameserviceid.tooltip.content')});
-    this.get('controller').loadUsers();
   },
 
   showInputError: function () {