Fixed update issues when showing update progress

bradmi · Jul 31, 2011 · cfa17b8 · cfa17b8
1 parent f86ae1e
commit cfa17b8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/Kudu.Core/Deployment/DeployResult.cs b/Kudu.Core/Deployment/DeployResult.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Diagnostics;
 
 namespace Kudu.Core.Deployment {
+    [DebuggerDisplay("{Id} {Status}")]
     public class DeployResult {
         public string Id { get; set; }
         public DeployStatus Status { get; set; }

diff --git a/Kudu.Web/Hubs/SourceControl/SourceControl.cs b/Kudu.Web/Hubs/SourceControl/SourceControl.cs
@@ -23,8 +23,10 @@ public SourceControl(IRepository repository,
             _repositoryManager = repositoryManager;
             _deploymentManager = deploymentManager;
 
-            connection.Received += OnDeploymentStatusChanged;
-            connection.Start();
+            if (!connection.IsActive) {
+                connection.Received += OnDeploymentStatusChanged;
+                connection.Start();
+            }
         }
 
         public ChangeSetDetailViewModel Show(string id) {

diff --git a/Kudu.Web/Hubs/SourceControl/SourceControl.css b/Kudu.Web/Hubs/SourceControl/SourceControl.css
@@ -119,7 +119,7 @@
 #scm .icon-notext {
     background-repeat: no-repeat;
     background-position: 0 50%;
-    padding-left: 10px;
+    padding-left: 12px;
     line-height: 20px;
 }
 
@@ -151,6 +151,10 @@
     background-image: url('../../../images/folder_table.png');
 }
 
+#scm .icon-tick {
+    background-image: url('../../../images/tick.png');
+}
+
 #scm .icon-message {
     list-style-image: url('../../../images/tick.png');
 }

diff --git a/Kudu.Web/Hubs/SourceControl/SourceControl.js b/Kudu.Web/Hubs/SourceControl/SourceControl.js
@@ -8,6 +8,7 @@ $(function () {
 
     var infiniteScrollCheck = false;
     var changesXhr = null;
+    var loadingRepository = false;
     var pageSize = 15;
 
     function getDiffClass(type) {
@@ -83,6 +84,13 @@ $(function () {
                 // Add the cross cutting data
                 this.branches = scm.branches[this.Id];
                 this.deploymentInfo = scm.deployments[this.Id];
+                this.showDeploy = !this.Active &&
+                                   this.deploymentInfo &&
+                                   this.deploymentInfo.Status == 'Success';
+
+                this.showLoading = this.deploymentInfo &&
+                                   this.deploymentInfo.Status !== 'Success' && 
+                                   this.deploymentInfo.Status !== 'Failed';
             });
 
             $('#changes').append($('#changeset').render(changes));
@@ -203,6 +211,8 @@ $(function () {
     }
 
     function loadRepository(onComplete) {
+        loadingRepository = true;
+
         $('#show').hide();
         $('#working').hide();
         $('#deploy-log').hide();
@@ -222,6 +232,8 @@ $(function () {
                getChangeSets(0, function () {
                    window.loader.hide(token);
 
+                   loadingRepository = false;
+
                    if (onComplete) {
                        onComplete();
                    }
@@ -235,6 +247,7 @@ $(function () {
            .fail(function (e) {
                onError(e);
                window.loader.hide(token);
+               loadingRepository = false;
            });
     }
 
@@ -412,13 +425,13 @@ $(function () {
     initialize();
 
     scm.updateDeployStatus = function (result) {
-        if (!document.getElementById(result.Id)) {
-            loadRepository(function () {
+        if (loadingRepository === false) {
+            if (!document.getElementById(result.Id)) {
+                loadRepository();
+            }
+            else {
                 updateStatus(result);
-            });
-        }
-        else if (changesXhr == null) {
-            updateStatus(result);
+            }
         }
     };
 

diff --git a/Kudu.Web/Views/Application/Scm.cshtml b/Kudu.Web/Views/Application/Scm.cshtml
@@ -26,7 +26,6 @@
             <div id="status">
             </div>
         </div> 
-
         <table id="log">
             <thead>
                 <tr>
@@ -113,11 +112,11 @@
             {{if deploymentInfo }}
             <a href="#/view-log/${Id}" class="view-log">view log</a>
             {{/if}}
-            <a href="#" class="update deploy${!Active && deploymentInfo && deploymentInfo.Status == 'Success' ? "" : " hide"}" data-id="${Id}">deploy</a>
+            <a href="#" class="update deploy${showDeploy ? "" : " hide"}" data-id="${Id}">deploy</a>
         </td>
         <td>
-            <span class="loading hide icon-notext icon-loading">&nbsp;</span>
-            <img class="status${Active ? "" : " hide"}" src="@Url.Content("~/images/tick.png")" />
+            <span class="loading icon-notext icon-loading${showLoading ? "" : " hide"}">&nbsp;</span>
+            <span class="status icon-notext icon-tick${Active ? "" : " hide"}">&nbsp;</span>
         </td>
     </tr>
 </script>