From 57a6dad7a2997fb25adc45ffdf506568ea526e16 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 24 Jan 2024 16:54:54 +0100 Subject: [PATCH 1/2] fix: max file size --- .../storage/bucket-[bucket]/settings/updateMaxFileSize.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte index 501154834c..cc6c3d1d66 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte @@ -36,7 +36,7 @@

Set the maximum file size allowed in the bucket.

{#if isCloud} - {@const size = humanFileSize(sizeToBytes(service, 'GB', 1024))} + {@const size = humanFileSize(sizeToBytes(service, 'MB', 1024))} {@const plan = tierToPlan($organization?.billingPlan)}

From 9e7982ed5053a1dfded7e1133112ff1b316815d9 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 25 Jan 2024 18:16:26 +0100 Subject: [PATCH 2/2] fix: use correct base for covertion --- src/lib/helpers/sizeConvertion.ts | 8 ++++++-- src/lib/helpers/unit.ts | 8 ++++---- .../bucket-[bucket]/settings/updateMaxFileSize.svelte | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib/helpers/sizeConvertion.ts b/src/lib/helpers/sizeConvertion.ts index 41b261069b..3f9d64621f 100644 --- a/src/lib/helpers/sizeConvertion.ts +++ b/src/lib/helpers/sizeConvertion.ts @@ -24,13 +24,17 @@ export function bytesToSize(value: number, unit: Size) { return value / Math.pow(1024, index); } -export function humanFileSize(bytes: number): { +export function humanFileSize( + bytes: number, + useBits = false +): { value: string; unit: Size; } { if (typeof bytes !== 'number') return { value: '0', unit: 'Bytes' }; const value = prettyBytes(bytes, { - locale: 'en' + locale: 'en', + bits: useBits }).split(' '); return { diff --git a/src/lib/helpers/unit.ts b/src/lib/helpers/unit.ts index 394782ea2a..81b8b4918c 100644 --- a/src/lib/helpers/unit.ts +++ b/src/lib/helpers/unit.ts @@ -73,12 +73,12 @@ export function createTimeUnitPair(initialValue = 0) { return { ...createValueUnitPair(initialValue, units), units }; } -export function createByteUnitPair(initialValue = 0) { +export function createByteUnitPair(initialValue = 0, base = 1024) { const units: Unit[] = [ { name: 'Bytes', value: 1 }, - { name: 'Kilobytes', value: 1024 }, - { name: 'Megabytes', value: 1024 ** 2 }, - { name: 'Gigabytes', value: 1024 ** 3 } + { name: 'Kilobytes', value: base }, + { name: 'Megabytes', value: base ** 2 }, + { name: 'Gigabytes', value: base ** 3 } ]; return { ...createValueUnitPair(initialValue, units), units }; } diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte index cc6c3d1d66..3499e9c348 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte @@ -14,7 +14,7 @@ import { updateBucket } from './+page.svelte'; const service = getServiceLimit('fileSize'); - const { value, unit, baseValue, units } = createByteUnitPair($bucket.maximumFileSize); + const { value, unit, baseValue, units } = createByteUnitPair($bucket.maximumFileSize, 1000); const options = units.map((v) => ({ label: v.name, value: v.name })); function updateMaxSize() { @@ -36,7 +36,7 @@

Set the maximum file size allowed in the bucket.

{#if isCloud} - {@const size = humanFileSize(sizeToBytes(service, 'MB', 1024))} + {@const size = humanFileSize(sizeToBytes(service, 'MB', 1000))} {@const plan = tierToPlan($organization?.billingPlan)}