From 339cd3ed892351d3d3dfbdb69a5fa58111c14f31 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Sun, 14 Jul 2024 19:42:49 +0530 Subject: [PATCH 01/19] fix: stuck uploader progress. --- src/lib/stores/uploader.ts | 8 +++++++- .../storage/bucket-[bucket]/create-file/create.svelte | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index 867dc3856..c90d52891 100644 --- 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); } ); @@ -94,6 +94,12 @@ const createUploader = () => { return n; }); }, + removeAtIndex: (itemIndex: number) => { + update((n) => { + n.files = n.files.filter((_file, index) => index !== itemIndex); + return n; + }); + }, removeFile: async (file: Models.File) => { if (file.chunksTotal === file.chunksUploaded) { return update((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 index 66315f0dd..57f75e9ea 100644 --- 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 @@ -29,7 +29,7 @@ async function create() { try { - uploader.uploadFile( + const uploadPromise = uploader.uploadFile( bucketId, $createFile.id ?? ID.unique(), $createFile.files[0], @@ -47,7 +47,11 @@ trackEvent(Submit.FileCreate, { customId: !!$createFile.id }); + + await uploadPromise; } catch (e) { + uploader.removeAtIndex(0); + addNotification({ type: 'error', message: e.message From 0bb957059396e162c85146e42fc518dacf89c9fe Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Wed, 17 Jul 2024 11:45:18 +0530 Subject: [PATCH 02/19] update: use file id to remove from queue. --- src/lib/stores/uploader.ts | 6 ------ .../storage/bucket-[bucket]/create-file/create.svelte | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index c90d52891..28bd29a81 100644 --- a/src/lib/stores/uploader.ts +++ b/src/lib/stores/uploader.ts @@ -94,12 +94,6 @@ const createUploader = () => { return n; }); }, - removeAtIndex: (itemIndex: number) => { - update((n) => { - n.files = n.files.filter((_file, index) => index !== itemIndex); - return n; - }); - }, removeFile: async (file: Models.File) => { if (file.chunksTotal === file.chunksUploaded) { return update((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 index 57f75e9ea..a82bf186e 100644 --- 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,10 +28,12 @@ }); async function create() { + const fileId = $createFile.id ?? ID.unique(); + try { const uploadPromise = uploader.uploadFile( bucketId, - $createFile.id ?? ID.unique(), + fileId, $createFile.files[0], $createFile.permissions ); @@ -50,7 +52,7 @@ await uploadPromise; } catch (e) { - uploader.removeAtIndex(0); + uploader.removeFromQueue(fileId); addNotification({ type: 'error', From cefd26c098a5748a86855489d24ec9e625ffbf35 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Fri, 19 Jul 2024 14:42:11 +0530 Subject: [PATCH 03/19] fix: documents selection state not reset on navigation. --- .../collection-[collection]/table.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index 8b8c7832d..4ebc07e0a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -1,5 +1,5 @@ -
+
(isOverflowing = v)}>
- - + + {domain.rules[0].domain} - - -
+ {#if hasAttributes && hasValidAttributes} + {#if data.documents.total} +
- - {:else if $hasPageQueries} - -
-
- Sorry, we couldn't find any documents. -

There are no documents that match your filters.

+ + {:else if $hasPageQueries} + +
+
+ Sorry, we couldn't find any documents. +

There are no documents that match your filters.

+
+
+ +
-
+ + {:else} + + {/if} + {:else} + (showCreateDropdown = true)}> +
+ Create an attribute to get started. +

+ Need a hand? Learn more in our documentation. +

+
+
+ + -
+
-
- {:else} - + {/if} - {:else} - (showCreateDropdown = true)}> -
- Create an attribute to get started. -

- Need a hand? Learn more in our documentation. -

-
-
- - - - -
-
- {/if} - + +{/key} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index 248ce7735..8b8c7832d 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -1,5 +1,5 @@