Merge branch 'master' into secondpropertiesmenu-emily

1 files changed, 2 insertions, 1 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 11523a9d8..eaaac4e6d 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -181,9 +181,10 @@ export namespace DashUploadUtils {
         });
     }
 
-    export async function upload(file: File): Promise<Upload.FileResponse> {
+    export async function upload(file: File, overwriteGuid?: string): Promise<Upload.FileResponse> {
         const { type, path, name } = file;
         const types = type?.split('/') ?? [];
+        uploadProgress.set(overwriteGuid ?? name, 'uploading'); // If the client sent a guid it uses to track upload progress, use that guid. Otherwise, use the file's name. 
 
         const category = types[0];
         let format = `.${types[1]}`;