Merge branch '1.8.x' into 'csv-imports-errors'.

Author: ItzNotABug

.github/workflows/publish.yml

@@ -79,7 +79,7 @@ jobs:
                   labels: ${{ steps.meta.outputs.labels }}
                   build-args: |
                       "PUBLIC_CONSOLE_MODE=cloud"
-                      "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import"
+                      "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt"
                       "PUBLIC_APPWRITE_MULTI_REGION=true"
                       "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
                       "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
@@ -118,7 +118,7 @@ jobs:
                   build-args: |
                       "PUBLIC_CONSOLE_MODE=self-hosted"
                       "PUBLIC_APPWRITE_MULTI_REGION=false"
-                      "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import"
+                      "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt"
                       "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
 
     publish-cloud-no-regions:
@@ -156,6 +156,6 @@ jobs:
                   build-args: |
                       "PUBLIC_CONSOLE_MODE=cloud"
                       "PUBLIC_APPWRITE_MULTI_REGION=false"
-                      "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import"
+                      "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt"
                       "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
                       "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"

package.json

@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@a5e5564",
+        "@appwrite.io/console": "^1.9.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

@@ -20,5 +20,6 @@ function isFlagEnabled(name: string) {
 
 export const flags = {
     showSites: isFlagEnabled('sites'),
-    showCsvImport: isFlagEnabled('csv-import')
+    showCsvImport: isFlagEnabled('csv-import'),
+    showAttributeEncrypt: isFlagEnabled('attribute-encrypt')
 };

src/lib/flags.ts

@@ -310,6 +310,7 @@ export type Plan = {
     users: number;
     teams: number;
     databases: number;
+    databasesAllowEncrypt: boolean;
     buckets: number;
     fileSize: number;
     functions: number;
@@ -339,7 +340,6 @@ export type Plan = {
     backupPolicies: number;
     emailBranding: boolean;
     supportsCredits: boolean;
-    databasesAllowEncrypt: boolean;
     supportsOrganizationRoles: boolean;
     buildSize: number; // in MB
     deploymentSize: number; // in MB

src/lib/sdk/billing.ts

@@ -117,7 +117,7 @@
                             <Layout.Stack direction="row" alignItems="center" gap="s">
                                 <Layout.Stack inline direction="row" alignItems="center" gap="xxs">
                                     <span class="text u-trim-1" data-private>{attribute.key}</span>
-                                    {#if isString(attribute) && !attribute.encrypt}
+                                    {#if isString(attribute) && attribute.encrypt}
                                         <Tooltip>
                                             <Icon
                                                 size="s"

src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte

@@ -50,6 +50,7 @@
     import { ActionMenu, Selector } from '@appwrite.io/pink-svelte';
     import { InputNumber, InputText, InputTextarea } from '$lib/elements/forms';
     import { Popover, Layout, Tag, Typography, Link } from '@appwrite.io/pink-svelte';
+    import { flags } from '$lib/flags';
 
     export let data: Partial<Models.AttributeString> = {
         required: false,
@@ -62,6 +63,8 @@
 
     let savedDefault = data.default;
 
+    let showEncrypt = flags.showAttributeEncrypt(page.data);
+
     function handleDefaultState(hideDefault: boolean) {
         if (hideDefault) {
             savedDefault = data.default;
@@ -84,7 +87,7 @@
 
     $: handleDefaultState($required || $array);
 
-    // check plan on cloud, always allow on self-hosted!
+    // Check plan on cloud, always allow on self-hosted
     $: supportsStringEncryption = isCloud ? $currentPlan?.databasesAllowEncrypt : true;
 </script>
 
@@ -125,50 +128,53 @@
     disabled={data.required || editing}
     description="Indicate whether this attribute is an array. Defaults to an empty array." />
 
-<Layout.Stack gap="xs" direction="column">
-    <div class="popover-holder" class:disabled-checkbox={!supportsStringEncryption || editing}>
-        <Layout.Stack inline gap="s" alignItems="flex-start" direction="row">
-            <Popover let:toggle placement="bottom-start">
-                <Selector.Checkbox
-                    size="s"
-                    id="encrypt"
-                    bind:checked={data.encrypt}
-                    disabled={!supportsStringEncryption || editing} />
-
-                <Layout.Stack gap="xxs" direction="column">
-                    <button
-                        type="button"
-                        class="u-cursor-pointer"
-                        on:click={(e) => {
-                            if (!supportsStringEncryption) {
-                                toggle(e);
-                            } else {
-                                data.encrypt = !data.encrypt;
-                            }
-                        }}>
-                        <Layout.Stack inline gap="xxs" direction="row" alignItems="center">
-                            <Typography.Text variant="m-500">Encrypted</Typography.Text>
-                            {#if !supportsStringEncryption}
-                                <Tag variant="default" size="xs" on:click={toggle}>Pro</Tag>
-                            {/if}
-                        </Layout.Stack>
-                    </button>
-                    <Typography.Text color="--fgcolor-neutral-tertiary">
-                        Indicate whether this attribute is encrypted. Encrypted attributes cannot be
-                        queried.
-                    </Typography.Text>
-                </Layout.Stack>
-
-                <ActionMenu.Root width="180px" slot="tooltip">
-                    <Typography.Text variant="m-500">
-                        Available on Pro plan. <Link.Anchor href={$upgradeURL}>Upgrade</Link.Anchor>
-                        to enable encrypted attributes.
-                    </Typography.Text>
-                </ActionMenu.Root>
-            </Popover>
-        </Layout.Stack>
-    </div>
-</Layout.Stack>
+{#if showEncrypt}
+    <Layout.Stack gap="xs" direction="column">
+        <div class="popover-holder" class:disabled-checkbox={!supportsStringEncryption || editing}>
+            <Layout.Stack inline gap="s" alignItems="flex-start" direction="row">
+                <Popover let:toggle placement="bottom-start">
+                    <Selector.Checkbox
+                        size="s"
+                        id="encrypt"
+                        bind:checked={data.encrypt}
+                        disabled={!supportsStringEncryption || editing} />
+
+                    <Layout.Stack gap="xxs" direction="column">
+                        <button
+                            type="button"
+                            class="u-cursor-pointer"
+                            on:click={(e) => {
+                                if (!supportsStringEncryption) {
+                                    toggle(e);
+                                } else {
+                                    data.encrypt = !data.encrypt;
+                                }
+                            }}>
+                            <Layout.Stack inline gap="xxs" direction="row" alignItems="center">
+                                <Typography.Text variant="m-500">Encrypted</Typography.Text>
+                                {#if !supportsStringEncryption}
+                                    <Tag variant="default" size="xs" on:click={toggle}>Pro</Tag>
+                                {/if}
+                            </Layout.Stack>
+                        </button>
+                        <Typography.Text color="--fgcolor-neutral-tertiary">
+                            Indicate whether this attribute is encrypted. Encrypted attributes
+                            cannot be queried.
+                        </Typography.Text>
+                    </Layout.Stack>
+
+                    <ActionMenu.Root width="180px" slot="tooltip">
+                        <Typography.Text variant="m-500">
+                            Available on Pro plan. <Link.Anchor href={$upgradeURL}
+                                >Upgrade</Link.Anchor>
+                            to enable encrypted attributes.
+                        </Typography.Text>
+                    </ActionMenu.Root>
+                </Popover>
+            </Layout.Stack>
+        </div>
+    </Layout.Stack>
+{/if}
 
 <style lang="scss">
     .popover-holder {

src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte

@@ -79,13 +79,15 @@
                     { id: 'type' },
                     { id: 'attributes' },
                     { id: 'orders' },
+                    { id: 'lengths' },
                     { id: 'actions', width: 40 }
                 ]}>
                 <svelte:fragment slot="header" let:root>
                     <Table.Header.Cell column="key" {root}>Key</Table.Header.Cell>
                     <Table.Header.Cell column="type" {root}>Type</Table.Header.Cell>
                     <Table.Header.Cell column="attributes" {root}>Attributes</Table.Header.Cell>
-                    <Table.Header.Cell column="orders" {root}>Asc/Desc</Table.Header.Cell>
+                    <Table.Header.Cell column="orders" {root}>Orders</Table.Header.Cell>
+                    <Table.Header.Cell column="lengths" {root}>Lengths</Table.Header.Cell>
                     <Table.Header.Cell column="actions" {root} />
                 </svelte:fragment>
                 {#each data.collection.indexes as index}
@@ -118,6 +120,9 @@
                         <Table.Cell column="orders" {root}>
                             {index.orders}
                         </Table.Cell>
+                        <Table.Cell column="lengths" {root}>
+                            {index.lengths}
+                        </Table.Cell>
                         <Table.Cell column="actions" {root}>
                             <Popover let:toggle padding="none" placement="bottom-end">
                                 <Button text icon ariaLabel="more options" on:click={toggle}>

src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte

@@ -5,7 +5,7 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Dependencies } from '$lib/constants';
-    import { Button, InputSelect, InputText } from '$lib/elements/forms';
+    import { Button, InputNumber, InputSelect, InputText } from '$lib/elements/forms';
     import { remove } from '$lib/helpers/array';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
@@ -36,7 +36,7 @@
             label: attribute.key
         }));
 
-    let attributeList = [{ value: '', order: '' }];
+    let attributeList = [{ value: '', order: '', length: null }];
 
     function generateIndexKey() {
         let indexKeys = $indexes.map((index) => index.key);
@@ -51,8 +51,8 @@
 
     function initialize() {
         attributeList = externalAttribute
-            ? [{ value: externalAttribute.key, order: 'ASC' }]
-            : [{ value: '', order: 'ASC' }];
+            ? [{ value: externalAttribute.key, order: 'ASC', length: null }]
+            : [{ value: '', order: 'ASC', length: null }];
         selectedType = IndexType.Key;
         key = `index_${$indexes.length + 1}`;
     }
@@ -78,8 +78,10 @@
                 key,
                 selectedType,
                 attributeList.map((a) => a.value),
-                attributeList.map((a) => a.order)
+                attributeList.map((a) => a.order),
+                attributeList.map((a) => (a.length ? Number(a.length) : null))
             );
+
             await Promise.allSettled([
                 invalidate(Dependencies.COLLECTION),
                 invalidate(Dependencies.DATABASE)
@@ -105,7 +107,7 @@
         if (addAttributeDisabled) return;
 
         // We assign instead of pushing to trigger Svelte's reactivity
-        attributeList = [...attributeList, { value: '', order: '' }];
+        attributeList = [...attributeList, { value: '', order: '', length: null }];
     }
 </script>
 
@@ -134,17 +136,26 @@
                     label={i === 0 ? 'Attribute' : undefined}
                     placeholder="Select Attribute"
                     bind:value={attribute.value} />
+
+                <InputSelect
+                    options={[
+                        { value: 'ASC', label: 'ASC' },
+                        { value: 'DESC', label: 'DESC' }
+                    ]}
+                    required
+                    id={`order-${i}`}
+                    label={i === 0 ? 'Order' : undefined}
+                    bind:value={attribute.order}
+                    placeholder="Select Order" />
+
                 <Layout.Stack direction="row" alignItems="flex-end" gap="xs">
-                    <InputSelect
-                        options={[
-                            { value: 'ASC', label: 'ASC' },
-                            { value: 'DESC', label: 'DESC' }
-                        ]}
-                        required
-                        id={`order-${i}`}
-                        label={i === 0 ? 'Order' : undefined}
-                        bind:value={attribute.order}
-                        placeholder="Select Order" />
+                    {#if selectedType === IndexType.Key}
+                        <InputNumber
+                            id={`length-${i}`}
+                            label={i === 0 ? 'Length' : undefined}
+                            placeholder="Enter Length"
+                            bind:value={attribute.length} />
+                    {/if}
                     <Button
                         icon
                         compact

src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte

@@ -39,6 +39,12 @@
                     id={`value-${selectedIndex.orders[i]}`}
                     value={selectedIndex.orders[i]}
                     readonly />
+                <InputText
+                    required
+                    label={i === 0 ? 'Length' : ''}
+                    id={`value-${selectedIndex.lengths[i]}`}
+                    value={selectedIndex.lengths[i]?.toString() ?? null}
+                    readonly />
             </Layout.Stack>
         {/each}
     {/if}