diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte index 83969bd44..073426670 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte @@ -12,7 +12,7 @@ const deleteUser = async () => { try { - await sdkForProject.storage.deleteBucket($bucket.$id); + await sdkForProject.storage.deleteBucket($bucket.response.$id); showDelete = false; await goto(`${base}/console/${$page.params.project}/storage`); } catch (error) { @@ -27,7 +27,7 @@
Delete Bucket -

Are you sure you want to delete {$bucket.name}?

+

Are you sure you want to delete {$bucket.response.name}?

diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index 21490941d..cc5ee0b7b 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -16,18 +16,20 @@ import { addNotification } from '$lib/stores/notifications'; import Delete from './_deleteBucket.svelte'; + $: response = $bucket.response; + let showDelete = false; let showError: false | 'name' | 'size' = false; let errorMessage = 'Something went wrong'; let errorType: 'error' | 'warning' | 'success' = 'error'; - let enabled = $bucket.enabled; + let enabled = response.enabled; let bucketName = ''; - let bucketPermissions = $bucket.permission; - let bucketRead = $bucket.$read; - let bucketWrite = $bucket.$write; + let bucketPermissions = response.permission; + let bucketRead = response.$read; + let bucketWrite = response.$write; let arePermsDisabled = true; - let encryption = $bucket.encryption; - let antivirus = $bucket.antivirus; + let encryption = response.encryption; + let antivirus = response.antivirus; let maxSize: number; let options = [ { label: 'Bytes', value: 'b' }, @@ -35,24 +37,24 @@ { label: 'Megabytes', value: 'mb' }, { label: 'Gigabytes', value: 'gb' } ]; - let extensions = $bucket.allowedFileExtensions; + let extensions = response.allowedFileExtensions; let isExtensionsDisabled = true; $: if (bucketPermissions || bucketRead || bucketWrite) { - if (bucketPermissions !== $bucket.permission) { + if (bucketPermissions !== response.permission) { arePermsDisabled = false; } else if (bucketRead) { - if (JSON.stringify(bucketRead) !== JSON.stringify($bucket.$read)) { + if (JSON.stringify(bucketRead) !== JSON.stringify(response.$read)) { arePermsDisabled = false; } else arePermsDisabled = true; } else if (bucketWrite) { - if (JSON.stringify(bucketWrite) !== JSON.stringify($bucket.$write)) { + if (JSON.stringify(bucketWrite) !== JSON.stringify(response.$write)) { arePermsDisabled = false; } else arePermsDisabled = true; } } $: if (extensions) { - if (JSON.stringify(extensions) !== JSON.stringify($bucket.allowedFileExtensions)) { + if (JSON.stringify(extensions) !== JSON.stringify(response.allowedFileExtensions)) { isExtensionsDisabled = false; } else isExtensionsDisabled = true; } @@ -66,16 +68,16 @@ async function toggleBucket() { try { await sdkForProject.storage.updateBucket( - $bucket.$id, - $bucket.name, - $bucket.permission, - $bucket.$read, - $bucket.$write, + response.$id, + response.name, + response.permission, + response.$read, + response.$write, enabled ); - $bucket.enabled = enabled; + response.enabled = enabled; addNotification({ - message: `${$bucket.name} has been updatede`, + message: `${response.name} has been updatede`, type: 'success' }); } catch (error) { @@ -87,8 +89,12 @@ } async function updateName() { try { - await sdkForProject.storage.updateBucket($bucket.$id, $bucket.name, $bucket.permission); - $bucket.name = bucketName; + await sdkForProject.storage.updateBucket( + response.$id, + response.name, + response.permission + ); + response.name = bucketName; bucketName = null; showError = false; addNotification({ @@ -102,15 +108,15 @@ async function updatePermissions() { try { await sdkForProject.storage.updateBucket( - $bucket.$id, - $bucket.name, + response.$id, + response.name, bucketPermissions, - bucketPermissions === 'bucket' ? bucketRead : $bucket.$read, - bucketPermissions === 'bucket' ? bucketWrite : $bucket.$write + bucketPermissions === 'bucket' ? bucketRead : response.$read, + bucketPermissions === 'bucket' ? bucketWrite : response.$write ); - $bucket.permission = bucketPermissions; - $bucket.$read = bucketRead; - $bucket.$write = bucketWrite; + response.permission = bucketPermissions; + response.$read = bucketRead; + response.$write = bucketWrite; arePermsDisabled = true; addNotification({ message: 'Permissions have been updated', @@ -127,21 +133,21 @@ async function updateSecurity() { try { await sdkForProject.storage.updateBucket( - $bucket.$id, - $bucket.name, - $bucket.permission, - $bucket.$read, - $bucket.$write, - $bucket.enabled, - $bucket.maximumFileSize, - $bucket.allowedFileExtensions, + response.$id, + response.name, + response.permission, + response.$read, + response.$write, + response.enabled, + response.maximumFileSize, + response.allowedFileExtensions, encryption, antivirus ); - $bucket.encryption = encryption; - $bucket.antivirus = antivirus; + response.encryption = encryption; + response.antivirus = antivirus; addNotification({ - message: `${$bucket.name} has been updatede`, + message: `${response.name} has been updatede`, type: 'success' }); } catch (error) { @@ -154,17 +160,17 @@ async function updateMaxSize() { try { await sdkForProject.storage.updateBucket( - $bucket.$id, - $bucket.name, - $bucket.permission, - $bucket.$read, - $bucket.$write, - $bucket.enabled, + response.$id, + response.name, + response.permission, + response.$read, + response.$write, + response.enabled, maxSize ); - $bucket.maximumFileSize = maxSize; + response.maximumFileSize = maxSize; addNotification({ - message: `${$bucket.name} has been updatede`, + message: `${response.name} has been updatede`, type: 'success' }); } catch (error) { @@ -178,18 +184,18 @@ async function updateAllowedExtensions() { try { await sdkForProject.storage.updateBucket( - $bucket.$id, - $bucket.name, - $bucket.permission, - $bucket.$read, - $bucket.$write, - $bucket.enabled, - $bucket.maximumFileSize, + response.$id, + response.name, + response.permission, + response.$read, + response.$write, + response.enabled, + response.maximumFileSize, extensions ); - $bucket.allowedFileExtensions = extensions; + response.allowedFileExtensions = extensions; addNotification({ - message: `${$bucket.name} has been updatede`, + message: `${response.name} has been updatede`, type: 'success' }); } catch (error) { @@ -202,13 +208,13 @@ - {#if $bucket} + {#if response}
-

{$bucket.name}

+

{response.name}

-

Created: {toLocaleDate($bucket.dateCreated)}

-

Last Updated: {toLocaleDate($bucket.dateUpdated)}

+

Created: {toLocaleDate(response.dateCreated)}

+

Last Updated: {toLocaleDate(response.dateUpdated)}

    @@ -222,7 +228,7 @@
    @@ -238,7 +244,7 @@ {#if showError === 'name'} @@ -348,7 +354,8 @@
    @@ -368,7 +375,7 @@
@@ -426,8 +433,8 @@