From ae4ed9c871a129558f28b482ea137725f41e545b Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Mon, 24 Nov 2025 21:04:16 +1300
Subject: [PATCH] Review fixes

---
 .../table-[table]/+page.svelte                | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

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 3ef8fcf76..06a02b8a9 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
@@ -189,7 +189,11 @@
                     alignItems="center"
                     justifyContent="flex-end"
                     style="padding-right: 40px;">
-                    <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
+                    <Layout.Stack
+                        direction="row"
+                        alignItems="center"
+                        justifyContent="flex-end"
+                        gap="s">
                         {#if !$isSmallViewport}
                             <Button
                                 secondary
@@ -206,6 +210,7 @@
                                     size="s"
                                     secondary
                                     class="small-button-dimensions"
+                                    disabled={!(hasColumns && hasValidColumns) || disableButton}
                                     on:click={() => (showImportCSV = true)}>
                                     <Icon icon={IconUpload} size="s" />
                                 </Button>
@@ -219,6 +224,7 @@
                                     size="s"
                                     secondary
                                     class="small-button-dimensions"
+                                    disabled={!(hasColumns && hasValidColumns) || disableButton}
                                     on:click={() => {
                                         trackEvent(Click.DatabaseExportCsv);
                                         goto(getTableExportUrl());
@@ -229,25 +235,6 @@
                                 <svelte:fragment slot="tooltip">Export CSV</svelte:fragment>
                             </Tooltip>
 
-                            <Tooltip placement="top">
-                                <Button
-                                    icon
-                                    size="s"
-                                    secondary
-                                    class="small-button-dimensions"
-                                    on:click={() => {
-                                        $expandTabs = !$expandTabs;
-                                        preferences.setKey('tableHeaderExpanded', $expandTabs);
-                                    }}>
-                                    <Icon
-                                        icon={!$expandTabs ? IconChevronDown : IconChevronUp}
-                                        size="s" />
-                                </Button>
-
-                                <svelte:fragment slot="tooltip"
-                                    >{!$expandTabs ? 'Expand' : 'Collapse'}</svelte:fragment>
-                            </Tooltip>
-
                             <Tooltip disabled={isRefreshing || !data.rows.total} placement="top">
                                 <Button
                                     icon
@@ -270,6 +257,25 @@
 
                                 <svelte:fragment slot="tooltip">Refresh</svelte:fragment>
                             </Tooltip>
+
+                            <Tooltip placement="top">
+                                <Button
+                                    icon
+                                    size="s"
+                                    secondary
+                                    class="small-button-dimensions"
+                                    on:click={() => {
+                                        $expandTabs = !$expandTabs;
+                                        preferences.setKey('tableHeaderExpanded', $expandTabs);
+                                    }}>
+                                    <Icon
+                                        icon={!$expandTabs ? IconChevronDown : IconChevronUp}
+                                        size="s" />
+                                </Button>
+
+                                <svelte:fragment slot="tooltip"
+                                    >{!$expandTabs ? 'Expand' : 'Collapse'}</svelte:fragment>
+                            </Tooltip>
                         {/if}
                     </Layout.Stack>
                 </Layout.Stack>