From 259dd91f161893643f620c2c7a2a739f9dd2bf41 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 11 Sep 2025 17:02:57 +0530 Subject: [PATCH 01/10] hotfix: prefs. --- src/lib/stores/preferences.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index 4e3e3224f..36419be28 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -220,7 +220,8 @@ function createPreferences() { loadTeamPrefs: loadTeamPreferences, getDisplayNames: (tableId: string) => { - return teamPreferences?.displayNames?.[tableId] ?? ['$id']; + const names = teamPreferences?.displayNames?.[tableId]; + return Array.isArray(names) && names.length > 0 ? names : ['$id']; }, setDisplayNames: async ( From e518cf749d5b668999bdffc144a3b5910d368cfa Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 11 Sep 2025 20:03:22 +0530 Subject: [PATCH 02/10] feat: combo-box on relationship searching. --- package.json | 4 +- pnpm-lock.yaml | 20 +++--- .../rows/columns/types/relationship.svelte | 67 ++++++++++++++++++- 3 files changed, 76 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index bf15dfbe5..ebc68859c 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "@ai-sdk/svelte": "^1.1.24", "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@6031134", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d8326d0", + "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d8326d0", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 088515c16..34a2258a0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,14 +18,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d8326d0 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d8326d0(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92 + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92(svelte@5.25.3) '@appwrite.io/pink-legacy': specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d8326d0 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d8326d0(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92 + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92(svelte@5.25.3) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.0 @@ -269,8 +269,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d8326d0': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d8326d0} + '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92} version: 2.0.0-RC.1 peerDependencies: svelte: ^4.0.0 @@ -284,8 +284,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d8326d0': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d8326d0} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3706,7 +3706,7 @@ snapshots: dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@d8326d0(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3719,7 +3719,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@d8326d0(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92(svelte@5.25.3)': dependencies: '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) '@floating-ui/dom': 1.6.13 diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte index 47cecb98c..fb829633b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte @@ -7,7 +7,8 @@ import { type ComponentType, onMount } from 'svelte'; import { isRelationshipToMany } from '../../store'; import { IconPlus, IconRelationship, IconX } from '@appwrite.io/pink-icons-svelte'; - import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { Input, Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { debounce } from '$lib/helpers/debounce'; type SelectOption = { label: string; @@ -42,6 +43,8 @@ let limit = 10; let offset = 0; + let searchNoResultsOption = undefined; + onMount(async () => { if (isRelationshipToMany(column)) { if (Array.isArray(value)) { @@ -80,7 +83,22 @@ return rows; } - function getAvailableOptions(excludeIndex?: number) { + async function searchRows(search: string = null) { + if (!search) return; + + const displayNames = preferences.getDisplayNames(column.relatedTable); + + const queries = []; + displayNames.forEach((name) => queries.push(Query.contains(name, search))); + + return await sdk.forProject(page.params.region, page.params.project).tablesDB.listRows({ + databaseId, + tableId: column.relatedTable, + queries + }); + } + + function getAvailableOptions(excludeIndex?: number): SelectOption[] { return options?.filter((option) => { const otherItems = excludeIndex !== undefined @@ -166,6 +184,44 @@ return baseOptions; } + // original list + let originalListPreSearch: Models.RowList; + + const debouncedSearch = debounce(async () => { + const availableOptions = getAvailableOptions(); + const includesItem = availableOptions + .filter((opt) => { + const label = String(opt.label ?? '').toLowerCase(); + const value = String(opt.value ?? '').toLowerCase(); + return ( + label.includes(newItemValue.toLowerCase()) || + value.includes(newItemValue.toLowerCase()) + ); + }) + .filter(Boolean); + + if (!includesItem.length) { + originalListPreSearch = rowList; + + try { + searchNoResultsOption = { + disabled: true, + message: 'Searching...' + }; + + const searchResults = await searchRows(newItemValue); + if (searchResults) { + rowList = searchResults; + } + } finally { + searchNoResultsOption = undefined; + } + } else { + // reset + rowList = originalListPreSearch; + } + }, 500); + // Reactive statements $: getRows(search).then((res) => (rowList = res)); @@ -193,6 +249,10 @@ $: if (limit && !isRelationshipToMany(column) && limited) { label = undefined; } + + $: if (newItemValue && newItemValue !== '') { + debouncedSearch(); + } {#if isRelationshipToMany(column)} @@ -298,13 +358,14 @@ {#if showInput} -
From da161c2f788b6728bedb40de389f99f97ec211e9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:40:23 +0000 Subject: [PATCH 03/10] Initial plan From df4e02d49263f5dc6b837301067b20397cd75deb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:43:20 +0000 Subject: [PATCH 04/10] Initial plan From f15062abd25d8dad79f5c9811e08bc67b02d9d9e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:49:41 +0000 Subject: [PATCH 05/10] Fix: Truncate firstName/firstname fields to 40 characters max in all modals and feedback Co-authored-by: stnguyen90 <1477010+stnguyen90@users.noreply.github.com> --- src/lib/stores/feedback.ts | 2 +- .../organization-[organization]/settings/BAAModal.svelte | 2 +- .../organization-[organization]/settings/Soc2Modal.svelte | 2 +- src/routes/(console)/supportWizard.svelte | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts index 30dc99687..8b140c0ca 100644 --- a/src/lib/stores/feedback.ts +++ b/src/lib/stores/feedback.ts @@ -144,7 +144,7 @@ function createFeedbackStore() { message, email, customFields, - firstname: name || 'Unknown', + firstname: (name || 'Unknown').slice(0, 40), metaFields: { source: get(feedback).source, orgId, diff --git a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte index bcaef823b..a6835a9c0 100644 --- a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte +++ b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte @@ -64,7 +64,7 @@ body: JSON.stringify({ subject: 'BAA Request', email: email, - firstName: $user?.name ?? '', + firstName: ($user?.name ?? '').slice(0, 40), message: `BAA request for ${$organization?.name ?? ''} (${$organization?.$id ?? ''})`, tags: ['cloud'], customFields: [ diff --git a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte index 1ec321e23..bce0634a3 100644 --- a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte +++ b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte @@ -65,7 +65,7 @@ body: JSON.stringify({ subject: 'SOC-2 Request', email: email, - firstName: $user?.name ?? '', + firstName: ($user?.name ?? '').slice(0, 40), message: `SOC-2 request for ${$organization?.name ?? ''} (${$organization?.$id ?? ''})`, tags: ['cloud'], customFields: [ diff --git a/src/routes/(console)/supportWizard.svelte b/src/routes/(console)/supportWizard.svelte index b6a177eb7..803cb1038 100644 --- a/src/routes/(console)/supportWizard.svelte +++ b/src/routes/(console)/supportWizard.svelte @@ -49,7 +49,7 @@ body: JSON.stringify({ email: $user.email, subject: $supportData.subject, - firstName: $user?.name || 'Unknown', + firstName: ($user?.name || 'Unknown').slice(0, 40), message: $supportData.message, tags: ['cloud'], customFields: [ From be3e178e27ed409c3a1247b4e87fabe04d2a6a9d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:49:54 +0000 Subject: [PATCH 06/10] Add character limits to support wizard: subject (128) and message (4096) Co-authored-by: stnguyen90 <1477010+stnguyen90@users.noreply.github.com> --- src/routes/(console)/supportWizard.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/supportWizard.svelte b/src/routes/(console)/supportWizard.svelte index b6a177eb7..a3531d06e 100644 --- a/src/routes/(console)/supportWizard.svelte +++ b/src/routes/(console)/supportWizard.svelte @@ -136,12 +136,14 @@ label="Subject" bind:value={$supportData.subject} placeholder="What do you need help with?" + maxlength={128} required /> + label="Tell us a bit more" + maxlength={4096} /> Date: Thu, 11 Sep 2025 14:50:28 -0700 Subject: [PATCH 07/10] fix: update Git installation link in updateInstallations.svelte --- .../settings/updateInstallations.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte index 6bc42ead2..034d9a5c8 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte @@ -171,7 +171,10 @@ Before installing Git in a locally hosted Appwrite project, ensure your environment variables are configured. - + {:else} From 2d9ec3a0eaf85f8d435d37a727f8aeebfb3e62af Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 12 Sep 2025 11:17:03 +0530 Subject: [PATCH 08/10] feat: combo-box on relationship searching on one type rels. --- package.json | 4 +- pnpm-lock.yaml | 20 ++--- .../table-[table]/layout/emptySheet.svelte | 1 - .../rows/columns/types/relationship.svelte | 79 ++++++++++++------- 4 files changed, 62 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index ebc68859c..0a0d37e97 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "@ai-sdk/svelte": "^1.1.24", "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@6031134", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92", + "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@952b37e", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@952b37e", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34a2258a0..ee369f6c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,14 +18,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@952b37e + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@952b37e(svelte@5.25.3) '@appwrite.io/pink-legacy': specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@952b37e + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@952b37e(svelte@5.25.3) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.0 @@ -269,8 +269,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92} + '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@952b37e': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@952b37e} version: 2.0.0-RC.1 peerDependencies: svelte: ^4.0.0 @@ -284,8 +284,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@952b37e': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@952b37e} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3706,7 +3706,7 @@ snapshots: dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@0fefd92(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@952b37e(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3719,7 +3719,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@0fefd92(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@952b37e(svelte@5.25.3)': dependencies: '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3) '@floating-ui/dom': 1.6.13 diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte index 7b7f1c7da..2f7db8290 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte @@ -230,7 +230,6 @@ {#if !$spreadsheetLoading} -
cache the rows + * 2. user makes a search -> api call -> not results found + * 3. user clears the search -> this variable sets the rowsList back! + * + * `#3` allows us to not make a call to getRows again, saves time and bandwidth! + */ + let cachedRowsCopyList: Models.RowList; + onMount(async () => { if (isRelationshipToMany(column)) { if (Array.isArray(value)) { @@ -60,24 +74,22 @@ } }); - async function getRows(search: string = null) { + async function getRows() { loadingRelationships = true; // already includes the `$id`, dw! const displayNames = preferences.getDisplayNames(column.relatedTable); - const queries = search - ? [Query.select(displayNames), Query.startsWith('$id', search), Query.orderDesc('')] - : [Query.select(displayNames)]; - const rows = await sdk .forProject(page.params.region, page.params.project) .tablesDB.listRows({ databaseId, tableId: column.relatedTable, - queries + // limit `5` as `25` would look too much on sheet! + queries: [Query.select(displayNames), Query.limit(5)] }); + cachedRowsCopyList = rows; loadingRelationships = false; return rows; @@ -89,7 +101,7 @@ const displayNames = preferences.getDisplayNames(column.relatedTable); const queries = []; - displayNames.forEach((name) => queries.push(Query.contains(name, search))); + displayNames.forEach((name) => queries.push(Query.contains(name, [search]))); return await sdk.forProject(page.params.region, page.params.project).tablesDB.listRows({ databaseId, @@ -127,13 +139,13 @@ if (newItemValue) { relatedList = [...relatedList, newItemValue]; value = relatedList; - newItemValue = ''; + newItemValue = null; showInput = false; } } function cancelAddItem() { - newItemValue = ''; + newItemValue = null; showInput = false; } @@ -184,46 +196,42 @@ return baseOptions; } - // original list - let originalListPreSearch: Models.RowList; - - const debouncedSearch = debounce(async () => { + const debouncedSearch = debounce(async (searchTerm: string) => { const availableOptions = getAvailableOptions(); const includesItem = availableOptions .filter((opt) => { const label = String(opt.label ?? '').toLowerCase(); const value = String(opt.value ?? '').toLowerCase(); return ( - label.includes(newItemValue.toLowerCase()) || - value.includes(newItemValue.toLowerCase()) + label.includes(searchTerm.toLowerCase()) || + value.includes(searchTerm.toLowerCase()) ); }) .filter(Boolean); if (!includesItem.length) { - originalListPreSearch = rowList; - try { searchNoResultsOption = { disabled: true, message: 'Searching...' }; - const searchResults = await searchRows(newItemValue); + const searchResults = await searchRows(searchTerm); if (searchResults) { rowList = searchResults; } } finally { searchNoResultsOption = undefined; } - } else { - // reset - rowList = originalListPreSearch; + } else if (cachedRowsCopyList) { + rowList = cachedRowsCopyList; } }, 500); // Reactive statements - $: getRows(search).then((res) => (rowList = res)); + $: if (!newItemValue && !cachedRowsCopyList) { + getRows().then((response) => (rowList = response)); + } $: paginatedItems = editing ? relatedList @@ -250,8 +258,11 @@ label = undefined; } - $: if (newItemValue && newItemValue !== '') { - debouncedSearch(); + $: if (newItemValue) { + debouncedSearch(newItemValue); + } else if (!newItemValue && cachedRowsCopyList) { + rowList = cachedRowsCopyList; + searchNoResultsOption = undefined; } @@ -365,6 +376,7 @@ bind:value={newItemValue} options={getAvailableOptions()} on:change={addNewItem} + on:select={(item) => console.log(item)} noResultsOption={searchNoResultsOption} leadingIcon={!limited ? IconRelationship : undefined} /> @@ -389,20 +401,29 @@ {:else} - { - if (singleRel === null) { + if (newItemValue === null) { value = null; + singleRel = null; } else { - value = rowList.rows.find((row) => row.$id === singleRel); + const selectedRow = rowList.rows.find((row) => row.$id === newItemValue); + + if (selectedRow) { + value = selectedRow; + singleRel = newItemValue; + } } + + newItemValue = null; }} leadingIcon={!limited ? IconRelationship : undefined} /> From c699af355695c7b2091f88b9b914a5cf61e74872 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 12 Sep 2025 11:24:13 +0530 Subject: [PATCH 09/10] remove: leftover. --- .../table-[table]/rows/columns/types/relationship.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte index 5ff149ba0..a40747bf6 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte @@ -86,7 +86,7 @@ databaseId, tableId: column.relatedTable, // limit `5` as `25` would look too much on sheet! - queries: [Query.select(displayNames), Query.limit(5)] + queries: [Query.select(displayNames), Query.limit(2)] }); cachedRowsCopyList = rows; @@ -376,7 +376,6 @@ bind:value={newItemValue} options={getAvailableOptions()} on:change={addNewItem} - on:select={(item) => console.log(item)} noResultsOption={searchNoResultsOption} leadingIcon={!limited ? IconRelationship : undefined} /> From c0ffa08924604ee4d4afc2e89844f462aefa9fa7 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 12 Sep 2025 11:47:47 +0530 Subject: [PATCH 10/10] fix: shortcut. --- .../databases/database-[database]/+layout.svelte | 8 ++++---- .../databases/database-[database]/+page.svelte | 10 +++++----- .../databases/database-[database]/store.ts | 2 +- .../databases/database-[database]/subNavigation.svelte | 4 ++-- .../database-[database]/table-[table]/+layout.svelte | 8 ++------ 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte index ff44bbee8..c4b66e957 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte @@ -12,7 +12,7 @@ import { Dependencies } from '$lib/constants'; import type { Models } from '@appwrite.io/console'; import CreateTable from './createTable.svelte'; - import { showCreate } from './store'; + import { showCreateTable } from './store'; import { TablesPanel } from '$lib/commandCenter/panels'; import { canWriteTables, canWriteDatabases } from '$lib/stores/roles'; import { showCreateBackup, showCreatePolicy } from './backups/store'; @@ -25,7 +25,7 @@ const databaseId = page.params.database; async function handleCreate(event: CustomEvent) { - $showCreate = false; + $showCreateTable = false; await invalidate(Dependencies.DATABASE); await goto( `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/table-${event.detail.$id}` @@ -36,7 +36,7 @@ { label: 'Create table', callback() { - $showCreate = true; + $showCreateTable = true; if (!page.url.pathname.endsWith(databaseId)) { goto( `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}` @@ -152,4 +152,4 @@ - + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte index 2bba6faf7..8234805e3 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte @@ -2,7 +2,7 @@ import { EmptySearch, PaginationWithLimit, SearchQuery, ViewSelector } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; - import { showCreate, tableViewColumns } from './store'; + import { showCreateTable, tableViewColumns } from './store'; import Table from './table.svelte'; import Grid from './grid.svelte'; import type { PageData } from './$types'; @@ -33,7 +33,7 @@ hideView={!data.tables.total} /> {#if $canWriteTables} - @@ -43,7 +43,7 @@ {#if data.tables.total} {#if data.view === 'grid'} - + {:else} {/if} @@ -77,13 +77,13 @@ href="https://appwrite.io/docs/products/databases/databases" text event="empty_documentation" - ariaLabel={`create table`}>Documentation + ariaLabel="create table">Documentation {#if $canWriteTables} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts index 368b1b30e..36e755d77 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts @@ -5,7 +5,7 @@ import { derived, writable } from 'svelte/store'; import { IconChartBar, IconCloudUpload, IconCog } from '@appwrite.io/pink-icons-svelte'; export const database = derived(page, ($page) => $page.data.database as Models.Database); -export const showCreate = writable(false); +export const showCreateTable = writable(false); export const tableViewColumns = writable([ { id: '$id', title: 'Table ID', type: 'string', width: 200 }, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte index a33c4e15b..864a133cc 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte @@ -1,7 +1,7 @@