From b15fd6246d77dca98c7ac16c30e609e2f32f0510 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Thu, 12 Jun 2025 14:52:14 -0400 Subject: [PATCH 01/16] Flag for index lengths --- .env.example | 2 +- src/lib/flags.ts | 3 ++- .../indexes/createIndex.svelte | 5 ++++- .../indexes/overviewIndex.svelte | 18 ++++++++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index 0e8699fc9..bf090442b 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,5 @@ PUBLIC_CONSOLE_MODE=self-hosted -PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt +PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt,index-lengths PUBLIC_APPWRITE_MULTI_REGION=false PUBLIC_APPWRITE_ENDPOINT=http://localhost/v1 PUBLIC_STRIPE_KEY= diff --git a/src/lib/flags.ts b/src/lib/flags.ts index 3c00ee6dc..db2417b83 100644 --- a/src/lib/flags.ts +++ b/src/lib/flags.ts @@ -21,5 +21,6 @@ function isFlagEnabled(name: string) { export const flags = { showSites: isFlagEnabled('sites'), showCsvImport: isFlagEnabled('csv-import'), - showAttributeEncrypt: isFlagEnabled('attribute-encrypt') + showAttributeEncrypt: isFlagEnabled('attribute-encrypt'), + showIndexLengths: isFlagEnabled('index-lengths') }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index ea4b38c50..74359ef81 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -14,6 +14,7 @@ import { type Attributes, collection, indexes } from '../store'; import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import { flags } from '$lib/flags'; export let showCreateIndex = false; export let externalAttribute: Attributes = null; @@ -38,6 +39,8 @@ let attributeList = [{ value: '', order: '', length: null }]; + let showLengths = flags.showIndexLengths(page.data); + function generateIndexKey() { let indexKeys = $indexes.map((index) => index.key); @@ -149,7 +152,7 @@ placeholder="Select Order" /> - {#if selectedType === IndexType.Key} + {#if selectedType === IndexType.Key && showLengths} @@ -39,12 +43,14 @@ id={`value-${selectedIndex.orders[i]}`} value={selectedIndex.orders[i]} readonly /> - + {#if showLengths} + + {/if} {/each} {/if} From 523785ce540d9cc1a17d615a289cf1b58cf88865 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 14 Jun 2025 12:02:59 +0530 Subject: [PATCH 02/16] fix: relationship selection issues. --- .../document-[document]/+page.svelte | 3 +- .../attributes/relationship.svelte | 276 +++++++++++------- 2 files changed, 170 insertions(+), 109 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index 103f9a8b2..31db52abd 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -20,7 +20,6 @@ const databaseId = page.params.database; const collectionId = page.params.collection; const documentId = page.params.document; - const editing = true; function initWork() { const prohibitedKeys = [ @@ -124,7 +123,7 @@ {label} - + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte index af18757b5..e63977b1b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte @@ -1,24 +1,22 @@ {#if isRelationshipToMany(attribute)} -
- - - {label} - - {optionalText} - + + + + + {label} + + {optionalText} + + + + {#if showTopAddButton} + + {/if} - {#if editing || total === 0} - + + + + {#if showEmptyInput} + + { + if (!relatedList[0]) relatedList = ['']; + updateRelatedList(); + }} /> + + {/if} + + + {#if editing && hasItems} + {#each paginatedItems as _, paginatedIndex} + {@const actualIndex = offset + paginatedIndex} + + + {#if relatedList[actualIndex]} +
+ +
+ {/if} +
+ {/each} + {/if} + + + {#if !editing && hasItems} + {#each relatedList as item, i} + + +
+ +
+
+ {/each} + {/if} + + + {#if showInput} + + +
+ +
+
+ {/if} +
+ + {#if showBottomAddButton} + + + {/if}
-
    - {#if !editing && relatedList?.length} - {#each relatedList as item, i} - - - {/each} - {/if} - - {#if showInput} - !relatedList.includes(n.value))} - on:change={() => { - value = relatedList; - showInput = false; - }} /> - - {/if} - {#if paginatedItems && editing} - {#each paginatedItems as item, i} - - - {/each} - {/if} -
- {#if editing} -
-

Total results: {total}

- -
- {/if} - - {#if total > 0 && !editing} - - {/if} -
+ {:else} Date: Sat, 14 Jun 2025 12:38:04 +0530 Subject: [PATCH 03/16] fix: time display logic. --- .../database-[database]/collection-[collection]/table.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte index 5c5b947e5..b996fbdff 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -251,12 +251,13 @@ {/if} {:else} + {@const datetime = document[id]} {@const formatted = formatColumn(document[id])} {@const isDatetimeAttribute = attr.type === 'datetime'} {#if isDatetimeAttribute} - + Timestamp - {toLocaleDateTime(formatted.whole, true, 'UTC')} + {toLocaleDateTime(datetime, true)} {:else if isString(attr) && attr.encrypt && showEncrypt} - {:else} - - - - - - - {$createPlatform.name} ({$createPlatform.key}) - - + + {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + - - - {/if} - - - {#if isPlatformCreated} -
- - - 1. Clone the starter kit from GitHub using the terminal or Android - Studio. - - - -
- -
- - 2. Open the file and update the configuration - settings. - - -
- -
- - 3. Run the app on a connected device or emulator, then click the button to verify the setup.
-
- {/if} -
- +
+
+ {/if} + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal or Android Studio. + + + +
+ +
+ + 2. Open the file and update the configuration + settings. + + +
+ +
+ + 3. Run the app on a connected device or emulator, then click the button to verify the setup. +
+
+ {/if} + + diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 20a0f1c25..3690efb38 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -103,115 +103,119 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj -
- - - - {#each Object.entries(platforms) as [key, value]} - - {/each} - + + + + + + {#each Object.entries(platforms) as [key, value]} + + {/each} + - - {#if !isPlatformCreated} -
- - - + + {#if !isPlatformCreated} +
+ + + - - - - - - You can find your Bundle Identifier in the General tab for - your app's primary target in Xcode. - - - - - - - -
- {:else} - - - - - - - {$createPlatform.name} ({$createPlatform.key}) - + + + + + + You can find your Bundle Identifier in the General tab + for your app's primary target in Xcode. + + + - - - - {/if} - - {#if isPlatformCreated} -
- - - 1. Clone the starter kit from GitHub using the terminal or XCode. - - - -
- -
- - 2. Open the file and - update the configuration settings. - - -
- -
- - 3. Run the app on a connected device or simulator, then click the button to verify the setup. + submit + forceShowLoader + submissionLoader={isCreatingPlatform} + disabled={!platform || + !$createPlatform.name || + !$createPlatform.key || + isCreatingPlatform}> + Create platform + +
+
+ {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + + + + -
- {/if} -
- + {/if} +
+ + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal or XCode. + + + +
+ +
+ + 2. Open the file and update + the configuration settings. + + +
+ +
+ + 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+
+ {/if} +
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 8d0aa74df..32f44a13c 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -162,132 +162,136 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg -
- - - - {#each Object.entries(platforms) as [key, value]} - - {/each} - + + + + + + {#each Object.entries(platforms) as [key, value]} + + {/each} + - - {#if !isPlatformCreated} -
- - - - - - {#if platform === PlatformType.Flutterweb} + + {#if !isPlatformCreated} +
+ + - - - - {placeholder[platform].tooltip} - - - - {:else} - - - - - {placeholder[platform].tooltip} - - - - {/if} - + bind:value={$createPlatform.name} /> - - -
- {:else} - - - - - - - {$createPlatform.name} ({$createPlatform.key}) - + + {#if platform === PlatformType.Flutterweb} + + + + + {placeholder[platform].tooltip} + + + + {:else} + + + + + {placeholder[platform].tooltip} + + + + {/if} + + - - - {/if} - - - {#if isPlatformCreated} -
- - - 1. Clone the starter kit from GitHub using the terminal, Android Studio - or VSCode. - - - -
- -
- - 2. Open the file and update the configuration settings. - - -
- -
- - 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+ {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key ?? + $createPlatform.hostname}) + + + + -
- {/if} -
- + {/if} +
+ + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal, Android Studio or + VSCode. + + + +
+ +
+ + 2. Open the file + and update the configuration settings. + + +
+ +
+ + 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+
+ {/if} +
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index d8b01e0eb..ae2d7dbd4 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -130,115 +130,118 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para -
- - - - {#each Object.entries(platforms) as [key, value]} - - {/each} - - - - {#if !isPlatformCreated} -
- - - - - - - - - - {placeholder[platform].tooltip} - - - - - - - -
- {:else} - - - - - - - {$createPlatform.name} ({$createPlatform.key}) - - - - + + + + + + {#each Object.entries(platforms) as [key, value]} + + {/each} - {/if} - - {#if isPlatformCreated} -
- - - 1. Clone the starter kit from GitHub using the terminal or VSCode. - + + {#if !isPlatformCreated} +
+ + + - -
- -
+ + + + + + {placeholder[platform].tooltip} + + + +
- 2. Open the file and update the configuration settings. - - -
- -
- - 3. Run the app on a connected device or simulator, then click the button to verify the setup. + submit + forceShowLoader + submissionLoader={isCreatingPlatform} + disabled={!platform || + !$createPlatform.name || + !$createPlatform.key || + isCreatingPlatform}> + Create platform + +
+
+ {:else} + + + + + + + {$createPlatform.name} ({$createPlatform.key}) + + + + -
- {/if} -
- + {/if} +
+ + + + {#if isPlatformCreated} +
+ + + 1. Clone the starter kit from GitHub using the terminal or VSCode. + + + +
+ +
+ + 2. Open the file and + update the configuration settings. + + +
+ +
+ + 3. Run the app on a connected device or simulator, then click the button to verify the setup. +
+
+ {/if} +
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte index bb675c7a9..e598a595a 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte @@ -197,157 +197,151 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p resetPlatformStore(); }; }); + + $: console.log('Reactivity triggered'); -
- - - {#if !isPlatformCreated || isChangingFramework} -
- -
- {#each frameworks as framework} - - {/each} -
+ + + {#if !isPlatformCreated || isChangingFramework} + + +
+ +
+ {#each frameworks as framework} + + {/each} +
+ + {#if isChangingFramework} + + {/if} + +
+
+ {#if !isChangingFramework} +
+ + + + + The hostname that your website will use to interact with the + Appwrite APIs in production or development environments. No + protocol or port number required. + + +
- {#if isChangingFramework} - - {/if} + + {/if} +
+ + {:else} + + + + {selectedFramework.label} -
- {#if !isChangingFramework} -
- - - - - The hostname that your website will use to interact with the - Appwrite APIs in production or development environments. No - protocol or port number required. - - -
- - {/if} - {:else} - - - - {selectedFramework.label} - - - - {/if} + +
+ {/if} - - {#if isPlatformCreated && !isChangingFramework} -
- - - 1. Clone the starter kit from GitHub using the terminal or VSCode. - + + {#if isPlatformCreated && !isChangingFramework} +
+ + + 1. Clone the starter kit from GitHub using the terminal or VSCode. + - -
- -
- - {#if selectedFramework.key === 'angular'} - 2. Change - to reflect the values below: - {:else} - 2. Rename into and update the values. - {/if} - - -
- -
+ +
+ +
+ {#if selectedFramework.key === 'angular'} 3. Install project dependencies - - -
- -
- - 4. Run the app, then click the 2. Change button to verify the setup. - -
- -
-
-
- - - Demo app runs on http://localhost:{selectedFramework.portNumber} - - {/if} -
- + code="src/environments/environment.ts" /> + to reflect the values below: + {:else} + 2. Rename into and update the values. + {/if} + + +
+ +
+ + 3. Install project dependencies + + +
+ +
+ + 4. Run the app, then click the button + to verify the setup. + +
+ +
+ +
+ + + Demo app runs on http://localhost:{selectedFramework.portNumber} + + {/if} +
From 03811bdab654c2cf6e2b6c7688e7a58b00ccf961 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 14 Jun 2025 16:49:50 +0530 Subject: [PATCH 07/16] fix: don't confirm for exit if platform already created. --- .../overview/platforms/createAndroid.svelte | 2 +- .../overview/platforms/createApple.svelte | 2 +- .../overview/platforms/createFlutter.svelte | 2 +- .../overview/platforms/createReactNative.svelte | 2 +- .../overview/platforms/createWeb.svelte | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte index 8141929fe..59e98a08b 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte @@ -91,7 +91,7 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page. }); - + {#if !isPlatformCreated} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 3690efb38..8f342e1a2 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -102,7 +102,7 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj }); - +
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 32f44a13c..72d23f7c3 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -161,7 +161,7 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg }); - + diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index ae2d7dbd4..50d8904f6 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -129,7 +129,7 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para }); - + diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte index e598a595a..202afce46 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte @@ -201,7 +201,7 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p $: console.log('Reactivity triggered'); - + {#if !isPlatformCreated || isChangingFramework} From c97074bd7e27cbbb118d1353c6d3d6c3ee290e15 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 14 Jun 2025 17:00:36 +0530 Subject: [PATCH 08/16] fix: missing platform keys on details. --- .../[platform]/+page@project-[region]-[project].svelte | 2 +- .../overview/platforms/createFlutter.svelte | 4 ++-- .../overview/platforms/createWeb.svelte | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte index 09335b492..7f3984344 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte @@ -98,7 +98,7 @@
{$platform.name}
-

{$platform.hostname}

+

{$platform.hostname || $platform.key}

diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 72d23f7c3..ab916c8ac 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -250,8 +250,8 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg - {$createPlatform.name} ({$createPlatform.key ?? - $createPlatform.hostname}) + {$createPlatform.name} ({$createPlatform.hostname || + $createPlatform.key})
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte index 202afce46..87d799d0a 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte @@ -197,8 +197,6 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p resetPlatformStore(); }; }); - - $: console.log('Reactivity triggered'); From e931fadad62c32fb13d04ef2724c153b19dbc511 Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 14 Jun 2025 17:53:27 +0530 Subject: [PATCH 09/16] fix: wizard copies. --- .../overview/platforms/createAndroid.svelte | 4 ++-- .../overview/platforms/createApple.svelte | 3 ++- .../overview/platforms/createFlutter.svelte | 4 ++-- .../overview/platforms/createReactNative.svelte | 14 +++++++------- .../overview/platforms/createWeb.svelte | 9 ++++++--- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte index ac89f191a..f56d1fd7e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte @@ -160,8 +160,8 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.
- 1. Clone the starter kit from GitHub using the terminal or Android - Studio. + 1. If you're starting a new project, you can clone our starter kit from + GitHub using the terminal, VSCode or Android Studio. diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 20a0f1c25..f63c7702b 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -186,7 +186,8 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj
- 1. Clone the starter kit from GitHub using the terminal or XCode. + 1. If you're starting a new project, you can clone our starter kit from + GitHub using the terminal or XCode. diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 8d0aa74df..ef6b62a88 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -260,8 +260,8 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg
- 1. Clone the starter kit from GitHub using the terminal, Android Studio - or VSCode. + 1. If you're starting a new project, you can clone our starter kit from + GitHub using the terminal, VSCode or Android Studio. diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index d8b01e0eb..a5d019254 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -25,7 +25,6 @@ import ConnectionLine from './components/ConnectionLine.svelte'; import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; - import { isCloud } from '$lib/system'; let showExitModal = false; let isPlatformCreated = false; @@ -36,9 +35,7 @@ const gitCloneCode = '\ngit clone https://github.com/appwrite/starter-for-react-native\ncd starter-for-react-native\n'; - const updateConfigCode = isCloud - ? `const APPWRITE_PROJECT_ID = "${projectId}";` - : `const APPWRITE_PROJECT_ID = "${projectId}"; + const updateConfigCode = `const APPWRITE_PROJECT_ID = "${projectId}"; const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.params.project).client.config.endpoint}"; `; @@ -212,7 +209,8 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para
- 1. Clone the starter kit from GitHub using the terminal or VSCode. + 1. If you're starting a new project, you can clone our starter kit from + GitHub using the terminal or VSCode. @@ -221,9 +219,11 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para 2. Open the file 2. Add your Appwrite credentials to and update the configuration settings. + code=".env.example" /> then rename it to if needed.
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte index bb675c7a9..8a8096182 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte @@ -274,7 +274,8 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p
- 1. Clone the starter kit from GitHub using the terminal or VSCode. + 1. If you're starting a new project, you can clone our starter kit from + GitHub using the terminal or VSCode. @@ -293,9 +294,11 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p to reflect the values below: {:else} 2. Rename into 2. Add your Appwrite credentials to and update the values. + code=".env.example" /> then rename it to if needed. {/if} From 9aee747fd739219bf07201c9602f026f4827e17c Mon Sep 17 00:00:00 2001 From: Darshan Date: Sat, 14 Jun 2025 18:00:10 +0530 Subject: [PATCH 10/16] update: env vars. --- .../overview/platforms/createReactNative.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index a5d019254..0fadb5ff7 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -35,8 +35,8 @@ const gitCloneCode = '\ngit clone https://github.com/appwrite/starter-for-react-native\ncd starter-for-react-native\n'; - const updateConfigCode = `const APPWRITE_PROJECT_ID = "${projectId}"; -const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.params.project).client.config.endpoint}"; + const updateConfigCode = `const EXPO_PUBLIC_APPWRITE_PROJECT_ID = "${projectId}"; +const EXPO_PUBLIC_APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.project).client.config.endpoint}"; `; export let platform: PlatformType = PlatformType.Reactnativeandroid; From 9696bf59291b2592322ced7c21672e57cb1ecc86 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 16 Jun 2025 11:01:09 +0200 Subject: [PATCH 11/16] Removing await function to fix the combobox select options --- src/lib/components/git/repositories.svelte | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index b82781169..c30a07174 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -23,7 +23,7 @@ import { page } from '$app/state'; import Card from '../card.svelte'; import SkeletonRepoList from './skeletonRepoList.svelte'; - import { untrack } from 'svelte'; + import { onMount, untrack } from 'svelte'; let { action = $bindable('select'), @@ -46,6 +46,11 @@ let search = $state(''); let selectedInstallation = $state(null); let isLoadingRepositories = $state(null); + let installationsMap = $state(null); + + onMount(() => { + loadInstallations(); + }); async function loadInstallations() { if (installationList) { @@ -59,7 +64,7 @@ ) ); } - return installationList.installations; + installationsMap = installationList.installations; } else { const { installations } = await sdk .forProject(page.params.region, page.params.project) @@ -70,7 +75,7 @@ } installation.set(installations.find((entry) => entry.$id === selectedInstallation)); } - return installations; + installationsMap = installations; } } @@ -123,7 +128,7 @@ {#if hasInstallations} - {#await loadInstallations()} + {#if !installationsMap} - {:then installations} + {:else} { + ...installationsMap.map((entry) => { return { label: entry.organization, value: entry.$id @@ -160,7 +165,7 @@ } search = ''; installation.set( - installations.find((entry) => entry.$id === selectedInstallation) + installationsMap.find((entry) => entry.$id === selectedInstallation) ); isLoadingRepositories = true; @@ -174,7 +179,7 @@ bind:value={search} disabled={!search && !$repositories?.repositories?.length} /> - {/await} + {/if} {#if selectedInstallation} @@ -310,3 +315,4 @@ {:else} {/if} +hai hoi From 420d365165ed459a3d5af2c3118ebe5aa5157600 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 16 Jun 2025 11:02:31 +0200 Subject: [PATCH 12/16] Remove debug --- src/lib/components/git/repositories.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index c30a07174..39f260a99 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -315,4 +315,3 @@ {:else} {/if} -hai hoi From 9ce44ac27a6d9d272cf491f5ed33616aecc9285c Mon Sep 17 00:00:00 2001 From: ernstmul Date: Mon, 16 Jun 2025 14:05:55 +0200 Subject: [PATCH 13/16] Use charts data for sum labels --- .../settings/usage/[[invoice]]/+page.svelte | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte index 81ee6ada9..24b82ae7b 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte @@ -34,8 +34,14 @@ $: dbWrites = data.usage.databasesWrites; $: legendData = [ - { name: 'Reads', value: data.usage.databasesReadsTotal }, - { name: 'Writes', value: data.usage.databasesWritesTotal } + { + name: 'Reads', + value: data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0) + }, + { + name: 'Writes', + value: data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0) + } ]; const tier = data?.currentInvoice?.plan ?? $organization?.billingPlan; From fd47665311b81df229ed12d469483033741d9ed9 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Mon, 16 Jun 2025 11:35:03 -0400 Subject: [PATCH 14/16] Update publish --- .github/workflows/publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7073e19f1..137c750f7 100644 --- a/.github/workflows/publish.yml +++ b/.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,attribute-encrypt" + "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt,index-lengths" "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,attribute-encrypt" + "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt,index-lengths" "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,attribute-encrypt" + "PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt,index-lengths" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}" "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" From cc3936d1fd88db3178f221e90f8bf714cd50cca1 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Mon, 16 Jun 2025 11:35:25 -0400 Subject: [PATCH 15/16] Use const --- .../collection-[collection]/attributes/string.svelte | 2 +- .../collection-[collection]/indexes/createIndex.svelte | 2 +- .../collection-[collection]/indexes/overviewIndex.svelte | 2 +- .../database-[database]/collection-[collection]/table.svelte | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index 3b4a60eb4..aff1747df 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -63,7 +63,7 @@ let savedDefault = data.default; - let showEncrypt = flags.showAttributeEncrypt(page.data); + const showEncrypt = flags.showAttributeEncrypt(page.data); function handleDefaultState(hideDefault: boolean) { if (hideDefault) { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index 74359ef81..1d6858eac 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -39,7 +39,7 @@ let attributeList = [{ value: '', order: '', length: null }]; - let showLengths = flags.showIndexLengths(page.data); + const showLengths = flags.showIndexLengths(page.data); function generateIndexKey() { let indexKeys = $indexes.map((index) => index.key); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte index c4c9552bf..f7318b6ea 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte @@ -9,7 +9,7 @@ export let showOverview = false; export let selectedIndex: Models.Index = null; - let showLengths = flags.showIndexLengths(page.data); + const showLengths = flags.showIndexLengths(page.data); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte index 5c5b947e5..432ce3e27 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -169,7 +169,7 @@ let checked = false; - let showEncrypt = flags.showAttributeEncrypt(data); + const showEncrypt = flags.showAttributeEncrypt(data); Date: Mon, 16 Jun 2025 16:41:28 -0700 Subject: [PATCH 16/16] fix: prevent disappearing documents table when switching collections When switching collections, the $attributes store doesn't update right away so $attributes is for the old collection, but $columns is for the new collection so attr ends up being undefined leading to the error: TypeError: Cannot read properties of undefined (reading 'type') Checking attr first prevents the exception from occuring, giving enough time for $attributes to update and the table to render correctly. --- .../collection-[collection]/table.svelte | 150 +++++++++--------- 1 file changed, 76 insertions(+), 74 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte index d85591a86..42bccd017 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -205,86 +205,88 @@ {#each $columns as { id } (id)} {@const attr = $attributes.find((n) => n.key === id)} - - {#if isRelationship(attr)} - {@const args = displayNames?.[attr.relatedCollection] ?? ['$id']} - {#if !isRelationshipToMany(attr)} - {#if document[id]} - {@const related = document[id]} - { - e.preventDefault(); - e.stopPropagation(); - goto( - `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}` - ); - }}> - {#each args as arg, i} - {#if arg !== undefined} - {#if i} -  | + {#if attr} + + {#if isRelationship(attr)} + {@const args = displayNames?.[attr.relatedCollection] ?? ['$id']} + {#if !isRelationshipToMany(attr)} + {#if document[id]} + {@const related = document[id]} + { + e.preventDefault(); + e.stopPropagation(); + goto( + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}` + ); + }}> + {#each args as arg, i} + {#if arg !== undefined} + {#if i} +  | + {/if} + + {related?.[arg]} + {/if} - - {related?.[arg]} - - {/if} - {/each} - + {/each} + + {:else} + n/a + {/if} {:else} - n/a + {@const itemsNum = document[id]?.length} + { + e.stopPropagation(); + e.preventDefault(); + relationshipData = document[id]; + showRelationships = true; + selectedRelationship = attr; + }}> + Items + {/if} {:else} - {@const itemsNum = document[id]?.length} - { - e.stopPropagation(); - e.preventDefault(); - relationshipData = document[id]; - showRelationships = true; - selectedRelationship = attr; - }}> - Items - - {/if} - {:else} - {@const datetime = document[id]} - {@const formatted = formatColumn(document[id])} - {@const isDatetimeAttribute = attr.type === 'datetime'} - {#if isDatetimeAttribute} - - Timestamp - {toLocaleDateTime(datetime, true)} - - {:else if isString(attr) && attr.encrypt && showEncrypt} - - {:else if formatted.truncated} - + {@const datetime = document[id]} + {@const formatted = formatColumn(document[id])} + {@const isDatetimeAttribute = attr.type === 'datetime'} + {#if isDatetimeAttribute} + + Timestamp + {toLocaleDateTime(datetime, true)} + + {:else if isString(attr) && attr.encrypt && showEncrypt} + + {:else if formatted.truncated} + + {formatted.value} + + {#if showing} + {formatted.whole} + {/if} + + + {:else} {formatted.value} - - {#if showing} - {formatted.whole} - {/if} - - - {:else} - {formatted.value} + {/if} {/if} - {/if} - + + {/if} {/each}