feat(nacos): add access control support
This commit is contained in:
67 files changed
+9062
-135
No files matched your search
@@ -24,7 +24,13 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(main).toContain('t("nacos.nacosAdvancedHint")');
|
||||
expect(main).toContain("@click=\"configTab = 'advanced'\"");
|
||||
expect(main).toContain('v-model="nacosServerAddr"');
|
||||
expect(main).not.toContain('v-model="nacosV3ConsoleAddr"');
|
||||
expect(main).toContain('v-model="nacosManagedNamespacesText"');
|
||||
expect(main).toContain('t("nacos.nacosManagedNamespacesHint")');
|
||||
expect(main).toContain("data-nacos-ordinary-user-toggle");
|
||||
expect(main).toContain('v-model="nacosOrdinaryAccount"');
|
||||
expect(main).toContain("nacosAuthKind === 'usernamePassword'");
|
||||
expect(main).toContain("nacosImplementation === 'nacos' && nacosAuthKind === 'usernamePassword'");
|
||||
expect(main).not.toContain("nacosVersionMode === 'v3' && nacosAuthKind === 'usernamePassword'");
|
||||
expect(main).not.toContain('v-model="nacosNamespace"');
|
||||
expect(main).toContain('t("nacos.nacosAuthHint")');
|
||||
expect(main).not.toContain('v-model="nacosMetricsMode"');
|
||||
@@ -40,8 +46,8 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(advanced).not.toContain("配置上下文路径");
|
||||
expect(advanced).toContain('v-model="nacosMetricsMode"');
|
||||
expect(advanced).toContain('v-model="nacosRNacosConsoleAddr"');
|
||||
expect(advanced).toContain('v-if="nacosHistoryEnabled"');
|
||||
expect(advanced).toContain('t("nacos.nacosRnacosDisabledHint")');
|
||||
expect(advanced).toContain('v-if="nacosRNacosConsoleAddr.trim()"');
|
||||
expect(advanced).toContain('v-model="nacosHistoryEnabled"');
|
||||
expect(advanced).toContain('v-model="nacosTlsSkipVerify"');
|
||||
expect(advanced).toContain('v-model.number="nacosPageSize"');
|
||||
});
|
||||
@@ -52,6 +58,7 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(source).not.toContain("DBX 不需要配置该地址");
|
||||
const mainStart = source.indexOf("data-nacos-profile-selector");
|
||||
const mainEnd = source.indexOf("<!-- Redis: host, port, user, password, ssl -->", mainStart);
|
||||
expect(source.slice(mainStart, mainEnd)).toContain("data-nacos-managed-namespaces");
|
||||
expect(source.slice(mainStart, mainEnd)).not.toContain('placeholder="http://127.0.0.1:8080"');
|
||||
expect(source).not.toContain("http://127.0.0.1:8010");
|
||||
expect(source).not.toContain("http://127.0.0.1:8818");
|
||||
@@ -60,7 +67,7 @@ describe("Nacos connection dialog layout", () => {
|
||||
it("uses a dedicated namespace selector instead of the database selector", () => {
|
||||
expect(source).toContain('t("nacos.nacosVisibleNamespacesTitle")');
|
||||
expect(source).toContain("openVisibleNacosNamespacesPicker");
|
||||
expect(source).toContain("api.nacosListNamespaces(draftId)");
|
||||
expect(source).toContain("loadReadableNacosNamespaces(draftId, api)");
|
||||
expect(source).toContain("showVisibleNacosNamespacesDialog");
|
||||
});
|
||||
|
||||
@@ -68,7 +75,7 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(source).toContain('form.value.db_type === "nacos"');
|
||||
expect(source).toContain("production.allNamespaces");
|
||||
expect(source).toContain("production.namespacePickerTitle");
|
||||
expect(source).toContain("api.nacosListNamespaces(connectionId)");
|
||||
expect(source).toContain("loadReadableNacosNamespaces(connectionId, api)");
|
||||
expect(source).toContain("nacosNamespaceIdentity(name)");
|
||||
});
|
||||
});
|
||||
@@ -18,9 +18,11 @@ import {
|
||||
isNacosErrorCode,
|
||||
isNacosConfigSaveSnapshotCurrent,
|
||||
isNacosConfigDeleteSnapshotInScope,
|
||||
mergeNacosNamespacePermissionAssignments,
|
||||
nacosConfigFileExtension,
|
||||
nacosMetricsCandidates,
|
||||
normalizeNacosMetricsUrl,
|
||||
parseNacosManagedNamespaces,
|
||||
parseNacosRawBody,
|
||||
parseNacosRawQuery,
|
||||
normalizeNacosEndpoint,
|
||||
@@ -79,6 +81,7 @@ describe("nacosAdmin helpers", () => {
|
||||
expect(() => normalizeNacosMetricsUrl("http://localhost/metrics#fragment")).toThrow(/fragment/);
|
||||
expect(() => normalizeNacosMetricsUrl("http://localhost/metrics#")).toThrow(/fragment/);
|
||||
});
|
||||
|
||||
it("parses raw query and body text", () => {
|
||||
expect(parseNacosRawQuery("?dataId=a&group=DEFAULT_GROUP")).toEqual({ dataId: "a", group: "DEFAULT_GROUP" });
|
||||
expect(parseNacosRawQuery("")).toBeUndefined();
|
||||
@@ -86,6 +89,24 @@ describe("nacosAdmin helpers", () => {
|
||||
expect(parseNacosRawBody("plain text")).toBe("plain text");
|
||||
});
|
||||
|
||||
it("parses, trims, and deduplicates managed namespace IDs", () => {
|
||||
expect(parseNacosManagedNamespaces(" public, team-a\nteam-a,team-b\n\n")).toEqual(["public", "team-a", "team-b"]);
|
||||
expect(parseNacosManagedNamespaces(" ")).toEqual([]);
|
||||
});
|
||||
|
||||
it("combines split read and write permission rows before role editing", () => {
|
||||
expect(
|
||||
mergeNacosNamespacePermissionAssignments([
|
||||
{ actionRaw: "r", parsedScope: { kind: "namespace", namespaceId: "team-a" } },
|
||||
{ actionRaw: "w", parsedScope: { kind: "namespace", namespaceId: "team-a" } },
|
||||
{ actionRaw: "r", parsedScope: { kind: "namespace", namespaceId: "team-b" } },
|
||||
]),
|
||||
).toEqual([
|
||||
{ namespaceId: "team-a", action: "rw" },
|
||||
{ namespaceId: "team-b", action: "r" },
|
||||
]);
|
||||
});
|
||||
|
||||
it("builds raw requests and detects mutations", () => {
|
||||
const req = buildNacosRawRequest("post", " /v1/cs/configs ", "a=1", '{"b":2}');
|
||||
expect(req).toEqual({ method: "post", path: "/v1/cs/configs", query: { a: "1" }, body: { b: 2 } });
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { filterNacosNamespacesForSidebar, normalizeNacosNamespaceSelection, normalizeNacosNamespacesForDisplay } from "@/lib/nacos/nacosNamespaceVisibility";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { filterNacosNamespacesForSidebar, loadReadableNacosNamespaces, normalizeNacosNamespaceSelection, normalizeNacosNamespacesForDisplay } from "@/lib/nacos/nacosNamespaceVisibility";
|
||||
import { nacosVisibleNamespaceSummary } from "@/lib/sidebar/sidebarVisibleFilterSummary";
|
||||
|
||||
const namespaces = [
|
||||
@@ -41,3 +41,12 @@ describe("filterNacosNamespacesForSidebar", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("loadReadableNacosNamespaces", () => {
|
||||
it("uses the backend-filtered list without per-namespace frontend probes", async () => {
|
||||
const nacosListNamespaces = vi.fn().mockResolvedValue([namespaces[1]]);
|
||||
|
||||
await expect(loadReadableNacosNamespaces("nacos", { nacosListNamespaces })).resolves.toEqual([namespaces[1]]);
|
||||
expect(nacosListNamespaces).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
+15
-1
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { filterSidebarTreeToConnectedConnections } from "@/lib/sidebar/sidebarSearchTree";
|
||||
import { filterSidebarTree, filterSidebarTreeToConnectedConnections } from "@/lib/sidebar/sidebarSearchTree";
|
||||
import type { TreeNode } from "@/types/database";
|
||||
|
||||
function connection(id: string): TreeNode {
|
||||
@@ -38,3 +38,17 @@ describe("connected sidebar connection filter", () => {
|
||||
expect(filterSidebarTreeToConnectedConnections(tree, new Set(["first"]))).toBe(tree);
|
||||
});
|
||||
});
|
||||
|
||||
describe("sidebar tree translated labels", () => {
|
||||
it("matches an application entry by its localized display label", () => {
|
||||
const node: TreeNode = {
|
||||
id: "nacos:nacos-access-control",
|
||||
label: "nacos.accessControlSidebarLabel",
|
||||
type: "nacos-access-control",
|
||||
connectionId: "nacos",
|
||||
};
|
||||
|
||||
expect(filterSidebarTree([node], "Nacos Access Control", new Set(), undefined, () => "Nacos Access Control")).toEqual([node]);
|
||||
expect(filterSidebarTree([node], "Nacos 用户和角色", new Set(), undefined, () => "Nacos 用户和角色")).toEqual([node]);
|
||||
});
|
||||
});
|
||||
@@ -27,7 +27,9 @@ describe("sidebar tree item layout", () => {
|
||||
expect(alignedCommentLeadingWidth(undefined, true)).toBeUndefined();
|
||||
});
|
||||
|
||||
it("renders etcd leaf actions without expanders", () => {
|
||||
it("renders navigation leaf actions without expanders", () => {
|
||||
expect(canTreeNodeShowExpander({ type: "nacos-namespace", childCount: 0 })).toBe(false);
|
||||
expect(canTreeNodeShowExpander({ type: "nacos-access-control", childCount: 0 })).toBe(false);
|
||||
expect(canTreeNodeShowExpander({ type: "etcd-root", childCount: 0 })).toBe(false);
|
||||
expect(canTreeNodeShowExpander({ type: "etcd-dashboard", childCount: 0 })).toBe(false);
|
||||
expect(canTreeNodeShowExpander({ type: "etcd-access-control", childCount: 0 })).toBe(false);
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { isDirectNavigationTreeNode, objectSourceKindForTreeNode, objectSourceTargetForTreeNode, shouldActivateTreeNodeOnSingleClick, shouldOpenObjectBrowserOnSingleClick, treeNodeRowAction, treeNodeRowDoubleClickAction } from "@/lib/sidebar/treeNodeClick";
|
||||
import {
|
||||
isDirectNavigationTreeNode,
|
||||
isRepeatableNavigationTreeNode,
|
||||
objectSourceKindForTreeNode,
|
||||
objectSourceTargetForTreeNode,
|
||||
shouldActivateTreeNodeOnSingleClick,
|
||||
shouldOpenObjectBrowserOnSingleClick,
|
||||
shouldRunTreeNodeRowAction,
|
||||
treeNodeRowAction,
|
||||
treeNodeRowDoubleClickAction,
|
||||
} from "@/lib/sidebar/treeNodeClick";
|
||||
|
||||
describe("treeNodeClick", () => {
|
||||
it("opens synonym nodes as synonym source", () => {
|
||||
@@ -44,6 +54,20 @@ describe("treeNodeClick", () => {
|
||||
expect(treeNodeRowAction("consul-overview", false, "double")).toBe("toggle");
|
||||
});
|
||||
|
||||
it("keeps Nacos namespace and access-control navigation responsive during rapid row switching", () => {
|
||||
for (const type of ["nacos-namespace", "nacos-access-control"] as const) {
|
||||
expect(isDirectNavigationTreeNode(type), type).toBe(true);
|
||||
expect(shouldActivateTreeNodeOnSingleClick(type, "double"), type).toBe(true);
|
||||
const action = treeNodeRowAction(type, false, "double");
|
||||
expect(action, type).toBe("toggle");
|
||||
expect(isRepeatableNavigationTreeNode(type), type).toBe(true);
|
||||
expect(shouldRunTreeNodeRowAction(action, 2, isRepeatableNavigationTreeNode(type)), type).toBe(true);
|
||||
}
|
||||
|
||||
expect(isRepeatableNavigationTreeNode("database")).toBe(false);
|
||||
expect(shouldRunTreeNodeRowAction("toggle", 2, false)).toBe(false);
|
||||
});
|
||||
|
||||
it("opens the connection database browser only when the capability is enabled", () => {
|
||||
expect(treeNodeRowDoubleClickAction("connection", false, "single", true, "postgres", true)).toBe("open-database-browser");
|
||||
expect(treeNodeRowDoubleClickAction("connection", false, "double", true, "postgres", false)).toBe("toggle");
|
||||
|
||||
@@ -357,6 +357,7 @@ export const listSqlFilesInFolder = forward("listSqlFilesInFolder");
|
||||
// Nacos
|
||||
export const nacosTestConnection = forward("nacosTestConnection");
|
||||
export const nacosListNamespaces = forward("nacosListNamespaces");
|
||||
export const nacosSidebarSnapshot = forward("nacosSidebarSnapshot");
|
||||
export const nacosCreateNamespace = forward("nacosCreateNamespace");
|
||||
export const nacosUpdateNamespace = forward("nacosUpdateNamespace");
|
||||
export const nacosListConfigs = forward("nacosListConfigs");
|
||||
@@ -375,6 +376,18 @@ export const nacosGetConfigHistory = forward("nacosGetConfigHistory");
|
||||
export const nacosRollbackConfig = forward("nacosRollbackConfig");
|
||||
export const nacosGetRNacosConsoleCaptcha = forward("nacosGetRNacosConsoleCaptcha");
|
||||
export const nacosLoginRNacosConsole = forward("nacosLoginRNacosConsole");
|
||||
export const nacosListUsers = forward("nacosListUsers");
|
||||
export const nacosCreateUser = forward("nacosCreateUser");
|
||||
export const nacosUpdateUser = forward("nacosUpdateUser");
|
||||
export const nacosDeleteUser = forward("nacosDeleteUser");
|
||||
export const nacosListRoleBindings = forward("nacosListRoleBindings");
|
||||
export const nacosAssignRole = forward("nacosAssignRole");
|
||||
export const nacosRemoveRole = forward("nacosRemoveRole");
|
||||
export const nacosAccessSnapshot = forward("nacosAccessSnapshot");
|
||||
export const nacosStartAccessOperation = forward("nacosStartAccessOperation");
|
||||
export const nacosGetAccessOperation = forward("nacosGetAccessOperation");
|
||||
export const nacosRetryAccessOperation = forward("nacosRetryAccessOperation");
|
||||
export const nacosUndoAccessOperation = forward("nacosUndoAccessOperation");
|
||||
export const nacosListServices = forward("nacosListServices");
|
||||
export const nacosGetService = forward("nacosGetService");
|
||||
export const nacosCreateService = forward("nacosCreateService");
|
||||
|
||||
@@ -185,6 +185,17 @@ import type {
|
||||
NacosConfigUpsert,
|
||||
NacosConnectionInfo,
|
||||
NacosRNacosConsoleCaptcha,
|
||||
NacosUserQuery,
|
||||
NacosUserList,
|
||||
NacosUserCreate,
|
||||
NacosUserUpdate,
|
||||
NacosRoleQuery,
|
||||
NacosRoleList,
|
||||
NacosRoleBinding,
|
||||
NacosAccessControlSnapshot,
|
||||
NacosAccessOperationRequest,
|
||||
NacosAccessOperationResult,
|
||||
NacosAccessOperationRetry,
|
||||
NacosInstanceInfo,
|
||||
NacosInstanceRef,
|
||||
NacosInstanceRegistration,
|
||||
@@ -194,6 +205,7 @@ import type {
|
||||
NacosDashboardSnapshot,
|
||||
NacosNamespaceCreate,
|
||||
NacosNamespaceInfo,
|
||||
NacosNamespaceSidebarSnapshot,
|
||||
NacosNamespaceUpdate,
|
||||
NacosRawRequest,
|
||||
NacosRawResponse,
|
||||
@@ -3162,6 +3174,10 @@ export async function nacosListNamespaces(connectionId: string): Promise<NacosNa
|
||||
return post("/api/nacos/namespaces/list", { connectionId });
|
||||
}
|
||||
|
||||
export async function nacosSidebarSnapshot(connectionId: string): Promise<NacosNamespaceSidebarSnapshot> {
|
||||
return post("/api/nacos/sidebar/snapshot", { connectionId });
|
||||
}
|
||||
|
||||
export async function nacosCreateNamespace(connectionId: string, req: NacosNamespaceCreate): Promise<void> {
|
||||
return post("/api/nacos/namespaces/create", { connectionId, req });
|
||||
}
|
||||
@@ -3303,6 +3319,54 @@ export async function nacosLoginRNacosConsole(connectionId: string, captcha?: st
|
||||
return post("/api/nacos/rnacos-console/login", { connectionId, captcha });
|
||||
}
|
||||
|
||||
export async function nacosListUsers(connectionId: string, query: NacosUserQuery): Promise<NacosUserList> {
|
||||
return post("/api/nacos/users/list", { connectionId, query });
|
||||
}
|
||||
|
||||
export async function nacosCreateUser(connectionId: string, req: NacosUserCreate): Promise<void> {
|
||||
return post("/api/nacos/users/create", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosUpdateUser(connectionId: string, req: NacosUserUpdate): Promise<void> {
|
||||
return post("/api/nacos/users/update", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosDeleteUser(connectionId: string, username: string): Promise<void> {
|
||||
return post("/api/nacos/users/delete", { connectionId, username });
|
||||
}
|
||||
|
||||
export async function nacosListRoleBindings(connectionId: string, query: NacosRoleQuery): Promise<NacosRoleList> {
|
||||
return post("/api/nacos/roles/list", { connectionId, query });
|
||||
}
|
||||
|
||||
export async function nacosAssignRole(connectionId: string, binding: NacosRoleBinding): Promise<void> {
|
||||
return post("/api/nacos/roles/assign", { connectionId, binding });
|
||||
}
|
||||
|
||||
export async function nacosRemoveRole(connectionId: string, binding: NacosRoleBinding): Promise<void> {
|
||||
return post("/api/nacos/roles/remove", { connectionId, binding });
|
||||
}
|
||||
|
||||
export async function nacosAccessSnapshot(connectionId: string): Promise<NacosAccessControlSnapshot> {
|
||||
return post("/api/nacos/access/snapshot", { connectionId });
|
||||
}
|
||||
|
||||
export async function nacosStartAccessOperation(connectionId: string, req: NacosAccessOperationRequest): Promise<NacosAccessOperationResult> {
|
||||
return post("/api/nacos/access/operations/start", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosGetAccessOperation(connectionId: string, operationId: string): Promise<NacosAccessOperationResult> {
|
||||
return post("/api/nacos/access/operations/get", { connectionId, operationId });
|
||||
}
|
||||
|
||||
export async function nacosRetryAccessOperation(connectionId: string, retry: NacosAccessOperationRetry): Promise<NacosAccessOperationResult> {
|
||||
return post("/api/nacos/access/operations/retry", { connectionId, retry });
|
||||
}
|
||||
|
||||
export async function nacosUndoAccessOperation(connectionId: string, operationId: string): Promise<NacosAccessOperationResult> {
|
||||
return post("/api/nacos/access/operations/undo", { connectionId, operationId });
|
||||
}
|
||||
|
||||
export async function nacosListServices(connectionId: string, query: NacosServiceQuery): Promise<NacosServiceList> {
|
||||
return post("/api/nacos/services/list", { connectionId, query });
|
||||
}
|
||||
|
||||
@@ -20,6 +20,17 @@ import type {
|
||||
NacosDashboardQuery,
|
||||
NacosDashboardSnapshot,
|
||||
NacosRNacosConsoleCaptcha,
|
||||
NacosUserQuery,
|
||||
NacosUserList,
|
||||
NacosUserCreate,
|
||||
NacosUserUpdate,
|
||||
NacosRoleQuery,
|
||||
NacosRoleList,
|
||||
NacosRoleBinding,
|
||||
NacosAccessControlSnapshot,
|
||||
NacosAccessOperationRequest,
|
||||
NacosAccessOperationResult,
|
||||
NacosAccessOperationRetry,
|
||||
NacosInstanceInfo,
|
||||
NacosInstanceRef,
|
||||
NacosInstanceRegistration,
|
||||
@@ -27,6 +38,7 @@ import type {
|
||||
NacosInstanceUpdateRequest,
|
||||
NacosNamespaceCreate,
|
||||
NacosNamespaceInfo,
|
||||
NacosNamespaceSidebarSnapshot,
|
||||
NacosNamespaceUpdate,
|
||||
NacosRawRequest,
|
||||
NacosRawResponse,
|
||||
@@ -45,6 +57,10 @@ export async function nacosListNamespaces(connectionId: string): Promise<NacosNa
|
||||
return invoke("nacos_list_namespaces", { connectionId });
|
||||
}
|
||||
|
||||
export async function nacosSidebarSnapshot(connectionId: string): Promise<NacosNamespaceSidebarSnapshot> {
|
||||
return invoke("nacos_sidebar_snapshot", { connectionId });
|
||||
}
|
||||
|
||||
export async function nacosCreateNamespace(connectionId: string, req: NacosNamespaceCreate): Promise<void> {
|
||||
return invoke("nacos_create_namespace", { connectionId, req });
|
||||
}
|
||||
@@ -121,6 +137,54 @@ export async function nacosLoginRNacosConsole(connectionId: string, captcha?: st
|
||||
return invoke("nacos_login_rnacos_console", { connectionId, captcha });
|
||||
}
|
||||
|
||||
export async function nacosListUsers(connectionId: string, query: NacosUserQuery): Promise<NacosUserList> {
|
||||
return invoke("nacos_list_users", { connectionId, query });
|
||||
}
|
||||
|
||||
export async function nacosCreateUser(connectionId: string, req: NacosUserCreate): Promise<void> {
|
||||
return invoke("nacos_create_user", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosUpdateUser(connectionId: string, req: NacosUserUpdate): Promise<void> {
|
||||
return invoke("nacos_update_user", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosDeleteUser(connectionId: string, username: string): Promise<void> {
|
||||
return invoke("nacos_delete_user", { connectionId, username });
|
||||
}
|
||||
|
||||
export async function nacosListRoleBindings(connectionId: string, query: NacosRoleQuery): Promise<NacosRoleList> {
|
||||
return invoke("nacos_list_role_bindings", { connectionId, query });
|
||||
}
|
||||
|
||||
export async function nacosAssignRole(connectionId: string, binding: NacosRoleBinding): Promise<void> {
|
||||
return invoke("nacos_assign_role", { connectionId, binding });
|
||||
}
|
||||
|
||||
export async function nacosRemoveRole(connectionId: string, binding: NacosRoleBinding): Promise<void> {
|
||||
return invoke("nacos_remove_role", { connectionId, binding });
|
||||
}
|
||||
|
||||
export async function nacosAccessSnapshot(connectionId: string): Promise<NacosAccessControlSnapshot> {
|
||||
return invoke("nacos_access_snapshot", { connectionId });
|
||||
}
|
||||
|
||||
export async function nacosStartAccessOperation(connectionId: string, req: NacosAccessOperationRequest): Promise<NacosAccessOperationResult> {
|
||||
return invoke("nacos_start_access_operation", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosGetAccessOperation(connectionId: string, operationId: string): Promise<NacosAccessOperationResult> {
|
||||
return invoke("nacos_get_access_operation", { connectionId, operationId });
|
||||
}
|
||||
|
||||
export async function nacosRetryAccessOperation(connectionId: string, retry: NacosAccessOperationRetry): Promise<NacosAccessOperationResult> {
|
||||
return invoke("nacos_retry_access_operation", { connectionId, retry });
|
||||
}
|
||||
|
||||
export async function nacosUndoAccessOperation(connectionId: string, operationId: string): Promise<NacosAccessOperationResult> {
|
||||
return invoke("nacos_undo_access_operation", { connectionId, operationId });
|
||||
}
|
||||
|
||||
export async function nacosListServices(connectionId: string, query: NacosServiceQuery): Promise<NacosServiceList> {
|
||||
return invoke("nacos_list_services", { connectionId, query });
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { NacosConfigHistoryItem, NacosConfigItem, NacosConfigKey, NacosContentMatch, NacosImplementation, NacosInstanceInfo, NacosRawRequest, NacosServiceInfo, NacosVersionMode } from "@/types/nacos";
|
||||
import type { NacosConfigHistoryItem, NacosConfigItem, NacosConfigKey, NacosContentMatch, NacosImplementation, NacosInstanceInfo, NacosPermissionInfo, NacosRawRequest, NacosServiceInfo, NacosVersionMode } from "@/types/nacos";
|
||||
import { diffArrays, diffChars } from "diff";
|
||||
|
||||
export type NacosRawTemplateKey = "serverState" | "namespaceList" | "configDetail" | "serviceList" | "instanceList";
|
||||
@@ -162,6 +162,43 @@ export function parseNacosRawQuery(text: string): Record<string, string> | undef
|
||||
return Object.fromEntries(new URLSearchParams(trimmed).entries());
|
||||
}
|
||||
|
||||
export function parseNacosManagedNamespaces(text: string): string[] {
|
||||
return [
|
||||
...new Set(
|
||||
text
|
||||
.split(/[\n,,]+/)
|
||||
.map((value) => value.trim())
|
||||
.filter(Boolean),
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
export type NacosNamespacePermissionAction = "r" | "w" | "rw";
|
||||
|
||||
export interface NacosNamespacePermissionAssignment {
|
||||
namespaceId: string;
|
||||
action: NacosNamespacePermissionAction;
|
||||
}
|
||||
|
||||
/**
|
||||
* The Nacos permission table may store read and write as separate rows for the
|
||||
* same role and namespace. The editor exposes one assignment per namespace, so
|
||||
* combine those rows before populating the form to avoid dropping either half
|
||||
* when an unchanged role is saved.
|
||||
*/
|
||||
export function mergeNacosNamespacePermissionAssignments(permissions: Pick<NacosPermissionInfo, "actionRaw" | "parsedScope">[]): NacosNamespacePermissionAssignment[] {
|
||||
const assignments = new Map<string, NacosNamespacePermissionAction>();
|
||||
for (const permission of permissions) {
|
||||
const namespaceId = permission.parsedScope?.namespaceId;
|
||||
if (!namespaceId || !["r", "w", "rw"].includes(permission.actionRaw)) continue;
|
||||
const current = assignments.get(namespaceId);
|
||||
const readable = current?.includes("r") || permission.actionRaw.includes("r");
|
||||
const writable = current?.includes("w") || permission.actionRaw.includes("w");
|
||||
assignments.set(namespaceId, readable && writable ? "rw" : readable ? "r" : "w");
|
||||
}
|
||||
return [...assignments].map(([namespaceId, action]) => ({ namespaceId, action }));
|
||||
}
|
||||
|
||||
export function parseNacosRawBody(text: string): unknown {
|
||||
const trimmed = text.trim();
|
||||
if (!trimmed) return undefined;
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
import type { NacosNamespaceInfo } from "@/types/nacos";
|
||||
|
||||
type NacosNamespaceAccessClient = {
|
||||
nacosListNamespaces(connectionId: string): Promise<NacosNamespaceInfo[]>;
|
||||
};
|
||||
|
||||
/** The backend applies account authorization or an explicitly configured namespace scope. */
|
||||
export async function loadReadableNacosNamespaces(connectionId: string, client: NacosNamespaceAccessClient): Promise<NacosNamespaceInfo[]> {
|
||||
return normalizeNacosNamespacesForDisplay(await client.nacosListNamespaces(connectionId));
|
||||
}
|
||||
|
||||
/**
|
||||
* Nacos 2/r-nacos may represent the default namespace with an empty ID, while
|
||||
* Nacos 3 returns the concrete `public` ID. Older backend builds could expose
|
||||
|
||||
@@ -48,6 +48,10 @@ export type ActiveTabSidebarTarget =
|
||||
type: "etcd-access-control";
|
||||
connectionId: string;
|
||||
}
|
||||
| {
|
||||
type: "nacos-access-control";
|
||||
connectionId: string;
|
||||
}
|
||||
| {
|
||||
type: "zookeeper-root";
|
||||
connectionId: string;
|
||||
@@ -161,6 +165,10 @@ export function activeTabSidebarTarget(tab: QueryTab | undefined | null): Active
|
||||
return { type: "etcd-access-control", connectionId: tab.connectionId };
|
||||
}
|
||||
|
||||
if (tab.mode === "nacos-access-control") {
|
||||
return { type: "nacos-access-control", connectionId: tab.connectionId };
|
||||
}
|
||||
|
||||
if (tab.mode === "zookeeper") {
|
||||
return { type: "zookeeper-root", connectionId: tab.connectionId };
|
||||
}
|
||||
@@ -252,6 +260,10 @@ export function matchesTarget(node: TreeNode, target: ActiveTabSidebarTarget): b
|
||||
return node.type === "etcd-access-control" && node.connectionId === target.connectionId;
|
||||
}
|
||||
|
||||
if (target.type === "nacos-access-control") {
|
||||
return node.type === "nacos-access-control" && node.connectionId === target.connectionId;
|
||||
}
|
||||
|
||||
if (target.type === "zookeeper-root") {
|
||||
return node.type === "zookeeper-root" && node.connectionId === target.connectionId;
|
||||
}
|
||||
|
||||
@@ -15,12 +15,12 @@ function bestMatch(matchLabel: SidebarLabelMatcher, label: string, comment?: str
|
||||
return best;
|
||||
}
|
||||
|
||||
function normalizedLabel(node: TreeNode): string {
|
||||
function normalizedLabel(node: TreeNode, resolveLabel?: (node: TreeNode) => string): string {
|
||||
// Keep the original case. The matcher lowercases internally for comparison;
|
||||
// preserving case here lets it tokenize camelCase labels ("camelCaseTable"
|
||||
// -> "camel" | "Case" | "Table") instead of treating them as one lowercase
|
||||
// blob.
|
||||
return node.label;
|
||||
return resolveLabel?.(node) ?? node.label;
|
||||
}
|
||||
|
||||
function findNodePath(nodes: readonly TreeNode[], targetNodeId: string, ancestors: readonly TreeNode[] = []): readonly TreeNode[] | undefined {
|
||||
@@ -53,10 +53,18 @@ export function resolveSidebarObjectSearchFilter(nodes: readonly TreeNode[], tar
|
||||
return preservesSubtree ? "" : query;
|
||||
}
|
||||
|
||||
export function filterSidebarTree(nodes: TreeNode[], query: string, collapsedIds: ReadonlySet<string>, searchableNodeTypes?: ReadonlySet<TreeNodeType>, options?: SidebarSearchMatcherOptions): TreeNode[] {
|
||||
const matchLabel = query ? createSidebarLabelMatcher(query, options) : undefined;
|
||||
export interface SidebarTreeSearchMatcherOptions extends SidebarSearchMatcherOptions {
|
||||
resolveLabel?: (node: TreeNode) => string;
|
||||
}
|
||||
|
||||
export function filterSidebarTree(nodes: TreeNode[], query: string, collapsedIds: ReadonlySet<string>, searchableNodeTypes?: ReadonlySet<TreeNodeType>, options?: SidebarTreeSearchMatcherOptions | ((node: TreeNode) => string)): TreeNode[] {
|
||||
// Accept the pre-regex label resolver form as well as the options object so
|
||||
// callers can use localized synthetic labels without losing regex matching.
|
||||
const resolveLabel = typeof options === "function" ? options : options?.resolveLabel;
|
||||
const matcherOptions = typeof options === "function" ? undefined : options;
|
||||
const matchLabel = query ? createSidebarLabelMatcher(query, matcherOptions) : undefined;
|
||||
if (!matchLabel && searchableNodeTypes === undefined) return nodes;
|
||||
return filterSidebarTreeWithMatcher(nodes, matchLabel, collapsedIds, searchableNodeTypes);
|
||||
return filterSidebarTreeWithMatcher(nodes, matchLabel, collapsedIds, searchableNodeTypes, resolveLabel);
|
||||
}
|
||||
|
||||
export function reuseLiveSidebarTreeNodes(indexedNodes: TreeNode[], liveNodes: readonly TreeNode[]): TreeNode[] {
|
||||
@@ -312,7 +320,7 @@ function preservedSearchChildren(node: TreeNode, collapsedIds: ReadonlySet<strin
|
||||
return node.children.filter((child) => !hiddenSearchNodeTypes.has(child.type)).map((child) => applySearchCollapsedState(child, collapsedIds));
|
||||
}
|
||||
|
||||
function filterSidebarTreeWithMatcher(nodes: TreeNode[], matchLabel: SidebarLabelMatcher | undefined, collapsedIds: ReadonlySet<string>, searchableNodeTypes?: ReadonlySet<TreeNodeType>): TreeNode[] {
|
||||
function filterSidebarTreeWithMatcher(nodes: TreeNode[], matchLabel: SidebarLabelMatcher | undefined, collapsedIds: ReadonlySet<string>, searchableNodeTypes?: ReadonlySet<TreeNodeType>, resolveLabel?: (node: TreeNode) => string): TreeNode[] {
|
||||
const filteredNodes: { node: TreeNode; score: number }[] = [];
|
||||
|
||||
for (const node of nodes) {
|
||||
@@ -320,7 +328,7 @@ function filterSidebarTreeWithMatcher(nodes: TreeNode[], matchLabel: SidebarLabe
|
||||
if (node.type === "object-browser" && node.hiddenChildren) {
|
||||
const matches = node.hiddenChildren.flatMap((child) => {
|
||||
if (searchableNodeTypes && !searchableNodeTypes.has(child.type)) return [];
|
||||
const match = matchLabel?.(normalizedLabel(child));
|
||||
const match = matchLabel?.(normalizedLabel(child, resolveLabel));
|
||||
if (matchLabel && !match) return [];
|
||||
return [{ node: child, score: match?.score ?? 0 }];
|
||||
});
|
||||
@@ -328,7 +336,7 @@ function filterSidebarTreeWithMatcher(nodes: TreeNode[], matchLabel: SidebarLabe
|
||||
continue;
|
||||
}
|
||||
|
||||
const label = normalizedLabel(node);
|
||||
const label = normalizedLabel(node, resolveLabel);
|
||||
const canSelfMatch = !searchableNodeTypes || searchableNodeTypes.has(node.type);
|
||||
const selfMatch = canSelfMatch ? (matchLabel ? bestMatch(matchLabel, label, node.comment, node.searchAliases) : { score: 0 }) : null;
|
||||
// Type-only filtering keeps matching rows and their ancestor path, but not
|
||||
@@ -340,7 +348,7 @@ function filterSidebarTreeWithMatcher(nodes: TreeNode[], matchLabel: SidebarLabe
|
||||
// Connection utility entries are synthetic navigation actions, not schema
|
||||
// search results. Keep real loaded descendants for connection-name matches,
|
||||
// but do not let those actions make a disconnected result look expanded.
|
||||
const filteredChildren = preservesSubtree ? preservedSearchChildren(node, collapsedIds) : node.children ? filterSidebarTreeWithMatcher(node.children, matchLabel, collapsedIds, searchableNodeTypes) : undefined;
|
||||
const filteredChildren = preservesSubtree ? preservedSearchChildren(node, collapsedIds) : node.children ? filterSidebarTreeWithMatcher(node.children, matchLabel, collapsedIds, searchableNodeTypes, resolveLabel) : undefined;
|
||||
|
||||
if (selfMatch || (filteredChildren && filteredChildren.length > 0)) {
|
||||
if (!node.children || preservesTypeMatchedTable) {
|
||||
|
||||
@@ -20,6 +20,8 @@ const leafTypes: Set<TreeNodeType> = new Set([
|
||||
"etcd-root",
|
||||
"etcd-dashboard",
|
||||
"etcd-access-control",
|
||||
"nacos-namespace",
|
||||
"nacos-access-control",
|
||||
"zookeeper-root",
|
||||
"consul-root",
|
||||
"consul-overview",
|
||||
|
||||
@@ -16,6 +16,8 @@ const toggleLeafNodeTypes = new Set<TreeNodeType>([
|
||||
"etcd-root",
|
||||
"etcd-dashboard",
|
||||
"etcd-access-control",
|
||||
"nacos-namespace",
|
||||
"nacos-access-control",
|
||||
"zookeeper-root",
|
||||
"consul-root",
|
||||
"consul-overview",
|
||||
@@ -31,12 +33,17 @@ const toggleLeafNodeTypes = new Set<TreeNodeType>([
|
||||
// These are application entry points rather than database objects. They should
|
||||
// always navigate on a single click, even when the user prefers double-click
|
||||
// activation for ordinary tree objects.
|
||||
const directNavigationTreeNodeTypes = new Set<TreeNodeType>(["consul-root", "consul-overview"]);
|
||||
const directNavigationTreeNodeTypes = new Set<TreeNodeType>(["consul-root", "consul-overview", "nacos-namespace", "nacos-access-control"]);
|
||||
const repeatableNavigationTreeNodeTypes = new Set<TreeNodeType>(["nacos-namespace", "nacos-access-control"]);
|
||||
|
||||
export function isDirectNavigationTreeNode(type: TreeNodeType): boolean {
|
||||
return directNavigationTreeNodeTypes.has(type);
|
||||
}
|
||||
|
||||
export function isRepeatableNavigationTreeNode(type: TreeNodeType): boolean {
|
||||
return repeatableNavigationTreeNodeTypes.has(type);
|
||||
}
|
||||
|
||||
export function shouldActivateTreeNodeOnSingleClick(type: TreeNodeType, activation: SidebarActivation = "single"): boolean {
|
||||
return activation !== "double" || isDirectNavigationTreeNode(type);
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ export function getTreeNodeIconInfo(node: TreeNode): TreeNodeIconInfo | null {
|
||||
return { icon: FolderOpen, colorClass: "text-sky-500" };
|
||||
case "etcd-dashboard":
|
||||
return { icon: Gauge, colorClass: "text-sky-500" };
|
||||
case "nacos-access-control":
|
||||
case "etcd-access-control":
|
||||
return { icon: ShieldCheck, colorClass: "text-sky-500" };
|
||||
case "zookeeper-root":
|
||||
|
||||
@@ -115,6 +115,10 @@ export function tabDisplayTitle(tab: QueryTab, t: Translate): string {
|
||||
if (compact) return connectionDisplayName(tab.connectionId);
|
||||
return `${connectionDisplayName(tab.connectionId)}@${t("tabs.etcdAccessControl")}`;
|
||||
}
|
||||
if (tab.mode === "nacos-access-control") {
|
||||
if (compact) return connectionDisplayName(tab.connectionId);
|
||||
return `${connectionDisplayName(tab.connectionId)}@${t("tabs.nacosAccessControl")}`;
|
||||
}
|
||||
if (tab.mode === "zookeeper") {
|
||||
if (compact) return connectionDisplayName(tab.connectionId);
|
||||
return `${connectionDisplayName(tab.connectionId)}@keys`;
|
||||
@@ -440,6 +444,7 @@ export function tabModeLabel(tab: QueryTab, t: Translate): string {
|
||||
if (tab.mode === "etcd") return t("tabs.etcd");
|
||||
if (tab.mode === "etcd-dashboard") return t("tabs.etcdDashboard");
|
||||
if (tab.mode === "etcd-access-control") return t("tabs.etcdAccessControl");
|
||||
if (tab.mode === "nacos-access-control") return t("tabs.nacosAccessControl");
|
||||
if (tab.mode === "zookeeper") return t("tabs.zookeeper");
|
||||
if (tab.mode === "consul") return t("tabs.consul");
|
||||
if (tab.mode === "consul-overview") return t("consul.ui.overview");
|
||||
|
||||
Reference in new issue
Block a user