feat(hbase): improve desktop connections and table operations

This commit is contained in:
zipg authored and GitHub committed 2026-07-28 21:11:59 +08:00
1 parent 8bd92e4f2c
commit a0d4a31467
17 files changed
+514 -50

No files matched your search

@@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" role="img" aria-label="Apache HBase">
<path fill="#ba160c" d="M2 2h5v7h10V2h5v20h-5v-8H7v8H2z" />
</svg>

After

Width:  |  Height:  |  Size: 167 B

@@ -299,6 +299,7 @@ interface DataGridProps {
totalRowCount?: number; totalRowCount?: number;
totalRowCountIsExact?: boolean; totalRowCountIsExact?: boolean;
paginationTotalRowCount?: number; paginationTotalRowCount?: number;
paginationEnabled?: boolean;
totalRowCountLoading?: boolean; totalRowCountLoading?: boolean;
loading?: boolean; loading?: boolean;
cacheKey?: string; cacheKey?: string;
@@ -319,6 +320,7 @@ const props = withDefaults(defineProps<DataGridProps>(), {
// Vue casts absent Boolean props to false unless a default is explicit. // Vue casts absent Boolean props to false unless a default is explicit.
// Regular grids have exact totals; document stores opt into lower-bound totals. // Regular grids have exact totals; document stores opt into lower-bound totals.
totalRowCountIsExact: true, totalRowCountIsExact: true,
paginationEnabled: true,
// Omitted row-action limits must keep normal table-data editing. // Omitted row-action limits must keep normal table-data editing.
allowInsertRows: undefined, allowInsertRows: undefined,
allowDeleteRows: undefined, allowDeleteRows: undefined,
@@ -461,7 +463,7 @@ const compactColumnHeaderActions = computed(() => settingsStore.editorSettings.c
const dataGridRenderMode = computed(() => settingsStore.editorSettings.dataGridRenderMode); const dataGridRenderMode = computed(() => settingsStore.editorSettings.dataGridRenderMode);
const dataGridSearchMode = computed(() => settingsStore.editorSettings.dataGridSearchMode); const dataGridSearchMode = computed(() => settingsStore.editorSettings.dataGridSearchMode);
const compactDataGridToolbar = computed(() => dataGridTopbarWidth.value > 0 && dataGridTopbarWidth.value < DATA_GRID_COMPACT_TOPBAR_WIDTH); const compactDataGridToolbar = computed(() => dataGridTopbarWidth.value > 0 && dataGridTopbarWidth.value < DATA_GRID_COMPACT_TOPBAR_WIDTH);
const infiniteScrollEnabled = computed(() => settingsStore.editorSettings.infiniteScroll); const infiniteScrollEnabled = computed(() => props.paginationEnabled && settingsStore.editorSettings.infiniteScroll);
const infiniteScrollMaxRows = computed(() => settingsStore.editorSettings.infiniteScrollMaxRows); const infiniteScrollMaxRows = computed(() => settingsStore.editorSettings.infiniteScrollMaxRows);
const expandedCellEditor = ref<{ rowId: number; col: number } | null>(null); const expandedCellEditor = ref<{ rowId: number; col: number } | null>(null);
@@ -9178,6 +9180,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
<DataGridPagination <DataGridPagination
v-model:custom-page-size-input="customPageSizeInput" v-model:custom-page-size-input="customPageSizeInput"
:pagination-enabled="paginationEnabled"
:selection-summary="selectionSummary" :selection-summary="selectionSummary"
:selection-summary-sum-text="selectionSummarySumText" :selection-summary-sum-text="selectionSummarySumText"
:loading="loading" :loading="loading"
@@ -10,19 +10,23 @@ import DataGridExportMenu from "@/components/grid/DataGridExportMenu.vue";
const { t } = useI18n(); const { t } = useI18n();
defineProps<{ withDefaults(
selectionSummary: { cellCount: number; rowCount: number } | null; defineProps<{
selectionSummarySumText: string; paginationEnabled?: boolean;
loading: boolean; selectionSummary: { cellCount: number; rowCount: number } | null;
infiniteScrollEnabled: boolean; selectionSummarySumText: string;
infiniteScrollAllLoaded: boolean; loading: boolean;
pageSize: number; infiniteScrollEnabled: boolean;
pageSizeMenuItems: LightDropdownItem[]; infiniteScrollAllLoaded: boolean;
exportMenuItems: LightDropdownItem[]; pageSize: number;
currentPage: number; pageSizeMenuItems: LightDropdownItem[];
canGoNextPage: boolean; exportMenuItems: LightDropdownItem[];
canJumpLastPage: boolean; currentPage: number;
}>(); canGoNextPage: boolean;
canJumpLastPage: boolean;
}>(),
{ paginationEnabled: true },
);
const customPageSizeInput = defineModel<string>("customPageSizeInput", { default: "" }); const customPageSizeInput = defineModel<string>("customPageSizeInput", { default: "" });
@@ -47,10 +51,10 @@ const emit = defineEmits<{
</div> </div>
</div> </div>
<Loader2 v-if="loading" class="w-3 h-3 animate-spin text-muted-foreground" /> <Loader2 v-if="loading" class="w-3 h-3 animate-spin text-muted-foreground" />
<template v-if="infiniteScrollEnabled"> <template v-if="paginationEnabled && infiniteScrollEnabled">
<span v-if="infiniteScrollAllLoaded" class="text-xs text-muted-foreground shrink-0">{{ t("grid.allLoaded") }}</span> <span v-if="infiniteScrollAllLoaded" class="text-xs text-muted-foreground shrink-0">{{ t("grid.allLoaded") }}</span>
</template> </template>
<template v-if="!infiniteScrollEnabled"> <template v-if="paginationEnabled && !infiniteScrollEnabled">
<LightDropdown <LightDropdown
:model-value="String(pageSize)" :model-value="String(pageSize)"
:items="pageSizeMenuItems" :items="pageSizeMenuItems"
@@ -213,6 +213,26 @@ describe("DataGridPagination", () => {
expect(nextPage).toHaveBeenCalledOnce(); expect(nextPage).toHaveBeenCalledOnce();
expect(lastPage).toHaveBeenCalledOnce(); expect(lastPage).toHaveBeenCalledOnce();
}); });
it("hides pagination controls when the data source does not support paging", () => {
const mounted = mountComponent(DataGridPagination, {
paginationEnabled: false,
selectionSummary: null,
selectionSummarySumText: "",
loading: false,
infiniteScrollEnabled: false,
infiniteScrollAllLoaded: false,
pageSize: 100,
customPageSizeInput: "",
pageSizeMenuItems: [],
exportMenuItems: [],
currentPage: 1,
canGoNextPage: false,
canJumpLastPage: false,
});
expect(findAll(mounted.root, (node) => node.props["data-stub"] === "Button" && node.props.class === "h-5 w-5 shrink-0")).toHaveLength(0);
});
}); });
describe("DataGridColumnHeader", () => { describe("DataGridColumnHeader", () => {
@@ -15,6 +15,7 @@ import { useToast } from "@/composables/useToast";
import * as api from "@/lib/backend/api"; import * as api from "@/lib/backend/api";
import type { CellValue } from "@/lib/dataGrid/cellValue"; import type { CellValue } from "@/lib/dataGrid/cellValue";
import { encodeHBaseTextInput, hbaseCellInput } from "@/lib/hbase/hbaseValues"; import { encodeHBaseTextInput, hbaseCellInput } from "@/lib/hbase/hbaseValues";
import { loadHBaseRowLimit, saveHBaseRowLimit } from "@/lib/hbase/hbaseBrowserPreferences";
import { useConnectionStore } from "@/stores/connectionStore"; import { useConnectionStore } from "@/stores/connectionStore";
import { useQueryStore } from "@/stores/queryStore"; import { useQueryStore } from "@/stores/queryStore";
import type { QueryResult } from "@/types/database"; import type { QueryResult } from "@/types/database";
@@ -40,7 +41,7 @@ const loading = ref(false);
const error = ref(""); const error = ref("");
const lookupMode = ref<LookupMode>("prefix"); const lookupMode = ref<LookupMode>("prefix");
const rowKeyInput = ref(""); const rowKeyInput = ref("");
const rowLimit = ref("100"); const rowLimit = ref(loadHBaseRowLimit());
const truncated = ref(false); const truncated = ref(false);
const elapsedMs = ref(0); const elapsedMs = ref(0);
const schema = ref<HBaseTableSchema>(); const schema = ref<HBaseTableSchema>();
@@ -123,6 +124,10 @@ watch(
{ immediate: true }, { immediate: true },
); );
watch(rowLimit, (value) => {
saveHBaseRowLimit(value);
});
async function refreshRows() { async function refreshRows() {
if (loading.value || !hasTable.value) return; if (loading.value || !hasTable.value) return;
loading.value = true; loading.value = true;
@@ -229,7 +234,7 @@ async function createTable() {
await api.hbaseCreateTable(props.connectionId, props.namespace, createdTable, families); await api.hbaseCreateTable(props.connectionId, props.namespace, createdTable, families);
createTableDialogOpen.value = false; createTableDialogOpen.value = false;
toast(t("hbase.tableCreated", { table: createdTable })); toast(t("hbase.tableCreated", { table: createdTable }));
await connectionStore.loadTables(props.connectionId, props.namespace); await connectionStore.refreshObjectListTreeNode(props.connectionId, props.namespace);
if (!hasTable.value) { if (!hasTable.value) {
const tab = queryStore.tabs.find((candidate) => candidate.id === props.tabId); const tab = queryStore.tabs.find((candidate) => candidate.id === props.tabId);
if (tab) tab.title = createdTable; if (tab) tab.title = createdTable;
@@ -249,7 +254,7 @@ async function deleteTable() {
try { try {
await api.hbaseDeleteTable(props.connectionId, props.namespace, props.table); await api.hbaseDeleteTable(props.connectionId, props.namespace, props.table);
deleteTableDialogOpen.value = false; deleteTableDialogOpen.value = false;
await connectionStore.loadTables(props.connectionId, props.namespace); await connectionStore.refreshObjectListTreeNode(props.connectionId, props.namespace);
queryStore.closeTab(props.tabId); queryStore.closeTab(props.tabId);
toast(t("hbase.tableDeleted", { table: qualifiedTableLabel.value })); toast(t("hbase.tableDeleted", { table: qualifiedTableLabel.value }));
} catch (caught) { } catch (caught) {
@@ -418,6 +423,7 @@ function errorMessage(value: unknown): string {
:allow-delete-rows="!readOnly" :allow-delete-rows="!readOnly"
:loading="loading" :loading="loading"
:page-limit="Number(rowLimit)" :page-limit="Number(rowLimit)"
:pagination-enabled="false"
:total-row-count="rows.length" :total-row-count="rows.length"
:total-row-count-is-exact="!truncated" :total-row-count-is-exact="!truncated"
@reload="refreshRows" @reload="refreshRows"
@@ -52,6 +52,7 @@ const assetIcons: Record<string, string> = {
presto: "presto", presto: "presto",
prestosql: "presto", prestosql: "presto",
hive: "hive", hive: "hive",
hbase: "hbase",
spark: "spark-logo.png", spark: "spark-logo.png",
apache_kylin: "apache_kylin", apache_kylin: "apache_kylin",
sundb: "sundb", sundb: "sundb",
@@ -445,7 +445,7 @@ function tabColorStyle(tab: QueryTab) {
function tabIconClass(tab: QueryTab) { function tabIconClass(tab: QueryTab) {
if (tab.mode === "mq") return ""; if (tab.mode === "mq") return "";
if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "vector" || tab.mode === "redis" || tab.mode === "objects" || tab.mode === "structure") return "text-emerald-600 dark:text-emerald-400"; if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "vector" || tab.mode === "redis" || tab.mode === "hbase" || tab.mode === "objects" || tab.mode === "structure") return "text-emerald-600 dark:text-emerald-400";
return "text-blue-600 dark:text-blue-400"; return "text-blue-600 dark:text-blue-400";
} }
@@ -472,7 +472,7 @@ const tabBarClass = computed(() => [isClassicLayout.value ? "bg-muted" : "border
const regularTabRowClass = computed(() => [isClassicLayout.value ? "h-9 items-stretch" : "h-10 items-center px-2", isClassicLayout.value && !hasFixedTabs.value ? "border-b" : ""]); const regularTabRowClass = computed(() => [isClassicLayout.value ? "h-9 items-stretch" : "h-10 items-center px-2", isClassicLayout.value && !hasFixedTabs.value ? "border-b" : ""]);
function tabMenuIcon(tab: QueryTab) { function tabMenuIcon(tab: QueryTab) {
if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "redis") return Table2; if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "redis" || tab.mode === "hbase") return Table2;
if (tab.mode === "vector") return TableProperties; if (tab.mode === "vector") return TableProperties;
if (tab.mode === "etcd" || tab.mode === "zookeeper") return KeyRound; if (tab.mode === "etcd" || tab.mode === "zookeeper") return KeyRound;
if (tab.mode === "etcd-dashboard") return Gauge; if (tab.mode === "etcd-dashboard") return Gauge;
@@ -615,7 +615,7 @@ function onOverflowItemKeydown(event: KeyboardEvent, tabId: string, kind: "regul
@mouseleave="tabDrag.clearTarget(tab.id)" @mouseleave="tabDrag.clearTarget(tab.id)"
> >
<span class="shrink-0" :class="tabIconClass(tab)"> <span class="shrink-0" :class="tabIconClass(tab)">
<Table2 v-if="tab.mode === 'data' || tab.mode === 'mongo' || tab.mode === 'redis'" class="h-3.5 w-3.5" /> <Table2 v-if="tab.mode === 'data' || tab.mode === 'mongo' || tab.mode === 'redis' || tab.mode === 'hbase'" class="h-3.5 w-3.5" />
<DatabaseIcon v-else-if="tab.mode === 'mq'" :db-type="tabDatabaseIconType(tab)" class="h-3.5 w-3.5" /> <DatabaseIcon v-else-if="tab.mode === 'mq'" :db-type="tabDatabaseIconType(tab)" class="h-3.5 w-3.5" />
<TableProperties v-else-if="tab.mode === 'vector'" class="h-3.5 w-3.5" /> <TableProperties v-else-if="tab.mode === 'vector'" class="h-3.5 w-3.5" />
<KeyRound v-else-if="tab.mode === 'etcd' || tab.mode === 'zookeeper'" class="h-3.5 w-3.5" /> <KeyRound v-else-if="tab.mode === 'etcd' || tab.mode === 'zookeeper'" class="h-3.5 w-3.5" />
@@ -809,7 +809,7 @@ function onOverflowItemKeydown(event: KeyboardEvent, tabId: string, kind: "regul
@mouseleave="tabDrag.clearTarget(tab.id)" @mouseleave="tabDrag.clearTarget(tab.id)"
> >
<span class="shrink-0" :class="tabIconClass(tab)"> <span class="shrink-0" :class="tabIconClass(tab)">
<Table2 v-if="tab.mode === 'data' || tab.mode === 'mongo' || tab.mode === 'redis'" class="h-3.5 w-3.5" /> <Table2 v-if="tab.mode === 'data' || tab.mode === 'mongo' || tab.mode === 'redis' || tab.mode === 'hbase'" class="h-3.5 w-3.5" />
<DatabaseIcon v-else-if="tab.mode === 'mq'" :db-type="tabDatabaseIconType(tab)" class="h-3.5 w-3.5" /> <DatabaseIcon v-else-if="tab.mode === 'mq'" :db-type="tabDatabaseIconType(tab)" class="h-3.5 w-3.5" />
<TableProperties v-else-if="tab.mode === 'vector'" class="h-3.5 w-3.5" /> <TableProperties v-else-if="tab.mode === 'vector'" class="h-3.5 w-3.5" />
<KeyRound v-else-if="tab.mode === 'etcd' || tab.mode === 'zookeeper'" class="h-3.5 w-3.5" /> <KeyRound v-else-if="tab.mode === 'etcd' || tab.mode === 'zookeeper'" class="h-3.5 w-3.5" />
@@ -18,3 +18,11 @@ describe("AppTabBar close confirmation layout", () => {
expect(tabBarSource).toContain('@click="handleCancelClose"'); expect(tabBarSource).toContain('@click="handleCancelClose"');
}); });
}); });
describe("AppTabBar HBase presentation", () => {
it("uses the table icon in regular, pinned, and overflow tab surfaces", () => {
expect(tabBarSource).toContain('if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "redis" || tab.mode === "hbase") return Table2;');
expect(tabBarSource.match(/tab\.mode === 'hbase'/g)).toHaveLength(2);
expect(tabBarSource).toContain('tab.mode === "hbase" || tab.mode === "objects"');
});
});
@@ -90,6 +90,7 @@ import {
import { copyNameForTreeNode, isDocumentBrowserTreeNode, objectSourceKindForTreeNode, shouldRunTreeNodeRowAction, treeNodeRowAction, treeNodeRowDoubleClickAction } from "@/lib/sidebar/treeNodeClick"; import { copyNameForTreeNode, isDocumentBrowserTreeNode, objectSourceKindForTreeNode, shouldRunTreeNodeRowAction, treeNodeRowAction, treeNodeRowDoubleClickAction } from "@/lib/sidebar/treeNodeClick";
import { dataTabOpenModeFromTreeClick, type DataTabOpenMode } from "@/lib/sidebar/dataTabOpenPolicy"; import { dataTabOpenModeFromTreeClick, type DataTabOpenMode } from "@/lib/sidebar/dataTabOpenPolicy";
import { isCopySidebarSelectionShortcut, isEditSidebarConnectionShortcut, isPasteSidebarSelectionShortcut } from "@/lib/editor/keyboardShortcuts"; import { isCopySidebarSelectionShortcut, isEditSidebarConnectionShortcut, isPasteSidebarSelectionShortcut } from "@/lib/editor/keyboardShortcuts";
import { handleSidebarTreeDeleteShortcut } from "@/lib/sidebar/sidebarTreeDeleteShortcut";
import { dataTableDoubleClickAction } from "@/lib/tabs/dataTabActivation"; import { dataTableDoubleClickAction } from "@/lib/tabs/dataTabActivation";
import { attachedDatabaseNameFromPath, buildCreateDatabaseSql, buildDuckDbAttachDatabaseSql, buildSqliteAttachDatabaseSql, supportsCreateDatabaseCharset, uniqueAttachedDatabaseName } from "@/lib/database/createDatabaseSql"; import { attachedDatabaseNameFromPath, buildCreateDatabaseSql, buildDuckDbAttachDatabaseSql, buildSqliteAttachDatabaseSql, supportsCreateDatabaseCharset, uniqueAttachedDatabaseName } from "@/lib/database/createDatabaseSql";
import { appendCreateDatabaseErrorHint } from "@/lib/database/createDatabaseErrorHints"; import { appendCreateDatabaseErrorHint } from "@/lib/database/createDatabaseErrorHints";
@@ -779,10 +780,20 @@ function onKeydown(event: KeyboardEvent) {
event.stopPropagation(); event.stopPropagation();
return; return;
} }
if (!event.metaKey && !event.ctrlKey && !event.altKey && !event.shiftKey && isDeleteTreeNodeShortcut(event)) { if (
if (!requestDeleteSelectedNode()) return; handleSidebarTreeDeleteShortcut(event, {
event.preventDefault(); activeNode: activeNode.value,
event.stopPropagation(); selectedNodes: selectedTreeNodesInVisibleOrder(),
databaseTypeForNode,
requestHBaseTableDelete: () => {
ensureDangerDialogRouting();
routeTreeItemDialogController();
requestDeleteHBaseTable();
return true;
},
requestDefaultDelete: requestDeleteSelectedNode,
})
) {
return; return;
} }
if (!isCopyTreeSelectionShortcut(event)) return; if (!isCopyTreeSelectionShortcut(event)) return;
@@ -791,10 +802,6 @@ function onKeydown(event: KeyboardEvent) {
copySelectedNames(); copySelectedNames();
} }
function isDeleteTreeNodeShortcut(event: KeyboardEvent): boolean {
return event.key === "Delete" || event.key === "Backspace";
}
function isPasteTreeClipboardShortcut(event: KeyboardEvent): boolean { function isPasteTreeClipboardShortcut(event: KeyboardEvent): boolean {
return isPasteSidebarSelectionShortcut(event, settingsStore.editorSettings.shortcuts); return isPasteSidebarSelectionShortcut(event, settingsStore.editorSettings.shortcuts);
} }
@@ -2936,6 +2943,26 @@ function createView() {
}); });
} }
function requestDeleteHBaseTable() {
showHBaseDeleteTableConfirm.value = true;
}
async function confirmDeleteHBaseTable() {
const node = sidebarDangerTarget.value ?? activeNode.value;
if (!node.connectionId || !node.database || connectionStore.getConfig(node.connectionId)?.db_type !== "hbase") return;
try {
await connectionStore.ensureConnected(node.connectionId);
await api.hbaseDeleteTable(node.connectionId, node.database, node.label);
closeDroppedTableObjectTabsForNode(node);
connectionStore.removePinnedTreeNodes([node]);
await connectionStore.refreshObjectListTreeNode(node.connectionId, node.database);
toast(t("hbase.tableDeleted", { table: node.database === "default" ? node.label : `${node.database}:${node.label}` }));
} catch (error: any) {
toast(t("contextMenu.tableOperationFailed", { message: error?.message || String(error) }), 5000);
throw error;
}
}
function createMysqlObjectTemplate() { function createMysqlObjectTemplate() {
const node = activeNode.value; const node = activeNode.value;
if (!node.connectionId || !node.database) return; if (!node.connectionId || !node.database) return;
@@ -3002,6 +3029,7 @@ const isSelected = computed(() => connectionStore.selectedTreeNodeId === activeN
const isMultiSelected = computed(() => connectionStore.selectedTreeNodeIdsSet.has(activeNode.value.id)); const isMultiSelected = computed(() => connectionStore.selectedTreeNodeIdsSet.has(activeNode.value.id));
const dangerDialogRoutes: Array<{ flag: { value: boolean }; createRequest: () => SidebarDangerDialogRequest }> = []; const dangerDialogRoutes: Array<{ flag: { value: boolean }; createRequest: () => SidebarDangerDialogRequest }> = [];
const showHBaseDeleteTableConfirm = shallowRef(false);
let stopDangerDialogRouting: (() => void) | null = null; let stopDangerDialogRouting: (() => void) | null = null;
@@ -3068,6 +3096,17 @@ routeDangerDialog(showDropTableConfirm, () =>
}), }),
); );
routeDangerDialog(showHBaseDeleteTableConfirm, () => {
const table = activeNode.value.database && activeNode.value.database !== "default" ? `${activeNode.value.database}:${activeNode.value.label}` : activeNode.value.label;
return dangerRequest({
title: t("hbase.deleteTable"),
message: t("hbase.deleteTableConfirm", { table }),
details: table,
confirmLabel: t("common.delete"),
confirm: confirmDeleteHBaseTable,
});
});
routeDangerDialog(showEmptyTableConfirm, () => routeDangerDialog(showEmptyTableConfirm, () =>
dangerRequest({ dangerRequest({
title: t("contextMenu.confirmEmptyTableTitle"), title: t("contextMenu.confirmEmptyTableTitle"),
@@ -3848,6 +3887,16 @@ function buildSpecialSidebarMenu(context: SidebarMenuFactoryContext): boolean {
icon: RefreshCw, icon: RefreshCw,
shortcut: shortcutRefresh, shortcut: shortcutRefresh,
}); });
if (!connectionStore.getConfig(node.connectionId || "")?.read_only) {
items.push({ label: "", separator: true });
items.push({
label: t("hbase.deleteTable"),
action: requestDeleteHBaseTable,
icon: Trash2,
shortcut: shortcutDelete,
variant: "destructive" as const,
});
}
return true; return true;
} }
@@ -0,0 +1,108 @@
// @vitest-environment happy-dom
import { describe, expect, it, vi } from "vitest";
import type { DatabaseType, TreeNode } from "@/types/database";
import { handleSidebarTreeDeleteShortcut } from "@/lib/sidebar/sidebarTreeDeleteShortcut";
function tableNode(id: string, connectionId: string): TreeNode {
return {
id,
label: id,
type: "table",
connectionId,
database: "default",
};
}
function databaseTypeForNode(node: TreeNode): DatabaseType | undefined {
return node.connectionId === "hbase-connection" ? "hbase" : "postgresql";
}
function deleteEvent(key: "Delete" | "Backspace", init: KeyboardEventInit = {}): KeyboardEvent {
return new KeyboardEvent("keydown", { key, cancelable: true, ...init });
}
describe("sidebar tree delete shortcut", () => {
it.each(["Delete", "Backspace"] as const)("routes %s for a single HBase table through REST deletion", (key) => {
const activeNode = tableNode("table-1", "hbase-connection");
const event = deleteEvent(key);
const stopPropagation = vi.spyOn(event, "stopPropagation");
const requestHBaseTableDelete = vi.fn(() => true);
const requestDefaultDelete = vi.fn(() => true);
expect(
handleSidebarTreeDeleteShortcut(event, {
activeNode,
selectedNodes: [activeNode],
databaseTypeForNode,
requestHBaseTableDelete,
requestDefaultDelete,
}),
).toBe(true);
expect(requestHBaseTableDelete).toHaveBeenCalledOnce();
expect(requestDefaultDelete).not.toHaveBeenCalled();
expect(event.defaultPrevented).toBe(true);
expect(stopPropagation).toHaveBeenCalledOnce();
});
it("blocks unsupported HBase multi-selection before generic SQL deletion", () => {
const activeNode = tableNode("table-1", "hbase-connection");
const selectedNodes = [activeNode, tableNode("table-2", "hbase-connection")];
const event = deleteEvent("Delete");
const requestHBaseTableDelete = vi.fn(() => true);
const requestDefaultDelete = vi.fn(() => true);
expect(
handleSidebarTreeDeleteShortcut(event, {
activeNode,
selectedNodes,
databaseTypeForNode,
requestHBaseTableDelete,
requestDefaultDelete,
}),
).toBe(true);
expect(requestHBaseTableDelete).not.toHaveBeenCalled();
expect(requestDefaultDelete).not.toHaveBeenCalled();
expect(event.defaultPrevented).toBe(true);
});
it("keeps the existing generic delete route for SQL tables", () => {
const activeNode = tableNode("table-1", "postgres-connection");
const event = deleteEvent("Delete");
const requestHBaseTableDelete = vi.fn(() => true);
const requestDefaultDelete = vi.fn(() => true);
expect(
handleSidebarTreeDeleteShortcut(event, {
activeNode,
selectedNodes: [activeNode],
databaseTypeForNode,
requestHBaseTableDelete,
requestDefaultDelete,
}),
).toBe(true);
expect(requestHBaseTableDelete).not.toHaveBeenCalled();
expect(requestDefaultDelete).toHaveBeenCalledOnce();
expect(event.defaultPrevented).toBe(true);
});
it("ignores modified delete shortcuts", () => {
const activeNode = tableNode("table-1", "hbase-connection");
const event = deleteEvent("Delete", { ctrlKey: true });
const requestHBaseTableDelete = vi.fn(() => true);
const requestDefaultDelete = vi.fn(() => true);
expect(
handleSidebarTreeDeleteShortcut(event, {
activeNode,
selectedNodes: [activeNode],
databaseTypeForNode,
requestHBaseTableDelete,
requestDefaultDelete,
}),
).toBe(false);
expect(requestHBaseTableDelete).not.toHaveBeenCalled();
expect(requestDefaultDelete).not.toHaveBeenCalled();
expect(event.defaultPrevented).toBe(false);
});
});
@@ -0,0 +1,20 @@
import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";
export const HBASE_ROW_LIMIT_STORAGE_KEY = "dbx-hbase-row-limit";
export const DEFAULT_HBASE_ROW_LIMIT = "100";
export const HBASE_ROW_LIMIT_OPTIONS = ["50", "100", "200", "500"] as const;
export function normalizeHBaseRowLimit(value: unknown): string {
const candidate = typeof value === "string" || typeof value === "number" ? String(value) : "";
return (HBASE_ROW_LIMIT_OPTIONS as readonly string[]).includes(candidate) ? candidate : DEFAULT_HBASE_ROW_LIMIT;
}
export function loadHBaseRowLimit(): string {
return normalizeHBaseRowLimit(safeLocalStorageGet(HBASE_ROW_LIMIT_STORAGE_KEY));
}
export function saveHBaseRowLimit(value: unknown): string {
const normalized = normalizeHBaseRowLimit(value);
safeLocalStorageSet(HBASE_ROW_LIMIT_STORAGE_KEY, normalized);
return normalized;
}
@@ -0,0 +1,32 @@
import type { DatabaseType, TreeNode } from "@/types/database";
interface SidebarTreeDeleteShortcutContext {
activeNode: TreeNode;
selectedNodes: readonly TreeNode[];
databaseTypeForNode: (node: TreeNode) => DatabaseType | undefined;
requestHBaseTableDelete: () => boolean;
requestDefaultDelete: () => boolean;
}
function isUnmodifiedDeleteShortcut(event: KeyboardEvent): boolean {
return !event.metaKey && !event.ctrlKey && !event.altKey && !event.shiftKey && (event.key === "Delete" || event.key === "Backspace");
}
export function handleSidebarTreeDeleteShortcut(event: KeyboardEvent, context: SidebarTreeDeleteShortcutContext): boolean {
if (!isUnmodifiedDeleteShortcut(event)) return false;
const activeHBaseTable = context.activeNode.type === "table" && context.databaseTypeForNode(context.activeNode) === "hbase";
const hasActiveMultiSelection = context.selectedNodes.length > 1 && context.selectedNodes.some((node) => node.id === context.activeNode.id);
if (activeHBaseTable && hasActiveMultiSelection) {
event.preventDefault();
event.stopPropagation();
return true;
}
const handled = activeHBaseTable ? context.requestHBaseTableDelete() : context.requestDefaultDelete();
if (!handled) return false;
event.preventDefault();
event.stopPropagation();
return true;
}
@@ -156,6 +156,26 @@ describe("queryStore database open state", () => {
expect(store.tabs.some((tab) => tab.id === structureId)).toBe(true); expect(store.tabs.some((tab) => tab.id === structureId)).toBe(true);
}); });
it("closes only the matching HBase table tab after deletion", async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const deletedTableId = store.createTab("hbase-1", "metrics", "events", "hbase", undefined, "events");
const otherTableId = store.createTab("hbase-1", "metrics", "archive", "hbase", undefined, "archive");
const otherNamespaceId = store.createTab("hbase-1", "default", "events", "hbase", undefined, "events");
store.closeDroppedTableObjectTabs({
connectionId: "hbase-1",
database: "metrics",
name: "events",
objectType: "TABLE",
});
expect(store.tabs.some((tab) => tab.id === deletedTableId)).toBe(false);
expect(store.tabs.some((tab) => tab.id === otherTableId)).toBe(true);
expect(store.tabs.some((tab) => tab.id === otherNamespaceId)).toBe(true);
});
it("matches dropped table schema candidates", async () => { it("matches dropped table schema candidates", async () => {
const { useQueryStore } = await import("@/stores/queryStore"); const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore(); const store = useQueryStore();
+4
View File
@@ -2012,6 +2012,10 @@ export const useQueryStore = defineStore("query", () => {
if (tab.connectionId !== target.connectionId || tab.database !== target.database) return false; if (tab.connectionId !== target.connectionId || tab.database !== target.database) return false;
const targetSchemas = droppedTableObjectSchemaCandidates(target); const targetSchemas = droppedTableObjectSchemaCandidates(target);
if ((target.objectType ?? "TABLE") === "TABLE" && tab.mode === "hbase") {
return tab.sql === target.name;
}
if (tab.mode === "data") { if (tab.mode === "data") {
const tableMeta = tableMetaForDataTab(tab); const tableMeta = tableMetaForDataTab(tab);
if (!tableMeta || tableMeta.tableName !== target.name) return false; if (!tableMeta || tableMeta.tableName !== target.name) return false;
+112 -19
View File
@@ -2067,6 +2067,54 @@ fn persist_connection_in_tx(tx: &rusqlite::Transaction<'_>, config: &ConnectionC
persist_nacos_auth_secrets_in_tx(tx, &config) persist_nacos_auth_secrets_in_tx(tx, &config)
} }
fn preserve_unreadable_connections_for_replacement(
tx: &rusqlite::Transaction<'_>,
replacement_ids: &HashSet<String>,
) -> Result<Vec<String>, String> {
let unreadable_rows = {
let mut stmt = tx.prepare("SELECT id, config_json FROM connections").map_err(|e| e.to_string())?;
let rows = stmt
.query_map([], |row| Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)))
.map_err(|e| e.to_string())?;
rows.collect::<Result<Vec<_>, _>>()
.map_err(|e| e.to_string())?
.into_iter()
.filter_map(|(id, json)| {
serde_json::from_str::<ConnectionConfig>(&json).err().map(|error| (id, json, error.to_string()))
})
.collect::<Vec<_>>()
};
tx.execute("DELETE FROM connections", []).map_err(|e| e.to_string())?;
let mut preserved_ids = Vec::new();
for (id, json, error) in unreadable_rows {
if replacement_ids.contains(&id) {
continue;
}
warn!("Preserving unreadable saved connection '{}' during connection list update: {}", id, error);
tx.execute("INSERT INTO connections (id, config_json) VALUES (?1, ?2)", params![id, json])
.map_err(|e| e.to_string())?;
preserved_ids.push(id);
}
Ok(preserved_ids)
}
fn delete_unreferenced_connection_secrets_in_tx(
tx: &rusqlite::Transaction<'_>,
retained_ids: &[String],
) -> Result<(), String> {
if retained_ids.is_empty() {
tx.execute("DELETE FROM connection_secrets", []).map_err(|e| e.to_string())?;
} else {
let placeholders = vec!["?"; retained_ids.len()].join(",");
let sql = format!("DELETE FROM connection_secrets WHERE connection_id NOT IN ({placeholders})");
let ids = retained_ids.iter().map(|id| id as &dyn ToSql);
tx.execute(&sql, params_from_iter(ids)).map_err(|e| e.to_string())?;
}
Ok(())
}
impl Storage { impl Storage {
pub async fn save_connection_metadata_preserving_secrets( pub async fn save_connection_metadata_preserving_secrets(
&self, &self,
@@ -2075,7 +2123,8 @@ impl Storage {
let configs = configs.to_vec(); let configs = configs.to_vec();
self.with_conn(move |conn| { self.with_conn(move |conn| {
let tx = conn.transaction().map_err(|e| e.to_string())?; let tx = conn.transaction().map_err(|e| e.to_string())?;
tx.execute("DELETE FROM connections", []).map_err(|e| e.to_string())?; let replacement_ids = configs.iter().map(|config| config.id.clone()).collect::<HashSet<_>>();
let mut retained_ids = preserve_unreadable_connections_for_replacement(&tx, &replacement_ids)?;
for config in &configs { for config in &configs {
let config = config.canonicalized(); let config = config.canonicalized();
@@ -2095,14 +2144,8 @@ impl Storage {
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
} }
if configs.is_empty() { retained_ids.extend(configs.iter().map(|config| config.id.clone()));
tx.execute("DELETE FROM connection_secrets", []).map_err(|e| e.to_string())?; delete_unreferenced_connection_secrets_in_tx(&tx, &retained_ids)?;
} else {
let placeholders = vec!["?"; configs.len()].join(",");
let sql = format!("DELETE FROM connection_secrets WHERE connection_id NOT IN ({placeholders})");
let ids = configs.iter().map(|config| &config.id as &dyn ToSql);
tx.execute(&sql, params_from_iter(ids)).map_err(|e| e.to_string())?;
}
tx.commit().map_err(|e| e.to_string()) tx.commit().map_err(|e| e.to_string())
}) })
@@ -2113,20 +2156,15 @@ impl Storage {
let configs = configs.to_vec(); let configs = configs.to_vec();
self.with_conn(move |conn| { self.with_conn(move |conn| {
let tx = conn.transaction().map_err(|e| e.to_string())?; let tx = conn.transaction().map_err(|e| e.to_string())?;
tx.execute("DELETE FROM connections", []).map_err(|e| e.to_string())?; let replacement_ids = configs.iter().map(|config| config.id.clone()).collect::<HashSet<_>>();
let mut retained_ids = preserve_unreadable_connections_for_replacement(&tx, &replacement_ids)?;
for config in &configs { for config in &configs {
persist_connection_in_tx(&tx, config)?; persist_connection_in_tx(&tx, config)?;
} }
if configs.is_empty() { retained_ids.extend(configs.iter().map(|config| config.id.clone()));
tx.execute("DELETE FROM connection_secrets", []).map_err(|e| e.to_string())?; delete_unreferenced_connection_secrets_in_tx(&tx, &retained_ids)?;
} else {
let placeholders = vec!["?"; configs.len()].join(",");
let sql = format!("DELETE FROM connection_secrets WHERE connection_id NOT IN ({placeholders})");
let ids = configs.iter().map(|config| &config.id as &dyn ToSql);
tx.execute(&sql, params_from_iter(ids)).map_err(|e| e.to_string())?;
}
tx.commit().map_err(|e| e.to_string()) tx.commit().map_err(|e| e.to_string())
}) })
@@ -2199,7 +2237,13 @@ impl Storage {
let mut configs = Vec::new(); let mut configs = Vec::new();
for (id, json) in rows { for (id, json) in rows {
let mut config: ConnectionConfig = serde_json::from_str(&json).map_err(|e| e.to_string())?; let mut config: ConnectionConfig = match serde_json::from_str(&json) {
Ok(config) => config,
Err(error) => {
warn!("Skipping unreadable saved connection '{}': {}", id, error);
continue;
}
};
config.password = self.get_secret(&id, "password").await?.unwrap_or_default(); config.password = self.get_secret(&id, "password").await?.unwrap_or_default();
for index in 0..config.transport_layers.len() { for index in 0..config.transport_layers.len() {
let layer_for_key = config.transport_layers[index].clone(); let layer_for_key = config.transport_layers[index].clone();
@@ -4014,6 +4058,55 @@ mod tests {
assert_eq!(mq_token(&loaded[0]), Some("mq-token-secret")); assert_eq!(mq_token(&loaded[0]), Some("mq-token-secret"));
} }
#[tokio::test]
async fn unreadable_saved_connections_do_not_block_loading_or_get_deleted_by_list_saves() {
let path = temp_db_path("unreadable-connection-preservation");
let storage = Storage::open(&path).await.unwrap();
let mut known = mq_connection("known", "known-secret");
storage.save_connections(std::slice::from_ref(&known)).await.unwrap();
let future_json = serde_json::json!({
"id": "future",
"name": "Future database",
"db_type": "future_database"
})
.to_string();
let inserted_json = future_json.clone();
storage
.with_conn(move |conn| {
let tx = conn.transaction().map_err(|e| e.to_string())?;
tx.execute(
"INSERT INTO connections (id, config_json) VALUES (?1, ?2)",
rusqlite::params!["future", inserted_json],
)
.map_err(|e| e.to_string())?;
tx.execute(
"INSERT INTO connection_secrets (connection_id, key, secret) VALUES (?1, ?2, ?3)",
rusqlite::params!["future", "password", "future-secret"],
)
.map_err(|e| e.to_string())?;
tx.commit().map_err(|e| e.to_string())
})
.await
.unwrap();
let loaded = storage.load_connections().await.unwrap();
assert_eq!(loaded.len(), 1);
assert_eq!(loaded[0].id, "known");
known.name = "Known updated".to_string();
storage.save_connection_metadata_preserving_secrets(std::slice::from_ref(&known)).await.unwrap();
assert_eq!(raw_connection_json(&storage, "future").await, future_json);
assert_eq!(storage.get_secret("future", "password").await.unwrap().as_deref(), Some("future-secret"));
storage.save_connections(&[]).await.unwrap();
assert!(storage.load_connections().await.unwrap().is_empty());
assert_eq!(raw_connection_json(&storage, "future").await, future_json);
assert_eq!(storage.get_secret("future", "password").await.unwrap().as_deref(), Some("future-secret"));
let _ = std::fs::remove_file(path);
}
#[tokio::test] #[tokio::test]
async fn metadata_save_scrubs_mq_auth_token_and_preserves_existing_secret() { async fn metadata_save_scrubs_mq_auth_token_and_preserves_existing_secret() {
let path = temp_db_path("mq-token-metadata"); let path = temp_db_path("mq-token-metadata");
+70
View File
@@ -0,0 +1,70 @@
import { strict as assert } from "node:assert";
import { readFileSync } from "node:fs";
import { test } from "vitest";
import { DEFAULT_HBASE_ROW_LIMIT, HBASE_ROW_LIMIT_STORAGE_KEY, loadHBaseRowLimit, normalizeHBaseRowLimit, saveHBaseRowLimit } from "../../apps/desktop/src/lib/hbase/hbaseBrowserPreferences.ts";
function functionBody(source: string, name: string): string {
const signatureIndex = source.indexOf(`async function ${name}(`);
assert.notEqual(signatureIndex, -1, `Could not find function ${name}`);
const bodyStart = source.indexOf("{", signatureIndex);
let depth = 0;
for (let index = bodyStart; index < source.length; index += 1) {
if (source[index] === "{") depth += 1;
if (source[index] === "}") {
depth -= 1;
if (depth === 0) return source.slice(bodyStart + 1, index);
}
}
throw new Error(`Could not parse function ${name}`);
}
test("HBase table DDL refreshes the visible object list instead of reusing loaded children", () => {
const source = readFileSync("apps/desktop/src/components/hbase/HBaseBrowser.vue", "utf8");
for (const name of ["createTable", "deleteTable"]) {
const body = functionBody(source, name);
assert.match(body, /await connectionStore\.refreshObjectListTreeNode\(props\.connectionId, props\.namespace\)/);
assert.doesNotMatch(body, /connectionStore\.loadTables/);
}
});
test("HBase grid disables unsupported offset and infinite-scroll pagination", () => {
const source = readFileSync("apps/desktop/src/components/hbase/HBaseBrowser.vue", "utf8");
assert.match(source, /<DataGrid[\s\S]*:pagination-enabled="false"/);
});
test("HBase table context menu exposes its REST-backed delete action", () => {
const source = readFileSync("apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue", "utf8");
const menuStart = source.indexOf('if (currentDatabaseType() === "hbase" && node.type === "table")');
const menuEnd = source.indexOf("return true;", menuStart);
const menu = source.slice(menuStart, menuEnd);
assert.match(menu, /label: t\("hbase\.deleteTable"\)/);
assert.match(menu, /action: requestDeleteHBaseTable/);
assert.match(source, /await api\.hbaseDeleteTable\(node\.connectionId, node\.database, node\.label\)/);
assert.match(source, /await connectionStore\.refreshObjectListTreeNode\(node\.connectionId, node\.database\)/);
});
test("HBase row scan limit is normalized and persisted", () => {
const previousDescriptor = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
const values = new Map<string, string>();
Object.defineProperty(globalThis, "localStorage", {
configurable: true,
value: {
getItem: (key: string) => values.get(key) ?? null,
setItem: (key: string, value: string) => values.set(key, value),
},
});
try {
assert.equal(loadHBaseRowLimit(), DEFAULT_HBASE_ROW_LIMIT);
assert.equal(normalizeHBaseRowLimit("500"), "500");
assert.equal(normalizeHBaseRowLimit("999"), DEFAULT_HBASE_ROW_LIMIT);
assert.equal(saveHBaseRowLimit("200"), "200");
assert.equal(values.get(HBASE_ROW_LIMIT_STORAGE_KEY), "200");
assert.equal(loadHBaseRowLimit(), "200");
} finally {
if (previousDescriptor) Object.defineProperty(globalThis, "localStorage", previousDescriptor);
else delete (globalThis as { localStorage?: Storage }).localStorage;
}
});
+23
View File
@@ -920,6 +920,18 @@ async fn test_connection_with_info_inner(
.await .await
.map(|_| "Connection successful".to_string()) .map(|_| "Connection successful".to_string())
} }
DatabaseType::Hbase => {
let client = db::hbase_driver::HBaseClient::new(
&url,
Some(&config.username),
Some(&config.password),
false,
connect_timeout,
)?;
db::hbase_driver::test_connection(&client, connect_timeout)
.await
.map(|_| "Connection successful".to_string())
}
DatabaseType::Qdrant | DatabaseType::Milvus | DatabaseType::Weaviate | DatabaseType::ChromaDb => { DatabaseType::Qdrant | DatabaseType::Milvus | DatabaseType::Weaviate | DatabaseType::ChromaDb => {
let kind = match config.db_type { let kind = match config.db_type {
DatabaseType::Qdrant => db::vector_driver::VectorDbKind::Qdrant, DatabaseType::Qdrant => db::vector_driver::VectorDbKind::Qdrant,
@@ -1241,6 +1253,17 @@ pub async fn connect_db(
db::elasticsearch_driver::test_connection(&mut client, connect_timeout).await?; db::elasticsearch_driver::test_connection(&mut client, connect_timeout).await?;
PoolKind::Elasticsearch(client) PoolKind::Elasticsearch(client)
} }
DatabaseType::Hbase => {
let client = db::hbase_driver::HBaseClient::new(
&url,
Some(&db_config.username),
Some(&db_config.password),
false,
connect_timeout,
)?;
db::hbase_driver::test_connection(&client, connect_timeout).await?;
PoolKind::HBase(client)
}
DatabaseType::Qdrant | DatabaseType::Milvus | DatabaseType::Weaviate | DatabaseType::ChromaDb => { DatabaseType::Qdrant | DatabaseType::Milvus | DatabaseType::Weaviate | DatabaseType::ChromaDb => {
let kind = match db_config.db_type { let kind = match db_config.db_type {
DatabaseType::Qdrant => db::vector_driver::VectorDbKind::Qdrant, DatabaseType::Qdrant => db::vector_driver::VectorDbKind::Qdrant,