dropHandler(e)}
- on:dragover|preventDefault={(e) => dragOverHandler(e)}>
+ on:drop|preventDefault={dropHandler}
+ on:dragover|preventDefault={dragOverHandler}>
@@ -97,11 +88,7 @@
Drag and drop files here to upload
- {/if}
+ title="Remove file">
+
+
+ {/if}
@@ -125,10 +113,11 @@
{#if !showDropdown}
-
(showDropdown = !showDropdown)}
- >
+ (showDropdown = !showDropdown)}>
+
File ID
-
+
+
{:else}
@@ -168,14 +157,9 @@
-
diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/file/[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket/[bucket]/file/[file]/+page.svelte
index 95b977653..38ec20e02 100644
--- a/src/routes/console/project-[project]/storage/bucket/[bucket]/file/[file]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/file/[file]/+page.svelte
@@ -11,18 +11,17 @@
import Delete from './_deleteFile.svelte';
import { page } from '$app/stores';
import { onMount } from 'svelte';
+ import { difference } from '$lib/helpers/array';
onMount(async () => {
let bucketId = $page.params.bucket;
let fileId = $page.params.file;
await file.load(bucketId, fileId);
- fileRead = $file?.$read;
- fileWrite = $file?.$write;
+ filePermissions = $file?.$permissions;
});
let showDelete = false;
- let fileRead = $file?.$read;
- let fileWrite = $file?.$write;
+ let filePermissions = $file?.$permissions;
let arePermsDisabled = true;
const getPreview = (fileId: string) =>
@@ -31,16 +30,10 @@
const getView = (fileId: string) =>
sdkForProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin';
- $: if (fileRead || fileWrite) {
- if (fileRead) {
- if (JSON.stringify(fileRead) !== JSON.stringify($file.$read)) {
- arePermsDisabled = false;
- } else arePermsDisabled = true;
- } else if (fileWrite) {
- if (JSON.stringify(fileWrite) !== JSON.stringify($file.$write)) {
- arePermsDisabled = false;
- } else arePermsDisabled = true;
- }
+ $: if (filePermissions) {
+ if (difference(filePermissions, $file.$permissions).length) {
+ arePermsDisabled = false;
+ } else arePermsDisabled = true;
}
function downloadFile() {
@@ -52,9 +45,8 @@
async function updatePermissions() {
try {
- await sdkForProject.storage.updateFile($file.bucketId, $file.$id, fileRead, fileWrite);
- $file.$read = fileRead;
- $file.$write = fileWrite;
+ await sdkForProject.storage.updateFile($file.bucketId, $file.$id, filePermissions);
+ $file.$permissions = filePermissions;
arePermsDisabled = true;
addNotification({
message: 'Permissions have been updated',
@@ -133,15 +125,10 @@
-
+ bind:tags={filePermissions} />
diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket/[bucket]/settings/+page.svelte
index 778684ce5..178c05534 100644
--- a/src/routes/console/project-[project]/storage/bucket/[bucket]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/settings/+page.svelte
@@ -19,14 +19,14 @@
import { onMount } from 'svelte';
import { page } from '$app/stores';
import Pill from '$lib/elements/pill.svelte';
+ import { difference } from '$lib/helpers/array';
let showDelete = false;
let enabled: boolean = null,
bucketName: string = null,
- bucketPermissions: string = null,
- bucketRead: string[] = null,
- bucketWrite: string[] = null,
+ bucketFileSecurity: boolean = null,
+ bucketPermissions: string[] = null,
arePermsDisabled = true,
encryption: boolean = null,
antivirus: boolean = null,
@@ -47,22 +47,17 @@
enabled ??= $bucket.enabled;
bucketName ??= $bucket.name;
bucketName ??= $bucket.name;
- bucketPermissions ??= $bucket.permission;
- bucketRead ??= $bucket.$read;
- bucketWrite ??= $bucket.$write;
+ bucketFileSecurity ??= $bucket.fileSecurity;
+ bucketPermissions ??= $bucket.$permissions;
encryption ??= $bucket.encryption;
antivirus ??= $bucket.antivirus;
});
$: maxSizePlaceholder = bytesToSize($bucket.maximumFileSize, byteUnit);
- $: if (bucketPermissions || bucketRead || bucketWrite) {
- if (bucketPermissions !== $bucket.permission) {
+ $: if (bucketFileSecurity || bucketPermissions) {
+ if (bucketFileSecurity !== $bucket.fileSecurity) {
arePermsDisabled = false;
- } else if (bucketRead) {
- if (JSON.stringify(bucketRead) !== JSON.stringify($bucket.$read)) {
- arePermsDisabled = false;
- } else arePermsDisabled = true;
- } else if (bucketWrite) {
- if (JSON.stringify(bucketWrite) !== JSON.stringify($bucket.$write)) {
+ } else if (bucketPermissions) {
+ if (difference(bucketPermissions, $bucket.$permissions).length) {
arePermsDisabled = false;
} else arePermsDisabled = true;
}
@@ -78,9 +73,8 @@
await sdkForProject.storage.updateBucket(
$bucket.$id,
$bucket.name,
- $bucket.permission,
- $bucket.$read,
- $bucket.$write,
+ undefined,
+ undefined,
enabled
);
$bucket.enabled = enabled;
@@ -97,7 +91,7 @@
}
async function updateName() {
try {
- await sdkForProject.storage.updateBucket($bucket.$id, $bucket.name, $bucket.permission);
+ await sdkForProject.storage.updateBucket($bucket.$id, bucketName);
$bucket.name = bucketName;
addNotification({
message: 'Name has been updated',
@@ -115,13 +109,11 @@
await sdkForProject.storage.updateBucket(
$bucket.$id,
$bucket.name,
- bucketPermissions,
- bucketPermissions === 'bucket' ? bucketRead : $bucket.$read,
- bucketPermissions === 'bucket' ? bucketWrite : $bucket.$write
+ bucketFileSecurity ? bucketPermissions : undefined,
+ bucketFileSecurity
);
- $bucket.permission = bucketPermissions;
- $bucket.$read = bucketRead;
- $bucket.$write = bucketWrite;
+ $bucket.fileSecurity = bucketFileSecurity;
+ $bucket.$permissions = bucketPermissions;
arePermsDisabled = true;
addNotification({
message: 'Permissions have been updated',
@@ -140,12 +132,12 @@
await sdkForProject.storage.updateBucket(
$bucket.$id,
$bucket.name,
- $bucket.permission,
- $bucket.$read,
- $bucket.$write,
- $bucket.enabled,
- $bucket.maximumFileSize,
- $bucket.allowedFileExtensions,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
encryption,
antivirus
);
@@ -169,10 +161,9 @@
await sdkForProject.storage.updateBucket(
$bucket.$id,
$bucket.name,
- $bucket.permission,
- $bucket.$read,
- $bucket.$write,
- $bucket.enabled,
+ undefined,
+ undefined,
+ undefined,
size
);
$bucket.maximumFileSize = maxSize;
@@ -193,11 +184,10 @@
await sdkForProject.storage.updateBucket(
$bucket.$id,
$bucket.name,
- $bucket.permission,
- $bucket.$read,
- $bucket.$write,
- $bucket.enabled,
- $bucket.maximumFileSize,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
extensions
);
$bucket.allowedFileExtensions = extensions;
@@ -274,8 +264,8 @@
type="radio"
class="is-small"
name="level"
- bind:group={bucketPermissions}
- value="bucket" />
+ bind:group={bucketFileSecurity}
+ value={true} />
Bucket Level
@@ -285,8 +275,8 @@
type="radio"
class="is-small"
name="level"
- bind:group={bucketPermissions}
- value="file" />
+ bind:group={bucketFileSecurity}
+ value={false} />
File Level
@@ -297,18 +287,13 @@
documentation for more on Permissions
- {#if bucketPermissions === 'bucket'}
+ {#if bucketFileSecurity}
-
+ bind:tags={bucketPermissions} />
{/if}
diff --git a/src/routes/console/project-[project]/storage/bucket/[bucket]/store.ts b/src/routes/console/project-[project]/storage/bucket/[bucket]/store.ts
index 4a15297b8..e2268e2d0 100644
--- a/src/routes/console/project-[project]/storage/bucket/[bucket]/store.ts
+++ b/src/routes/console/project-[project]/storage/bucket/[bucket]/store.ts
@@ -26,23 +26,8 @@ function createFilesStore() {
return {
subscribe,
set,
- load: async (
- bucketId: string,
- search?: string,
- limit?: number,
- offset?: number,
- cursor?: string,
- cursorDirection?: string
- ) => {
- const response = await sdkForProject.storage.listFiles(
- bucketId,
- search,
- limit,
- offset,
- cursor,
- cursorDirection,
- 'DESC'
- );
+ load: async (bucketId: string, queries?: string[], search?: string) => {
+ const response = await sdkForProject.storage.listFiles(bucketId, queries, search);
set(response);
}
};
diff --git a/src/routes/console/project-[project]/storage/store.ts b/src/routes/console/project-[project]/storage/store.ts
index 6078297c2..64130f4d3 100644
--- a/src/routes/console/project-[project]/storage/store.ts
+++ b/src/routes/console/project-[project]/storage/store.ts
@@ -5,12 +5,12 @@ import { cachedStore } from '$lib/helpers/cache';
export const bucketList = cachedStore<
Models.BucketList,
{
- load: (search: string, limit: number, offset: number) => Promise;
+ load: (queries: string[], search: string) => Promise;
}
>('bucketList', function ({ set }) {
return {
- load: async (search, limit, offset) => {
- const response = await sdkForProject.storage.listBuckets(search, limit, offset);
+ load: async (queries, search) => {
+ const response = await sdkForProject.storage.listBuckets(queries, search);
set(response);
}
};