From f8505b53808bb04b7e03f6a30ff5f03a9da5fe73 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 1 Oct 2025 16:05:14 +0530 Subject: [PATCH] misc: fix subNav not updating; fix: proper table suggestion state when creating a new table from inside the sheet view. --- .../database-[database]/createTable.svelte | 28 +++++++++++-------- .../database-[database]/subNavigation.svelte | 10 +++---- .../database-[database]/table.svelte | 4 ++- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte index 9fe9676c2..ed906429c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte @@ -19,6 +19,7 @@ } = $props(); const databaseId = page.params.database; + const isOnTablesPage = $derived(page.route?.id.endsWith('table-[table]')); let name = $state(''); let id: string = $state(null); @@ -27,10 +28,17 @@ let creatingTable = $state(false); - function enableThinkingModeForSuggestions() { + function enableThinkingModeForSuggestions(table: Models.Table) { if ($tableColumnSuggestions.enabled) { // if enabled, trigger thinking mode! - $tableColumnSuggestions.thinking = true; + tableColumnSuggestions.update((store) => ({ + ...store, + thinking: true, + table: { + id: table.$id, + name: table.name + } + })); } } @@ -45,14 +53,6 @@ name }); - tableColumnSuggestions.update((store) => ({ - ...store, - table: { - id: table.$id, - name: table.name - } - })); - updateAndCleanup(); await onTableCreated(table); @@ -62,7 +62,7 @@ creatingTable = false; // don't wait for UI to mount! - enableThinkingModeForSuggestions(); + enableThinkingModeForSuggestions(table); } catch (e) { error = e.message; trackError(e, Submit.TableCreate); @@ -103,6 +103,12 @@ touchedId = false; } }); + + $effect(() => { + if (showCreate && isOnTablesPage && $tableColumnSuggestions.table) { + $tableColumnSuggestions.table = null; + } + }); 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 6a7483f6d..8bbeee520 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 @@ -29,12 +29,12 @@ import { onMount } from 'svelte'; import { subNavigation } from '$lib/stores/database'; - let data = $derived(page.data) as PageData; + const data = $derived(page.data) as PageData; - let region = $derived(page.params.region); - let project = $derived(page.params.project); - let tableId = $derived(page.params.table); - let databaseId = $derived(page.params.database); + const region = $derived(page.params.region); + const project = $derived(page.params.project); + const tableId = $derived(page.params.table); + const databaseId = $derived(page.params.database); let openBottomSheet = $state(false); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte index 76334874f..55d0b7537 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte @@ -14,6 +14,7 @@ import type { PageData } from './$types'; import { tableViewColumns } from './store'; import Confirm from '$lib/components/confirm.svelte'; + import { subNavigation } from '$lib/stores/database'; export let data: PageData; const databaseId = page.params.database; @@ -38,7 +39,8 @@ type: 'success', message: `${selectedTables.length} table${selectedTables.length > 1 ? 's' : ''} deleted` }); - invalidate(Dependencies.TABLES); + await invalidate(Dependencies.TABLES); + subNavigation.update(); } catch (error) { addNotification({ type: 'error',