AMBARI-2187. Hadoop2 Monitoring: Jobs page should be hidden when HDP 2.0.x stack is installed. (srimanth)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1485471 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -306,6 +306,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-2187. Hadoop2 Monitoring: Jobs page should be hidden when HDP 2.0.x 
+ stack is installed. (srimanth)
+
  AMBARI-2188. Update mock json data for Test mode. (srimanth) 
 
  AMBARI-2169. Going from Hosts page to Host Details page and back should

ambari-web/app/app.js

@@ -51,7 +51,10 @@ module.exports = Em.Application.create({
     return '/stacks2/HDP/versions/' + stackVersion.replace(/HDP-/g, '');
   }.property('currentStackVersion'),
   clusterName: null,
-  currentStackVersion: null
+  currentStackVersion: null,
+  currentStackVersionNumber: function(){
+    return this.get('currentStackVersion').replace(/HDP(Local)?-/, '');
+  }.property('currentStackVersion')
 });
 
 /**

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

@@ -40,7 +40,7 @@ App.MainAdminClusterController = Em.Controller.extend({
     var upgradeVersion = this.get('upgradeVersion') || App.defaultStackVersion;
     var currentStack = {};
     var upgradeStack = {};
-    var currentVersion = App.currentStackVersion.replace(/HDP-/, '');
+    var currentVersion = App.get('currentStackVersionNumber');
     var minUpgradeVersion = currentVersion;
     upgradeVersion = upgradeVersion.replace(/HDP-/, '');
     data.items.mapProperty('Versions.stack_version').forEach(function(version){

ambari-web/app/controllers/wizard.js

@@ -458,7 +458,7 @@ App.WizardController = Em.Controller.extend({
       sender: this,
       data: {
         stackUrl: App.get('stack2VersionURL'),
-        stackVersion: App.currentStackVersion.replace(/HDP(Local)?-/, '')
+        stackVersion: App.get('currentStackVersionNumber')
       },
       success: 'loadServiceComponentsSuccessCallback',
       error: 'loadServiceComponentsErrorCallback'

ambari-web/app/routes/main.js

@@ -97,9 +97,14 @@ module.exports = Em.Route.extend({
   apps: Em.Route.extend({
     route: '/apps',
     connectOutlets: function (router) {
-      //router.get('clusterController').loadRuns();
-      router.get('mainAppsController').loadRuns();
-      router.get('mainController').connectOutlet('mainApps');
+      if (App.get('currentStackVersionNumber') >= '2.0.0') {
+        Em.run.next(function () {
+          router.transitionTo('main.dashboard');
+        });
+      } else {
+        router.get('mainAppsController').loadRuns();
+        router.get('mainController').connectOutlet('mainApps');
+      }
     }
   }),
 

ambari-web/app/views/main/admin/cluster.js

@@ -22,6 +22,6 @@ App.MainAdminClusterView = Em.View.extend({
   templateName: require('templates/main/admin/cluster'),
 
   isUpgradeAvailable: function(){
-    return this.get('controller.upgradeVersion').replace(/HDP-/, '') > App.currentStackVersion.replace(/HDP-/, '');
+    return this.get('controller.upgradeVersion').replace(/HDP-/, '') > App.get('currentStackVersionNumber');
   }.property('controller.upgradeVersion', 'App.currentStackVersion')
 });

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

@@ -30,14 +30,17 @@ App.MainMenuView = Em.CollectionView.extend({
       { label:Em.I18n.t('menu.item.dashboard'), routing:'dashboard', active:'active'},
       { label:Em.I18n.t('menu.item.heatmaps'), routing:'charts'},
       { label:Em.I18n.t('menu.item.services'), routing:'services'},
-      { label:Em.I18n.t('menu.item.hosts'), routing:'hosts'},
-      { label:Em.I18n.t('menu.item.jobs'), routing:'apps'}
+      { label:Em.I18n.t('menu.item.hosts'), routing:'hosts'}
     ];
 
     if (App.supports.mirroring) {
       result.push({ label:Em.I18n.t('menu.item.mirroring'), routing:'mirroring'});
     }
 
+    if (App.get('currentStackVersionNumber') < '2.0.0') {
+      result.push({ label:Em.I18n.t('menu.item.jobs'), routing:'apps'});
+    }
+
     if (App.get('isAdmin')) {
       result.push({ label:Em.I18n.t('menu.item.admin'), routing:'admin'});
     }