From c7a77fe1ef9fb77da716415feffd3ee628daa3ca Mon Sep 17 00:00:00 2001 From: Darshan Date: Tue, 2 Sep 2025 16:47:58 +0530 Subject: [PATCH] add: sys cols filtering support. --- package.json | 4 ++-- pnpm-lock.yaml | 10 +++++----- .../table-[table]/+page.svelte | 15 ++++++++++++++- .../table-[table]/sheetOptions.svelte | 5 ++--- .../table-[table]/spreadsheet.svelte | 16 +--------------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 02cb4f171..225e5a051 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@2cf27e0", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@2cf27e0", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a7a9b5d", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", @@ -95,5 +95,5 @@ "svelte-preprocess" ] }, - "packageManager": "pnpm@10.15.0" + "packageManager": "pnpm@10.15.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6ff6011a..555ec886b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@2cf27e0 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@2cf27e0(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a7a9b5d + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a7a9b5d(svelte@5.25.3) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.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@2cf27e0': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@2cf27e0} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a7a9b5d': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a7a9b5d} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -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@2cf27e0(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@a7a9b5d(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]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte index 7439aa097..7a52f59e9 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte @@ -51,12 +51,25 @@ })); } + function createFilterableColumns(columns: Column[], selected: string[] = []): Column[] { + const idColumn = [{ id: '$id', title: '$id', type: 'string' as ColumnType }].filter( + (col) => !selected.includes(col.id) + ); + + const systemColumns = [ + { id: '$createdAt', title: '$createdAt', type: 'datetime' as ColumnType }, + { id: '$updatedAt', title: '$updatedAt', type: 'datetime' as ColumnType } + ].filter((col) => !!selected.includes(col.id)); + + return [...idColumn, ...columns.filter((column) => !column.isAction), ...systemColumns]; + } + $: selected = preferences.getCustomTableColumns(page.params.table); $: if ($table.columns) { const freshColumns = createTableColumns($table.columns, selected); tableColumns.set(freshColumns); - filterColumns.set(freshColumns.filter((column) => !column.isAction)); + filterColumns.set(createFilterableColumns(freshColumns, selected)); } $: hasColumns = !!$table.columns.length; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte index 3cf68e0e7..34585a4fb 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte @@ -163,12 +163,11 @@ {#each menuItems as item, index (index)} {#if item.divider} - {@const isLastDivider = index === menuItems.length - 2} + {@const isLastDivider = index === menuItems.length - 2}
+ style:padding-block-end={isLastDivider ? '0.25rem' : '0.5rem'}>
{:else if shouldShow(item)} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte index 3a03032bf..ee2e82dd9 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte @@ -106,15 +106,6 @@ const minimumWidth = 168; const emptyCellsLimit = $isSmallViewport ? 12 : 18; - const SYSTEM_KEYS = new Set([ - '$tableId', - '$databaseId', - '$permissions', - '$createdAt', - '$updatedAt', - '$id', - '$sequence' - ]); /* TODO: should be fixed at the sdk level! */ let selectedRows = []; let spreadsheetContainer: SpreadsheetContainer; @@ -576,16 +567,11 @@ async function updateRowContents(row: Models.Row) { try { - const onlyData = Object.fromEntries( - Object.entries(row).filter(([key]) => !SYSTEM_KEYS.has(key)) - ); - - // TODO | BUG: related rows still have `system` columns atm! await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({ databaseId, tableId: $table.$id, rowId: row.$id, - data: onlyData, + data: row, permissions: row.$permissions });