Merge pull request #1193 from ItzNotABug/fix-storage-wizard-and-uploa…

…d-progress Fix Stuck Uploader Progress on File Upload
appwrite · Aug 27, 2024 · fc9742f · fc9742f
2 parents 18c2cdc + 8ecfe96
commit fc9742f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts
@@ -79,7 +79,7 @@ const createUploader = () => {
                 (p) => {
                     newFile.$id = p.$id;
                     newFile.progress = p.progress;
-                    newFile.completed = p.progress === 100 ? true : false;
+                    newFile.completed = p.progress === 100;
                     updateFile(p.$id, newFile);
                 }
             );
@@ -91,6 +91,7 @@ const createUploader = () => {
         removeFromQueue: (id: string) => {
             update((n) => {
                 n.files = n.files.filter((f) => f.$id !== id);
+                n.isOpen = n.files.length !== 0;
                 return n;
             });
         },

diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
@@ -28,17 +28,18 @@
     });
 
     async function create() {
+        const fileId = $createFile.id ?? ID.unique();
+
         try {
-            uploader.uploadFile(
+            const uploadPromise = uploader.uploadFile(
                 bucketId,
-                $createFile.id ?? ID.unique(),
+                fileId,
                 $createFile.files[0],
                 $createFile.permissions
             );
 
             createFile.reset();
             wizard.hide();
-            invalidate(Dependencies.FILES);
 
             addNotification({
                 type: 'success',
@@ -47,7 +48,12 @@
             trackEvent(Submit.FileCreate, {
                 customId: !!$createFile.id
             });
+
+            await uploadPromise;
+            invalidate(Dependencies.FILES);
         } catch (e) {
+            uploader.removeFromQueue(fileId);
+
             addNotification({
                 type: 'error',
                 message: e.message