feat(hbase): improve desktop connections and table operations
This commit is contained in:
17 files changed
+514
-50
No files matched your search
@@ -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;
|
||||
}
|
||||
Reference in new issue
Block a user