AMBARI-7559 UI sending requests to non-existing cluster. (atkach)

ambari-web/app/controllers/application.js

@@ -44,8 +44,8 @@ App.ApplicationController = Em.Controller.extend(App.UserPref, {
   }.property('App.router.clusterController.isLoaded','App.router.loggedIn'),
 
   isExistingClusterDataLoaded: function () {
-    return !Em.isNone(App.router.get('clusterController.clusterName')) && this.get('isClusterDataLoaded');
-  }.property('App.router.clusterController.clusterName', 'isClusterDataLoaded'),
+    return App.router.get('clusterInstallCompleted') && this.get('isClusterDataLoaded');
+  }.property('App.router.clusterInstallCompleted', 'isClusterDataLoaded'),
 
   init: function(){
     this._super();

ambari-web/app/controllers/main.js

@@ -63,11 +63,11 @@ App.MainController = Em.Controller.extend({
   },
 
   startPolling: function () {
-    if (App.router.get('clusterController.isLoaded')) {
+    if (App.router.get('applicationController.isExistingClusterDataLoaded')) {
       App.router.get('updateController').set('isWorking', true);
       App.router.get('backgroundOperationsController').set('isWorking', true);
     }
-  }.observes('App.router.clusterController.isLoaded'),
+  }.observes('App.router.applicationController.isExistingClusterDataLoaded'),
   stopPolling: function(){
     App.router.get('updateController').set('isWorking', false);
     App.router.get('backgroundOperationsController').set('isWorking', false);

ambari-web/app/routes/installer.js

@@ -426,6 +426,7 @@ module.exports = Em.Route.extend({
         // We need to do recovery based on whether we are in Add Host or Installer wizard
         controller.saveClusterState('DEFAULT');
         App.router.set('clusterController.isLoaded', false);
+        router.set('clusterInstallCompleted', true);
         router.transitionTo('main.dashboard.index');
       });
     }

ambari-web/app/routes/main.js

@@ -31,7 +31,7 @@ module.exports = Em.Route.extend({
           if (App.get('testMode')) {
             router.get('mainController').initialize();
           } else {
-            if (App.get('clusterName')) {
+            if (router.get('clusterInstallCompleted')) {
               App.router.get('mainController').checkServerClientVersion().done(function () {
                 App.router.get('clusterController').loadClientServerClockDistance().done(function () {
                   router.get('mainController').initialize();