Skip to content

Commit 5315086

Browse files
committed
feat(queries): streamline table context menu and show database in footers
- add View Data as the first table context-menu action and keep View Structure second - open View Structure directly on the table's Schema sub-page instead of generating a query tab - persist table-view sub-page selection in tab metadata and reuse existing tabs - show the active database beside rows and execution time in table/result footers - remove the redundant application status bar and derive footer database reactively - cover sub-page routing in tabStore tests
1 parent cbb3432 commit 5315086

10 files changed

Lines changed: 94 additions & 60 deletions

File tree

‎src/components/database-browser/DataTableView.vue‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<script setup lang="ts">
2+
import type { TableViewSubPage } from '@/store'
23
import { invoke } from '@tauri-apps/api/core'
34
import { save as showSaveDialog } from '@tauri-apps/plugin-dialog'
45
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
@@ -60,6 +61,7 @@ const props = defineProps<{
6061
database: string
6162
schema?: string
6263
tableName: string
64+
initialSubPage?: TableViewSubPage
6365
}>()
6466
6567
const { t } = useI18n()
@@ -68,8 +70,8 @@ const ROWS_PER_PAGE_OPTIONS = [100, 500, 1000] as const
6870
type RowsPerPage = (typeof ROWS_PER_PAGE_OPTIONS)[number]
6971
7072
// Sub-page navigation
71-
type SubPage = 'data' | 'schema' | 'indexes' | 'foreign_keys' | 'triggers'
72-
const activeSubPage = ref<SubPage>('data')
73+
type SubPage = TableViewSubPage
74+
const activeSubPage = ref<SubPage>(props.initialSubPage ?? 'data')
7375
const subPages: { id: SubPage, label: string }[] = [
7476
{ id: 'data', label: 'Data' },
7577
{ id: 'schema', label: 'Schema' },
@@ -78,6 +80,11 @@ const subPages: { id: SubPage, label: string }[] = [
7880
{ id: 'triggers', label: 'Triggers' },
7981
]
8082
83+
watch(() => props.initialSubPage, (subPage) => {
84+
if (subPage)
85+
activeSubPage.value = subPage
86+
})
87+
8188
const currentPage = ref(1)
8289
const rowsPerPage = ref<RowsPerPage>(100)
8390
const filterInput = ref('')
@@ -837,8 +844,8 @@ onBeforeUnmount(() => {
837844
})
838845
839846
watch(
840-
() => [props.connectionId, props.tableName, props.schema] as const,
841-
async ([newConnId, _newTable, _newSchema], [oldConnId]) => {
847+
() => [props.connectionId, props.database, props.tableName, props.schema] as const,
848+
async ([newConnId, _newDatabase, _newTable, _newSchema], [oldConnId]) => {
842849
currentPage.value = 1
843850
appliedFilter.value = ''
844851
filterInput.value = ''
@@ -1223,6 +1230,9 @@ watch(
12231230
<div class="text-xs text-muted-foreground px-3 py-1.5 border-t bg-muted/20 flex shrink-0 gap-3 items-center overflow-hidden">
12241231
<!-- Left: stats -->
12251232
<div class="flex flex-shrink-0 gap-3 items-center">
1233+
<span v-if="props.database" class="tabular-nums">
1234+
{{ t('pages.queries.status.database') }}: {{ props.database }}
1235+
</span>
12261236
<span v-if="totalCount > 0" class="tabular-nums">
12271237
{{ totalCount.toLocaleString() }} rows
12281238
</span>

‎src/components/database-browser/QueryResultPanel.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ const displayExecutionTime = computed(() => gridExecutionTimeMs.value ?? props.e
373373
</template>
374374
<div class="flex-1" />
375375
<div v-if="displayResults && activeOutputView === 'results'" class="text-xs text-muted-foreground flex gap-2 items-center">
376+
<span v-if="database && displayResults.columns.length === 0">{{ t('pages.queries.status.database') }}: {{ database }}</span>
376377
<span v-if="displayResults.columns.length > 0">{{ t('components.queryResult.rows', { count: displayResults.rows.length }) }}</span>
377378
<span v-else-if="displayResults.rowsAffected !== undefined">{{ t('components.queryResult.rowsAffected', { count: displayResults.rowsAffected }) }}</span>
378379
<span v-if="formattedTime">• {{ t('components.queryResult.time', { time: formattedTime }) }}</span>

‎src/components/grid/DataGrid.vue‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -846,14 +846,15 @@ watch(sortableColumns, (columns) => {
846846
/>
847847

848848
<!-- Status Bar -->
849-
<div class="text-xs text-muted-foreground px-3 py-1.5 border-t bg-muted/20 flex flex-shrink-0 gap-3 items-center">
850-
<span class="tabular-nums">{{ statusText }}</span>
851-
<span v-if="formattedTime" class="text-muted-foreground/70">{{ formattedTime }}</span>
849+
<div class="text-xs text-muted-foreground px-3 py-1.5 border-t bg-muted/20 flex flex-shrink-0 gap-3 items-center overflow-hidden">
850+
<span v-if="database" class="flex-shrink-0 tabular-nums">{{ $t('pages.queries.status.database') }}: {{ database }}</span>
851+
<span class="flex-shrink-0 tabular-nums">{{ statusText }}</span>
852+
<span v-if="formattedTime" class="text-muted-foreground/70 flex-shrink-0">{{ formattedTime }}</span>
852853
<div class="flex-1" />
853-
<span v-if="sortSummary" class="text-primary tabular-nums">
854+
<span v-if="sortSummary" class="text-primary flex-shrink-0 tabular-nums">
854855
{{ sortSummary }}
855856
</span>
856-
<span v-if="filter.hasActiveFilters.value" class="text-blue-500 tabular-nums">
857+
<span v-if="filter.hasActiveFilters.value" class="text-blue-500 flex-shrink-0 tabular-nums">
857858
{{ filter.filters.value.length }} {{ $t('components.dataGrid.filter.activeFilters') }}
858859
</span>
859860
</div>

‎src/components/sidebar/SchemaTree.vue‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,16 @@ async function refreshDatabase(dbName: string) {
204204
}
205205
206206
// Context menu action handler
207-
type ContextAction = 'selectTopN' | 'viewStructure' | 'createScript' | 'exportData' | 'showErDiagram' | 'dropTable' | 'truncateTable'
207+
type ContextAction = 'viewData' | 'viewStructure' | 'selectTopN' | 'createScript' | 'exportData' | 'showErDiagram' | 'dropTable' | 'truncateTable'
208208
209209
function handleContextAction(action: ContextAction) {
210210
if (!contextMenuTable.value)
211211
return
212212
const { table, database, schema } = contextMenuTable.value
213213
const handlers: Record<ContextAction, () => void> = {
214-
selectTopN: () => emit('selectTopN', table, database, schema, 100),
214+
viewData: () => emit('selectTable', table, database, schema),
215215
viewStructure: () => emit('viewStructure', table, database, schema),
216+
selectTopN: () => emit('selectTopN', table, database, schema, 100),
216217
createScript: () => emit('createScript', table, database, schema),
217218
exportData: () => emit('exportData', table, database, schema),
218219
showErDiagram: () => emit('showErDiagram', database, schema),
@@ -752,10 +753,10 @@ defineExpose({ refresh })
752753
<div class="p-1">
753754
<div
754755
class="text-sm px-2 py-1.5 rounded-sm flex cursor-pointer items-center hover:text-accent-foreground hover:bg-accent"
755-
@click="handleContextAction('selectTopN')"
756+
@click="handleContextAction('viewData')"
756757
>
757-
<span class="i-carbon-arrow-down mr-2 h-3.5 w-3.5" />
758-
{{ t('components.databaseBrowser.contextMenu.selectTopN') }}
758+
<span class="i-carbon-data-table mr-2 h-3.5 w-3.5" />
759+
{{ t('components.databaseBrowser.contextMenu.viewData') }}
759760
</div>
760761
<div
761762
class="text-sm px-2 py-1.5 rounded-sm flex cursor-pointer items-center hover:text-accent-foreground hover:bg-accent"
@@ -764,6 +765,13 @@ defineExpose({ refresh })
764765
<span class="i-carbon-table mr-2 h-3.5 w-3.5" />
765766
{{ t('components.databaseBrowser.contextMenu.viewStructure') }}
766767
</div>
768+
<div
769+
class="text-sm px-2 py-1.5 rounded-sm flex cursor-pointer items-center hover:text-accent-foreground hover:bg-accent"
770+
@click="handleContextAction('selectTopN')"
771+
>
772+
<span class="i-carbon-arrow-down mr-2 h-3.5 w-3.5" />
773+
{{ t('components.databaseBrowser.contextMenu.selectTopN') }}
774+
</div>
767775
<div
768776
class="text-sm px-2 py-1.5 rounded-sm flex cursor-pointer items-center hover:text-accent-foreground hover:bg-accent"
769777
@click="handleContextAction('createScript')"

‎src/lang/enUS.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,7 @@ export const enUS = {
14361436
invalidResponse: 'Invalid response from server',
14371437
},
14381438
contextMenu: {
1439+
viewData: 'View Data',
14391440
selectTopN: 'Select Top 100',
14401441
viewStructure: 'View Structure',
14411442
createScript: 'CREATE Script',

‎src/lang/zhCN.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,7 @@ export const zhCN = {
14361436
invalidResponse: '服务器响应无效',
14371437
},
14381438
contextMenu: {
1439+
viewData: '查看数据',
14391440
selectTopN: '查询前100条',
14401441
viewStructure: '查看结构',
14411442
createScript: 'CREATE脚本',

‎src/pages/QueriesPage.vue‎

Lines changed: 25 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ const activeConnection = computed(() => {
8080
8181
const activeTab = computed(() => tabStore.activeTab)
8282
83+
// Single source of truth for the database shown next to a result: the tab's
84+
// execution database, falling back to the sidebar selection while the tab is
85+
// still being created/synced.
86+
const activeDatabase = computed<string | undefined>(() =>
87+
activeTab.value?.database || selectedDatabase.value || undefined,
88+
)
89+
8390
const editorContent = computed({
8491
get: () => activeTab.value?.content || '',
8592
set: (value: string) => {
@@ -581,20 +588,11 @@ function handleSelectTopN(table: TableInfo, database: string, schema?: string, n
581588
}
582589
583590
function handleViewStructure(table: TableInfo, database: string, schema?: string) {
584-
const query = `-- Table structure for ${table.name}
585-
-- Database: ${database}${schema ? `\n-- Schema: ${schema}` : ''}
586-
587-
-- View columns
588-
SELECT column_name, data_type, is_nullable, column_default
589-
FROM information_schema.columns
590-
WHERE table_name = '${table.name}'${schema ? ` AND table_schema = '${schema}'` : ''};`
591-
592591
const connId = getActiveConnectionId()
593-
if (connId) {
594-
const tab = tabStore.createTab(connId, database, schema)
595-
tabStore.updateTabContent(tab.id, query)
596-
tabStore.updateTabName(tab.id, `STRUCTURE_${table.name}`)
597-
}
592+
if (!connId)
593+
return
594+
ensureDatabaseContext(connId, database)
595+
tabStore.openTableViewTab(connId, database, table.name, schema, 'schema')
598596
}
599597
600598
function handleExportData(_table: TableInfo, _database: string, _schema?: string) {
@@ -667,17 +665,21 @@ async function handleDestructiveConfirm() {
667665
}
668666
}
669667
670-
function handleSelectTable(table: TableInfo, database: string, schema?: string) {
671-
const connId = getActiveConnectionId()
672-
if (!connId)
673-
return
674-
// Execute USE database to set the backend connection's database context.
675-
// The Rust get_table_data MySQL branch ignores query.database, requiring
676-
// the connection to already have a database selected.
668+
// Execute USE database to set the backend connection's database context.
669+
// The Rust get_table_data MySQL branch ignores query.database, requiring
670+
// the connection to already have a database selected.
671+
function ensureDatabaseContext(connId: string, database: string) {
677672
const escapedDb = database.replace(/`/g, '``')
678673
invoke('execute_query', { connectionId: connId, sql: `USE \`${escapedDb}\`` }).catch(() => {
679674
// Best-effort: some databases don't support USE (e.g. SQLite)
680675
})
676+
}
677+
678+
function handleSelectTable(table: TableInfo, database: string, schema?: string) {
679+
const connId = getActiveConnectionId()
680+
if (!connId)
681+
return
682+
ensureDatabaseContext(connId, database)
681683
tabStore.openTableViewTab(connId, database, table.name, schema)
682684
}
683685
@@ -1202,6 +1204,7 @@ function closeResultPanel() {
12021204
:database="activeTab.tableView.database"
12031205
:schema="activeTab.tableView.schema"
12041206
:table-name="activeTab.tableView.tableName"
1207+
:initial-sub-page="activeTab.tableView.subPage ?? 'data'"
12051208
class="flex-1"
12061209
/>
12071210

@@ -1355,7 +1358,7 @@ function closeResultPanel() {
13551358
<!-- Status info -->
13561359
<div v-if="activeTab" class="text-xs text-muted-foreground flex gap-2 items-center">
13571360
<span v-if="activeConnection" class="font-medium">{{ activeConnection.name }}</span>
1358-
<span v-if="activeConnection?.database">/ {{ activeConnection.database }}</span>
1361+
<span v-if="activeDatabase">/ {{ activeDatabase }}</span>
13591362
</div>
13601363
</div>
13611364

@@ -1434,7 +1437,7 @@ function closeResultPanel() {
14341437
:execution-time="activeTab?.executionTime"
14351438
:sql="activeTab?.lastExecutedSql ?? activeTab?.content"
14361439
:connection-id="getConnectionId() ?? undefined"
1437-
:database="activeTab?.database"
1440+
:database="activeDatabase"
14381441
:explain-plan="activeTab?.explainPlan ?? null"
14391442
:is-explaining="activeTab?.isExplaining ?? false"
14401443
:explain-error="activeTab?.explainError ?? null"
@@ -1444,26 +1447,6 @@ function closeResultPanel() {
14441447
</template>
14451448
</div>
14461449
</div>
1447-
1448-
<!-- Status bar -->
1449-
<div class="text-xs text-muted-foreground px-3 py-1 border-t bg-muted/30 flex items-center justify-between">
1450-
<div class="flex gap-4 items-center">
1451-
<span v-if="activeConnection?.database">
1452-
{{ t('pages.queries.status.database') }}: {{ activeConnection.database }}
1453-
</span>
1454-
</div>
1455-
<div class="flex gap-4 items-center">
1456-
<span v-if="activeTab?.results">
1457-
{{ t('pages.queries.status.rows') }}: {{ activeTab.results.rows.length }}
1458-
</span>
1459-
<span v-if="activeTab?.executionTime">
1460-
{{ t('pages.queries.status.time') }}: {{ activeTab.executionTime }}ms
1461-
</span>
1462-
<span v-if="activeTab?.isExecuting" class="text-primary">
1463-
{{ t('pages.queries.status.executing') }}
1464-
</span>
1465-
</div>
1466-
</div>
14671450
</div>
14681451

14691452
<!-- Destructive Action Confirmation Dialog (Drop/Truncate Table) -->

‎src/store/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ export type { PlanState } from './entitlementStore'
4545
export { useHistoryStore } from './historyStore'
4646
export type { HistoryEntry, HistoryEntryStatus } from './historyStore'
4747
export { useTabStore } from './tabStore'
48-
export type { ErDiagramMeta, QueryResult, QueryTab } from './tabStore'
48+
export type { ErDiagramMeta, QueryResult, QueryTab, TableViewMeta, TableViewSubPage } from './tabStore'

‎src/store/tabStore.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ export type ErDiagramMeta = {
2222
schema?: string
2323
}
2424

25+
export type TableViewSubPage = 'data' | 'schema' | 'indexes' | 'foreign_keys' | 'triggers'
26+
2527
export type TableViewMeta = {
2628
tableName: string
2729
database: string
2830
schema?: string
31+
subPage?: TableViewSubPage
2932
}
3033

3134
export type ListingTabMeta = {
@@ -115,7 +118,13 @@ export const useTabStore = defineStore('tabs', {
115118
return tab
116119
},
117120

118-
openTableViewTab(connectionId: string, database: string, tableName: string, schema?: string): QueryTab {
121+
openTableViewTab(
122+
connectionId: string,
123+
database: string,
124+
tableName: string,
125+
schema?: string,
126+
subPage: TableViewSubPage = 'data',
127+
): QueryTab {
119128
const existing = this.tabs.find(
120129
t => t.tableView
121130
&& t.tableView.tableName === tableName
@@ -125,6 +134,7 @@ export const useTabStore = defineStore('tabs', {
125134
&& !t.orphanFromConnectionId,
126135
)
127136
if (existing) {
137+
existing.tableView = { ...existing.tableView!, subPage }
128138
this.activeTabId = existing.id
129139
return existing
130140
}
@@ -138,7 +148,7 @@ export const useTabStore = defineStore('tabs', {
138148
schema,
139149
isExecuting: false,
140150
hasUnsavedChanges: false,
141-
tableView: { tableName, database, schema },
151+
tableView: { tableName, database, schema, subPage },
142152
}
143153
this.tabs = [...this.tabs, tab]
144154
this.activeTabId = tab.id

‎tests/store/tabStore.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,31 @@ describe('tabStore', () => {
8585
const tab = store.openTableViewTab('conn-1', 'mydb', 'users', 'public')
8686

8787
expect(tab.name).toBe('users')
88-
expect(tab.tableView).toEqual({ tableName: 'users', database: 'mydb', schema: 'public' })
88+
expect(tab.tableView).toEqual({ tableName: 'users', database: 'mydb', schema: 'public', subPage: 'data' })
8989
expect(tab.connectionId).toBe('conn-1')
9090
expect(tab.database).toBe('mydb')
9191
expect(store.activeTabId).toBe('tab-1')
9292
})
9393

94+
it('opens a table view tab on the requested sub-page', () => {
95+
const store = useTabStore()
96+
97+
const tab = store.openTableViewTab('conn-1', 'mydb', 'users', 'public', 'schema')
98+
99+
expect(tab.tableView?.subPage).toBe('schema')
100+
})
101+
102+
it('switches an existing table view tab to the requested sub-page', () => {
103+
const store = useTabStore()
104+
const tab = store.openTableViewTab('conn-1', 'mydb', 'users', 'public')
105+
expect(tab.tableView?.subPage).toBe('data')
106+
107+
const reopened = store.openTableViewTab('conn-1', 'mydb', 'users', 'public', 'schema')
108+
109+
expect(reopened.id).toBe(tab.id)
110+
expect(reopened.tableView?.subPage).toBe('schema')
111+
})
112+
94113
it('switches to existing table view tab', () => {
95114
const store = useTabStore()
96115
;(crypto.randomUUID as jest.Mock).mockReturnValueOnce('tab-1')

0 commit comments

Comments
 (0)