AMBARI-7691 Cluster state is lost when session is expired during cluster installation. (atkach)

ambari-web/app/mappers/stack_mapper.js

@@ -73,7 +73,7 @@ App.stackMapper = App.QuickDataMapper.create({
     var resulOS = [];
     var resultRepo = [];
 
-    var stackVersions =   json.items.filterProperty('Versions.active');
+    var stackVersions = json.items.filterProperty('Versions.active');
     stackVersions.sortProperty('Versions.stack_version').reverse().forEach(function(item) {
       var stack = item.Versions;
       var operatingSystemsArray = [];
@@ -106,9 +106,9 @@ App.stackMapper = App.QuickDataMapper.create({
       
     }, this);
 
+    App.store.commit();
     App.store.loadMany(modelRepo, resultRepo);
     App.store.loadMany(modelOS, resulOS);
     App.store.loadMany(modelStack, resultStack);
-
   }
 });

ambari-web/app/mixins/common/userPref.js

@@ -80,7 +80,9 @@ App.UserPref = Em.Mixin.create({
    * @param {Object} value
    */
   postUserPref: function (key, value) {
-    if(!App.get('isAdmin')) return;
+    if (!App.get('isAdmin')) {
+      return $.Deferred().reject().promise();
+    };
     var keyValuePair = {};
     keyValuePair[key] = JSON.stringify(value);
     return App.ajax.send({

ambari-web/test/controllers/installer_test.js

@@ -27,6 +27,12 @@ describe('App.InstallerController', function () {
   var installerController = App.InstallerController.create();
 
   describe('#loadStacksVersionsSuccessCallback', function() {
+    beforeEach(function () {
+      sinon.stub(App.store, 'commit', Em.K);
+    });
+    afterEach(function () {
+      App.store.commit.restore();
+    });
     it ('Correct data', function() {
       installerController.loadStacksVersionsSuccessCallback(require('test/stack'));
       expect(installerController.get('content.stacks.length')).to.equal(2);

ambari-web/test/mappers/stack_mapper_test.js

@@ -260,6 +260,10 @@ describe('App.stackMapper', function () {
       App.resetDsStoreTypeMap(App.Repository);
       App.resetDsStoreTypeMap(App.OperatingSystem);
       App.resetDsStoreTypeMap(App.Stack);
+      sinon.stub(App.store, 'commit', Em.K);
+    });
+    afterEach(function(){
+      App.store.commit.restore();
     });
 
 		
@@ -282,4 +286,4 @@ describe('App.stackMapper', function () {
       expect(App.Repository.find().get('length')).to.equal(8);
     });
   });
-});
+});