+
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
+ {#each $uploader.files as file}
+ {#if file.completed || file.progress === 100}
+ -
+
+
+
+
+
+ {:else if file.failed}
+ -
+
+
+ Failed
+
+
+ {:else if file.cancelled}
+ cancelled?
+ {:else}
+ -
+
+
+ Pending
+
+
+ {/if}
+ {/each}
{/if}
-
-
diff --git a/src/lib/helpers/sizeConvertion.ts b/src/lib/helpers/sizeConvertion.ts
new file mode 100644
index 000000000..e62d7a9f0
--- /dev/null
+++ b/src/lib/helpers/sizeConvertion.ts
@@ -0,0 +1,17 @@
+export function bytesToSize(bytes: number, decimals = 1) {
+ if (bytes === 0) return '0 Bytes';
+
+ const k = 1024;
+ const dm = decimals < 0 ? 0 : decimals;
+ const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+
+ const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+ return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+}
+
+export function sizeToBytes(value: number, unit: string) {
+ const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+ const index = sizes.indexOf(unit);
+ return value * Math.pow(1024, index);
+}
diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts
index b1571f4f1..6ca846214 100644
--- a/src/lib/stores/uploader.ts
+++ b/src/lib/stores/uploader.ts
@@ -3,6 +3,7 @@ import { writable } from 'svelte/store';
type UploaderFile = {
$id: string;
+ bucketId: string;
name: string;
progress: number;
completed: boolean;
@@ -12,12 +13,14 @@ type UploaderFile = {
};
export type Uploader = {
isOpen: boolean;
+ isCollapsed: boolean;
files: UploaderFile[];
};
const createUploader = () => {
const { subscribe, set, update } = writable
({
isOpen: false,
+ isCollapsed: false,
files: []
});
@@ -35,17 +38,42 @@ const createUploader = () => {
return {
subscribe,
- toggle: () =>
+
+ close: () =>
update((n) => {
n.isOpen = !n.isOpen;
+ return n;
+ }),
+ toggle: () =>
+ update((n) => {
+ n.isCollapsed = !n.isCollapsed;
+
return n;
}),
reset: () =>
set({
isOpen: false,
+ isCollapsed: false,
files: []
}),
+ addFile: async (file: Models.File, isOpen = true, isCollapsed = false) => {
+ const newFile: UploaderFile = {
+ $id: file.$id,
+ bucketId: file.bucketId,
+ name: file.name,
+ progress: calculateProgress(file),
+ completed: calculateProgress(file) === 100 ? true : false,
+ failed: false,
+ cancelled: false
+ };
+ return update((n) => {
+ n.isOpen = isOpen;
+ n.isCollapsed = isCollapsed;
+ n.files.unshift(newFile);
+ return n;
+ });
+ },
removeFile: async (file: Models.File) => {
if (file.chunksTotal === file.chunksUploaded) {
return update((n) => {
@@ -63,3 +91,8 @@ const createUploader = () => {
};
export const uploader = createUploader();
+
+function calculateProgress(file: Models.File) {
+ const progress = file.chunksUploaded / file.chunksTotal;
+ return Math.round(progress * 100);
+}
diff --git a/src/routes/console/[project]/storage/_create.svelte b/src/routes/console/[project]/storage/_create.svelte
index c1031b9bf..8bd164664 100644
--- a/src/routes/console/[project]/storage/_create.svelte
+++ b/src/routes/console/[project]/storage/_create.svelte
@@ -1,6 +1,7 @@
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte
index 52877ed14..e70afc305 100644
--- a/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte
+++ b/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte
@@ -20,7 +20,7 @@
navigate: event,
title: $bucket.name,
copy: {
- text: bucketId,
+ text: 'Bucket ID',
value: bucketId
},
tabs: [
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte
index a885da6ee..19e08c5ed 100644
--- a/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte
+++ b/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte
@@ -1,25 +1,40 @@
+
+