From f3bbc6acfd9c87af9cee0bf32700154fd3aefb57 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 27 Aug 2025 17:06:57 +0530 Subject: [PATCH 1/2] fix: prefs corruption. --- src/lib/stores/preferences.ts | 37 ++++++++++++------- .../table-[table]/rows/create.svelte | 6 --- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index c54cf4ef8..0e444461c 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -19,7 +19,8 @@ type ConsolePreferences = { type TeamPreferences = { names?: string[]; order?: string[]; - widths?: { [columnId: string]: { fixed: number | { min: number }; resized: number } }; + /* old `widths` got corrupted */ + widths_v2?: { [columnId: string]: { fixed: number | { min: number }; resized: number } }; }; type ConsolePreferencesStore = { @@ -38,7 +39,7 @@ type ConsolePreferencesStore = { [key: string]: TeamPreferences['order']; }; columnWidths?: { - [key: string]: TeamPreferences['widths']; + [key: string]: TeamPreferences['widths_v2']; }; miscellaneous?: { [key: string]: string | number | boolean; @@ -242,16 +243,12 @@ function createPreferences() { return teamPreferences?.columnOrder?.[tableId] ?? []; }, - async saveColumnOrder( - orgId: string, - collectionId: string, - columnIds: TeamPreferences['order'] - ) { + async saveColumnOrder(orgId: string, tableId: string, columnIds: TeamPreferences['order']) { if (!teamPreferences.columnOrder) { teamPreferences.columnOrder = {}; } - teamPreferences.columnOrder[collectionId] = columnIds; + teamPreferences.columnOrder[tableId] = columnIds; await sdk.forConsole.teams.updatePrefs({ teamId: orgId, @@ -259,21 +256,33 @@ function createPreferences() { }); }, - getColumnWidths(collectionId: string): TeamPreferences['widths'] { - return teamPreferences?.columnWidths?.[collectionId] ?? {}; + getColumnWidths(tableId: string): TeamPreferences['widths_v2'] { + const columnWidths = teamPreferences?.columnWidths?.[tableId] ?? {}; + + if (columnWidths['$uid']) { + columnWidths['$id'] = columnWidths['$uid']; + delete columnWidths['$uid']; + } + + return columnWidths; }, async saveColumnWidths( orgId: string, - collectionId: string, - width: TeamPreferences['widths'] + tableId: string, + width: TeamPreferences['widths_v2'] ) { if (!teamPreferences.columnWidths) { teamPreferences.columnWidths = {}; } - teamPreferences.columnWidths[collectionId] = { - ...teamPreferences.columnWidths[collectionId], + if (width['$id']) { + width['$uid'] = width['$id']; + delete width['$id']; + } + + teamPreferences.columnWidths[tableId] = { + ...teamPreferences.columnWidths[tableId], ...width }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte index 8a28b2744..aec5e8ad4 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte @@ -119,12 +119,6 @@ createMore = false; } }); - - $effect(() => { - if ($createRow) { - console.log($createRow.row); - } - }); {#if $createRow} From 9324535cbf845796a7e3b423a90a1f247bf69fb5 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 27 Aug 2025 17:26:51 +0530 Subject: [PATCH 2/2] fix: prefs corruption using same widths prefs key!. --- src/lib/stores/preferences.ts | 37 ++++++++++++++++------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts index 0e444461c..0270c2948 100644 --- a/src/lib/stores/preferences.ts +++ b/src/lib/stores/preferences.ts @@ -19,8 +19,7 @@ type ConsolePreferences = { type TeamPreferences = { names?: string[]; order?: string[]; - /* old `widths` got corrupted */ - widths_v2?: { [columnId: string]: { fixed: number | { min: number }; resized: number } }; + widths?: { [columnId: string]: { fixed: number | { min: number }; resized: number } }; }; type ConsolePreferencesStore = { @@ -39,7 +38,7 @@ type ConsolePreferencesStore = { [key: string]: TeamPreferences['order']; }; columnWidths?: { - [key: string]: TeamPreferences['widths_v2']; + [key: string]: TeamPreferences['widths']; }; miscellaneous?: { [key: string]: string | number | boolean; @@ -60,6 +59,13 @@ async function updateConsolePreferences(store: ConsolePreferencesStore): Promise await sdk.forConsole.account.updatePrefs({ prefs: currentPreferences }); } +function safePrefsKey(widthPreferences: TeamPreferences['widths'], from: string, to: string) { + if (widthPreferences?.[from]) { + widthPreferences[to] = widthPreferences[from]; + delete widthPreferences[from]; + } +} + function createPreferences() { const { subscribe, set, update } = writable({}); let preferences: ConsolePreferencesStore = {}; @@ -256,36 +262,27 @@ function createPreferences() { }); }, - getColumnWidths(tableId: string): TeamPreferences['widths_v2'] { + getColumnWidths(tableId: string): TeamPreferences['widths'] { const columnWidths = teamPreferences?.columnWidths?.[tableId] ?? {}; - - if (columnWidths['$uid']) { - columnWidths['$id'] = columnWidths['$uid']; - delete columnWidths['$uid']; - } - + safePrefsKey(columnWidths, '$uid', '$id'); return columnWidths; }, - async saveColumnWidths( - orgId: string, - tableId: string, - width: TeamPreferences['widths_v2'] - ) { + async saveColumnWidths(orgId: string, tableId: string, width: TeamPreferences['widths']) { if (!teamPreferences.columnWidths) { teamPreferences.columnWidths = {}; } - if (width['$id']) { - width['$uid'] = width['$id']; - delete width['$id']; - } - teamPreferences.columnWidths[tableId] = { ...teamPreferences.columnWidths[tableId], ...width }; + // older version could still have the problematic key! + for (const tableWidths of Object.values(teamPreferences.columnWidths)) { + safePrefsKey(tableWidths, '$id', '$uid'); + } + await sdk.forConsole.teams.updatePrefs({ teamId: orgId, prefs: teamPreferences