From eb436d23594f186e762bf11042eb3706a64396f8 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 25 Jul 2025 19:53:37 +0530 Subject: [PATCH] update: persist column ordering and widths. --- package.json | 2 +- pnpm-lock.yaml | 10 +- src/lib/helpers/types.ts | 1 + src/lib/stores/preferences.ts | 65 ++++++---- .../collection-[collection]/+layout.svelte | 22 +++- .../collection-[collection]/+page.svelte | 5 +- .../attributes/+page.svelte | 6 +- .../createAttribute.svelte | 52 +++++++- .../indexes/+page.svelte | 4 +- .../layout/emptySheet.svelte | 21 +++- .../sheetOptions.svelte | 15 ++- .../spreadsheet.svelte | 112 ++++++++++++------ .../collection-[collection]/store.ts | 33 +++++- .../createCollection.svelte | 1 - .../database-[database]/subNavigation.svelte | 3 +- 15 files changed, 270 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index d13daa57a..29effd4a5 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c88c338", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e0df9cb", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e3f1f9920..429364a7d 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@c88c338 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c88c338(svelte@5.25.3) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e0df9cb + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e0df9cb(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -281,8 +281,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@c88c338': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@c88c338} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e0df9cb': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e0df9cb} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3679,7 +3679,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@c88c338(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e0df9cb(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/lib/helpers/types.ts b/src/lib/helpers/types.ts index 73e9a9f95..abb4c133a 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -12,6 +12,7 @@ export type PinkColumn = { min: number; } | number; + minimumWidth?: number; hide?: boolean; }; diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index 2da020e1c..eb4303102 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -17,6 +17,7 @@ type Preferences = { type TeamPreferences = { names?: string[]; order?: string[]; + widths?: { [columnId: string]: { fixed: number | { min: number }; resized: number } }; }; type PreferencesStore = { @@ -30,6 +31,9 @@ type PreferencesStore = { columnOrder?: { [key: string]: TeamPreferences['order']; }; + columnWidths?: { + [key: string]: TeamPreferences['widths']; + }; } & { hideAiDisclaimer?: boolean }; async function updateConsolePreferences(store: PreferencesStore): Promise { @@ -49,6 +53,7 @@ async function updateConsolePreferences(store: PreferencesStore): Promise function createPreferences() { const { subscribe, set, update } = writable({}); let preferences: PreferencesStore = {}; + let teamPreferences: PreferencesStore = {}; if (browser) { // fresh fetch. @@ -74,6 +79,17 @@ function createPreferences() { } }); + async function loadTeamPreferences(orgId: string) { + try { + const teamPrefs = await sdk.forConsole.teams.getPrefs(orgId); + teamPreferences = teamPrefs ?? {}; + return teamPreferences; + } catch (error) { + teamPreferences = {}; + return teamPreferences; + } + } + /** * Update the local store and then synchronizes them on user prefs. */ @@ -162,15 +178,7 @@ function createPreferences() { n.collections[collectionId] = Array.from(new Set(columns)); return n; }), - loadTeamPrefs: async (id: string) => { - const teamPrefs = await sdk.forConsole.teams.getPrefs(id); - update((n) => { - n[id] = teamPrefs; - return n; - }); - - return teamPrefs; - }, + loadTeamPrefs: loadTeamPreferences, getDisplayNames: () => { return preferences?.displayNames ?? {}; }, @@ -196,7 +204,7 @@ function createPreferences() { }, getColumnOrder(collectionId: string): TeamPreferences['order'] { - return preferences?.columnOrder[collectionId] ?? []; + return teamPreferences?.columnOrder?.[collectionId] ?? []; }, async saveColumnOrder( @@ -204,23 +212,38 @@ function createPreferences() { collectionId: string, columnIds: TeamPreferences['order'] ) { - let teamPrefs: Models.Preferences; + if (!teamPreferences.columnOrder) { + teamPreferences.columnOrder = {}; + } - await updateAndSync((n) => { - if (!n?.columnOrder) { - n ??= {}; - n.columnOrder ??= {}; - } + teamPreferences.columnOrder[collectionId] = columnIds; - teamPrefs = n; - n.columnOrder[collectionId] = columnIds; + await sdk.forConsole.teams.updatePrefs(orgId, teamPreferences); + }, - return n; - }); + getColumnWidths(collectionId: string): TeamPreferences['widths'] { + return teamPreferences?.columnWidths?.[collectionId] ?? {}; + }, - await sdk.forConsole.teams.updatePrefs(orgId, teamPrefs); + async saveColumnWidths( + orgId: string, + collectionId: string, + width: TeamPreferences['widths'] + ) { + if (!teamPreferences.columnWidths) { + teamPreferences.columnWidths = {}; + } + + teamPreferences.columnWidths[collectionId] = { + ...teamPreferences.columnWidths[collectionId], + ...width + }; + + await sdk.forConsole.teams.updatePrefs(orgId, teamPreferences); } }; } export const preferences = createPreferences(); + +export type PreferencesType = ReturnType; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte index 445373a12..ef5301415 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte @@ -21,8 +21,11 @@ import { onMount } from 'svelte'; import { collection, + columns, + columnsOrder, databaseColumnSheetOptions, databaseRowSheetOptions, + reorderItems, showCreateAttributeSheet } from './store'; import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter'; @@ -214,17 +217,26 @@ await createAttribute?.submit(), + onClick: async () => { + await createAttribute?.submit(); + }, disabled: !selectedOption }}> + bind:this={createAttribute} + showCreate={$showCreateAttributeSheet.show} + direction={$showCreateAttributeSheet.direction} + columns={$showCreateAttributeSheet.columns} + columnsOrder={$showCreateAttributeSheet.columnsOrder} + onColumnsReorder={(newOrder) => { + columnsOrder.set(newOrder); + columns.set(reorderItems($columns, $columnsOrder)); + }} /> ($showCreateAttributeSheet = false)); + onDestroy(() => ($showCreateAttributeSheet.show = false)); {#key page.params.collection} @@ -174,6 +174,7 @@ {:else} { - $showCreateAttributeSheet = true; + $showCreateAttributeSheet.show = true; } } }} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 50a34caf3..61a319aa5 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -139,7 +139,7 @@ columnsOrder = preferences.getColumnOrder(collectionId); }); - onDestroy(() => ($showCreateAttributeSheet = false)); + onDestroy(() => ($showCreateAttributeSheet.show = false)); @@ -150,7 +150,7 @@ secondary disabled={$isCsvImportInProgress} on:click={() => { - $showCreateAttributeSheet = true; + $showCreateAttributeSheet.show = true; }} event="create_attribute"> @@ -352,7 +352,7 @@ showActions={$canWriteCollections} actions={{ primary: { - onClick: () => ($showCreateAttributeSheet = true) + onClick: () => ($showCreateAttributeSheet.show = true) } }} /> {/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte index 0f4dfe262..b0ddfb92d 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte @@ -1,6 +1,6 @@ @@ -202,7 +202,7 @@ primary: { text: 'Create columns', onClick: async () => { - $showCreateAttributeSheet = true; + $showCreateAttributeSheet.show = true; } } }} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte index 34c32aafb..77d166c8c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte @@ -1,5 +1,6 @@ @@ -407,6 +448,9 @@ bottomActionClick={() => (showRecordsCreateSheet.show = true)} on:columnsSwap={(order) => { saveColumnsOrder(order.detail); + }} + on:columnsResize={(resize) => { + saveColumnsWidth(resize.detail); }}> {#each $columns as column (column.id)} @@ -415,7 +459,7 @@ ($showCreateAttributeSheet = true)}> + on:click={() => ($showCreateAttributeSheet.show = true)}> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts index 8c2c29eaf..070f93f78 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts @@ -27,6 +27,10 @@ export const attributes = derived( export const indexes = derived(page, ($page) => $page.data.collection.indexes as Models.Index[]); export const columns = writable([]); +export const columnsOrder = writable([]); +export const columnsWidth = writable<{ + [columnId: string]: { fixed: number | { min: number }; resized: number }; +}>(); export const isCsvImportInProgress = writable(false); @@ -37,6 +41,7 @@ type DatabaseSheetOptions = { isEdit?: boolean; disableSubmit?: boolean; submitAction?: () => Promise; + direction?: ColumnDirection; }; export const databaseColumnSheetOptions = writable({ @@ -45,7 +50,8 @@ export const databaseColumnSheetOptions = writable({ column: null, isEdit: false, disableSubmit: false, - submitAction: null + submitAction: null, + direction: null }); export const databaseRowSheetOptions = writable< @@ -68,7 +74,30 @@ export const sortState = writable({ direction: 'default' as SortDirection }); -export const showCreateAttributeSheet = writable(false); +export type ColumnDirection = { + neighbour: string; + to: 'left' | 'right'; +}; + +export type CreateAttribute = { + show: boolean; + column?: string; + title: string; + direction?: ColumnDirection; + onDone?: () => void; + columns?: Column[]; + columnsOrder?: string[]; +}; + +export const showCreateAttributeSheet = writable({ + show: false, + column: null, + title: 'Insert column', + direction: null, + onDone: null, + columns: null, + columnsOrder: null +}); export function reorderItems( items: T[], diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte index 58571ebcb..69ccbb679 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte @@ -92,7 +92,6 @@ on:input={() => { if (!touchedId) { touchedId = true; - console.log(touchedId); } }} /> 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 6ee4ddf02..46d2226f4 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 @@ -86,7 +86,8 @@ {/if} - + +