refactor init sequence

dashboard/src/js/setup.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/* global $, angular, Clipboard, ENDPOINTS_OVH, window, FileReader, document */
+/* global $, angular, Clipboard, ENDPOINTS_OVH, window, FileReader, document, redirectIfNeeded */
 
 // create main application module
 var app = angular.module('Application', ['pascalprecht.translate', 'ngCookies', 'angular-md5', 'ui-notification', 'ui.bootstrap']);
@@ -277,23 +277,22 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
                 return;
             }
 
-            $scope.message = status.setup.message;
+            if (!error) $scope.message = status.setup.message;
 
             setTimeout(waitForDnsSetup, 5000);
         });
     }
 
-    function initialize() {
+    function init() {
         Client.getProvisionStatus(function (error, status) {
-            if (error) {
-                // During domain migration, the box code restarts and can result in getStatus() failing temporarily
-                console.error(error);
-                $scope.state = 'waitingForBox';
-                return $timeout(initialize, 3000);
-            }
+            $scope.state = 'waitingForBox';
+            if (error) return Client.initError(error, init);
 
-            // domain is currently like a lock flag
-            if (status.adminFqdn) return waitForDnsSetup();
+            if (redirectIfNeeded(status, 'setup')) return; // redirected to some other view...
+
+            if (status.setup.active) return waitForDnsSetup();
+
+            $scope.error.setup = status.setup.errorMessage; // show any previous error
 
             if (status.provider === 'digitalocean' || status.provider === 'digitalocean-mp') {
                 $scope.dnsCredentials.provider = 'digitalocean';
@@ -329,5 +328,5 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         $timeout(function () { $scope.clipboardDone = false; }, 5000);
     });
 
-    initialize();
+    init();
 }]);