Merge remote-tracking branch 'origin/main' into feat-documentsdb

# Conflicts:
#	bun.lock
#	package.json
#	src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte
#	src/routes/(console)/project-[region]-[project]/settings/updateLabels.svelte

Author: premtsd-code

bun.lock

@@ -20,11 +20,11 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "github:appwrite/sdk-for-console#d27fbd5",
+        "@appwrite.io/console": "github:appwrite/sdk-for-console#vector-db-sdk",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3",
         "@appwrite.io/pink-legacy": "^1.0.3",
-        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@bfe7ce3",
+        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@8dcaa17",
         "@codemirror/autocomplete": "^6.19.0",
         "@codemirror/commands": "^6.9.0",
         "@codemirror/lang-javascript": "^6.2.4",
@@ -68,7 +68,7 @@
         "@melt-ui/svelte": "^0.86.6",
         "@playwright/test": "^1.58.2",
         "@sveltejs/adapter-static": "^3.0.10",
-        "@sveltejs/kit": "^2.55.0",
+        "@sveltejs/kit": "^2.57.1",
         "@sveltejs/vite-plugin-svelte": "^5.1.1",
         "@testing-library/dom": "^10.4.1",
         "@testing-library/jest-dom": "^6.9.1",

package.json

@@ -443,6 +443,8 @@ export enum Submit {
     MessagingTopicSubscriberDelete = 'submit_messaging_topic_subscriber_delete',
     ApplyQuickFilter = 'submit_apply_quick_filter',
     RequestBAA = 'submit_request_baa',
+    BAAAddonEnable = 'submit_baa_addon_enable',
+    BAAAddonDisable = 'submit_baa_addon_disable',
     RequestSoc2 = 'submit_request_soc2',
     SiteCreate = 'submit_site_create',
     SiteDelete = 'submit_site_delete',

pnpm-lock.yaml

@@ -16,9 +16,14 @@
         }
     }
 
