fix(sidebar): distinguish schema and table icon colors
This commit is contained in:
1 parent
cb754cd0cc
commit
a7922b9cbf
2 files changed
+25
-1
No files matched your search
@@ -256,7 +256,7 @@ function getIconInfo(node: TreeNode): { icon: any; colorClass: string } | null {
|
|||||||
const databaseType = node.connectionId ? effectiveDatabaseTypeForConnection(connectionStore.getConfig(node.connectionId)) : undefined;
|
const databaseType = node.connectionId ? effectiveDatabaseTypeForConnection(connectionStore.getConfig(node.connectionId)) : undefined;
|
||||||
if (isXuguPublicSynonymTreeNode(databaseType, node.type, node.schema)) return { icon: Link2, colorClass: "text-sky-500" };
|
if (isXuguPublicSynonymTreeNode(databaseType, node.type, node.schema)) return { icon: Link2, colorClass: "text-sky-500" };
|
||||||
if (isXuguSchedulerJobTreeNode(databaseType, node.type, node.schema)) return { icon: CalendarClock, colorClass: "text-primary" };
|
if (isXuguSchedulerJobTreeNode(databaseType, node.type, node.schema)) return { icon: CalendarClock, colorClass: "text-primary" };
|
||||||
return { icon: FolderOpen, colorClass: "text-sky-400" };
|
return { icon: FolderOpen, colorClass: "text-amber-500" };
|
||||||
}
|
}
|
||||||
case "table":
|
case "table":
|
||||||
return { icon: Table, colorClass: "text-green-500" };
|
return { icon: Table, colorClass: "text-green-500" };
|
||||||
|
|||||||
+24
@@ -1,8 +1,21 @@
|
|||||||
import assert from "node:assert/strict";
|
import assert from "node:assert/strict";
|
||||||
|
import { readFileSync } from "node:fs";
|
||||||
import { test } from "vitest";
|
import { test } from "vitest";
|
||||||
import { getTreeNodeIconInfo } from "../../apps/desktop/src/lib/sidebar/treeNodeIcon.ts";
|
import { getTreeNodeIconInfo } from "../../apps/desktop/src/lib/sidebar/treeNodeIcon.ts";
|
||||||
import type { TreeNode } from "../../apps/desktop/src/types/database.ts";
|
import type { TreeNode } from "../../apps/desktop/src/types/database.ts";
|
||||||
|
|
||||||
|
const treeItemSource = readFileSync(new URL("../../apps/desktop/src/components/sidebar/TreeItem.vue", import.meta.url), "utf8");
|
||||||
|
|
||||||
|
function treeItemIconColorClass(nodeType: "schema" | "table", iconName: "FolderOpen" | "Table"): string {
|
||||||
|
const caseStart = treeItemSource.indexOf(`case "${nodeType}"`);
|
||||||
|
assert.notEqual(caseStart, -1, `Could not find TreeItem ${nodeType} mapping`);
|
||||||
|
const nextCase = treeItemSource.indexOf("\n case ", caseStart + 1);
|
||||||
|
const caseBlock = treeItemSource.slice(caseStart, nextCase === -1 ? undefined : nextCase);
|
||||||
|
const colorClass = caseBlock.match(new RegExp(`return \\{ icon: ${iconName}, colorClass: "([^"]+)" \\}`))?.[1];
|
||||||
|
assert.ok(colorClass, `Could not find TreeItem ${nodeType} color`);
|
||||||
|
return colorClass;
|
||||||
|
}
|
||||||
|
|
||||||
test("GridFS sidebar nodes use a dedicated cool-color icon treatment", () => {
|
test("GridFS sidebar nodes use a dedicated cool-color icon treatment", () => {
|
||||||
const gridfs = getTreeNodeIconInfo({ type: "mongo-gridfs" } as TreeNode);
|
const gridfs = getTreeNodeIconInfo({ type: "mongo-gridfs" } as TreeNode);
|
||||||
const bucket = getTreeNodeIconInfo({ type: "mongo-bucket" } as TreeNode);
|
const bucket = getTreeNodeIconInfo({ type: "mongo-bucket" } as TreeNode);
|
||||||
@@ -17,3 +30,14 @@ test("GridFS sidebar icon mapping stays distinct from Mongo collections", () =>
|
|||||||
|
|
||||||
assert.notEqual(gridfs?.colorClass, collection?.colorClass);
|
assert.notEqual(gridfs?.colorClass, collection?.colorClass);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("schema and table sidebar icon colors stay consistent and distinct", () => {
|
||||||
|
const schema = getTreeNodeIconInfo({ type: "schema" } as TreeNode);
|
||||||
|
const table = getTreeNodeIconInfo({ type: "table" } as TreeNode);
|
||||||
|
const treeItemSchemaColor = treeItemIconColorClass("schema", "FolderOpen");
|
||||||
|
const treeItemTableColor = treeItemIconColorClass("table", "Table");
|
||||||
|
|
||||||
|
assert.equal(treeItemSchemaColor, schema?.colorClass);
|
||||||
|
assert.equal(treeItemTableColor, table?.colorClass);
|
||||||
|
assert.notEqual(treeItemSchemaColor, treeItemTableColor);
|
||||||
|
});
|
||||||
Reference in new issue
Block a user