AMBARI-7038. Main menu disappears after view-page refresh. (onechiporenko)

ambari-web/app/router.js

@@ -436,8 +436,6 @@ App.Router = Em.Router.extend({
 
     main: require('routes/main'),
 
-    views: require('routes/views'),
-
     experimental: Em.Route.extend({
       route: '/experimental',
       enter: function (router, context) {

ambari-web/app/routes/main.js

@@ -225,6 +225,7 @@ module.exports = Em.Route.extend({
     }
   }),
 
+  views: require('routes/views'),
 
   hosts: Em.Route.extend({
     route: '/hosts',

ambari-web/app/routes/views.js

@@ -17,26 +17,17 @@
  */
 
 var App = require('app');
-var stringUtils = require('utils/string_utils');
 
 module.exports = Em.Route.extend({
   route: '/views',
   enter: function (router) {
-    router.getAuthenticated().done(function (loggedIn) {
-      if (loggedIn) {
-        router.get('mainViewsController').loadAmbariViews();
-      } else {
-        Em.run.next(function () {
-          router.transitionTo('login');
-        });
-      }
-    });
+    router.get('mainViewsController').loadAmbariViews();
   },
   index: Em.Route.extend({
     route: '/',
     connectOutlets: function (router) {
       router.get('mainViewsController').dataLoading().done(function() {
-        router.get('applicationController').connectOutlet('mainViews');
+        router.get('mainController').connectOutlet('mainViews');
       });
     }
   }),
@@ -45,7 +36,7 @@ module.exports = Em.Route.extend({
     connectOutlets: function (router, params) {
       // find and set content for `mainViewsDetails` and associated controller
       router.get('mainViewsController').dataLoading().done(function() {
-        router.get('applicationController').connectOutlet('mainViewsDetails', App.router.get('mainViewsController.ambariViews')
+        router.get('mainController').connectOutlet('mainViewsDetails', App.router.get('mainViewsController.ambariViews')
           .findProperty('href', ['/views', params.viewName, params.version, params.instanceName].join('/')));
       });
     }

ambari-web/app/views/main/menu.js

@@ -57,7 +57,7 @@ App.MainMenuView = Em.CollectionView.extend({
       }
 
       if (App.supports.views) {
-        result.push({ label:Em.I18n.t('menu.item.views'), routing:'views', isView:true, views: this.get('views')});
+        result.push({ label:Em.I18n.t('menu.item.views'), routing:'views.index', isView:true, views: this.get('views')});
       }
 
     }
@@ -116,7 +116,7 @@ App.MainMenuView = Em.CollectionView.extend({
       return this.get('content').routing == 'services';
     }.property(''),
     isViewsItem: function () {
-      return this.get('content').routing == 'views';
+      return this.get('content').routing.contains('views');
     }.property(''),
     goToSection: function (event) {
       if (event.context === 'hosts') {

ambari-web/app/views/main/views_view.js

@@ -26,7 +26,7 @@ App.MainViewsView = Em.View.extend({
 
   views: function() {
     return App.router.get('mainViewsController.ambariViews');
-  }.property('App.router.mainViewsController.ambariViews'),
+  }.property('App.router.mainViewsController.ambariViews.@each'),
 
   selectedViewBinding: 'controller.selectedView'