-    $: href = $currentPlan?.usagePerProject
-        ? `${base}/organization-${$organization.$id}/billing`
-        : `${base}/organization-${$organization.$id}/usage`;
+    // Guard org id: this reactive runs even when the {#if} below is false, so optional
+    // chaining on $currentPlan alone is not enough — $organization can be undefined.
+    $: orgId = $organization?.$id;
+    $: href = orgId
+        ? $currentPlan?.usagePerProject
+            ? `${base}/organization-${orgId}/billing`
+            : `${base}/organization-${orgId}/usage`
+        : '';
 </script>
 
 {#if $organization?.$id && !dismissed}

src/lib/actions/analytics.ts

@@ -86,6 +86,18 @@
                         {formatNum(currentPlan.executions)} executions
                     </span>
                 </li>
+                {#if currentPlan.domains > 0}
+                    <li class="list-item u-gap-4 u-cross-center">
+                        <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
+                        <span class="text">
+                            Limited to {currentPlan.domains} custom {pluralize(
+                                currentPlan.domains,
+                                'domain'
+                            )}
+                            per project
+                        </span>
+                    </li>
+                {/if}
             </ul>
         {:else}
             <ul class="un-order-list">
@@ -105,12 +117,22 @@
                 <li>
                     Limited to {formatNum(currentPlan.executions)} executions
                 </li>
+                {#if currentPlan.domains > 0}
+                    <li>
+                        Limited to {currentPlan.domains} custom {pluralize(
+                            currentPlan.domains,
+                            'domain'
+                        )} per project
+                    </li>
+                {:else}
+                    <li>Unlimited custom domains</li>
+                {/if}
             </ul>
         {/if}
     {:else if planHasGroup(selectedTab, BillingPlanGroup.Pro)}
         <Typography.Text>Everything in the Free plan, plus:</Typography.Text>
         <ul class="un-order-list">
-            <li>Unlimited databases, buckets, functions</li>
+            <li>Unlimited databases, buckets, functions, and custom domains</li>
             <li>Unlimited seats</li>
             <li>{currentPlan.bandwidth}GB bandwidth</li>
             <li>{currentPlan.storage}GB storage</li>

src/lib/components/billing/alerts/realtimePricing.svelte

@@ -9,7 +9,7 @@
     import { Button, InputSelect } from '$lib/elements/forms';
     import DualTimeView from './dualTimeView.svelte';
     import type { Models } from '@appwrite.io/console';
-    import { calculateSize } from '$lib/helpers/sizeConvertion';
+    import { calculateSize, humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
     import InputSearch from '$lib/elements/forms/inputSearch.svelte';
     import { ID, Query, Permission, Role } from '@appwrite.io/console';
     import {
@@ -34,6 +34,8 @@
     import { showCreateBucket } from '$routes/(console)/project-[region]-[project]/storage/+page.svelte';
     import { preferences } from '$lib/stores/preferences';
     import { addNotification } from '$lib/stores/notifications';
+    import { isCloud } from '$lib/system';
+    import { currentPlan } from '$lib/stores/organization';
 
     export let show: boolean;
     export let mimeTypeQuery: string = 'image/';
@@ -52,7 +54,12 @@
     let searchEnabled = false;
     let fileSelector: HTMLInputElement;
     let uploading = false;
+    let uploadProgress = 0;
     let view: 'grid' | 'list' = 'list';
+    $: planMaxSize =
+        isCloud && $currentPlan?.['fileSize']
+            ? sizeToBytes($currentPlan['fileSize'], 'MB', 1000)
+            : null;
 
     onMount(() => {
         const lastSelectedBucket = preferences.getKey('lastSelectedBucket', null);
@@ -91,12 +98,17 @@
     async function uploadFile() {
         try {
             uploading = true;
+            uploadProgress = 0;
             let file = null;
+
             if (localFileBucketSelected) {
                 file = await sdk.forConsoleIn(page.params.region).storage.createFile({
                     bucketId: 'default',
                     fileId: ID.unique(),
-                    file: localFile[0]
+                    file: localFile[0],
+                    onProgress: (progress) => {
+                        uploadProgress = progress.progress;
+                    }
                 });
             } else {
                 file = await sdk
@@ -105,7 +117,10 @@
                         bucketId: selectedBucket,
                         fileId: ID.unique(),
                         file: fileSelector.files[0],
-                        permissions: [Permission.read(Role.any())]
+                        permissions: [Permission.read(Role.any())],
+                        onProgress: (progress) => {
+                            uploadProgress = progress.progress;
+                        }
                     });
                 search.set($search === null ? '' : null);
             }
@@ -117,6 +132,7 @@
             });
         } finally {
             uploading = false;
+            uploadProgress = 0;
         }
     }
 
@@ -240,7 +256,7 @@
 <svelte:document on:visibilitychange={handleVisibilityChange} />
 
 <Form {onSubmit} isModal class="file-picker-modal-form">
-    <Modal bind:open={show} title="Select file" size="l">
+    <Modal bind:open={show} title="Select file" size="l" dismissible={!uploading}>
         <Layout.Stack direction={$isSmallViewport ? 'column' : 'row'} height="50vh" gap="none">
             <!-- min-width to avoid a layout-shift -->
             <aside>
@@ -366,7 +382,7 @@
                                         direction="row"
                                         gap="s">
                                         <Typography.Text variant="l-500">
-                                            Drag and drop files here or click to upload
+                                            Drag and drop a file here or click to upload
                                         </Typography.Text>
                                         <Tooltip>
                                             <Layout.Stack
@@ -381,8 +397,12 @@
                                                     : `${allowedExtension} files are allowed`}</svelte:fragment>
                                         </Tooltip>
                                     </Layout.Stack>
-                                    <Typography.Caption variant="400"
-                                        >Max file size: 10MB</Typography.Caption>
+                                    {#if planMaxSize}
+                                        {@const readableMaxSize = humanFileSize(planMaxSize)}
+                                        <Typography.Caption variant="400"
+                                            >Max file size: {readableMaxSize.value +
+                                                readableMaxSize.unit}</Typography.Caption>
+                                    {/if}
                                 </Layout.Stack>
                             </Layout.Stack>
                         </Upload.Dropzone>
@@ -418,7 +438,10 @@
                                     bind:this={fileSelector} />
                                 {#if uploading}
                                     <div class="loader is-small"></div>
-                                    <span>Uploading</span>
+                                    <span
+                                        >Uploading{uploadProgress > 0
+                                            ? ` ${uploadProgress}%`
+                                            : ''}</span>
                                 {:else}
                                     <span class="icon-upload" aria-hidden="true"></span>
                                     <span>Upload</span>
@@ -701,12 +724,18 @@
         </Layout.Stack>
         <svelte:fragment slot="footer">
             <Layout.Stack direction="row" justifyContent="flex-end">
-                <Button text on:click={closeModal}>Cancel</Button>
+                <Button text disabled={uploading} on:click={closeModal}>Cancel</Button>
                 <Button
                     submit
-                    disabled={(selectedBucket === null && localFileBucketSelected === false) ||
-                        (selectedFile === null && localFile === null)}
-                    >Select
+                    disabled={uploading ||
+                        (selectedBucket === null && localFileBucketSelected === false) ||
+                        (selectedFile === null && localFile === null)}>
+                    {#if uploading}
+                        <div class="loader is-small"></div>
+                        <span>Uploading{uploadProgress > 0 ? ` ${uploadProgress}%` : ''}</span>
+                    {:else}
+                        Select
+                    {/if}
                 </Button>
             </Layout.Stack>
         </svelte:fragment>

src/lib/components/billing/planComparisonBox.svelte

@@ -9,7 +9,8 @@
             return {
                 name: file.name,
                 size: file.size,
-                status: file.status
+                status: file.status,
+                progress: file.progress
             };
         })}
         on:close={() => uploader.close()} />

src/lib/components/filePicker.svelte

@@ -64,7 +64,7 @@
                 <Layout.Stack alignItems="center" gap="s">
                     <Layout.Stack alignItems="center" justifyContent="center" inline>
                         <Typography.Text variant="l-500" align="center" inline>
-                            Drag and drop files here or click to upload
+                            Drag and drop a file here or click to upload
                             <Layout.Stack
                                 style="display: inline-flex; vertical-align: middle;"
                                 inline

src/lib/components/uploadBox.svelte

@@ -88,7 +88,8 @@ export enum Dependencies {
     MESSAGING_TOPIC_SUBSCRIBERS = 'dependency:messaging_topic_subscribers',
     SITE = 'dependency:site',
     SITES = 'dependency:sites',
-    SITES_DOMAINS = 'dependency:sites_domains'
+    SITES_DOMAINS = 'dependency:sites_domains',
+    ADDONS = 'dependency:addons'
 }
 
 export const defaultScopes: string[] = [
@@ -475,6 +476,30 @@ export const scopes: ScopeDefinition[] = [
         description: "Access to delete your site's logs",
         category: 'Sites',
         icon: 'globe'
+    },
+    {
+        scope: 'webhooks.read',
+        description: "Access to read your project's webhooks",
+        category: 'Other',
+        icon: 'globe'
+    },
+    {
+        scope: 'webhooks.write',
+        description: "Access to create, update, and delete your project's webhooks",
+        category: 'Other',
+        icon: 'globe'
+    },
+    {
+        scope: 'keys.read',
+        description: "Access to read your project's API keys",
+        category: 'Other',
+        icon: 'globe'
+    },
+    {
+        scope: 'keys.write',
+        description: "Access to create, update, and delete your project's API keys",
+        category: 'Other',
+        icon: 'globe'
     }
 ];