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 d24ed367b..1305d5369 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
@@ -61,7 +61,9 @@
import {
Button,
Form,
+ FormItem,
FormList,
+ InputChoice,
InputSelect,
InputSwitch,
InputTags,
@@ -78,6 +80,7 @@
import Delete from '../deleteBucket.svelte';
import { bucket } from '../store';
import UpdateMaxFileSize from './updateMaxFileSize.svelte';
+ import { readOnly } from '$lib/stores/billing';
let showDelete = false;
@@ -229,7 +232,9 @@
-
+
@@ -243,13 +248,15 @@
id="name"
label="Name"
placeholder="Enter name"
- autocomplete={false}
+ readonly={$readOnly}
bind:value={bucketName} />
-
@@ -301,7 +308,9 @@
-
+
Update
@@ -317,54 +326,29 @@
-
-
-
-
-
-
-
-
+
+
+ This parameter allows you to configure whether or not the files
+ inside the bucket should be scanned by the Appwrite Antivirus
+ scanner.
+
+
@@ -406,7 +390,7 @@
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 9e93117ce..74c4bd5b4 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
@@ -4,7 +4,7 @@
import { Button, Form, InputNumber, InputSelect } from '$lib/elements/forms';
import { humanFileSize } from '$lib/helpers/sizeConvertion';
import { createByteUnitPair } from '$lib/helpers/unit';
- import { getServiceLimit } from '$lib/stores/billing';
+ import { getServiceLimit, readOnly } from '$lib/stores/billing';
import { organization } from '$lib/stores/organization';
import { wizard } from '$lib/stores/wizard';
import { isCloud } from '$lib/system';
@@ -55,6 +55,7 @@
- Update
+ Update
diff --git a/src/routes/console/wizard/cloudOrganization/usageRates.svelte b/src/routes/console/wizard/cloudOrganization/usageRates.svelte
index 72773a988..d62fbd673 100644
--- a/src/routes/console/wizard/cloudOrganization/usageRates.svelte
+++ b/src/routes/console/wizard/cloudOrganization/usageRates.svelte
@@ -13,6 +13,7 @@
import { organization } from '$lib/stores/organization';
import { createOrganization } from './store';
import { plansInfo } from '$lib/stores/billing';
+ import { abbreviateNumber } from '$lib/helpers/numbers';
export let show = false;
export let tier: string;
@@ -29,24 +30,24 @@
{
id: 'members',
resource: 'Organization members',
- unit: ''
+ unit: 'member'
},
- { id: 'bandwith', resource: 'Bandwidth', unit: 'GB' },
+ { id: 'bandwidth', resource: 'Bandwidth', unit: 'GB' },
{ id: 'storage', resource: 'Storage', unit: 'GB' },
{
id: 'executions',
resource: 'Function executions',
- unit: 'executions'
+ unit: ' executions'
},
{
id: 'users',
resource: 'Active users',
- unit: 'AU'
+ unit: ' AU'
},
{
id: 'realtime',
resource: 'Concurrent connections',
- unit: 'connections'
+ unit: ' connections'
}
];
@@ -65,11 +66,28 @@
{#each planData as usage}
-
- {usage.resource}
- {plan[usage.id]}{usage?.unit}
- {plan[`${usage.id}Addon`]}
-
+ {#if usage['id'] === 'members'}
+
+ {usage.resource}
+
+ {plan[usage.id] || 'Unlimited'}
+
+ ${plan.memberAddon.price}/{usage?.unit}
+
+ {:else}
+ {@const addon = plan[`${usage.id}Addon`]}
+
+ {usage.resource}
+
+ {abbreviateNumber(plan[usage.id])}{usage?.unit}
+
+ ${addon?.price}/{['MB', 'GB', 'TB'].includes(addon?.unit)
+ ? addon?.value
+ : abbreviateNumber(addon?.value, 0)}{usage?.unit}
+
+ {/if}
{/each}