Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

feat(objects): add compact browser view and column controls

二丫讲梵5db11475a52e
diff --git a/apps/desktop/src/components/objects/DatabaseBrowser.vue b/apps/desktop/src/components/objects/DatabaseBrowser.vue
index 86d2de8021..0734b2524f 100644
--- a/apps/desktop/src/components/objects/DatabaseBrowser.vue
+++ b/apps/desktop/src/components/objects/DatabaseBrowser.vue
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { computed, nextTick, onActivated, onBeforeUnmount, ref, watch } from "vue";
-import { ArrowDown, ArrowUp, Check, Copy, Database, GripVertical, LayoutGrid, List, Loader2, RefreshCw, Search, TerminalSquare, X } from "@lucide/vue";
+import { ArrowDown, ArrowUp, Check, Copy, Database, GripVertical, Grid3X3, LayoutGrid, List, Loader2, RefreshCw, Search, Settings2, TerminalSquare, X } from "@lucide/vue";
import { useI18n } from "vue-i18n";
import { Button } from "@/components/ui/button";
import { DropdownMenuItem, DropdownMenuSeparator, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger } from "@/components/ui/dropdown-menu";
@@ -24,6 +24,7 @@ import { useSettingsStore } from "@/stores/settingsStore";
import { useSidebarMenuPresentation } from "@/composables/useSidebarMenuPresentation";
import type { ConnectionConfig, TreeNode } from "@/types/database";
import { copyToClipboard } from "@/lib/common/clipboard";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
type DatabaseRow = {
name: string;
@@ -112,7 +113,10 @@ const hasUpdatedAt = computed(() => rows.value.some((row) => !!row.updatedAt?.tr
const hasComment = computed(() => rows.value.some((row) => !!row.comment?.trim()));
const hasDefaultCharset = computed(() => rows.value.some((row) => !!row.defaultCharset?.trim()));
const hasDefaultCollation = computed(() => rows.value.some((row) => !!row.defaultCollation?.trim()));
-const isListView = computed(() => settingsStore.editorSettings.objectBrowserViewMode !== "grid");
+const viewMode = computed(() => settingsStore.editorSettings.objectBrowserViewMode);
+const isListView = computed(() => viewMode.value === "list");
+const isGridView = computed(() => viewMode.value === "grid");
+const isCompactView = computed(() => viewMode.value === "compact");
// Measured condensation for the header row: tier 1 moves the sort/view
// controls into the overflow menu, tier 2 drops the connection chip (the tab
// title already carries it). See useToolbarOverflow for the tier contract.
@@ -132,9 +136,30 @@ const columns = computed<DatabaseBrowserColumnKey[]>(() => {
if (hasComment.value) next.push("comment");
return next;
});
+const columnVisibility = ref<Partial<Record<DatabaseBrowserColumnKey, boolean>>>({});
+const columnVisibilityStorageKey = computed(() => `dbx-database-browser-columns:v1:${props.connection.id}`);
+const columnDefinitions = computed(() => columns.value.map((key) => ({ key, label: columnLabel(key) })));
+function isColumnVisible(key: DatabaseBrowserColumnKey) {
+ return key === "name" || columnVisibility.value[key] !== false;
+}
+function toggleColumnVisibility(key: DatabaseBrowserColumnKey) {
+ if (key === "name") return;
+ columnVisibility.value = { ...columnVisibility.value, [key]: !isColumnVisible(key) };
+ localStorage.setItem(columnVisibilityStorageKey.value, JSON.stringify(columnVisibility.value));
+}
+function loadColumnVisibility() {
+ try {
+ const saved = JSON.parse(localStorage.getItem(columnVisibilityStorageKey.value) || "{}");
+ if (saved && typeof saved === "object") columnVisibility.value = saved;
+ } catch {
+ columnVisibility.value = {};
+ }
+}
+watch(columnVisibilityStorageKey, loadColumnVisibility, { immediate: true });
-const gridTemplateColumns = computed(() => columns.value.map((key, index) => (index === columns.value.length - 1 ? `minmax(${columnWidths.value[key]}px, 1fr)` : `${columnWidths.value[key]}px`)).join(" "));
-const gridMinWidth = computed(() => columns.value.reduce((total, key) => total + columnWidths.value[key], 0) + Math.max(0, columns.value.length - 1) * 12 + 24);
+const visibleColumns = computed(() => columns.value.filter(isColumnVisible));
+const gridTemplateColumns = computed(() => visibleColumns.value.map((key, index) => (index === visibleColumns.value.length - 1 ? `minmax(${columnWidths.value[key]}px, 1fr)` : `${columnWidths.value[key]}px`)).join(" "));
+const gridMinWidth = computed(() => visibleColumns.value.reduce((total, key) => total + columnWidths.value[key], 0) + Math.max(0, visibleColumns.value.length - 1) * 12 + 24);
const sortKeyOptions = computed(() => columns.value);
const visibleRows = computed(() => {
@@ -247,7 +272,7 @@ function toggleSort(key: DatabaseBrowserSortKey) {
sortDirection.value = initialSortDirection(key);
}
-function setViewMode(mode: "list" | "grid") {
+function setViewMode(mode: "list" | "grid" | "compact") {
settingsStore.updateEditorSettings({ objectBrowserViewMode: mode });
scrollToTop();
}
@@ -523,9 +548,12 @@ defineExpose({ focusSearch, refresh });
<button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isListView }" :title="t('objects.viewList')" @click="setViewMode('list')">
<List class="h-3.5 w-3.5" />
</button>
- <button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': !isListView }" :title="t('objects.viewGrid')" @click="setViewMode('grid')">
+ <button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isGridView }" :title="t('objects.viewGrid')" @click="setViewMode('grid')">
<LayoutGrid class="h-3.5 w-3.5" />
</button>
+ <button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isCompactView }" :title="t('objects.viewCompact')" @click="setViewMode('compact')">
+ <Grid3X3 class="h-3.5 w-3.5" />
+ </button>
</div>
<Button variant="ghost" size="icon" class="h-7 w-7" :title="t('contextMenu.refreshTab')" :disabled="loading" @click="refresh">
<RefreshCw class="h-3.5 w-3.5" :class="{ 'animate-spin': loading }" />
@@ -557,6 +585,10 @@ defineExpose({ focusSearch, refresh });
<LayoutGrid class="h-3.5 w-3.5" />
{{ t("objects.viewGrid") }}
</DropdownMenuItem>
+ <DropdownMenuItem @select="setViewMode('compact')">
+ <Grid3X3 class="h-3.5 w-3.5" />
+ {{ t("objects.viewCompact") }}
+ </DropdownMenuItem>
</ToolbarOverflowMenu>
</div>
@@ -565,13 +597,15 @@ defineExpose({ focusSearch, refresh });
<div v-else-if="visibleRows.length === 0" class="flex flex-1 items-center justify-center text-sm text-muted-foreground">{{ t("databaseBrowser.empty") }}</div>
<div v-else class="flex min-h-0 min-w-0 flex-1">
<div v-if="isListView" ref="listOuterRef" class="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-auto overflow-y-hidden" @scroll.passive="onListHorizontalScroll">
- <div class="grid h-7 shrink-0 items-center gap-3 border-b bg-muted/40 px-3 text-xs font-medium text-muted-foreground" :style="{ gridTemplateColumns, minWidth: `${gridMinWidth}px` }">
- <div v-for="key in columns" :key="key" class="relative flex min-w-0 items-center">
+ <div class="relative grid h-7 shrink-0 items-center gap-3 border-b bg-muted/40 px-3 text-xs font-medium text-muted-foreground" :style="{ gridTemplateColumns, minWidth: `${gridMinWidth}px` }">
+ <div v-for="key in visibleColumns" :key="key" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" @click="toggleSort(key)">
<span class="truncate">{{ columnLabel(key) }}</span
><component :is="sortIconFor(key)" v-if="sortIconFor(key)" class="h-3 w-3 shrink-0" />
</button>
<div
+ v-if="visibleColumns[visibleColumns.length - 1] !== key"
+ :data-database-column-resize="key"
class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
@mousedown="onColumnResizeStart(key, $event)"
@dblclick="resetColumnWidth(key, key === 'name' || key === 'comment' ? 260 : key === 'defaultCollation' ? 170 : key === 'defaultCharset' ? 130 : key === 'sizeBytes' ? 100 : 150, $event)"
@@ -579,6 +613,20 @@ defineExpose({ focusSearch, refresh });
<GripVertical class="h-3 w-3" />
</div>
</div>
+ <Popover>
+ <PopoverTrigger as-child>
+ <button type="button" class="absolute right-1 top-1/2 z-10 flex h-6 w-6 -translate-y-1/2 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground" :title="t('objects.configureColumns')" :aria-label="t('objects.configureColumns')">
+ <Settings2 class="h-3.5 w-3.5" />
+ </button>
+ </PopoverTrigger>
+ <PopoverContent align="end" class="w-52 p-1">
+ <div class="px-2 py-1.5 text-xs font-medium text-foreground">{{ t("objects.configureColumns") }}</div>
+ <button v-for="column in columnDefinitions" :key="column.key" type="button" class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-xs hover:bg-accent" :disabled="column.key === 'name'" @click="toggleColumnVisibility(column.key)">
+ <span class="flex h-4 w-4 items-center justify-center rounded border" :class="isColumnVisible(column.key) ? 'border-primary bg-primary text-primary-foreground' : 'border-border bg-background text-transparent'"><Check class="h-3 w-3 stroke-[3]" /></span>
+ <span class="truncate">{{ column.label }}</span>
+ </button>
+ </PopoverContent>
+ </Popover>
</div>
<div ref="listScrollerRef" class="min-h-0 flex-1 overflow-auto" @scroll.passive="onListVerticalScroll">
<div
@@ -593,7 +641,7 @@ defineExpose({ focusSearch, refresh });
<CustomContextMenu :items="() => databaseContextMenuItems(row)" v-slot="{ onContextMenu }">
<div class="contents" @contextmenu="onContextMenu">
<div
- v-for="key in columns"
+ v-for="key in visibleColumns"
:key="key"
class="min-w-0 truncate text-xs text-muted-foreground"
:class="{ 'flex items-center gap-2 text-[13px] font-medium text-foreground': key === 'name', 'tabular-nums': key === 'sizeBytes' || key === 'createdAt' || key === 'updatedAt' }"
@@ -607,24 +655,34 @@ defineExpose({ focusSearch, refresh });
</div>
</div>
</div>
- <div v-else ref="gridScrollerRef" class="grid min-h-0 flex-1 grid-cols-[repeat(auto-fill,minmax(160px,1fr))] content-start gap-3 overflow-auto p-3" @scroll.passive="onGridScroll">
+ <div v-else ref="gridScrollerRef" class="grid min-h-0 flex-1 content-start overflow-auto" :class="isCompactView ? 'grid-cols-[repeat(auto-fill,minmax(128px,1fr))] gap-1 p-1' : 'grid-cols-[repeat(auto-fill,minmax(160px,1fr))] gap-3 p-3'" @scroll.passive="onGridScroll">
<div
v-for="row in visibleRows"
:key="row.name"
tabindex="0"
- class="flex min-h-28 cursor-pointer flex-col items-center gap-1 rounded-lg border bg-card p-3 text-center outline-none transition-all hover:border-primary/40 hover:shadow-sm focus-visible:border-primary"
+ :class="
+ isCompactView
+ ? 'flex h-7 min-w-0 cursor-pointer items-center gap-1 rounded border bg-card px-1.5 text-[11px] outline-none transition-all hover:border-primary/40 hover:bg-accent/40 focus-visible:border-primary'
+ : 'flex min-h-28 cursor-pointer flex-col items-center gap-1 rounded-lg border bg-card p-3 text-center outline-none transition-all hover:border-primary/40 hover:shadow-sm focus-visible:border-primary'
+ "
@dblclick="openDatabase(row.name)"
@keydown.enter.prevent="openDatabase(row.name)"
>
<CustomContextMenu :items="() => databaseContextMenuItems(row)" v-slot="{ onContextMenu }">
<div class="contents" @contextmenu="onContextMenu">
- <div class="flex h-11 w-11 shrink-0 items-center justify-center rounded-full bg-emerald-500/10 shadow-sm"><Database class="h-6 w-6 text-emerald-600 dark:text-emerald-400" /></div>
- <span class="w-full truncate text-sm font-medium text-foreground" :title="row.name">{{ row.name }}</span>
- <div class="flex min-h-[15px] items-center gap-1 text-[10px] leading-[15px] text-muted-foreground">
- <span v-if="row.sizeBytes != null">{{ formatObjectBrowserBytes(row.sizeBytes) }}</span
- ><span v-if="row.createdAt && row.sizeBytes != null">·</span><span v-if="row.createdAt">{{ formatObjectBrowserTimestamp(row.createdAt) }}</span>
- </div>
- <div v-if="hasComment" class="w-full truncate text-[10px] leading-[15px] text-muted-foreground/60" :title="row.comment || ''">{{ row.comment || "\u00A0" }}</div>
+ <template v-if="isCompactView">
+ <Database class="h-3.5 w-3.5 shrink-0 text-emerald-600 dark:text-emerald-400" aria-hidden="true" />
+ <span class="min-w-0 truncate font-medium text-foreground" :title="row.name">{{ row.name }}</span>
+ </template>
+ <template v-else>
+ <div class="flex h-11 w-11 shrink-0 items-center justify-center rounded-full bg-emerald-500/10 shadow-sm"><Database class="h-6 w-6 text-emerald-600 dark:text-emerald-400" /></div>
+ <span class="w-full truncate text-sm font-medium text-foreground" :title="row.name">{{ row.name }}</span>
+ <div class="flex min-h-[15px] items-center gap-1 text-[10px] leading-[15px] text-muted-foreground">
+ <span v-if="row.sizeBytes != null">{{ formatObjectBrowserBytes(row.sizeBytes) }}</span
+ ><span v-if="row.createdAt && row.sizeBytes != null">·</span><span v-if="row.createdAt">{{ formatObjectBrowserTimestamp(row.createdAt) }}</span>
+ </div>
+ <div v-if="hasComment" class="w-full truncate text-[10px] leading-[15px] text-muted-foreground/60" :title="row.comment || ''">{{ row.comment || "\u00A0" }}</div>
+ </template>
</div>
</CustomContextMenu>
</div>
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index 8483f858b5..55ecd51099 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -31,6 +31,8 @@ import {
FileText,
Info,
GripVertical,
+ Grid3X3,
+ Settings2,
KeyRound,
LayoutGrid,
Link2,
@@ -197,6 +199,7 @@ import { invalidateObjectDdl } from "@/lib/metadata/objectDdlCache";
import { invalidateObjectBrowserRowsCache } from "@/lib/table/objectBrowserRowsCache";
import { eventEditorInstanceKey, resolveInitialEventEditorRequest } from "@/lib/table/eventEditorRequest";
import { createLocateTabMenuItem } from "@/lib/tabs/tabMenu";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
type ObjectFilter = ObjectBrowserFilter;
type ObjectBrowserColumnKey = "select" | "name" | "type" | "estimatedRows" | "totalBytes" | "created_at" | "updated_at" | "comment";
@@ -448,6 +451,35 @@ const objectColumnWidths = ref<Record<ObjectBrowserColumnKey, number>>({
updated_at: 150,
comment: 260,
});
+const objectColumnVisibility = ref<Partial<Record<ObjectBrowserColumnKey, boolean>>>({});
+const objectColumnVisibilityStorageKey = computed(() => `dbx-object-browser-columns:v1:${props.connection.id}:${props.database}:${selectedSchema.value ?? ""}`);
+const objectColumnDefinitions = computed(() => [
+ { key: "name" as const, label: t("objects.name") },
+ { key: "type" as const, label: t("objects.type") },
+ ...(showObjectRowStats.value ? [{ key: "estimatedRows" as const, label: objectRowsLabel.value }] : []),
+ ...(showObjectSizeStats.value ? [{ key: "totalBytes" as const, label: t("objects.size") }] : []),
+ ...(hasCreatedAt.value ? [{ key: "created_at" as const, label: t("objects.createdAt") }] : []),
+ ...(hasUpdatedAt.value ? [{ key: "updated_at" as const, label: t("objects.updatedAt") }] : []),
+ { key: "comment" as const, label: t("objects.comment") },
+]);
+function isObjectColumnVisible(key: ObjectBrowserColumnKey) {
+ return key === "name" || objectColumnVisibility.value[key] !== false;
+}
+function toggleObjectColumnVisibility(key: ObjectBrowserColumnKey) {
+ if (key === "name") return;
+ objectColumnVisibility.value = { ...objectColumnVisibility.value, [key]: !isObjectColumnVisible(key) };
+ localStorage.setItem(objectColumnVisibilityStorageKey.value, JSON.stringify(objectColumnVisibility.value));
+ nextTick(() => syncObjectListHeaderScroll());
+}
+function loadObjectColumnVisibility() {
+ try {
+ const saved = JSON.parse(localStorage.getItem(objectColumnVisibilityStorageKey.value) || "{}");
+ if (saved && typeof saved === "object") objectColumnVisibility.value = saved;
+ } catch {
+ objectColumnVisibility.value = {};
+ }
+}
+watch(objectColumnVisibilityStorageKey, loadObjectColumnVisibility, { immediate: true });
const objectBrowserRowsLoadGuard = createObjectBrowserRowsLoadGuard();
// schema 列表的失效只跟随上下文(连接/库/schema 变化、卸载),不跟随对象列表加载:
// loadObjects() 会推进 objectBrowserRowsLoadGuard 的 epoch,若两者共用一个 epoch,
@@ -516,7 +548,10 @@ const showDatabaseChip = computed(() => toolbarTier.value < 2);
const hasCreatedAt = computed(() => rows.value.some((row) => row.created_at?.trim()));
const hasUpdatedAt = computed(() => rows.value.some((row) => row.updated_at?.trim()));
const hasAnyComment = computed(() => rows.value.some((row) => row.comment?.trim()));
-const isListView = computed(() => settingsStore.editorSettings.objectBrowserViewMode !== "grid");
+const viewMode = computed<ObjectBrowserViewMode>(() => settingsStore.editorSettings.objectBrowserViewMode);
+const isListView = computed(() => viewMode.value === "list");
+const isGridView = computed(() => viewMode.value === "grid");
+const isCompactView = computed(() => viewMode.value === "compact");
type ObjectBrowserScroller =
| HTMLElement
@@ -536,7 +571,7 @@ let viewportFrame = 0;
let restoreViewportFrame = 0;
function objectBrowserViewMode(): ObjectBrowserViewMode {
- return isListView.value ? "list" : "grid";
+ return viewMode.value;
}
function activeScroller() {
@@ -643,7 +678,7 @@ onActivated(() => {
restoreObjectBrowserViewport();
});
-function setViewMode(mode: "list" | "grid") {
+function setViewMode(mode: ObjectBrowserViewMode) {
settingsStore.updateEditorSettings({ objectBrowserViewMode: mode });
scrollObjectsToTop();
}
@@ -702,14 +737,13 @@ function toggleCheckboxColumn() {
const objectBrowserColumns = computed<ObjectBrowserColumnKey[]>(() => {
const columns: ObjectBrowserColumnKey[] = [];
if (showCheckboxColumn.value) columns.push("select");
- columns.push("name", "type");
- if (showObjectRowStats.value) columns.push("estimatedRows");
- if (showObjectSizeStats.value) columns.push("totalBytes");
- if (hasCreatedAt.value) columns.push("created_at");
- if (hasUpdatedAt.value) columns.push("updated_at");
- columns.push("comment");
+ for (const definition of objectColumnDefinitions.value) if (isObjectColumnVisible(definition.key)) columns.push(definition.key);
return columns;
});
+function isLastVisibleObjectColumn(key: ObjectBrowserColumnKey) {
+ const visibleColumns = objectBrowserColumns.value.filter((column) => column !== "select");
+ return visibleColumns[visibleColumns.length - 1] === key;
+}
const gridTemplateColumns = computed(() => {
return objectBrowserColumns.value
.map((key, index, columns) => {
@@ -739,7 +773,9 @@ const selectableRows = computed(() => rows.value.filter((row) => row.type === "T
// The previous flat `v-for` rendered every card (plus its CustomContextMenu)
// at once, which stalls the UI on schemas with thousands of objects.
const OBJECT_GRID_MIN_CARD_WIDTH = 160; // former `minmax(160px, 1fr)` floor
+const OBJECT_COMPACT_MIN_CARD_WIDTH = 128;
const OBJECT_GRID_GAP = 12; // 0.75rem, former grid gap (both axes)
+const OBJECT_COMPACT_GAP = 4;
// Card height is dataset-stable: if any object has timestamps/comments, every card
// reserves those slots (even when empty) so borders stay level across a row.
// objectGridRowHeight adapts to the dataset instead of always using the worst case.
@@ -753,6 +789,7 @@ const OBJECT_GRID_CARD_COMMENT_H = 19;
const OBJECT_GRID_CARD_SAFETY = 6; // buffer for sub-pixel font differences
const objectGridRowHeight = computed(() => {
+ if (isCompactView.value) return 28 + OBJECT_COMPACT_GAP;
let cardH = OBJECT_GRID_CARD_BASE_H;
if (hasCreatedAt.value || hasUpdatedAt.value) cardH += OBJECT_GRID_CARD_TIMESTAMP_H;
if (hasAnyComment.value) cardH += OBJECT_GRID_CARD_COMMENT_H;
@@ -763,7 +800,9 @@ const gridColumns = ref(1);
let gridResizeObserver: ResizeObserver | null = null;
function recomputeGridColumns(width: number) {
- gridColumns.value = Math.max(1, Math.floor((width + OBJECT_GRID_GAP) / (OBJECT_GRID_MIN_CARD_WIDTH + OBJECT_GRID_GAP)));
+ const minWidth = isCompactView.value ? OBJECT_COMPACT_MIN_CARD_WIDTH : OBJECT_GRID_MIN_CARD_WIDTH;
+ const gap = isCompactView.value ? OBJECT_COMPACT_GAP : OBJECT_GRID_GAP;
+ gridColumns.value = Math.max(1, Math.floor((width + gap) / (minWidth + gap)));
}
// The grid container lives inside a v-else, so it mounts/unmounts when the user
@@ -789,6 +828,12 @@ watch(
},
{ flush: "post" },
);
+watch(viewMode, () =>
+ nextTick(() => {
+ const el = gridContainerRef.value;
+ if (el) recomputeGridColumns(el.clientWidth - parseFloat(getComputedStyle(el).paddingLeft) - parseFloat(getComputedStyle(el).paddingRight));
+ }),
+);
onBeforeUnmount(() => {
gridResizeObserver?.disconnect();
@@ -4617,9 +4662,12 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isListView }" :title="t('objects.viewList')" @click="setViewMode('list')">
<List class="h-3.5 w-3.5" />
</button>
- <button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': !isListView }" :title="t('objects.viewGrid')" @click="setViewMode('grid')">
+ <button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isGridView }" :title="t('objects.viewGrid')" @click="setViewMode('grid')">
<LayoutGrid class="h-3.5 w-3.5" />
</button>
+ <button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isCompactView }" :title="t('objects.viewCompact')" @click="setViewMode('compact')">
+ <Grid3X3 class="h-3.5 w-3.5" />
+ </button>
</div>
<Button v-if="showInlineCheckboxToggle && supportsBatchTableActions" variant="ghost" size="icon" class="h-7 w-7" :class="{ 'text-primary': settingsStore.editorSettings.objectBrowserShowCheckbox }" :title="t('objects.toggleCheckbox')" @click="toggleCheckboxColumn">
<CheckSquare v-if="settingsStore.editorSettings.objectBrowserShowCheckbox" class="h-3.5 w-3.5" />
@@ -4659,6 +4707,10 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<LayoutGrid class="h-3.5 w-3.5" />
{{ t("objects.viewGrid") }}
</DropdownMenuItem>
+ <DropdownMenuItem @select="setViewMode('compact')">
+ <Grid3X3 class="h-3.5 w-3.5" />
+ {{ t("objects.viewCompact") }}
+ </DropdownMenuItem>
<DropdownMenuCheckboxItem v-if="supportsBatchTableActions" :model-value="settingsStore.editorSettings.objectBrowserShowCheckbox" @select.prevent @update:model-value="toggleCheckboxColumn()">{{ t("objects.toggleCheckbox") }}</DropdownMenuCheckboxItem>
<template v-if="showObjectFilter && toolbarTier >= 2">
<DropdownMenuSeparator />
@@ -4717,7 +4769,7 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<div v-else class="flex min-h-0 min-w-0 flex-1" :class="{ 'event-editor-layout': isEventEditor }">
<div class="flex min-h-0 min-w-0 flex-1 flex-col">
<div v-if="isListView" class="object-browser-table flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden">
- <div ref="objectListHeaderRef" class="h-7 shrink-0 overflow-hidden">
+ <div ref="objectListHeaderRef" class="relative h-7 shrink-0 overflow-hidden">
<div class="grid h-7 items-center gap-3 border-b bg-muted/40 px-3 text-xs font-medium text-muted-foreground" :style="{ gridTemplateColumns, minWidth: `${objectGridMinWidth}px` }">
<div v-if="showCheckboxColumn" class="relative flex min-w-0 items-center">
<button class="flex h-6 w-6 items-center justify-center rounded-sm hover:bg-accent" type="button" :disabled="visibleSelectableRows.length === 0" @click="toggleVisibleTableSelection">
@@ -4728,30 +4780,44 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div class="relative flex min-w-0 items-center">
+ <div v-if="isObjectColumnVisible('name')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" @click="toggleSort('name')">
<span class="truncate">{{ t("objects.name") }}</span>
<component :is="sortIconFor('name')" v-if="sortIconFor('name')" class="h-3 w-3 shrink-0" />
</button>
- <div class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary" @mousedown="onObjectColumnResizeStart('name', $event)" @dblclick="resetObjectColumnWidth('name', 260, $event)">
+ <div
+ v-if="!isLastVisibleObjectColumn('name')"
+ data-object-column-resize="name"
+ class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
+ @mousedown="onObjectColumnResizeStart('name', $event)"
+ @dblclick="resetObjectColumnWidth('name', 260, $event)"
+ >
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div class="relative flex min-w-0 items-center">
+ <div v-if="isObjectColumnVisible('type')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" @click="toggleSort('type')">
<span class="truncate">{{ t("objects.type") }}</span>
<component :is="sortIconFor('type')" v-if="sortIconFor('type')" class="h-3 w-3 shrink-0" />
</button>
- <div class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary" @mousedown="onObjectColumnResizeStart('type', $event)" @dblclick="resetObjectColumnWidth('type', 110, $event)">
+ <div
+ v-if="!isLastVisibleObjectColumn('type')"
+ data-object-column-resize="type"
+ class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
+ @mousedown="onObjectColumnResizeStart('type', $event)"
+ @dblclick="resetObjectColumnWidth('type', 110, $event)"
+ >
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div v-if="showObjectRowStats" class="relative flex min-w-0 items-center">
+ <div v-if="showObjectRowStats && isObjectColumnVisible('estimatedRows')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" :title="t('objects.statisticsHint')" @click="toggleSort('estimatedRows')">
<span class="truncate">{{ objectRowsLabel }}</span>
<component :is="sortIconFor('estimatedRows')" v-if="sortIconFor('estimatedRows')" class="h-3 w-3 shrink-0" />
</button>
<div
+ v-if="!isLastVisibleObjectColumn('estimatedRows')"
+ data-object-column-resize="estimatedRows"
class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
@mousedown="onObjectColumnResizeStart('estimatedRows', $event)"
@dblclick="resetObjectColumnWidth('estimatedRows', 110, $event)"
@@ -4759,12 +4825,14 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div v-if="showObjectSizeStats" class="relative flex min-w-0 items-center">
+ <div v-if="showObjectSizeStats && isObjectColumnVisible('totalBytes')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" :title="t('objects.statisticsHint')" @click="toggleSort('totalBytes')">
<span class="truncate">{{ t("objects.size") }}</span>
<component :is="sortIconFor('totalBytes')" v-if="sortIconFor('totalBytes')" class="h-3 w-3 shrink-0" />
</button>
<div
+ v-if="!isLastVisibleObjectColumn('totalBytes')"
+ data-object-column-resize="totalBytes"
class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
@mousedown="onObjectColumnResizeStart('totalBytes', $event)"
@dblclick="resetObjectColumnWidth('totalBytes', 100, $event)"
@@ -4772,12 +4840,14 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div v-if="hasCreatedAt" class="relative flex min-w-0 items-center">
+ <div v-if="hasCreatedAt && isObjectColumnVisible('created_at')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" @click="toggleSort('created_at')">
<span class="truncate">{{ t("objects.createdAt") }}</span>
<component :is="sortIconFor('created_at')" v-if="sortIconFor('created_at')" class="h-3 w-3 shrink-0" />
</button>
<div
+ v-if="!isLastVisibleObjectColumn('created_at')"
+ data-object-column-resize="created_at"
class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
@mousedown="onObjectColumnResizeStart('created_at', $event)"
@dblclick="resetObjectColumnWidth('created_at', 150, $event)"
@@ -4785,12 +4855,14 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div v-if="hasUpdatedAt" class="relative flex min-w-0 items-center">
+ <div v-if="hasUpdatedAt && isObjectColumnVisible('updated_at')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" @click="toggleSort('updated_at')">
<span class="truncate">{{ t("objects.updatedAt") }}</span>
<component :is="sortIconFor('updated_at')" v-if="sortIconFor('updated_at')" class="h-3 w-3 shrink-0" />
</button>
<div
+ v-if="!isLastVisibleObjectColumn('updated_at')"
+ data-object-column-resize="updated_at"
class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
@mousedown="onObjectColumnResizeStart('updated_at', $event)"
@dblclick="resetObjectColumnWidth('updated_at', 150, $event)"
@@ -4798,12 +4870,14 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<GripVertical class="h-3 w-3" />
</div>
</div>
- <div class="relative flex min-w-0 items-center">
+ <div v-if="isObjectColumnVisible('comment')" class="relative flex min-w-0 items-center">
<button class="flex min-w-0 items-center gap-1 truncate pr-4 text-left" type="button" :disabled="usesServerObjectPaging" @click="toggleSort('comment')">
<span class="truncate">{{ t("objects.comment") }}</span>
<component :is="sortIconFor('comment')" v-if="sortIconFor('comment')" class="h-3 w-3 shrink-0" />
</button>
<div
+ v-if="!isLastVisibleObjectColumn('comment')"
+ data-object-column-resize="comment"
class="absolute -right-2 top-0 bottom-0 z-10 flex w-3 cursor-col-resize items-center justify-center text-muted-foreground/70 hover:bg-primary/30 hover:text-primary"
@mousedown="onObjectColumnResizeStart('comment', $event)"
@dblclick="resetObjectColumnWidth('comment', 260, $event)"
@@ -4812,6 +4886,20 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
</div>
</div>
</div>
+ <Popover>
+ <PopoverTrigger as-child>
+ <button type="button" class="absolute right-1 top-1/2 z-10 flex h-6 w-6 -translate-y-1/2 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground" :title="t('objects.configureColumns')" :aria-label="t('objects.configureColumns')">
+ <Settings2 class="h-3.5 w-3.5" />
+ </button>
+ </PopoverTrigger>
+ <PopoverContent align="end" class="w-52 p-1">
+ <div class="px-2 py-1.5 text-xs font-medium text-foreground">{{ t("objects.configureColumns") }}</div>
+ <button v-for="column in objectColumnDefinitions" :key="column.key" type="button" class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-xs hover:bg-accent" :disabled="column.key === 'name'" @click="toggleObjectColumnVisibility(column.key)">
+ <span class="flex h-4 w-4 items-center justify-center rounded border" :class="isObjectColumnVisible(column.key) ? 'border-primary bg-primary text-primary-foreground' : 'border-border bg-background text-transparent'"><Check class="h-3 w-3 stroke-[3]" /></span>
+ <span class="truncate">{{ column.label }}</span>
+ </button>
+ </PopoverContent>
+ </Popover>
</div>
<RecycleScroller ref="listScrollerRef" class="object-browser-scroller min-h-0 flex-1" :style="{ '--dbx-object-grid-min-width': `${objectGridMinWidth}px` }" :items="filteredRows" :item-size="34" :buffer="600" :skip-hover="true" key-field="id">
<template #default="{ item }">
@@ -4852,25 +4940,25 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
{{ t("objects.partitions", { count: item.partitionCount }) }}
</span>
</div>
- <div class="flex min-w-0 items-center gap-1.5 truncate text-xs text-muted-foreground">
+ <div v-if="isObjectColumnVisible('type')" class="flex min-w-0 items-center gap-1.5 truncate text-xs text-muted-foreground">
<span class="truncate">{{ typeLabel(item) }}</span>
<span v-if="item.valid != null" class="shrink-0 rounded border px-1 py-px text-[10px] font-medium" :class="item.valid ? 'border-emerald-500/30 text-emerald-600' : 'border-destructive/30 text-destructive'">
{{ t(item.valid ? "objects.validStatus" : "objects.invalidStatus") }}
</span>
</div>
- <div v-if="showObjectRowStats" class="truncate text-xs tabular-nums text-muted-foreground" :title="item.estimatedRows == null ? '' : formatObjectBrowserCount(item.estimatedRows)">
+ <div v-if="showObjectRowStats && isObjectColumnVisible('estimatedRows')" class="truncate text-xs tabular-nums text-muted-foreground" :title="item.estimatedRows == null ? '' : formatObjectBrowserCount(item.estimatedRows)">
{{ formatObjectBrowserCount(item.estimatedRows) }}
</div>
- <div v-if="showObjectSizeStats" class="truncate text-xs tabular-nums text-muted-foreground" :title="item.totalBytes == null ? '' : formatObjectBrowserBytes(item.totalBytes)">
+ <div v-if="showObjectSizeStats && isObjectColumnVisible('totalBytes')" class="truncate text-xs tabular-nums text-muted-foreground" :title="item.totalBytes == null ? '' : formatObjectBrowserBytes(item.totalBytes)">
{{ formatObjectBrowserBytes(item.totalBytes) }}
</div>
- <div v-if="hasCreatedAt" class="truncate text-xs tabular-nums text-muted-foreground" :title="formatObjectBrowserTimestamp(item.created_at)">
+ <div v-if="hasCreatedAt && isObjectColumnVisible('created_at')" class="truncate text-xs tabular-nums text-muted-foreground" :title="formatObjectBrowserTimestamp(item.created_at)">
{{ formatObjectBrowserTimestamp(item.created_at) }}
</div>
- <div v-if="hasUpdatedAt" class="truncate text-xs tabular-nums text-muted-foreground" :title="formatObjectBrowserTimestamp(item.updated_at)">
+ <div v-if="hasUpdatedAt && isObjectColumnVisible('updated_at')" class="truncate text-xs tabular-nums text-muted-foreground" :title="formatObjectBrowserTimestamp(item.updated_at)">
{{ formatObjectBrowserTimestamp(item.updated_at) }}
</div>
- <div class="truncate text-xs text-muted-foreground" :title="item.comment || ''">
+ <div v-if="isObjectColumnVisible('comment')" class="truncate text-xs text-muted-foreground" :title="item.comment || ''">
{{ item.comment || "" }}
</div>
</div>
@@ -4878,12 +4966,13 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
</template>
</RecycleScroller>
</div>
- <div v-else ref="gridContainerRef" class="object-browser-grid-wrapper min-h-0 flex-1 p-2">
+ <div v-else ref="gridContainerRef" class="object-browser-grid-wrapper min-h-0 flex-1 p-2" :class="{ 'p-1': isCompactView }">
<RecycleScroller ref="gridScrollerRef" v-if="gridRows.length > 0" class="object-browser-grid-scroller h-full" :items="gridRows" :item-size="objectGridRowHeight" :buffer="600" :skip-hover="true" key-field="key">
<template #default="{ item: row }">
- <div class="object-browser-grid-row" :style="{ gridTemplateColumns: `repeat(${gridColumns}, minmax(0, 1fr))`, height: `${objectGridRowHeight - OBJECT_GRID_GAP}px` }">
+ <div class="object-browser-grid-row" :style="{ gridTemplateColumns: `repeat(${gridColumns}, minmax(0, 1fr))`, columnGap: `${isCompactView ? OBJECT_COMPACT_GAP : OBJECT_GRID_GAP}px`, height: `${objectGridRowHeight - (isCompactView ? OBJECT_COMPACT_GAP : OBJECT_GRID_GAP)}px` }">
<CustomContextMenu v-for="item in row.cards" :key="item.id" :items="() => getObjectBrowserMenuItems(item)" v-slot="{ onContextMenu, isOpen }">
<div
+ v-if="isGridView"
class="relative flex h-full min-h-0 cursor-default flex-col items-center gap-1 rounded-lg border p-3 text-center transition-all"
:class="{
'border-primary bg-accent shadow-sm': isOpen || sourceRow?.id === item.id || sidePanelRow?.id === item.id || selectedTableIds.has(item.id),
@@ -4924,6 +5013,25 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
{{ item.comment?.trim() || "\u00A0" }}
</div>
</div>
+ <div
+ v-else
+ data-object-compact-card
+ class="flex h-full min-w-0 cursor-default items-center gap-1 rounded border px-1.5 text-[11px] text-foreground transition-colors"
+ :class="{
+ 'border-primary bg-accent shadow-sm': isOpen || sourceRow?.id === item.id || sidePanelRow?.id === item.id || selectedTableIds.has(item.id),
+ 'bg-card hover:border-primary/40 hover:bg-accent/40': !isOpen && sourceRow?.id !== item.id && sidePanelRow?.id !== item.id && !selectedTableIds.has(item.id),
+ }"
+ :title="item.displayName"
+ @click="onRowClick(item, $event)"
+ @contextmenu="onContextMenu"
+ >
+ <button v-if="showCheckboxColumn" class="mr-1 flex h-5 w-5 shrink-0 items-center justify-center rounded-sm text-muted-foreground hover:bg-accent hover:text-foreground" type="button" :class="{ invisible: item.type !== 'TABLE' }" @click.stop="toggleTableSelection(item)">
+ <CheckSquare v-if="selectedTableIds.has(item.id)" class="h-3.5 w-3.5 text-primary" />
+ <Square v-else class="h-3.5 w-3.5" />
+ </button>
+ <component :is="iconFor(item)" class="h-3.5 w-3.5 shrink-0" :class="iconClass(item.type)" aria-hidden="true" />
+ <span class="min-w-0 truncate font-medium">{{ item.displayName }}</span>
+ </div>
</CustomContextMenu>
</div>
</template>
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
index 7330e98155..e3ab27321a 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
@@ -60,7 +60,18 @@ vi.mock("vue-virtual-scroller", () => ({
},
}),
}));
-vi.mock("@/components/ui/searchable-select", () => ({ SearchableSelect: { render: () => null } }));
+vi.mock("@/components/ui/searchable-select", () => ({
+ SearchableSelect: defineComponent({
+ props: {
+ modelValue: { type: String, default: "" },
+ options: { type: Array, default: () => [] },
+ },
+ emits: ["update:modelValue"],
+ setup(props, { emit }) {
+ return () => h("button", { "data-schema-select": true, onClick: () => emit("update:modelValue", props.options[1] ?? "") }, props.modelValue);
+ },
+ }),
+}));
vi.mock("@/components/ui/ToolbarOverflowMenu.vue", () => ({ default: { render: () => null } }));
vi.mock("@/components/editor/QueryEditor.vue", () => ({ default: { render: () => null } }));
vi.mock("@/components/editor/DangerConfirmDialog.vue", () => ({ default: { render: () => null } }));
@@ -102,6 +113,7 @@ beforeEach(() => {
]);
mocks.ensureConnected.mockResolvedValue(undefined);
invalidateObjectBrowserRowsCache({});
+ localStorage.clear();
});
afterEach(() => {
@@ -110,6 +122,7 @@ afterEach(() => {
host.remove();
}
invalidateObjectBrowserRowsCache({});
+ localStorage.clear();
gridStyle.remove();
});
@@ -143,18 +156,50 @@ function menuButton(label: string): HTMLButtonElement {
return buttons[0]!;
}
-describe.each(["list", "grid"] as const)("ObjectBrowser locate in sidebar (%s)", (viewMode) => {
+describe.each(["list", "grid", "compact"] as const)("ObjectBrowser locate in sidebar (%s)", (viewMode) => {
beforeEach(() => {
mocks.viewMode = viewMode;
});
+ it("reloads list column visibility when the selected schema changes", async () => {
+ if (viewMode !== "list") return;
+ localStorage.setItem("dbx-object-browser-columns:v1:locate-connection:browser_database:browser_schema", JSON.stringify({ comment: false }));
+ localStorage.setItem("dbx-object-browser-columns:v1:locate-connection:browser_database:row_schema", JSON.stringify({ comment: true }));
+
+ const host = await mountBrowser({ schema: "browser_schema" });
+ const table = () => host.querySelector<HTMLElement>(".object-browser-table");
+ expect(table()?.textContent).not.toContain("objects.comment");
+
+ host.querySelector<HTMLButtonElement>("[data-schema-select]")?.click();
+ await vi.waitFor(() => expect(table()?.textContent).toContain("objects.comment"));
+ });
+
+ it("keeps the column picker clear of the trailing resize handle", async () => {
+ if (viewMode !== "list") return;
+ localStorage.setItem("dbx-object-browser-columns:v1:locate-connection:browser_database:browser_schema", JSON.stringify({ type: false }));
+
+ const host = await mountBrowser({ schema: "browser_schema" });
+ expect(host.querySelector('[title="objects.configureColumns"]')).not.toBeNull();
+ expect(host.querySelector('[data-object-column-resize="name"]')).not.toBeNull();
+ expect(host.querySelector('[data-object-column-resize="comment"]')).toBeNull();
+ });
+
+ it("keeps the compact card icon and full-name tooltip", async () => {
+ if (viewMode !== "compact") return;
+ const host = await mountBrowser();
+ const card = host.querySelector<HTMLElement>('[data-object-compact-card][title="orders"]');
+ expect(card).not.toBeNull();
+ expect(card?.querySelector("svg")).not.toBeNull();
+ expect(card?.textContent).toContain("orders");
+ });
+
it.each([
["orders", "TABLE"],
["recent_orders", "VIEW"],
["order_totals", "MATERIALIZED_VIEW"],
])("locates %s with the exact row identity without opening a tab", async (tableName, tableType) => {
const host = await mountBrowser();
- expect(host.querySelector(viewMode === "grid" ? ".object-browser-grid-scroller" : ".object-browser-scroller")).not.toBeNull();
+ expect(host.querySelector(viewMode === "list" ? ".object-browser-scroller" : ".object-browser-grid-scroller")).not.toBeNull();
await openMenu(host, tableName);
expect(mocks.locateTable).not.toHaveBeenCalled();
mocks.ensureConnected.mockClear();
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index b9e04bdf51..996973fa1b 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -5837,6 +5837,8 @@ export default {
toggleCheckbox: "Toggle multi-select",
viewList: "List view",
viewGrid: "Grid view",
+ viewCompact: "Compact grid view",
+ configureColumns: "Configure columns",
sortAsc: "Ascending",
sortDesc: "Descending",
sortBy: "Sort by",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 2fd258ad54..8e15700a68 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -5147,6 +5147,8 @@ export default withEnglishFallback({
valid: "válido",
invalid: "inválido",
refreshDiscardConfirm: "Actualizar descartará los cambios sin guardar en el código fuente, ¿deseas continuar?",
+ viewCompact: "Vista de cuadrícula compacta",
+ configureColumns: "Configurar columnas de visualización",
},
structureEditor: {
mysqlDataTypeHelp: {
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 1bf3ce7a70..6415b89a58 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -4967,6 +4967,8 @@ export default withEnglishFallback({
valid: "valido",
invalid: "non valido",
refreshDiscardConfirm: "L'aggiornamento eliminerà le modifiche non salvate al codice sorgente. Continuare?",
+ viewCompact: "Vista compatta a griglia",
+ configureColumns: "Configura colonne visualizzate",
},
structureEditor: {
mysqlDataTypeHelp: {
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index d09e416193..41cecf29a8 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -5029,6 +5029,8 @@ export default withEnglishFallback({
valid: "有効",
invalid: "無効",
refreshDiscardConfirm: "更新すると、保存されていないソースコードの変更が破棄されます。続行しますか?",
+ viewCompact: "コンパクトグリッドビュー",
+ configureColumns: "表示列を設定",
},
structureEditor: {
mysqlDataTypeHelp: {
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 77cb9ec52d..2a16dbf4ef 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -5010,6 +5010,8 @@ export default withEnglishFallback({
sortDesc: "내림차순",
sortBy: "정렬 기준",
refreshDiscardConfirm: "새로 고침하면 저장되지 않은 소스 코드 변경 사항이 삭제됩니다. 계속하시겠습니까?",
+ viewCompact: "컴팩트 3x3 그리드 뷰",
+ configureColumns: "표시 열 구성",
},
structureEditor: {
createTitle: "테이블 만들기",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index f3add95e0a..ce9bfacb5f 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -4967,6 +4967,8 @@ export default withEnglishFallback({
valid: "Válido",
invalid: "Inválido",
refreshDiscardConfirm: "Atualizar descartará as modificações não salvas no código-fonte. Deseja continuar?",
+ viewCompact: "Visualização compacta em grade",
+ configureColumns: "Configurar colunas de exibição",
},
structureEditor: {
mysqlDataTypeHelp: {
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index f46756d421..d01a4c2f9a 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -5488,6 +5488,8 @@ export default withEnglishFallback({
sortAsc: "По возрастанию",
sortDesc: "По убыванию",
sortBy: "Сортировать по",
+ viewCompact: "Компактный вид сетки",
+ configureColumns: "Настроить отображаемые столбцы",
},
structureEditor: {
createTitle: "Создание таблицы",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index 57c8555c02..91970acd82 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -5823,6 +5823,8 @@ export default withEnglishFallback({
sortAsc: "เรียงจากน้อยไปมาก",
sortDesc: "เรียงจากมากไปน้อย",
sortBy: "เรียงตาม",
+ viewCompact: "มุมมองกริดแบบกะทัดรัด",
+ configureColumns: "กำหนดค่าคอลัมน์ที่แสดง",
},
structureEditor: {
createTitle: "สร้าง Table",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 4fd6178c5f..8664d1f793 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -5826,6 +5826,8 @@ export default withEnglishFallback({
toggleCheckbox: "切换多选模式",
viewList: "列表视图",
viewGrid: "平铺视图",
+ viewCompact: "紧凑九宫格视图",
+ configureColumns: "配置显示列",
sortAsc: "升序",
sortDesc: "降序",
sortBy: "排序方式",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 9b9df3dcaa..44c3a59120 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -4714,6 +4714,8 @@ export default withEnglishFallback({
valid: "有效",
invalid: "無效",
refreshDiscardConfirm: "重新整理將捨棄未儲存的原始碼修改,是否繼續?",
+ viewCompact: "緊湊九宮格檢視",
+ configureColumns: "設定顯示欄",
},
structureEditor: {
mysqlDataTypeHelp: {
diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
index c3598892d0..40c6f79f1b 100644
--- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
+++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
@@ -31,6 +31,11 @@ import { DATA_GRID_EXTRACTOR_OPTIONS_MIGRATION_VERSION } from "@/lib/dataGrid/da
import { DEFAULT_MONO_FONT_FAMILY } from "@/lib/app/appFonts";
describe("normalizeEditorSettings", () => {
+ it("preserves the compact object browser view and rejects unknown modes", () => {
+ expect(normalizeEditorSettings({ objectBrowserViewMode: "compact" }).objectBrowserViewMode).toBe("compact");
+ expect(normalizeEditorSettings({ objectBrowserViewMode: "unknown" as any }).objectBrowserViewMode).toBe(DEFAULT_EDITOR_SETTINGS.objectBrowserViewMode);
+ });
+
it("defaults tab titles to the compact presentation while preserving an explicit opt-out", () => {
expect(DEFAULT_EDITOR_SETTINGS.compactTabTitle).toBe(true);
expect(normalizeEditorSettings({}).compactTabTitle).toBe(true);
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index e0560d9520..2d75f7837e 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -1201,7 +1201,7 @@ export interface EditorSettings {
pluginGraphicsEngineIds: string[];
toolbarItems: ToolbarItems;
objectBrowserShowCheckbox: boolean;
- objectBrowserViewMode: "list" | "grid";
+ objectBrowserViewMode: "list" | "grid" | "compact";
sqlVariableSubstitutionEnabled: boolean;
sqlVariableSyntaxOverrides: SqlVariableSyntaxOverrides;
continueOnErrorOnBatch: boolean;
@@ -2244,7 +2244,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
pluginGraphicsEngineIds: normalizePluginGraphicsEngineIds(settings.pluginGraphicsEngineIds),
toolbarItems: normalizeToolbarItems(settings.toolbarItems),
objectBrowserShowCheckbox: typeof settings.objectBrowserShowCheckbox === "boolean" ? settings.objectBrowserShowCheckbox : DEFAULT_EDITOR_SETTINGS.objectBrowserShowCheckbox,
- objectBrowserViewMode: settings.objectBrowserViewMode === "grid" ? "grid" : DEFAULT_EDITOR_SETTINGS.objectBrowserViewMode,
+ objectBrowserViewMode: settings.objectBrowserViewMode === "grid" || settings.objectBrowserViewMode === "compact" ? settings.objectBrowserViewMode : DEFAULT_EDITOR_SETTINGS.objectBrowserViewMode,
sqlVariableSubstitutionEnabled: typeof settings.sqlVariableSubstitutionEnabled === "boolean" ? settings.sqlVariableSubstitutionEnabled : DEFAULT_EDITOR_SETTINGS.sqlVariableSubstitutionEnabled,
sqlVariableSyntaxOverrides: normalizeSqlVariableSyntaxOverrides(settings.sqlVariableSyntaxOverrides),
continueOnErrorOnBatch: settings.continueOnErrorOnBatch === true,
@@ -3104,7 +3104,7 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.pluginGraphicsEngineIds !== undefined) editorSettings.value.pluginGraphicsEngineIds = normalizePluginGraphicsEngineIds(partial.pluginGraphicsEngineIds);
if (partial.toolbarItems !== undefined) editorSettings.value.toolbarItems = normalizeToolbarItems(partial.toolbarItems);
if (partial.objectBrowserShowCheckbox !== undefined) editorSettings.value.objectBrowserShowCheckbox = partial.objectBrowserShowCheckbox === true;
- if (partial.objectBrowserViewMode !== undefined) editorSettings.value.objectBrowserViewMode = partial.objectBrowserViewMode === "grid" ? "grid" : "list";
+ if (partial.objectBrowserViewMode !== undefined) editorSettings.value.objectBrowserViewMode = partial.objectBrowserViewMode === "grid" || partial.objectBrowserViewMode === "compact" ? partial.objectBrowserViewMode : "list";
if (partial.sqlVariableSubstitutionEnabled !== undefined) editorSettings.value.sqlVariableSubstitutionEnabled = partial.sqlVariableSubstitutionEnabled === true;
if (partial.sqlVariableSyntaxOverrides !== undefined) editorSettings.value.sqlVariableSyntaxOverrides = normalizeSqlVariableSyntaxOverrides(partial.sqlVariableSyntaxOverrides);
if (partial.continueOnErrorOnBatch !== undefined) editorSettings.value.continueOnErrorOnBatch = partial.continueOnErrorOnBatch === true;
diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts
index fe9fbb57bd..80c98e2053 100644
--- a/apps/desktop/src/types/database.ts
+++ b/apps/desktop/src/types/database.ts
@@ -2015,7 +2015,7 @@ export interface TableStructureEditorViewport {
scrollLeft: number;
}
-export type ObjectBrowserViewMode = "list" | "grid";
+export type ObjectBrowserViewMode = "list" | "grid" | "compact";
export type ObjectBrowserFilter = "all" | "tables" | "views" | "materializedViews" | "procedures" | "functions" | "triggers" | "events" | "sequences" | "packages" | "types";