From e22527f1b7984e7cf05e0db800c2a8814ab6b369 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 14:01:52 +0530 Subject: [PATCH 1/6] fix: column selector logic. --- src/lib/components/columnSelector.svelte | 40 ++++++++++++------- src/lib/stores/preferences.ts | 2 +- .../collection-[collection]/+page.svelte | 5 ++- .../collection-[collection]/table.svelte | 6 ++- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte index 42db1b9b5..4da7f09ff 100644 --- a/src/lib/components/columnSelector.svelte +++ b/src/lib/components/columnSelector.svelte @@ -20,6 +20,7 @@ let maxHeight = $state('none'); let containerRef = $state(null); + const collectionId = $derived(page.params.collection); const calcMaxHeight = () => { if (containerRef) { @@ -32,10 +33,10 @@ }; const saveColumnPreferences = () => { - const shownColumns = $columns.filter((n) => n.hide !== true).map((n) => n.id); + const shownColumns = $columns.filter((n) => n.hide === true).map((n) => n.id); if (isCustomCollection) { - preferences.setCustomCollectionColumns(page.params.collection, shownColumns); + preferences.setCustomCollectionColumns(collectionId, shownColumns); } else { preferences.setColumns(shownColumns); } @@ -43,27 +44,36 @@ onMount(() => { if (isCustomCollection) { - const shownColumns = preferences.getCustomCollectionColumns(page.params.collection); + const shownColumns = preferences.getCustomCollectionColumns(collectionId); - columns.update((columns) => { - return columns.map((column) => { - column.hide = !shownColumns.includes(column.id); + columns.set( + $columns.map((column) => { + column.hide = shownColumns?.includes(column.id) ?? false; return column; - }); - }); + }) + ); } else { const prefs = preferences.get(page.route); - if (prefs?.columns && prefs.columns.length > 0) { - columns.update((cols) => { - return cols.map((column) => { - column.hide = !prefs.columns.includes(column.id); + if (prefs?.columns) { + columns.set( + $columns.map((column) => { + column.hide = prefs.columns?.includes(column.id) ?? false; return column; - }); - }); + }) + ); } } + columns.subscribe((ctx) => { + const columns = ctx.filter((n) => n.hide === true).map((n) => n.id); + if (isCustomCollection) { + preferences.setCustomCollectionColumns(collectionId, columns); + } else { + preferences.setColumns(columns); + } + }); + calcMaxHeight(); }); @@ -79,7 +89,7 @@ columns.update((cols) => cols.map((col) => { if (col.id === column.id) { - col.hide = !column.hide; + column.hide = !column.hide; } return col; }) diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index 98911f7a7..c552158a2 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -176,7 +176,7 @@ function createPreferences() { names: TeamPreferences['names'] ) => { let teamPrefs: Models.Preferences; - update((n) => { + await updateAndSync((n) => { if (!n?.displayNames) { n ??= {}; n.displayNames ??= {}; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte index de62d50fc..2ec1a4eef 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -34,12 +34,13 @@ const filterColumns = writable([]); $: selected = preferences.getCustomCollectionColumns(page.params.collection); + $: columns.set( $collection.attributes.map((attribute) => ({ id: attribute.key, title: attribute.key, type: attribute.type as ColumnType, - hide: !selected?.includes(attribute.key), + show: selected?.includes(attribute.key) ?? true, array: attribute?.array, format: 'format' in attribute && attribute?.format === 'enum' ? attribute.format : null, elements: 'elements' in attribute ? attribute.elements : null @@ -50,7 +51,7 @@ ...['$id', '$createdAt', '$updatedAt'].map((id) => ({ id, title: id, - hide: false, + show: true, type: (id === '$id' ? 'string' : 'datetime') as ColumnType })) ]); 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 569ad5798..33ef10ec3 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 @@ -38,16 +38,18 @@ const databaseId = page.params.database; const collectionId = page.params.collection; + + let displayNames = {}; let showRelationships = false; let selectedRelationship: Models.AttributeRelationship = null; let relationshipData: Partial[]; - let displayNames = {}; onMount(async () => { displayNames = preferences.getDisplayNames(); updateMaxWidth(); }); + // replace with `$effect` later! afterUpdate(() => updateMaxWidth()); function updateMaxWidth() { @@ -108,7 +110,7 @@ id: attribute.key, title: attribute.key, type: attribute.type as ColumnType, - hide: !selected?.includes(attribute.key), + show: selected?.includes(attribute.key) ?? true, array: attribute?.array, width: { min: 168 }, format: From 94de9d988080c98f4524b00e2a3d8e169772ac12 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 17:04:34 +0530 Subject: [PATCH 2/6] fix: display names on relationship component. --- src/lib/components/columnSelector.svelte | 17 +--- .../attributes/relationship.svelte | 21 ++++- .../relationshipsModal.svelte | 6 +- .../settings/displayName.svelte | 82 ++++++++++++------- 4 files changed, 76 insertions(+), 50 deletions(-) diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte index 4da7f09ff..0813e624e 100644 --- a/src/lib/components/columnSelector.svelte +++ b/src/lib/components/columnSelector.svelte @@ -46,8 +46,8 @@ if (isCustomCollection) { const shownColumns = preferences.getCustomCollectionColumns(collectionId); - columns.set( - $columns.map((column) => { + columns.update((n) => + n.map((column) => { column.hide = shownColumns?.includes(column.id) ?? false; return column; }) @@ -56,8 +56,8 @@ const prefs = preferences.get(page.route); if (prefs?.columns) { - columns.set( - $columns.map((column) => { + columns.update((n) => + n.map((column) => { column.hide = prefs.columns?.includes(column.id) ?? false; return column; }) @@ -65,15 +65,6 @@ } } - columns.subscribe((ctx) => { - const columns = ctx.filter((n) => n.hide === true).map((n) => n.id); - if (isCustomCollection) { - preferences.setCustomCollectionColumns(collectionId, columns); - } else { - preferences.setColumns(columns); - } - }); - calcMaxHeight(); }); 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 e63977b1b..b68882015 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 @@ -116,9 +116,24 @@ $: totalCount = relatedList?.length ?? 0; $: options = - documentList?.documents?.map((n) => { - const data = displayNames.filter((name) => name !== '$id').map((name) => n?.[name]); - return { value: n.$id, label: n.$id, data }; + documentList?.documents?.map((document) => { + const names = displayNames.filter((name) => name !== '$id'); + const values = names + .map((name) => document?.[name]) + // always supposed to be a string but just being a bit safe here + .filter((value) => value != null && typeof value === 'string' && value !== ''); + + const label = !values.length + ? document.$id + : // values are in `$id (a | b)` format + // previously used to have a `$id a | b`. + `${document.$id} (${values.join(' | ')})`; + + return { + label, + value: document.$id, + data: names.map((name) => document?.[name]) + }; }) ?? []; $: hasItems = totalCount > 0; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte index aa90532f7..843644ccb 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte @@ -22,15 +22,15 @@ data = null; selectedRelationship = null; } + + $: tableColumns = [{ id: '$id', width: 200 }, ...args.map((id) => ({ id }))]; {#if data?.length} {#snippet children(paginatedItems: typeof data)} - ({ id }))]}> + Document ID {#if args?.length} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte index fa36903b7..a7ecfcd57 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte @@ -15,7 +15,11 @@ import { organization } from '$lib/stores/organization'; const collectionId = page.params.collection; - let names: string[] = [...(preferences.getDisplayNames()?.[collectionId] ?? [])]; + + let names: string[] = $state( + // edge case with `$id`? probably got saved during local tests... + [...(preferences.getDisplayNames()?.[collectionId] ?? [])].filter((name) => name !== '$id') + ); async function updateDisplayName() { try { @@ -36,23 +40,32 @@ } } - $: options = ($attributes as Models.AttributeString[]) - .filter( - (attr) => - attr.type === 'string' && !attr?.array && !names?.some((name) => name === attr.key) - ) - .map((attr) => { - return { + function getValidAttributes() { + return ($attributes as Models.AttributeString[]).filter( + (attr) => attr.type === 'string' && !attr?.array + ); + } + + function getOptions(index: number) { + const current = names?.[index]; + return getValidAttributes() + .filter((attr) => !names?.includes(attr.key) || attr.key === current) + .map((attr) => ({ value: attr.key, label: attr.key - }; - }); + })); + } - $: addAttributeDisabled = names?.length >= 5 || (names?.length && !names[names?.length - 1]); + const addAttributeDisabled = $derived( + names?.length >= 5 || (names?.length && !names[names?.length - 1]) + ); - $: updateBtnDisabled = + const updateBtnDisabled = $derived( !symmetricDifference(names, preferences.getDisplayNames()?.[collectionId] ?? [])?.length || - (names?.length && !last(names)); + (names?.length && !last(names)) + ); + + const hasExhaustedOptions = $derived(getValidAttributes().length === names?.length);
@@ -72,19 +85,22 @@ {#if names?.length} - {#each names as name, i} + {#each names as name, index} + {@const options = getOptions(index)} + {@const disabled = + (!!names[index] && names.length > index + 1) || hasExhaustedOptions} i + 1} - {options} /> + {options} + {disabled} + bind:value={names[index]} + placeholder="Select attribute" /> - + + + {#if !hasExhaustedOptions} +
+ +
+ {/if}
From 3d841b777d9160136fd1d9c80d169c5f20c527d8 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 17:32:02 +0530 Subject: [PATCH 3/6] update: trim the name; exclude `$id`. --- .../attributes/relationship.svelte | 7 ++++++- .../settings/displayName.svelte | 20 +++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) 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 b68882015..ceae619eb 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 @@ -123,11 +123,16 @@ // always supposed to be a string but just being a bit safe here .filter((value) => value != null && typeof value === 'string' && value !== ''); + const displayValues = !editing + ? values + : // on non edit routes like create, there's enough space! + values.map((value) => (value.length > 5 ? value.slice(0, 5) + '...' : value)); + const label = !values.length ? document.$id : // values are in `$id (a | b)` format // previously used to have a `$id a | b`. - `${document.$id} (${values.join(' | ')})`; + `${document.$id} (${displayValues.join(' | ')})`; return { label, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte index a7ecfcd57..46b972b03 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte @@ -16,15 +16,23 @@ const collectionId = page.params.collection; - let names: string[] = $state( - // edge case with `$id`? probably got saved during local tests... - [...(preferences.getDisplayNames()?.[collectionId] ?? [])].filter((name) => name !== '$id') - ); + function getDisplayNames() { + return [...(preferences.getDisplayNames()?.[collectionId] ?? [])].filter( + (name) => name !== '$id' + ); // edge case with `$id`? got saved during tests! + } + + let names: string[] = $state(getDisplayNames()); async function updateDisplayName() { try { - await preferences.setDisplayNames($organization.$id, collectionId, names); - names = [...(preferences.getDisplayNames()?.[collectionId] ?? [])]; + // $state makes proxy, + // structuredClone doesn't work + const regularArray = [...names]; + + await preferences.setDisplayNames($organization.$id, collectionId, regularArray); + names = getDisplayNames(); + await invalidate(Dependencies.TEAM); addNotification({ message: 'Display names has been updated', From 0ea3fe6227268ee6103b287faa28d5bfc7130642 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 17:48:26 +0530 Subject: [PATCH 4/6] address comment. --- .../database-[database]/collection-[collection]/+page.svelte | 2 +- .../database-[database]/collection-[collection]/table.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte index 2ec1a4eef..15a350650 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -40,7 +40,7 @@ id: attribute.key, title: attribute.key, type: attribute.type as ColumnType, - show: selected?.includes(attribute.key) ?? true, + hide: !!selected?.includes(attribute.key), array: attribute?.array, format: 'format' in attribute && attribute?.format === 'enum' ? attribute.format : null, elements: 'elements' in attribute ? attribute.elements : null 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 33ef10ec3..e8492d995 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 @@ -110,7 +110,7 @@ id: attribute.key, title: attribute.key, type: attribute.type as ColumnType, - show: selected?.includes(attribute.key) ?? true, + hide: !!selected?.includes(attribute.key), array: attribute?.array, width: { min: 168 }, format: From 6c967872e0922e698cb6d2303ffb5b7652581d06 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 18:54:40 +0530 Subject: [PATCH 5/6] address comment. --- src/lib/components/columnSelector.svelte | 1 + .../database-[database]/collection-[collection]/table.svelte | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte index 0813e624e..a899fe9e4 100644 --- a/src/lib/components/columnSelector.svelte +++ b/src/lib/components/columnSelector.svelte @@ -91,6 +91,7 @@ + {#if $columns?.length} {@render children(toggle, selectedColumnsNumber)} 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 e8492d995..585f8f26c 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 @@ -49,9 +49,6 @@ updateMaxWidth(); }); - // replace with `$effect` later! - afterUpdate(() => updateMaxWidth()); - function updateMaxWidth() { const tableCells = Array.from(document.querySelectorAll('.less-width-truncated')); From f6b47b1894c6e3009b6af704af7a953d7c924129 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 19:01:43 +0530 Subject: [PATCH 6/6] address comment. --- .../collection-[collection]/table.svelte | 15 +-------------- 1 file changed, 1 insertion(+), 14 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 585f8f26c..a798ed2bf 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 @@ -10,7 +10,7 @@ import { preferences } from '$lib/stores/preferences'; import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; - import { afterUpdate, onMount } from 'svelte'; + import { onMount } from 'svelte'; import type { PageData } from './$types'; import { isRelationship, @@ -46,21 +46,8 @@ onMount(async () => { displayNames = preferences.getDisplayNames(); - updateMaxWidth(); }); - function updateMaxWidth() { - const tableCells = Array.from(document.querySelectorAll('.less-width-truncated')); - - const visibleColumnsCount = $columns.filter((col) => !col.hide).length; - const newMaxWidth = Math.max(50 - (visibleColumnsCount - 1) * 5, 25); - - tableCells.forEach((cell) => { - const cellItem = cell as HTMLElement; - cellItem.style.maxWidth = `${newMaxWidth}vw`; - }); - } - function formatArray(array: unknown[]) { if (array.length === 0) return '[ ]';