Merge pull request #53 from can-anierzad/feat/start-again

Start a new session

Author: Martin Kennish

PolyDeploy/Clients/Deploy/src/js/controllers/ResultController.js

@@ -1,5 +1,5 @@
-module.exports = ['$scope', 'SessionService',
-    function ($scope, SessionService) {
+module.exports = ['$scope', '$state','SessionService',
+    function ($scope, $state, SessionService) {
 
         // Wait for session.
         SessionService.sessionPromise.then(
@@ -18,6 +18,29 @@
                 }
             });
 
+        // Start a new deploy.
+        $scope.restart = function () {
+
+            // Create a new session.
+            SessionService.newSession()
+                .then(function () {
+
+                    // Navigate back to beginning.
+                    $state.go('install.upload');
+                });
+        };
+
+        // Is the install complete?
+        $scope.isComplete = function () {
+
+            var session = $scope.session;
+
+            // Is the session complete?
+            return session
+                && session.Status
+                && session.Status === 2;
+        };
+
         // Current status.
         $scope.currentStatus = function (session) {
 
@@ -80,8 +103,6 @@
                 panelClass = modPackage.Success ? 'panel-success' : 'panel-danger';
             }
 
-            console.log(panelClass);
-
             return panelClass;
         };
 

PolyDeploy/Clients/Deploy/src/js/services/SessionService.js

@@ -12,6 +12,13 @@
         // Gets a new session from the API.
         function newSession() {
 
+            // Is there an interval promise?
+            if (sessionRefreshInterval) {
+
+                // Cancel it.
+                $interval.cancel(sessionRefreshInterval);
+            }
+
             // Get a session from the API.
             sessionPromise = SessionDataService.create().then(
                 function (session) {
@@ -36,6 +43,16 @@
                     return SessionDataService.get(session.Guid).then(
                         function (sessionUpdate) {
 
+                            // Do we need to stop refreshing?
+                            if (sessionUpdate
+                                && sessionUpdate.Status
+                                && sessionUpdate.Status === 2) {
+
+                                // Complete, no need to continue refreshing.
+                                $interval.cancel(sessionRefreshInterval);
+                            }
+
+                            // Replace current session data.
                             replace(sessionObject, sessionUpdate);
 
                             return sessionObject;
@@ -51,7 +68,6 @@
                 function (session) {
 
                     // Get session summary.
-                    console.log('GetSummary: ' + session.Guid);
                     return SessionDataService.summary(session.Guid);
                 });
         }

PolyDeploy/Clients/Deploy/src/js/templates/result.html

@@ -19,6 +19,12 @@ <h2>Installing</h2>
             <h4>{{ currentStatus(session) }}</h4>
             <!-- /Current -->
 
+            <button
+                type="button"
+                class="btn btn-primary"
+                ng-disabled="!isComplete()"
+                ng-click="restart()">New Session</button>
+
             <div class="row">
 
                 <!-- Packages -->