diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte
index 604a7b819..cfe5b5721 100644
--- a/src/lib/components/uploadBox.svelte
+++ b/src/lib/components/uploadBox.svelte
@@ -37,6 +37,8 @@
-
+
Failed
- {:else if file.cancelled}
- cancelled?
{:else}
-
{file.progress}%
+
{progress}%
-
+
Pending
-
{/if}
{/each}
diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts
index 6ca846214..371bba624 100644
--- a/src/lib/stores/uploader.ts
+++ b/src/lib/stores/uploader.ts
@@ -1,5 +1,6 @@
import type { Models } from '@aw-labs/appwrite-console';
import { writable } from 'svelte/store';
+import { sdkForProject } from './sdk';
type UploaderFile = {
$id: string;
@@ -8,7 +9,6 @@ type UploaderFile = {
progress: number;
completed: boolean;
failed: boolean;
- cancelled: boolean;
error?: string;
};
export type Uploader = {
@@ -57,22 +57,37 @@ const createUploader = () => {
isCollapsed: false,
files: []
}),
- addFile: async (file: Models.File, isOpen = true, isCollapsed = false) => {
+ uploadFile: async (bucketId: string, id: string, file: File, permissions: string[]) => {
const newFile: UploaderFile = {
- $id: file.$id,
- bucketId: file.bucketId,
+ $id: id,
+ bucketId: bucketId,
name: file.name,
- progress: calculateProgress(file),
- completed: calculateProgress(file) === 100 ? true : false,
- failed: false,
- cancelled: false
+ progress: 0,
+ completed: false,
+ failed: false
};
- return update((n) => {
- n.isOpen = isOpen;
- n.isCollapsed = isCollapsed;
+ update((n) => {
+ n.isOpen = true;
+ n.isCollapsed = false;
n.files.unshift(newFile);
return n;
});
+ const uploadedFile = await sdkForProject.storage.createFile(
+ bucketId,
+ id ?? 'unique()',
+ file,
+ permissions,
+ (p) => {
+ newFile.$id = p.$id;
+ newFile.progress = p.progress;
+ newFile.completed = p.progress === 100 ? true : false;
+ updateFile(p.$id, newFile);
+ }
+ );
+ newFile.$id = uploadedFile.$id;
+ newFile.progress = 100;
+ newFile.completed = true;
+ updateFile(newFile.$id, newFile);
},
removeFile: async (file: Models.File) => {
if (file.chunksTotal === file.chunksUploaded) {
@@ -81,10 +96,6 @@ const createUploader = () => {
return n;
});
- } else {
- if (confirm('Are you sure you want to cancel the upload?')) {
- updateFile(file.$id, { cancelled: true });
- }
}
}
};
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte
index 600677d32..0592ac359 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte
@@ -162,11 +162,15 @@
{
+ showDropdown[index] = false;
+ }}
href={`${base}/console/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}
icon="pencil">Update
{
+ showDropdown[index] = false;
selectedFile = file;
showDelete = true;
}}>Delete
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte
index 5570b62f1..5872087f1 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte
@@ -2,7 +2,6 @@
import { Button, FormList, InputFile } from '$lib/elements/forms';
import { Pill } from '$lib/elements';
import { Modal, CustomId, Heading, Alert } from '$lib/components';
- import { sdkForProject } from '$lib/stores/sdk';
import { createEventDispatcher } from 'svelte';
import { page } from '$app/stores';
import { uploader } from '$lib/stores/uploader';
@@ -25,20 +24,15 @@
async function create() {
try {
- const file = await sdkForProject.storage.createFile(
- bucketId,
- id ?? 'unique()',
- files[0],
- permissions
- );
- files = null;
showCreate = false;
+ await uploader.uploadFile(bucketId, id, files[0], permissions);
+ files = null;
showCustomId = false;
- uploader.addFile(file);
+ // uploader.addFile(file);
dispatch('created');
addNotification({
type: 'success',
- message: `${file.name} has been created`
+ message: `File has been uploaded`
});
trackEvent('submit_file_create');
} catch ({ message }) {