Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@appwrite.io/pink-icons": "0.25.0",
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3",
"@appwrite.io/pink-legacy": "^1.0.3",
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@bfe7ce3",
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8dcaa17",
"@faker-js/faker": "^9.9.0",
"@plausible-analytics/tracker": "^0.4.4",
"@popperjs/core": "^2.11.8",
Expand Down
35 changes: 27 additions & 8 deletions src/lib/components/filePicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
let searchEnabled = false;
let fileSelector: HTMLInputElement;
let uploading = false;
let uploadProgress = 0;
let view: 'grid' | 'list' = 'list';
$: planMaxSize =
isCloud && $currentPlan?.['fileSize']
Expand Down Expand Up @@ -97,12 +98,17 @@
async function uploadFile() {
try {
uploading = true;
uploadProgress = 0;
let file = null;

if (localFileBucketSelected) {
file = await sdk.forConsoleIn(page.params.region).storage.createFile({
bucketId: 'default',
fileId: ID.unique(),
file: localFile[0]
file: localFile[0],
onProgress: (progress) => {
uploadProgress = progress.progress;
}
});
} else {
file = await sdk
Expand All @@ -111,7 +117,10 @@
bucketId: selectedBucket,
fileId: ID.unique(),
file: fileSelector.files[0],
permissions: [Permission.read(Role.any())]
permissions: [Permission.read(Role.any())],
onProgress: (progress) => {
uploadProgress = progress.progress;
}
});
search.set($search === null ? '' : null);
}
Expand All @@ -123,6 +132,7 @@
});
} finally {
uploading = false;
uploadProgress = 0;
}
}

Expand Down Expand Up @@ -246,7 +256,7 @@
<svelte:document on:visibilitychange={handleVisibilityChange} />

<Form {onSubmit} isModal class="file-picker-modal-form">
<Modal bind:open={show} title="Select file" size="l">
<Modal bind:open={show} title="Select file" size="l" dismissible={!uploading}>
<Layout.Stack direction={$isSmallViewport ? 'column' : 'row'} height="50vh" gap="none">
<!-- min-width to avoid a layout-shift -->
<aside>
Expand Down Expand Up @@ -428,7 +438,10 @@
bind:this={fileSelector} />
{#if uploading}
<div class="loader is-small"></div>
<span>Uploading</span>
<span
>Uploading{uploadProgress > 0
? ` ${uploadProgress}%`
: ''}</span>
{:else}
<span class="icon-upload" aria-hidden="true"></span>
<span>Upload</span>
Expand Down Expand Up @@ -711,12 +724,18 @@
</Layout.Stack>
<svelte:fragment slot="footer">
<Layout.Stack direction="row" justifyContent="flex-end">
<Button text on:click={closeModal}>Cancel</Button>
<Button text disabled={uploading} on:click={closeModal}>Cancel</Button>
<Button
submit
disabled={(selectedBucket === null && localFileBucketSelected === false) ||
(selectedFile === null && localFile === null)}
>Select
disabled={uploading ||
(selectedBucket === null && localFileBucketSelected === false) ||
(selectedFile === null && localFile === null)}>
{#if uploading}
<div class="loader is-small"></div>
<span>Uploading{uploadProgress > 0 ? ` ${uploadProgress}%` : ''}</span>
{:else}
Select
{/if}
</Button>
</Layout.Stack>
</svelte:fragment>
Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/uploadBox.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
return {
name: file.name,
size: file.size,
status: file.status
status: file.status,
progress: file.progress
};
})}
on:close={() => uploader.close()} />
Expand Down
Loading