Fix file transfer progress bar.

immense · Apr 17, 2020 · eaa9fcb · eaa9fcb
1 parent def7f55
commit eaa9fcb
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/Server/API/FileSharingController.cs b/Server/API/FileSharingController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Remotely.Server.Services;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -31,13 +32,13 @@ public ActionResult Get(string id)
 
         [HttpPost]
         [RequestSizeLimit(500_000_000)]
-        public List<string> Post()
+        public async Task<List<string>> Post()
         {
             var fileIDs = new List<string>();
             foreach (var file in Request.Form.Files)
             {
                 var orgID = User.Identity.IsAuthenticated ? DataService.GetUserByName(User.Identity.Name).OrganizationID : null;
-                var id = DataService.AddSharedFile(file, orgID);
+                var id = await DataService.AddSharedFile(file, orgID);
                 fileIDs.Add(id);
             }
             return fileIDs;

diff --git a/Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml
@@ -182,14 +182,14 @@
 
     </div>
 
+    <div id="fileTransferDiv" hidden="hidden">
+        <span>File Transfer:</span>
+        <progress id="fileTransferProgress"></progress>
+    </div>
 
     <footer>
         <div class="footer-wrapper">
             <p>&copy; @DateTimeOffset.Now.Year - Translucency Software</p>
-            <p hidden="hidden">
-                <span>File Transfer:</span>
-                <progress id="fileTransferProgress"></progress>
-            </p>
         </div>
     </footer>
     <script type="module" src="~/scripts/RemoteControl/Main.js">

diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
@@ -175,7 +175,7 @@ public bool AddOrUpdateDevice(Device device, out Device updatedDevice)
             return true;
         }
 
-        public string AddSharedFile(IFormFile file, string organizationID)
+        public async Task<string> AddSharedFile(IFormFile file, string organizationID)
         {
             var expirationDate = DateTimeOffset.Now.AddDays(-AppConfig.DataRetentionInDays);
             var expiredFiles = RemotelyContext.SharedFiles.Where(x => x.Timestamp < expirationDate);
@@ -186,7 +186,7 @@ public string AddSharedFile(IFormFile file, string organizationID)
             {
                 using (var ms = new MemoryStream())
                 {
-                    stream.CopyTo(ms);
+                    await stream.CopyToAsync(ms);
                     fileContents = ms.ToArray();
                 }
             }
@@ -197,7 +197,7 @@ public string AddSharedFile(IFormFile file, string organizationID)
                 ContentType = file.ContentType,
                 OrganizationID = organizationID
             });
-            RemotelyContext.SaveChanges();
+            await RemotelyContext.SaveChangesAsync();
             return newEntity.Entity.ID;
         }
 

diff --git a/Server/wwwroot/css/remote-control.css b/Server/wwwroot/css/remote-control.css
@@ -275,4 +275,15 @@ footer {
     bottom: 25px;
     right: 25px;
     z-index: 4;
+}
+
+#fileTransferDiv {
+    position: fixed;
+    right: 5px;
+    bottom: 5px;
+    background-color: rgb(50, 50, 50);
+    color: white;
+    z-index: 3;
+    padding: 10px;
+    border-radius: 5px;
 }
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.js b/Server/wwwroot/scripts/RemoteControl/UI.js
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.js.map b/Server/wwwroot/scripts/RemoteControl/UI.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.ts b/Server/wwwroot/scripts/RemoteControl/UI.ts
@@ -524,9 +524,10 @@ function uploadFiles(fileList: FileList) {
         FileTransferProgress.parentElement.setAttribute("hidden", "hidden");
         ShowMessage("File upload failed.");
     });
-    xhr.addEventListener("progress", function (e) {
+
+    xhr.upload.onprogress = (e) => {
         FileTransferProgress.value = isFinite(e.loaded / e.total) ? e.loaded / e.total : 0;
-    });
+    }
     xhr.send(fd);
 }