From 1c76b6d19ccadc8a2d58030b5f15c298a1e76a59 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Tue, 20 Aug 2024 12:44:35 +0900 Subject: [PATCH 1/7] Continue trying to implement renaming attributes --- package-lock.json | 10 +- package.json | 2 +- .../attributes/boolean.svelte | 7 +- .../attributes/datetime.svelte | 6 +- .../attributes/edit.svelte | 9 +- .../attributes/email.svelte | 6 +- .../attributes/enum.svelte | 6 +- .../attributes/float.svelte | 6 +- .../attributes/integer.svelte | 6 +- .../attributes/ip.svelte | 6 +- .../attributes/relationship.svelte | 6 +- .../attributes/store.ts | 2 +- .../attributes/string.svelte | 8 +- .../attributes/url.svelte | 6 +- .../database-[database]/string.svelte | 106 ++++++++++++++++++ 15 files changed, 161 insertions(+), 31 deletions(-) create mode 100644 src/routes/console/project-[project]/databases/database-[database]/string.svelte diff --git a/package-lock.json b/package-lock.json index 650428e1e..8a193822e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@appwrite/console", "dependencies": { - "@appwrite.io/console": "^0.6.2", + "@appwrite.io/console": "npm:bradley-console@0.6.7", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", @@ -149,9 +149,11 @@ "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==" }, "node_modules/@appwrite.io/console": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.2.tgz", - "integrity": "sha512-3qYknuFwhvTN2GnPB8G1w5DgxfVorGtfj4uuEaXbTmMUmjA8fHaW5VkJriuUxCi6/TpxDxqV/hhEkdoXL+5H4w==" + "name": "bradley-console", + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/bradley-console/-/bradley-console-0.6.7.tgz", + "integrity": "sha512-HCaaWY2LdQ6XrUCXeF2XgMR9voCmhe/VEsJmKkLJT/uXy6H97rPkAnktEnQwHdPkIK3ZGeIGQJjKf/DgypNubA==", + "license": "BSD-3-Clause" }, "node_modules/@appwrite.io/pink": { "version": "0.25.0", diff --git a/package.json b/package.json index e566dcf14..285df73df 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "^0.6.2", + "@appwrite.io/console": "npm:bradley-console@0.6.7", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index 0c007dd29..4f7fa4ebc 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -20,15 +20,16 @@ export async function updateBoolean( databaseId: string, collectionId: string, - - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateBooleanAttribute( databaseId, collectionId, data.key, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte index 6fc0798a6..a16869433 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte @@ -21,14 +21,16 @@ export async function updateDatetime( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateDatetimeAttribute( databaseId, collectionId, data.key, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte index a59723d75..2ecde6f3a 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte @@ -16,6 +16,7 @@ const databaseId = $page.params.database; const collectionId = $page.params.collection; + let originalKey = ''; let error: string; let currentAttr: Attributes; @@ -31,8 +32,11 @@ }) as Option; async function submit() { + console.log(originalKey); + try { - await option.update(databaseId, collectionId, selectedAttribute); + await option.update(databaseId, collectionId, selectedAttribute, originalKey); + originalKey = selectedAttribute.key; await invalidate(Dependencies.COLLECTION); if (!$page.url.pathname.includes('attributes')) { await goto( @@ -76,8 +80,7 @@ label="Attribute Key" placeholder="Enter Key" bind:value={selectedAttribute.key} - autofocus - readonly /> + autofocus /> {/if} {#if option} + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateEmailAttribute( databaseId, collectionId, data.key, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte index ceaf4488e..2bb0da7de 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte @@ -22,7 +22,8 @@ export async function updateEnum( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateEnumAttribute( databaseId, @@ -30,7 +31,8 @@ data.key, data.elements, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte index d92ce2d69..f23957e80 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte @@ -23,7 +23,8 @@ export async function updateFloat( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateFloatAttribute( databaseId, @@ -32,7 +33,8 @@ data.required, data.min, data.max, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte index bc4231dc4..4642ba40e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte @@ -23,7 +23,8 @@ export async function updateInteger( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateIntegerAttribute( databaseId, @@ -32,7 +33,8 @@ data.required, data.min, data.max, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte index 3af418ebf..1b5d07994 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte @@ -20,14 +20,16 @@ export async function updateIp( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateIpAttribute( databaseId, collectionId, data.key, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index 59150c3a7..341eb5a8e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -29,7 +29,8 @@ export async function updateRelationship( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { if (!isValueOfStringEnum(RelationMutate, data.onDelete)) { throw new Error(`Invalid on delete: ${data.onDelete}`); @@ -38,7 +39,8 @@ databaseId, collectionId, data.key, - data.onDelete + data.onDelete, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts index 3c3106fc1..f84794c37 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts @@ -32,7 +32,7 @@ export type Option = { key: string, data: Partial ) => Promise; - update: (databaseId: string, collectionId: string, data: Partial) => Promise; + update: (databaseId: string, collectionId: string, data: Partial, originalKey: string) => Promise; format?: 'email' | 'ip' | 'url' | 'enum'; icon: string; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index 37d1e2e2f..a08cbbbaa 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -21,14 +21,16 @@ export async function updateString( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateStringAttribute( databaseId, collectionId, - data.key, + originalKey, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte index e2c6755c6..aae66f37d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte @@ -21,14 +21,16 @@ export async function updateUrl( databaseId: string, collectionId: string, - data: Partial + data: Partial, + originalKey?: string ) { await sdk.forProject.databases.updateUrlAttribute( databaseId, collectionId, data.key, data.required, - data.default + data.default, + data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/string.svelte new file mode 100644 index 000000000..a08cbbbaa --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/string.svelte @@ -0,0 +1,106 @@ + + + + + +{#if data.size >= 50} + +{:else} + +{/if} + + Indicate whether this is a required attribute + + + Indicate whether this attribute should act as an array, with the default value set as an empty + array. + From 3f13565cf59d13a8f9aad83c7bb0a9cc526ef7fd Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Thu, 22 Aug 2024 17:17:25 +0900 Subject: [PATCH 2/7] Get relationship attribute renaming working --- .../collection-[collection]/attributes/edit.svelte | 4 +--- .../collection-[collection]/attributes/relationship.svelte | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte index 2ecde6f3a..4dbf5da9d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte @@ -32,11 +32,8 @@ }) as Option; async function submit() { - console.log(originalKey); - try { await option.update(databaseId, collectionId, selectedAttribute, originalKey); - originalKey = selectedAttribute.key; await invalidate(Dependencies.COLLECTION); if (!$page.url.pathname.includes('attributes')) { await goto( @@ -57,6 +54,7 @@ $: if (showEdit) { currentAttr ??= { ...selectedAttribute }; + originalKey = currentAttr.key; error = null; } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index 341eb5a8e..337252c1d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -35,10 +35,11 @@ if (!isValueOfStringEnum(RelationMutate, data.onDelete)) { throw new Error(`Invalid on delete: ${data.onDelete}`); } + await sdk.forProject.databases.updateRelationshipAttribute( databaseId, collectionId, - data.key, + originalKey, data.onDelete, data.key !== originalKey ? data.key : undefined, ); @@ -189,7 +190,6 @@ placeholder="Enter Key" bind:value={data.key} autofocus - readonly={editing} required />
From 0b5dded8bf6fac3dda3ffe6ec766888a9244d654 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Fri, 30 Aug 2024 21:19:36 +0900 Subject: [PATCH 3/7] Make string attribute size editable --- package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- .../attributes/string.svelte | 7 +++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 76e3f287e..10b9e68ec 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "1.0.1", + "@appwrite.io/console": "npm:bradley-console@1.0.1", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a8d775f6..1b6c406db 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: 1.0.1 - version: 1.0.1 + specifier: npm:bradley-console@1.0.1 + version: bradley-console@1.0.1 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -193,9 +193,6 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@1.0.1': - resolution: {integrity: sha512-9U7jG0XnRcxDhuma308z8XD/BF9cK6OpukxN87Tk0N/QGsNJBbH1it0LLCt6X7rPzNpOALT0LLTeMa0VEsQBow==} - '@appwrite.io/pink-icons@0.25.0': resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==} @@ -1469,6 +1466,9 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} + bradley-console@1.0.1: + resolution: {integrity: sha512-cdX5xkUg4rnIjdEojkONddY1o2bXevBuHk4mzy6qzxiFlnfxZdEmO+oHVo2JKeOH8H8uq6kjrt/Xz3LH60Zdbg==} + browserslist@4.23.3: resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -3691,8 +3691,6 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@1.0.1': {} - '@appwrite.io/pink-icons@0.25.0': {} '@appwrite.io/pink@0.25.0': @@ -5254,6 +5252,8 @@ snapshots: dependencies: fill-range: 7.1.1 + bradley-console@1.0.1: {} + browserslist@4.23.3: dependencies: caniuse-lite: 1.0.30001651 diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index 37d1e2e2f..056ffb48b 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -28,7 +28,8 @@ collectionId, data.key, data.required, - data.default + data.default, + data.size ); } @@ -73,9 +74,7 @@ id="size" label="Size" placeholder="Enter size" - bind:value={data.size} - required={!editing} - readonly={editing} /> + bind:value={data.size} /> {#if data.size >= 50} Date: Thu, 5 Sep 2024 16:01:46 +1200 Subject: [PATCH 4/7] Merge fixes --- .../collection-[collection]/attributes/string.svelte | 2 +- .../databases/database-[database]/string.svelte | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index d5b6184f5..16e3484f1 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -30,7 +30,7 @@ originalKey, data.required, data.default, - data.size + data.size, data.key !== originalKey ? data.key : undefined, ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte index a08cbbbaa..d2d1f84b7 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte @@ -30,6 +30,7 @@ originalKey, data.required, data.default, + data.size, data.key !== originalKey ? data.key : undefined, ); } From 92e8a323138ca745b96840949898678bfe83f55d Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Thu, 5 Sep 2024 16:02:39 +1200 Subject: [PATCH 5/7] Lint --- .../collection-[collection]/attributes/boolean.svelte | 2 +- .../collection-[collection]/attributes/datetime.svelte | 2 +- .../collection-[collection]/attributes/email.svelte | 2 +- .../collection-[collection]/attributes/enum.svelte | 2 +- .../collection-[collection]/attributes/float.svelte | 2 +- .../collection-[collection]/attributes/integer.svelte | 2 +- .../collection-[collection]/attributes/ip.svelte | 2 +- .../attributes/relationship.svelte | 2 +- .../collection-[collection]/attributes/store.ts | 7 ++++++- .../collection-[collection]/attributes/string.svelte | 8 ++------ .../collection-[collection]/attributes/url.svelte | 2 +- .../databases/database-[database]/string.svelte | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index 4f7fa4ebc..34cf6fae1 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -29,7 +29,7 @@ data.key, data.required, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte index a16869433..a2cd24a12 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte @@ -30,7 +30,7 @@ data.key, data.required, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte index a67cd309a..d7a606fd5 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte @@ -31,7 +31,7 @@ data.key, data.required, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte index 2bb0da7de..a8fce3f17 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte @@ -32,7 +32,7 @@ data.elements, data.required, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte index f23957e80..065ac2ecb 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte @@ -34,7 +34,7 @@ data.min, data.max, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte index 4642ba40e..532a60222 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte @@ -34,7 +34,7 @@ data.min, data.max, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte index 1b5d07994..115deac83 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte @@ -29,7 +29,7 @@ data.key, data.required, data.default, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte index 337252c1d..173c35d5a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte @@ -41,7 +41,7 @@ collectionId, originalKey, data.onDelete, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts index f84794c37..05fa8b81c 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts @@ -32,7 +32,12 @@ export type Option = { key: string, data: Partial ) => Promise; - update: (databaseId: string, collectionId: string, data: Partial, originalKey: string) => Promise; + update: ( + databaseId: string, + collectionId: string, + data: Partial, + originalKey: string + ) => Promise; format?: 'email' | 'ip' | 'url' | 'enum'; icon: string; }; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index 16e3484f1..3e6e2f97c 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -31,7 +31,7 @@ data.required, data.default, data.size, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } @@ -72,11 +72,7 @@ $: handleDefaultState($required || $array); - + {#if data.size >= 50} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte index d2d1f84b7..4b09b5384 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte @@ -31,7 +31,7 @@ data.required, data.default, data.size, - data.key !== originalKey ? data.key : undefined, + data.key !== originalKey ? data.key : undefined ); } From 06509e23cc3d2aeed33160675f42bf0dc9048c7d Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 6 Sep 2024 12:39:43 +0200 Subject: [PATCH 6/7] fix: edit attribute state --- .../collection-[collection]/attributes/edit.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte index f38616cc0..a42c7d890 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte @@ -56,6 +56,8 @@ currentAttr ??= { ...selectedAttribute }; originalKey = currentAttr.key; error = null; + } else { + currentAttr = null; } From 562b717db25c7a6084bdb587fb8fdacbc76965db Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Mon, 9 Sep 2024 19:16:48 +1200 Subject: [PATCH 7/7] Update SDK --- package-lock.json | 8 ++++---- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f98ca048a..a91385e60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "@appwrite/console", "dependencies": { - "@appwrite.io/console": "1.1.0-rc.3", + "@appwrite.io/console": "1.1.0", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", @@ -149,9 +149,9 @@ "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==" }, "node_modules/@appwrite.io/console": { - "version": "1.1.0-rc.3", - "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-1.1.0-rc.3.tgz", - "integrity": "sha512-FGd3HVb2OVQ/n3NiF5aWPfgUmLg3hoF5xYwzhlHZGPFxJxyL92s6C06sTTg6CkqACZf4MHJJ68l6ivo2fmfhJA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-1.1.0.tgz", + "integrity": "sha512-jWg+NW9RJxh2pnE/14xwpXBcChiSLYBnG3Jkr5RnMJ1mH7BYmbAuLTyxFn3UFy5llB7jVq8pHNYGqA93ZoEMsQ==" }, "node_modules/@appwrite.io/pink": { "version": "0.25.0", diff --git a/package.json b/package.json index bffbefa0c..a1e12394c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "1.1.0-rc.3", + "@appwrite.io/console": "1.1.0", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ddec2676f..64f87bea5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: 1.1.0-rc.3 - version: 1.1.0-rc.3 + specifier: 1.1.0 + version: 1.1.0 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -193,8 +193,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@1.1.0-rc.3': - resolution: {integrity: sha512-FGd3HVb2OVQ/n3NiF5aWPfgUmLg3hoF5xYwzhlHZGPFxJxyL92s6C06sTTg6CkqACZf4MHJJ68l6ivo2fmfhJA==} + '@appwrite.io/console@1.1.0': + resolution: {integrity: sha512-jWg+NW9RJxh2pnE/14xwpXBcChiSLYBnG3Jkr5RnMJ1mH7BYmbAuLTyxFn3UFy5llB7jVq8pHNYGqA93ZoEMsQ==} '@appwrite.io/pink-icons@0.25.0': resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==} @@ -3697,7 +3697,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@1.1.0-rc.3': {} + '@appwrite.io/console@1.1.0': {} '@appwrite.io/pink-icons@0.25.0': {}