Merge branch 'main' of github.com:appwrite/console into refactor-chan…

…ge-plan-to-map
appwrite · Dec 28, 2023 · f096271 · f096271
2 parents b4b86dc + 7a69d59
commit f096271
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/src/lib/components/filters/content.svelte b/src/lib/components/filters/content.svelte
@@ -115,7 +115,7 @@
 
 <div>
     <form on:submit|preventDefault={addFilter}>
-        <div class="selects u-flex u-gap-8 u-margin-block-start-16">
+        <ul class="selects u-flex u-gap-8 u-margin-block-start-16">
             <InputSelect
                 id="column"
                 options={$columns.map((c) => ({
@@ -130,7 +130,7 @@
                 options={operatorsForColumn}
                 placeholder="Select operator"
                 bind:value={operatorKey} />
-        </div>
+        </ul>
         {#if column && operator && !operator?.hideInput}
             <div class="u-margin-block-start-8">
                 {#if column.type === 'integer' || column.type === 'double'}

diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
@@ -121,7 +121,6 @@
         {#if isCloud && $organization?.billingPlan === BillingPlan.STARTER && !$page.url.pathname.startsWith('/console/account')}
             <Button
                 disabled={$organization?.markedForDeletion}
-                secondary
                 on:click={() => wizard.start(ChangeOrganizationTierCloud)}>
                 Upgrade
             </Button>

diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts
@@ -91,7 +91,7 @@ export async function submitStripeCard(name: string, urlRoute?: string) {
         }
     } catch (e) {
         trackError(e, Submit.PaymentMethodCreate);
-        throw e.message;
+        throw e;
     }
 }
 

diff --git a/src/routes/console/organization-[organization]/billing/budgetCap.svelte b/src/routes/console/organization-[organization]/billing/budgetCap.svelte
@@ -74,7 +74,12 @@
                 </Alert>
             {:else}
                 <FormList>
-                    <InputSwitch id="capActive" label="Enable budget cap" bind:value={capActive} />
+                    <InputSwitch id="cap-active" label="Enable budget cap" bind:value={capActive}>
+                        <svelte:fragment slot="description">
+                            Budget cap limits do not include the base amount of your plan. Cap usage
+                            is reset at the beginning of each billing cycle.
+                        </svelte:fragment>
+                    </InputSwitch>
                     {#if capActive}
                         <InputNumber
                             placeholder="Add budget cap"

diff --git a/...t]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/...t]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
@@ -68,9 +68,15 @@
     <CardGrid>
         <Heading tag="h6" size="7">Permissions</Heading>
         <p>
-            Assign read or write permissions at the <b>collection level</b> or
-            <b>document level</b>. If collection level permissions are assigned, permissions applied
-            to individual documents are ignored.
+            A user requires appropriate permissions at either the <b>collection level</b> or
+            <b>document level</b> to access a document. If no permissions are configured, no user
+            can access the document
+            <a
+                href="https://appwrite.io/docs/products/databases/permissions"
+                target="_blank"
+                rel="noopener noreferrer"
+                class="link">Learn more about database permissions</a
+            >.
         </p>
 
         <svelte:fragment slot="aside">

diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
@@ -53,7 +53,7 @@
 
     const projectId = $page.params.project;
     const bucketId = $page.params.bucket;
-    const usedStorage = bytesToSize(data.organizationUsage.storageTotal, 'MB');
+    const usedStorage = bytesToSize(data.organizationUsage.storageTotal, 'GB');
     const getPreview = (fileId: string) =>
         sdk.forProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin';