AMBARI-9691. Kerberos Wizard: error in step2 after relogin. (akovalenko)

ambari-web/app/controllers/main/admin/kerberos/step2_controller.js

@@ -58,12 +58,11 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({
   }.property('stepConfigs.@each.errorCount', 'miscModalVisible', 'submitButtonClicked', 'testConnectionInProgress'),
 
   hostNames: function () {
-    return this.get('content.hosts');
-  }.property('content.hosts'),
+    return App.get('allHostNames');
+  }.property('App.allHostNames'),
 
   serviceConfigTags: [],
 
-
   clearStep: function () {
     this._super();
     this.get('serviceConfigTags').clear();
@@ -169,7 +168,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({
   },
 
   createKerberosHostComponents: function () {
-    var hostNames = this.get('content.hosts');
+    var hostNames = this.get('hostNames');
     var queryStr = '';
     hostNames.forEach(function (hostName) {
       queryStr += 'Hosts/host_name=' + hostName + '|';

ambari-web/app/controllers/main/admin/kerberos/step3_controller.js

@@ -45,7 +45,7 @@ App.KerberosWizardStep3Controller = App.KerberosProgressPageController.extend({
           error: 'onTaskError'
         });
       } else {
-        var hostNames = self.get('content.hosts');
+        var hostNames = App.get('allHostNames');
         self.updateComponent('KERBEROS_CLIENT', hostNames, "KERBEROS", "Install");
       }
     });

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

@@ -37,7 +37,6 @@ App.KerberosWizardController = App.WizardController.extend({
   content: Em.Object.create({
     controllerName: 'kerberosWizardController',
     serviceName: 'KERBEROS',
-    hosts: '',
     kerberosOption: null,
     cluster: null,
     services: [],
@@ -147,12 +146,6 @@ App.KerberosWizardController = App.WizardController.extend({
     this.set('content.kerberosOption', stepController.get('selectedItem'));
   },
 
-  loadConfigTag: function (tag) {
-    var tagVal = App.db.getKerberosWizardConfigTag(tag);
-    this.set('content.' + tag, tagVal);
-  },
-
-
   loadTasksStatuses: function () {
     var statuses = this.getDBProperty('tasksStatuses');
     this.set('content.tasksStatuses', statuses);
@@ -234,7 +227,6 @@ App.KerberosWizardController = App.WizardController.extend({
           var kerberosStep2controller = App.get('router.kerberosWizardStep2Controller');
           this.loadAdvancedConfigs(kerberosStep2controller);
           this.loadServiceConfigProperties();
-          this.load('hosts');
         }
       }
     ],

ambari-web/app/router.js

@@ -347,7 +347,7 @@ App.Router = Em.Router.extend({
             route = 'main.admin.adminSecurity';
           } else if (clusterStatusOnServer && (clusterStatusOnServer.wizardControllerName === App.router.get('kerberosWizardController.name'))) {
             // if wizardControllerName == "adminKerberosController", then it means someone closed the browser or the browser was crashed when we were last in Add Kerberos wizard
-            route = 'main.admin.adminKerberos.index';
+            route = 'main.admin.adminKerberos.adminAddKerberos';
           } else if (clusterStatusOnServer && clusterStatusOnServer.wizardControllerName === App.router.get('addServiceController.name')) {
             // if wizardControllerName == "addHostController", then it means someone closed the browser or the browser was crashed when we were last in Add Hosts wizard
             route = 'main.serviceAdd';

ambari-web/app/routes/add_kerberos_routes.js

@@ -20,7 +20,7 @@ var App = require('app');
 module.exports = App.WizardRoute.extend({
   route: '/enable',
   enter: function (router) {
-    Em.run.next(function () {
+    router.get('mainController').dataLoading().done(function () {
       var kerberosWizardController = router.get('kerberosWizardController');
       App.router.get('updateController').set('isWorking', false);
       var popup = App.ModalPopup.show({
@@ -35,29 +35,29 @@ module.exports = App.WizardRoute.extend({
 
         onClose: function () {
           var self = this;
-          switch(kerberosWizardController.get('currentStep')) {
+          switch (kerberosWizardController.get('currentStep')) {
             case "2":
               var step2Controller = router.get('kerberosWizardStep2Controller');
               if (step2Controller.get('testConnectionInProgress')) {
-                step2Controller.showConnectionInProgressPopup(function() {
-                  kerberosWizardController.warnBeforeExitPopup(function() {
+                step2Controller.showConnectionInProgressPopup(function () {
+                  kerberosWizardController.warnBeforeExitPopup(function () {
                     self.exitWizard();
                   }, false);
                 });
               } else {
-                kerberosWizardController.warnBeforeExitPopup(function() {
+                kerberosWizardController.warnBeforeExitPopup(function () {
                   self.exitWizard();
                 }, false);
               }
               break;
             case "6":
             case "7":
-              kerberosWizardController.warnBeforeExitPopup(function() {
+              kerberosWizardController.warnBeforeExitPopup(function () {
                 self.exitWizard();
               }, true);
               break;
             default:
-              kerberosWizardController.warnBeforeExitPopup(function() {
+              kerberosWizardController.warnBeforeExitPopup(function () {
                 self.exitWizard();
               }, false);
           }
@@ -108,20 +108,20 @@ module.exports = App.WizardRoute.extend({
         }
 
       }
-      router.transitionTo('step' + kerberosWizardController.get('currentStep'));
+      Em.run.next(function(){
+        router.transitionTo('step' + kerberosWizardController.get('currentStep'));
+      });
     });
   },
 
   step1: Em.Route.extend({
     route: '/step1',
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('1');
-    },
 
     connectOutlets: function (router) {
       console.log('in addSecurity.step1:connectOutlets');
       var controller = router.get('kerberosWizardController');
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('1');
         controller.loadAllPriorSteps();
         controller.connectOutlet('kerberosWizardStep1', controller.get('content'));
       });
@@ -144,13 +144,11 @@ module.exports = App.WizardRoute.extend({
   step2: Em.Route.extend({
     route: '/step2',
 
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('2');
-    },
     connectOutlets: function (router) {
       console.log('in kerberosWizardController.step2:connectOutlets');
       var controller = router.get('kerberosWizardController');
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('2');
         controller.loadAllPriorSteps();
         var kerberosWizardStep2Controller = router.get('kerberosWizardStep2Controller');
         kerberosWizardStep2Controller.set('wizardController', controller);
@@ -179,13 +177,11 @@ module.exports = App.WizardRoute.extend({
   step3: Em.Route.extend({
     route: '/step3',
 
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('3');
-    },
     connectOutlets: function (router) {
       console.log('in kerberosWizardController.step3:connectOutlets');
       var controller = router.get('kerberosWizardController');
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('3');
         controller.loadAllPriorSteps();
         controller.connectOutlet('kerberosWizardStep3', controller.get('content'));
       });
@@ -204,15 +200,13 @@ module.exports = App.WizardRoute.extend({
   step4: Em.Route.extend({
     route: '/step4',
 
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('4');
-    },
     connectOutlets: function (router) {
       console.log('in kerberosWizardController.step4:connectOutlets');
       var controller = router.get('kerberosWizardController');
       var step4Controller = router.get('kerberosWizardStep4Controller');
       controller.setCurrentStep(4);
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('4');
         controller.loadAllPriorSteps();
         controller.setLowerStepsDisable(4);
         step4Controller.set('wizardController', controller);
@@ -236,13 +230,11 @@ module.exports = App.WizardRoute.extend({
   step5: Em.Route.extend({
     route: '/step5',
 
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('5');
-    },
     connectOutlets: function (router) {
       console.log('in kerberosWizardController.step5:connectOutlets');
       var controller = router.get('kerberosWizardController');
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('5');
         controller.setLowerStepsDisable(5);
         controller.loadAllPriorSteps();
         controller.connectOutlet('kerberosWizardStep5', controller.get('content'));
@@ -275,14 +267,12 @@ module.exports = App.WizardRoute.extend({
   step6: Em.Route.extend({
     route: '/step6',
 
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('6');
-    },
     connectOutlets: function (router) {
       console.log('in kerberosWizardController.step6:connectOutlets');
       var controller = router.get('kerberosWizardController');
       var stepController = router.get('kerberosWizardStep6Controller');
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('6');
         controller.setLowerStepsDisable(6);
         controller.loadAllPriorSteps();
         stepController.setRequest();
@@ -307,13 +297,11 @@ module.exports = App.WizardRoute.extend({
   step7: Em.Route.extend({
     route: '/step7',
 
-    enter: function (router) {
-      router.get('kerberosWizardController').setCurrentStep('7');
-    },
     connectOutlets: function (router) {
       console.log('in kerberosWizardController.step7:connectOutlets');
       var controller = router.get('kerberosWizardController');
       controller.dataLoading().done(function () {
+        router.get('kerberosWizardController').setCurrentStep('7');
         controller.setLowerStepsDisable(7);
         controller.loadAllPriorSteps();
         controller.connectOutlet('kerberosWizardStep7', controller.get('content'));

ambari-web/app/templates/main/admin/kerberos/wizard.hbs

@@ -36,11 +36,7 @@
           </div>
         </div>
         <div class="wizard-content well span9">
-          {{#if view.isLoaded}}
-            {{outlet}}
-          {{else}}
-            <div class="spinner"></div>
-          {{/if}}
+          {{outlet}}
         </div>
       </div>
     </div>

ambari-web/app/views/main/admin/kerberos/wizard_view.js

@@ -20,42 +20,7 @@ var App = require('app');
 
 App.KerberosWizardView = Em.View.extend(App.WizardMenuMixin, {
 
-  templateName: require('templates/main/admin/kerberos/wizard'),
-
-  isLoaded: false,
-
-  willInsertElement: function () {
-    if (this.get('controller').getDBProperty('hosts')) {
-      this.set('isLoaded', true);
-    } else {
-      this.loadHosts();
-    }
-  },
-
-  loadHosts: function () {
-    App.ajax.send({
-      name: 'hosts.confirmed',
-      sender: this,
-      data: {},
-      success: 'loadHostsSuccessCallback',
-      error: 'loadHostsErrorCallback'
-    });
-  },
-
-  loadHostsSuccessCallback: function (response) {
-    var installedHostNames = [];
-
-    response.items.forEach(function (item) {
-      installedHostNames.push(item.Hosts.host_name);
-    });
-    this.get('controller').setDBProperty('hosts', installedHostNames);
-    this.set('controller.content.hosts', installedHostNames);
-    this.set('isLoaded', true);
-  },
-
-  loadHostsErrorCallback: function(){
-    this.set('isLoaded', true);
-  }
+  templateName: require('templates/main/admin/kerberos/wizard')
 });