AMBARI-4129. HA wizard not accessible after upgrade. (yusaku)

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

@@ -49,7 +49,6 @@ App.MainAdminHighAvailabilityController = Em.Controller.extend({
         return;
       }
     }
-    App.db.mergeStorage();
     App.router.transitionTo('enableHighAvailability');
   },
 

ambari-web/app/controllers/main/host/details.js

@@ -1058,7 +1058,6 @@ App.MainHostDetailsController = Em.Controller.extend({
   moveComponent: function (event) {
     App.showConfirmationPopup(function() {
       var component = event.context;
-      App.db.mergeStorage();
       var reassignMasterController = App.router.get('reassignMasterController');
       reassignMasterController.saveComponentToReassign(component);
       reassignMasterController.getSecurityStatus();

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

@@ -158,7 +158,6 @@ App.MainServiceController = Em.ArrayController.extend({
     if (this.get('isAllServicesInstalled')) {
       return;
     }
-    App.db.mergeStorage();
     App.router.transitionTo('main.serviceAdd');
   }
 

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

@@ -220,7 +220,6 @@ App.MainServiceItemController = Em.Controller.extend({
   reassignMaster: function (hostComponent) {
     var component = App.HostComponent.find().findProperty('componentName', hostComponent);
     console.log('In Reassign Master', hostComponent);
-    App.db.mergeStorage();
     var reassignMasterController = App.router.get('reassignMasterController');
     reassignMasterController.saveComponentToReassign(component);
     reassignMasterController.getSecurityStatus();

ambari-web/app/models/cluster_states.js

@@ -95,6 +95,10 @@ App.clusterStatus = Ember.Object.create({
           } else {
             // default status already set
           }
+          // this is to ensure that the local storage namespaces are initialized with all expected namespaces.
+          // after upgrading ambari, loading local storage data from the "persist" data saved via an older version of
+          // Ambari can result in missing namespaces that are defined in the new version of Ambari.
+          App.db.mergeStorage();
         },
         error: function (xhr) {
           if (xhr.status == 404) {

ambari-web/app/routes/main.js

@@ -686,7 +686,6 @@ module.exports = Em.Route.extend({
       }),
 
       addSecurity: function (router, object) {
-        App.db.mergeStorage();
         router.get('mainAdminSecurityController').setAddSecurityWizardStatus('RUNNING');
         router.transitionTo('adminAddSecurity');
       },

ambari-web/app/utils/db.js

@@ -93,7 +93,7 @@ App.db.mergeStorage = function() {
     console.log('doing a cleanup');
     App.db.cleanUp();
   } else {
-    App.db.data = $.extend(true,{}, InitialData, App.db.data);
+    localStorage.setObject('ambari', $.extend(true,{}, InitialData, App.db.data));
   }
 };