完善项目入口与成员管理页面并同步真实整改进度
This commit is contained in:
1 parent
af779818fb
commit
a11315ddff
33 files changed
+1757
-29
No files matched your search
@@ -11,7 +11,7 @@ import { aliyunProvider, deferred, mountComposable, verifiedResponse } from "../
|
||||
test("板块导航默认只选中基本信息,超级管理员可切换全部板块", () => {
|
||||
const navigation = useDashboardNavigation(ref({ role: "super_admin" }));
|
||||
assert.equal(navigation.activeSection.value, "overview");
|
||||
assert.equal(navigation.sections.value.length, 7);
|
||||
assert.equal(navigation.sections.value.length, 8);
|
||||
for (const section of navigation.sections.value) {
|
||||
navigation.selectSection(section.id);
|
||||
assert.equal(navigation.activeSection.value, section.id);
|
||||
@@ -32,17 +32,17 @@ test("用户管理导航按权限显示,权限变化后回到基本信息", ()
|
||||
assert.equal(navigation.activeSection.value, "users");
|
||||
user.value = { role: "admin" };
|
||||
assert.equal(navigation.activeSection.value, "users");
|
||||
assert.equal(navigation.sections.value.length, 7);
|
||||
assert.equal(navigation.sections.value.length, 8);
|
||||
user.value = null;
|
||||
assert.equal(navigation.activeSection.value, "overview");
|
||||
assert.equal(navigation.sections.value.length, 5);
|
||||
assert.equal(navigation.sections.value.length, 6);
|
||||
});
|
||||
|
||||
test("单板块布局使用互斥条件,切换重置滚动且保留弹窗入口", async () => {
|
||||
const { readFile } = await import("node:fs/promises");
|
||||
const template = await readFile(new URL("./Dashboard.vue", import.meta.url), "utf8");
|
||||
const stylesheet = await readFile(new URL("./DashboardLayout.css", import.meta.url), "utf8");
|
||||
for (const id of ["overview", "activity", "domains", "servers", "keys", "dns-accounts", "users"]) {
|
||||
for (const id of ["overview", "activity", "projects", "domains", "servers", "keys", "dns-accounts", "users"]) {
|
||||
assert.ok(template.includes(`v-if="activeSection === '${id}'"`));
|
||||
}
|
||||
assert.match(template, /:key="activeSection"/);
|
||||
@@ -95,6 +95,7 @@ test("完整页面逐个渲染六个板块,每次只有一个内容标题", as
|
||||
const headings = {
|
||||
overview: "基本信息",
|
||||
activity: "运行概览",
|
||||
projects: "项目与成员",
|
||||
domains: "托管域名",
|
||||
servers: "部署服务器",
|
||||
keys: "服务器 SSH 密钥",
|
||||
@@ -111,6 +112,7 @@ test("完整页面逐个渲染六个板块,每次只有一个内容标题", as
|
||||
app.component(name, { render: () => null });
|
||||
}
|
||||
app.component("UserManagement", { render: () => Vue.h("h2", headings.users) });
|
||||
app.component("ProjectManagement", { render: () => Vue.h("h2", headings.projects) });
|
||||
app.component("DNSAccounts", { render: () => Vue.h("h2", headings["dns-accounts"]) });
|
||||
app.component("DeploymentResult", { render: () => null });
|
||||
const warnings = [];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup>
|
||||
import UserManagement from "../UserManagement/UserManagement.vue";
|
||||
import ProjectManagement from "../ProjectManagement/ProjectManagement.vue";
|
||||
import DNSAccounts from "../DNSAccounts/DNSAccounts.vue";
|
||||
import SettingsModal from "./SettingsModal.vue";
|
||||
import DomainModal from "./DomainModal.vue";
|
||||
@@ -328,6 +329,7 @@ const { activeSection, activeLabel, sections, selectSection } = useDashboardNavi
|
||||
</div>
|
||||
|
||||
<UserManagement v-if="activeSection === 'users'" />
|
||||
<ProjectManagement v-if="activeSection === 'projects'" />
|
||||
<DNSAccounts v-if="activeSection === 'dns-accounts'" :refresh-key="settings" />
|
||||
|
||||
<section v-if="activeSection === 'activity'" class="panel operations-panel">
|
||||
|
||||
@@ -3,6 +3,7 @@ import { computed, ref } from "vue";
|
||||
export const dashboardSections = [
|
||||
{ id: "overview", label: "基本信息", group: "总览", hint: "查看用户、域名状态、证书到期时间和部署服务器" },
|
||||
{ id: "activity", label: "运行概览", group: "总览", hint: "查看证书有效期、续期覆盖和任务执行情况" },
|
||||
{ id: "projects", label: "项目与成员", group: "证书与部署", hint: "查看有权访问的项目并管理项目成员角色" },
|
||||
{ id: "domains", label: "域名配置", group: "证书与部署", hint: "管理域名、申请证书和执行部署" },
|
||||
{ id: "servers", label: "部署服务器", group: "证书与部署", hint: "配置部署目标及 SSH 认证方式" },
|
||||
{ id: "keys", label: "SSH 私钥", group: "证书与部署", hint: "管理加密保存的 SSH 私钥" },
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
.project-management {
|
||||
padding: 22px;
|
||||
color: #25344d;
|
||||
border: 1px solid #dfe6f0;
|
||||
border-radius: 16px;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.project-heading,
|
||||
.project-toolbar,
|
||||
.project-pagination,
|
||||
.project-confirm {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.project-management h2,
|
||||
.project-management h3 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.project-heading {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.project-layout {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(200px, 260px) minmax(0, 1fr);
|
||||
gap: 22px;
|
||||
}
|
||||
|
||||
.project-directory,
|
||||
.project-members,
|
||||
.project-title {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.project-directory {
|
||||
padding-right: 20px;
|
||||
border-right: 1px solid #e5eaf2;
|
||||
}
|
||||
|
||||
.project-management button,
|
||||
.project-management input,
|
||||
.project-management select {
|
||||
min-height: 36px;
|
||||
padding: 7px 10px;
|
||||
border: 1px solid #d5ddea;
|
||||
border-radius: 8px;
|
||||
color: inherit;
|
||||
background: #fff;
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
.project-management button {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.project-management button:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.project-management :focus-visible {
|
||||
outline: 2px solid #3664c3;
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
.project-list {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
margin: 16px 0;
|
||||
max-height: 48vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.project-list button {
|
||||
text-align: left;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.project-list button[aria-current="true"] {
|
||||
border-color: #4c74cc;
|
||||
background: #edf3ff;
|
||||
}
|
||||
|
||||
.project-management small {
|
||||
display: block;
|
||||
margin-top: 4px;
|
||||
color: #68788f;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.project-title h3 {
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.project-grant-form {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(160px, 1fr) minmax(145px, 200px) auto;
|
||||
align-items: end;
|
||||
gap: 12px;
|
||||
margin: 18px 0;
|
||||
}
|
||||
|
||||
.project-grant-form label {
|
||||
display: grid;
|
||||
min-width: 0;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.project-grant-form input {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.project-management .project-primary {
|
||||
color: #fff;
|
||||
border-color: #3664c3;
|
||||
background: #3664c3;
|
||||
}
|
||||
|
||||
.project-help {
|
||||
color: #68788f;
|
||||
cursor: help;
|
||||
}
|
||||
|
||||
.project-member-table {
|
||||
max-height: 46vh;
|
||||
overflow: auto;
|
||||
border: 1px solid #e5eaf2;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.project-member-table table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.project-member-table th,
|
||||
.project-member-table td {
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid #edf0f6;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.project-member-table th {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
background: #f5f7fb;
|
||||
}
|
||||
|
||||
.project-role-list {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.project-role {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 3px 7px;
|
||||
border-radius: 6px;
|
||||
background: #f0f4fb;
|
||||
}
|
||||
|
||||
.project-role button {
|
||||
min-height: 28px;
|
||||
padding: 2px 5px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.project-pagination {
|
||||
margin-top: 14px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.project-member-pagination {
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.project-member-pagination label {
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.project-empty {
|
||||
padding: 24px 10px;
|
||||
color: #68788f;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.project-error {
|
||||
color: #a12c3b;
|
||||
}
|
||||
|
||||
.project-notice {
|
||||
color: #247049;
|
||||
}
|
||||
|
||||
.project-confirm {
|
||||
justify-content: flex-start;
|
||||
margin-bottom: 14px;
|
||||
padding: 12px;
|
||||
border-radius: 8px;
|
||||
background: #fff4df;
|
||||
}
|
||||
|
||||
@media (max-width: 1000px) {
|
||||
.project-layout {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.project-directory {
|
||||
padding-right: 0;
|
||||
border-right: 0;
|
||||
}
|
||||
|
||||
.project-list {
|
||||
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
|
||||
max-height: 24vh;
|
||||
}
|
||||
|
||||
.project-grant-form {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
import { onMounted, onUnmounted, ref } from "vue";
|
||||
import { handleProjectSession, pageSizes, requestProjectAPI } from "./ProjectRequest.js";
|
||||
import { useProjectMembers } from "./ProjectMembers.js";
|
||||
|
||||
export function useProjectManagement() {
|
||||
const projects = ref([]);
|
||||
const selectedProject = ref(null);
|
||||
const loadingProjects = ref(false);
|
||||
const projectError = ref("");
|
||||
const projectPageSize = ref(5);
|
||||
const projectCursors = ref([""]);
|
||||
const projectPage = ref(0);
|
||||
const projectHasMore = ref(false);
|
||||
const projectNextCursor = ref("");
|
||||
const members = useProjectMembers(selectedProject);
|
||||
let generation = 0;
|
||||
let controller;
|
||||
|
||||
async function loadProjects() {
|
||||
const current = ++generation;
|
||||
controller?.abort();
|
||||
controller = new AbortController();
|
||||
loadingProjects.value = true;
|
||||
projectError.value = "";
|
||||
const selectedID = selectedProject.value?.id;
|
||||
projects.value = [];
|
||||
selectedProject.value = null;
|
||||
projectHasMore.value = false;
|
||||
projectNextCursor.value = "";
|
||||
const query = new URLSearchParams({
|
||||
page_size: String(projectPageSize.value),
|
||||
after: projectCursors.value[projectPage.value],
|
||||
});
|
||||
try {
|
||||
const result = await requestProjectAPI(`/api/v1/projects?${query}`, { signal: controller.signal });
|
||||
if (current !== generation) return;
|
||||
projects.value = result.items || [];
|
||||
projectHasMore.value = Boolean(result.has_more && result.next_cursor);
|
||||
projectNextCursor.value = result.next_cursor || "";
|
||||
selectedProject.value = projects.value.find((item) => item.id === selectedID) || projects.value[0] || null;
|
||||
} catch (error) {
|
||||
if (current === generation && error.name !== "AbortError") projectError.value = handleProjectSession(error);
|
||||
} finally {
|
||||
if (current === generation) loadingProjects.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function selectProject(id) {
|
||||
if (loadingProjects.value || selectedProject.value?.id === id) return;
|
||||
selectedProject.value = projects.value.find((item) => item.id === id) || null;
|
||||
}
|
||||
|
||||
async function changeProjectPageSize(value) {
|
||||
if (!pageSizes.includes(Number(value))) return;
|
||||
projectPageSize.value = Number(value);
|
||||
projectPage.value = 0;
|
||||
projectCursors.value = [""];
|
||||
await loadProjects();
|
||||
}
|
||||
|
||||
async function nextProjectPage() {
|
||||
if (loadingProjects.value || !projectHasMore.value) return;
|
||||
projectCursors.value = [...projectCursors.value.slice(0, projectPage.value + 1), projectNextCursor.value];
|
||||
projectPage.value += 1;
|
||||
await loadProjects();
|
||||
}
|
||||
|
||||
async function previousProjectPage() {
|
||||
if (loadingProjects.value || projectPage.value === 0) return;
|
||||
projectPage.value -= 1;
|
||||
await loadProjects();
|
||||
}
|
||||
|
||||
onMounted(loadProjects);
|
||||
onUnmounted(() => {
|
||||
generation += 1;
|
||||
controller?.abort();
|
||||
});
|
||||
|
||||
return {
|
||||
...members, projects, selectedProject, loadingProjects, projectError,
|
||||
projectPageSize, projectPage, projectHasMore, pageSizes,
|
||||
loadProjects, selectProject, changeProjectPageSize, nextProjectPage, previousProjectPage,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,361 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import { nextTick, ref } from "vue";
|
||||
import { readFile } from "node:fs/promises";
|
||||
import { mountComposable, deferred } from "../../test-support/mount.js";
|
||||
import { useProjectManagement } from "./ProjectManagement.js";
|
||||
import { useProjectMembers } from "./ProjectMembers.js";
|
||||
import { useUserWorkspace } from "../UserManagement/UserWorkspace.js";
|
||||
|
||||
test("完整成员页面可渲染中文、多个角色、权限拒绝和确认状态且转义账户文字", async (t) => {
|
||||
const Vue = await import("vue");
|
||||
const { parse, compileTemplate } = await import("@vue/compiler-sfc");
|
||||
const { renderToString } = await import("@vue/server-renderer");
|
||||
const source = await readFile(new URL("./ProjectManagement.vue", import.meta.url), "utf8");
|
||||
const { descriptor } = parse(source);
|
||||
const compiled = compileTemplate({ source: descriptor.template.content, filename: "ProjectManagement.vue", id: "project-members", compilerOptions: { mode: "function" } });
|
||||
assert.deepEqual(compiled.errors, []);
|
||||
const render = new Function("Vue", compiled.code)(Vue);
|
||||
const { state } = await mountComposable(t, useProjectManagement, async (path) => {
|
||||
if (path.startsWith("/api/v1/projects?")) return page([projectA]);
|
||||
if (path === "/api/v1/users") return page([]);
|
||||
return page([{ ...memberA, username: "<script>unexpected</script>" }]);
|
||||
});
|
||||
const renderPage = async () => {
|
||||
const warnings = [];
|
||||
const app = Vue.createSSRApp({ render, setup: () => state });
|
||||
app.config.warnHandler = (message) => warnings.push(message);
|
||||
const html = await renderToString(app);
|
||||
assert.deepEqual(warnings, []);
|
||||
return html;
|
||||
};
|
||||
let html = await renderPage();
|
||||
assert.match(html, /项目与成员/);
|
||||
assert.match(html, /DNS 管理员/);
|
||||
assert.match(html, /<script>unexpected<\/script>/);
|
||||
assert.doesNotMatch(html, /<script>unexpected/);
|
||||
state.requestRevoke(state.members.value[0], "dns_admin");
|
||||
html = await renderPage();
|
||||
assert.match(html, /确认撤销/);
|
||||
state.selectedProject.value = { ...projectA, can_manage_members: false };
|
||||
html = await renderPage();
|
||||
assert.match(html, /当前没有成员管理权限/);
|
||||
assert.doesNotMatch(html, /project-grant-form/);
|
||||
assert.doesNotMatch(html, /unexpected/);
|
||||
});
|
||||
|
||||
test("账户页提供本人可分享的账户 ID,不要求用户查看数据库", async () => {
|
||||
const source = await readFile(new URL("../UserManagement/UserTable.vue", import.meta.url), "utf8");
|
||||
assert.ok(source.includes("账户 ID:{{ item.id }}"));
|
||||
});
|
||||
|
||||
test("目录卸载后响应不再修改页面状态", async (t) => {
|
||||
const pending = deferred();
|
||||
const { state, unmount } = await mountComposable(t, useProjectManagement, () => pending.promise);
|
||||
unmount();
|
||||
pending.resolve(page([projectA]));
|
||||
await flush();
|
||||
assert.deepEqual(state.projects.value, []);
|
||||
assert.equal(state.selectedProject.value, null);
|
||||
});
|
||||
|
||||
test("网络错误显示中文,服务端错误保留安全的请求编号", async (t) => {
|
||||
let mode = "network";
|
||||
const { state } = await setupMembers(t, (path) => {
|
||||
if (!path.includes("/members?")) return;
|
||||
if (mode === "network") throw new TypeError("Failed to fetch");
|
||||
return Response.json({ error: "读取失败", request_id: "scert-test-123" }, { status: 500 });
|
||||
});
|
||||
assert.equal(state.memberError.value, "项目请求失败,请检查网络后重试");
|
||||
mode = "server";
|
||||
await state.loadMembers();
|
||||
assert.match(state.memberError.value, /请求编号:scert-test-123/);
|
||||
});
|
||||
|
||||
test("变更请求在卸载后成功,不显示成功提示也不再读取成员", async (t) => {
|
||||
const pending = deferred();
|
||||
const { state, calls, unmount } = await setupMembers(t, (_path, options) => options.method === "POST" ? pending.promise : undefined);
|
||||
state.memberForm.value = { userID: "target", role: "read_only" };
|
||||
const mutation = state.grantMember();
|
||||
const count = calls.length;
|
||||
unmount();
|
||||
pending.resolve(Response.json({}, { status: 201 }));
|
||||
await mutation;
|
||||
assert.equal(calls.length, count);
|
||||
assert.equal(state.memberNotice.value, "");
|
||||
});
|
||||
|
||||
test("停用成员仍可撤销角色,但不在授予角色的建议列表中", async (t) => {
|
||||
const { state } = await setupMembers(t, (path) => path.includes("/members?") ? page([{ ...memberA, status: "disabled" }]) : undefined);
|
||||
assert.equal(state.members.value.length, 1);
|
||||
assert.equal(state.accountChoices.value.some((item) => item.id === memberA.user_id), false);
|
||||
state.requestRevoke(state.members.value[0], "dns_admin");
|
||||
assert.equal(state.pendingRevoke.value.userID, memberA.user_id);
|
||||
});
|
||||
|
||||
test("撤销必须确认且 DELETE 不带正文,撤销自身管理权限后清空敏感页面", async (t) => {
|
||||
let revoked = false;
|
||||
const { state, calls } = await setupMembers(t, (path, options) => {
|
||||
if (options.method === "DELETE") { revoked = true; return new Response(null, { status: 204 }); }
|
||||
if (revoked && path.includes("/members?")) return Response.json({ error: "无权管理成员" }, { status: 403 });
|
||||
});
|
||||
state.requestRevoke(memberA, "project_admin");
|
||||
assert.equal(calls.some(({ options }) => options.method === "DELETE"), false);
|
||||
assert.equal(state.pendingRevoke.value.userID, "user-a");
|
||||
await state.confirmRevoke();
|
||||
const request = calls.find(({ options }) => options.method === "DELETE");
|
||||
assert.equal(request.path, "/api/v1/projects/project-a/members/user-a/roles/project_admin");
|
||||
assert.equal(Object.hasOwn(request.options, "body"), false);
|
||||
assert.equal(state.canManageMembers.value, false);
|
||||
assert.deepEqual(state.members.value, []);
|
||||
assert.deepEqual(state.accountChoices.value, []);
|
||||
assert.equal(state.pendingRevoke.value, null);
|
||||
});
|
||||
|
||||
test("切换项目后旧成员响应和账户建议不得污染新项目", async (t) => {
|
||||
const oldMembers = deferred();
|
||||
const oldAccounts = deferred();
|
||||
let accounts = 0;
|
||||
const { state, project } = await setupMembers(t, (path) => {
|
||||
if (path.includes("project-a/members")) return oldMembers.promise;
|
||||
if (path === "/api/v1/users" && ++accounts === 1) return oldAccounts.promise;
|
||||
if (path.includes("project-b/members")) return page([{ ...memberA, user_id: "new-user" }]);
|
||||
});
|
||||
project.value = projectB;
|
||||
await flush();
|
||||
oldMembers.resolve(page([{ ...memberA, user_id: "old-user" }]));
|
||||
oldAccounts.resolve(page([{ id: "old-account", status: "active" }]));
|
||||
await flush();
|
||||
assert.deepEqual(state.members.value.map((item) => item.user_id), ["new-user"]);
|
||||
assert.equal(state.accountChoices.value.some((item) => item.id === "old-account"), false);
|
||||
});
|
||||
|
||||
test("旧分页请求后返回时不能覆盖新的页长和内容", async (t) => {
|
||||
const old = deferred();
|
||||
const { state } = await setupMembers(t, (path) => {
|
||||
if (path.includes("/members?page_size=10")) return old.promise;
|
||||
if (path.includes("/members?page_size=5")) return page([{ ...memberA, user_id: "five" }]);
|
||||
});
|
||||
await state.changeMemberPageSize(5);
|
||||
old.resolve(page([memberA], "user-a"));
|
||||
await flush();
|
||||
assert.equal(state.members.value[0].user_id, "five");
|
||||
assert.equal(state.memberHasMore.value, false);
|
||||
});
|
||||
|
||||
test("切换项目后旧变更成功不能清空新表单或显示错误成功消息", async (t) => {
|
||||
const pending = deferred();
|
||||
const { state, project } = await setupMembers(t, (_path, options) => options.method === "POST" ? pending.promise : undefined);
|
||||
state.memberForm.value = { userID: "target-a", role: "dns_admin" };
|
||||
const mutation = state.grantMember();
|
||||
project.value = projectB;
|
||||
await flush();
|
||||
state.memberForm.value = { userID: "target-b", role: "read_only" };
|
||||
pending.resolve(Response.json({}, { status: 201 }));
|
||||
await mutation;
|
||||
assert.equal(state.memberForm.value.userID, "target-b");
|
||||
assert.equal(state.memberNotice.value, "");
|
||||
});
|
||||
|
||||
test("卸载后成员请求失败不得回写或触发登录跳转", async (t) => {
|
||||
const pending = deferred();
|
||||
const { state, unmount } = await setupMembers(t, (path) => path.includes("/members?") ? pending.promise : undefined);
|
||||
let redirects = 0;
|
||||
window.location.assign = () => { redirects += 1; };
|
||||
unmount();
|
||||
pending.resolve(Response.json({ error: "会话过期" }, { status: 401 }));
|
||||
await flush();
|
||||
assert.deepEqual(state.members.value, []);
|
||||
assert.equal(redirects, 0);
|
||||
});
|
||||
|
||||
test("有效页面收到 401 跳转登录并清空成员与账户建议", async (t) => {
|
||||
const pending = deferred();
|
||||
const { state } = await setupMembers(t, (path) => path.includes("/members?") ? pending.promise : undefined);
|
||||
const redirects = [];
|
||||
window.location.assign = (path) => redirects.push(path);
|
||||
pending.resolve(Response.json({ error: "请登录" }, { status: 401 }));
|
||||
await flush();
|
||||
assert.deepEqual(redirects, ["/login"]);
|
||||
assert.equal(state.canManageMembers.value, false);
|
||||
assert.deepEqual(state.accountChoices.value, []);
|
||||
});
|
||||
|
||||
test("账户建议失败不妨碍通过明确账户 ID 授予角色", async (t) => {
|
||||
const { state, calls } = await setupMembers(t, (path) => path === "/api/v1/users" ? Response.json({}, { status: 500 }) : undefined);
|
||||
assert.match(state.accountError.value, /账户 ID/);
|
||||
state.memberForm.value = { userID: "known-user", role: "read_only" };
|
||||
await state.grantMember();
|
||||
assert.equal(calls.filter(({ options }) => options.method === "POST").length, 1);
|
||||
});
|
||||
|
||||
test("普通工作台采用单板块导航,不挂载管理员控制台", async (t) => {
|
||||
const { state } = await mountComposable(t, useUserWorkspace, async () => page([]));
|
||||
assert.equal(state.section.value, "account");
|
||||
state.section.value = "projects";
|
||||
assert.equal(state.section.value, "projects");
|
||||
const template = await readFile(new URL("../UserManagement/UserWorkspace.vue", import.meta.url), "utf8");
|
||||
assert.ok(template.includes(`v-if="section === 'account'"`));
|
||||
assert.ok(template.includes(`v-else-if="section === 'projects'"`));
|
||||
assert.equal(template.includes("<Dashboard"), false);
|
||||
});
|
||||
|
||||
const projectA = { id: "project-a", name: "项目甲", can_manage_members: true };
|
||||
const projectB = { id: "project-b", name: "项目乙", can_manage_members: true };
|
||||
const memberA = { user_id: "user-a", username: "成员甲", status: "active", roles: ["project_admin", "dns_admin"] };
|
||||
const page = (items, next = "") => Response.json({ items, has_more: Boolean(next), next_cursor: next, page_size: 10 });
|
||||
const flush = async () => { await new Promise((resolve) => setImmediate(resolve)); await nextTick(); };
|
||||
|
||||
async function setupMembers(t, handler = () => undefined, project = ref(projectA)) {
|
||||
const calls = [];
|
||||
const mounted = await mountComposable(t, () => useProjectMembers(project), async (path, options) => {
|
||||
calls.push({ path, options });
|
||||
const override = handler(path, options);
|
||||
if (override !== undefined) return override;
|
||||
if (path === "/api/v1/users") return page([{ id: "self", username: "本人", status: "active" }, { id: "disabled", status: "disabled" }]);
|
||||
return page([memberA]);
|
||||
});
|
||||
return { ...mounted, calls, project };
|
||||
}
|
||||
|
||||
test("项目入口使用服务端项目且默认选择实际返回项,不写死默认项目", async (t) => {
|
||||
const calls = [];
|
||||
const { state } = await mountComposable(t, useProjectManagement, async (path, options) => {
|
||||
calls.push({ path, options });
|
||||
if (path.startsWith("/api/v1/projects?")) return page([projectA, projectB]);
|
||||
if (path === "/api/v1/users") return page([]);
|
||||
return page([memberA]);
|
||||
});
|
||||
assert.equal(state.selectedProject.value.id, "project-a");
|
||||
assert.equal(state.members.value.length, 1);
|
||||
assert.ok(calls.every(({ options }) => options.credentials === "include" && options.cache === "no-store"));
|
||||
assert.equal(calls.some(({ path }) => path.includes("default")), false);
|
||||
state.selectProject("project-b");
|
||||
await flush();
|
||||
assert.equal(state.selectedProject.value.id, "project-b");
|
||||
assert.ok(calls.some(({ path }) => path.includes("project-b/members")));
|
||||
});
|
||||
|
||||
test("项目分页保留游标并支持四种页长,未知项目不能被选中", async (t) => {
|
||||
const paths = [];
|
||||
const { state } = await mountComposable(t, useProjectManagement, async (path) => {
|
||||
paths.push(path);
|
||||
if (path.startsWith("/api/v1/projects?")) {
|
||||
const query = new URL(path, "http://localhost").searchParams;
|
||||
return query.get("after") ? page([projectB]) : page([projectA], "project-a");
|
||||
}
|
||||
return page([]);
|
||||
});
|
||||
await state.nextProjectPage();
|
||||
assert.equal(state.projectPage.value, 1);
|
||||
assert.equal(state.selectedProject.value.id, "project-b");
|
||||
assert.ok(paths.includes("/api/v1/projects?page_size=5&after=project-a"));
|
||||
await state.previousProjectPage();
|
||||
assert.equal(state.projectPage.value, 0);
|
||||
for (const size of [5, 10, 15, 30]) {
|
||||
await state.changeProjectPageSize(size);
|
||||
assert.equal(state.projectPageSize.value, size);
|
||||
assert.equal(state.projectPage.value, 0);
|
||||
}
|
||||
const count = paths.length;
|
||||
await state.changeProjectPageSize(100);
|
||||
assert.equal(paths.length, count);
|
||||
state.selectProject("hidden-project");
|
||||
assert.equal(state.selectedProject.value, null);
|
||||
});
|
||||
|
||||
test("没有项目时显示空列表,不尝试请求默认项目或全站用户", async (t) => {
|
||||
const paths = [];
|
||||
const { state } = await mountComposable(t, useProjectManagement, async (path) => { paths.push(path); return page([]); });
|
||||
assert.deepEqual(state.projects.value, []);
|
||||
assert.equal(state.selectedProject.value, null);
|
||||
assert.equal(paths.length, 1);
|
||||
});
|
||||
|
||||
test("项目查询刷新失败清空旧项目和成员,旧响应不能覆盖新分页", async (t) => {
|
||||
const old = deferred();
|
||||
let attempt = 0;
|
||||
const { state } = await mountComposable(t, useProjectManagement, (path) => {
|
||||
if (!path.startsWith("/api/v1/projects?")) return page([]);
|
||||
attempt += 1;
|
||||
if (attempt === 1) return old.promise;
|
||||
if (attempt === 2) return page([projectB]);
|
||||
return Response.json({ error: "无法读取项目" }, { status: 500 });
|
||||
});
|
||||
await state.changeProjectPageSize(15);
|
||||
old.resolve(page([projectA]));
|
||||
await flush();
|
||||
assert.equal(state.selectedProject.value.id, "project-b");
|
||||
await state.loadProjects();
|
||||
assert.equal(state.selectedProject.value, null);
|
||||
assert.deepEqual(state.projects.value, []);
|
||||
assert.deepEqual(state.members.value, []);
|
||||
assert.equal(state.projectError.value, "无法读取项目");
|
||||
});
|
||||
|
||||
test("只读成员不请求成员目录或账户建议,也不能伪造授予操作", async (t) => {
|
||||
const { state, calls } = await setupMembers(t, undefined, ref({ ...projectA, can_manage_members: false }));
|
||||
assert.equal(state.canManageMembers.value, false);
|
||||
state.memberForm.value = { userID: "target", role: "project_admin" };
|
||||
await state.grantMember();
|
||||
assert.equal(calls.length, 0);
|
||||
});
|
||||
|
||||
test("账户建议只使用已有可见账户接口和本页成员,不使用邮箱或全站查询", async (t) => {
|
||||
const { state, calls } = await setupMembers(t);
|
||||
assert.deepEqual(state.accountChoices.value, [{ id: "self", username: "本人" }, { id: "user-a", username: "成员甲" }]);
|
||||
assert.equal(calls.filter(({ path }) => path === "/api/v1/users").length, 1);
|
||||
});
|
||||
|
||||
test("成员分页使用账户游标且多个角色不拆分,切换页长重置页码", async (t) => {
|
||||
const { state, calls } = await setupMembers(t, (path) => {
|
||||
if (path.includes("/members?")) return page([memberA], "user-a");
|
||||
});
|
||||
assert.equal(state.members.value[0].roles.length, 2);
|
||||
await state.nextMemberPage();
|
||||
assert.equal(state.memberPage.value, 1);
|
||||
assert.ok(calls.at(-1).path.endsWith("page_size=10&after=user-a"));
|
||||
await state.previousMemberPage();
|
||||
assert.equal(state.memberPage.value, 0);
|
||||
for (const size of [5, 10, 15, 30]) {
|
||||
await state.changeMemberPageSize(size);
|
||||
assert.equal(state.memberPageSize.value, size);
|
||||
assert.equal(state.memberPage.value, 0);
|
||||
assert.ok(calls.at(-1).path.endsWith(`page_size=${size}&after=`));
|
||||
}
|
||||
const count = calls.length;
|
||||
await state.changeMemberPageSize(100);
|
||||
assert.equal(calls.length, count);
|
||||
});
|
||||
|
||||
test("授予角色只提交账户 ID 与角色,去重点击并在成功后刷新", async (t) => {
|
||||
const pending = deferred();
|
||||
const { state, calls } = await setupMembers(t, (_path, options) => options.method === "POST" ? pending.promise : undefined);
|
||||
state.memberForm.value = { userID: " target ", role: "dns_admin" };
|
||||
const first = state.grantMember();
|
||||
await state.grantMember();
|
||||
const posts = calls.filter(({ options }) => options.method === "POST");
|
||||
assert.equal(posts.length, 1);
|
||||
assert.deepEqual(JSON.parse(posts[0].options.body), { user_id: "target", role: "dns_admin" });
|
||||
assert.equal(posts[0].options.headers["Content-Type"], "application/json");
|
||||
pending.resolve(Response.json({ message: "成功" }, { status: 201 }));
|
||||
await first;
|
||||
assert.equal(state.memberNotice.value, "项目角色已授予");
|
||||
assert.equal(state.memberForm.value.userID, "");
|
||||
assert.equal(state.savingMember.value, false);
|
||||
});
|
||||
|
||||
test("非法账户和角色不提交请求,重复授权冲突保留表单供修正", async (t) => {
|
||||
const { state, calls } = await setupMembers(t, (_path, options) => options.method === "POST" ? Response.json({ error: "角色已存在" }, { status: 409 }) : undefined);
|
||||
const initial = calls.length;
|
||||
for (const form of [{ userID: "../other", role: "dns_admin" }, { userID: "target", role: "super_admin" }]) {
|
||||
state.memberForm.value = form;
|
||||
await state.grantMember();
|
||||
}
|
||||
assert.equal(calls.length, initial);
|
||||
state.memberForm.value = { userID: "target", role: "dns_admin" };
|
||||
await state.grantMember();
|
||||
assert.equal(state.memberError.value, "角色已存在");
|
||||
assert.equal(state.memberForm.value.userID, "target");
|
||||
assert.equal(state.canManageMembers.value, true);
|
||||
});
|
||||
@@ -0,0 +1,124 @@
|
||||
<script setup>
|
||||
import { useProjectManagement } from "./ProjectManagement.js";
|
||||
|
||||
const {
|
||||
projects, selectedProject, loadingProjects, projectError, projectPageSize,
|
||||
projectPage, projectHasMore, pageSizes, loadProjects, selectProject,
|
||||
changeProjectPageSize, nextProjectPage, previousProjectPage,
|
||||
members, accountChoices, loadingMembers, savingMember, memberError, accountError,
|
||||
memberNotice, canManageMembers, memberPageSize, memberPage, memberHasMore,
|
||||
memberForm, projectRoles, pendingRevoke, loadMembers, changeMemberPageSize,
|
||||
nextMemberPage, previousMemberPage, grantMember, requestRevoke, confirmRevoke, roleLabel,
|
||||
} = useProjectManagement();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="project-management" aria-label="项目与成员">
|
||||
<header class="project-heading">
|
||||
<h2>项目与成员</h2>
|
||||
<button type="button" :disabled="loadingProjects || savingMember" @click="loadProjects">刷新项目</button>
|
||||
</header>
|
||||
<p v-if="projectError" class="project-error" role="alert">{{ projectError }}</p>
|
||||
<div class="project-layout">
|
||||
<aside class="project-directory" aria-label="可见项目">
|
||||
<div class="project-toolbar">
|
||||
<h3>我的项目</h3>
|
||||
<label>每页
|
||||
<select :value="projectPageSize" :disabled="loadingProjects || savingMember" @change="changeProjectPageSize($event.target.value)">
|
||||
<option v-for="size in pageSizes" :key="size" :value="size">{{ size }}</option>
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<p v-if="loadingProjects" role="status">正在读取项目……</p>
|
||||
<p v-else-if="!projects.length && !projectError" class="project-empty">暂无可见项目</p>
|
||||
<nav class="project-list" aria-label="选择项目">
|
||||
<button
|
||||
v-for="project in projects" :key="project.id" type="button"
|
||||
:aria-current="selectedProject?.id === project.id ? 'true' : undefined"
|
||||
:title="project.description || project.name"
|
||||
@click="selectProject(project.id)"
|
||||
>
|
||||
<strong>{{ project.name }}</strong>
|
||||
<small>{{ project.can_manage_members ? "可管理成员" : "项目成员" }}</small>
|
||||
</button>
|
||||
</nav>
|
||||
<div class="project-pagination">
|
||||
<button type="button" :disabled="loadingProjects || savingMember || projectPage === 0" @click="previousProjectPage">上一页</button>
|
||||
<span>第 {{ projectPage + 1 }} 页</span>
|
||||
<button type="button" :disabled="loadingProjects || savingMember || !projectHasMore" @click="nextProjectPage">下一页</button>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<section class="project-members" aria-label="项目成员管理">
|
||||
<template v-if="selectedProject">
|
||||
<div class="project-toolbar">
|
||||
<div class="project-title">
|
||||
<h3 :title="selectedProject.description">{{ selectedProject.name }}</h3>
|
||||
<small :title="selectedProject.id">项目 ID:{{ selectedProject.id }}</small>
|
||||
</div>
|
||||
<button v-if="canManageMembers" type="button" :disabled="loadingMembers || savingMember" @click="loadMembers">刷新成员</button>
|
||||
</div>
|
||||
<p v-if="memberError" class="project-error" role="alert">{{ memberError }}</p>
|
||||
<p v-if="memberNotice" class="project-notice" role="status">{{ memberNotice }}</p>
|
||||
<p v-if="!canManageMembers" class="project-empty">当前没有成员管理权限。权限调整后请刷新项目。</p>
|
||||
<template v-else>
|
||||
<form class="project-grant-form" @submit.prevent="grantMember">
|
||||
<label class="project-account-field">
|
||||
<span>成员账户 <span class="project-help" tabindex="0" title="仅建议当前可见账户和本页已有成员;其他账户请填写对方提供的账户 ID。项目角色不改变账户的全局角色。">ⓘ</span></span>
|
||||
<input v-model="memberForm.userID" list="project-account-options" autocomplete="off" required maxlength="128" placeholder="选择或填写账户 ID" :disabled="savingMember || loadingMembers" />
|
||||
<datalist id="project-account-options">
|
||||
<option v-for="account in accountChoices" :key="account.id" :value="account.id">{{ account.username }}</option>
|
||||
</datalist>
|
||||
</label>
|
||||
<label>项目角色
|
||||
<select v-model="memberForm.role" :disabled="savingMember || loadingMembers">
|
||||
<option v-for="role in projectRoles" :key="role.value" :value="role.value">{{ role.label }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<button class="project-primary" type="submit" :disabled="savingMember || loadingMembers">{{ savingMember ? "正在保存……" : "授予角色" }}</button>
|
||||
</form>
|
||||
<p v-if="accountError" class="project-error" role="status">{{ accountError }}</p>
|
||||
<div v-if="pendingRevoke" class="project-confirm" role="alert">
|
||||
<span>确认撤销“{{ pendingRevoke.username }}”的“{{ roleLabel(pendingRevoke.role) }}”角色?</span>
|
||||
<span class="project-help" tabindex="0" title="撤销自己的项目管理员角色后会立即失去成员管理权限;其他已授予的角色不受影响。">ⓘ</span>
|
||||
<button type="button" :disabled="savingMember" @click="confirmRevoke">确认撤销</button>
|
||||
<button type="button" :disabled="savingMember" @click="pendingRevoke = null">取消</button>
|
||||
</div>
|
||||
<div class="project-member-table" :aria-busy="loadingMembers">
|
||||
<table>
|
||||
<thead><tr><th scope="col">成员</th><th scope="col">状态</th><th scope="col">项目角色</th></tr></thead>
|
||||
<tbody>
|
||||
<tr v-for="member in members" :key="member.user_id">
|
||||
<td><strong>{{ member.username }}</strong><small>{{ member.user_id }}</small></td>
|
||||
<td>{{ member.status === "active" ? "正常" : "已停用" }}</td>
|
||||
<td><div class="project-role-list">
|
||||
<span v-for="role in member.roles" :key="role" class="project-role">
|
||||
{{ roleLabel(role) }}
|
||||
<button type="button" :disabled="savingMember || loadingMembers" :aria-label="`撤销 ${member.username} 的${roleLabel(role)}角色`" @click="requestRevoke(member, role)">撤销</button>
|
||||
</span>
|
||||
</div></td>
|
||||
</tr>
|
||||
<tr v-if="!members.length"><td colspan="3" class="project-empty">{{ loadingMembers ? "正在读取成员……" : "本页暂无成员" }}</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="project-pagination project-member-pagination">
|
||||
<label>每页
|
||||
<select :value="memberPageSize" :disabled="savingMember || loadingMembers" @change="changeMemberPageSize($event.target.value)">
|
||||
<option v-for="size in pageSizes" :key="size" :value="size">{{ size }}</option>
|
||||
</select>
|
||||
位成员
|
||||
</label>
|
||||
<button type="button" :disabled="savingMember || loadingMembers || memberPage === 0" @click="previousMemberPage">上一页</button>
|
||||
<span>第 {{ memberPage + 1 }} 页</span>
|
||||
<button type="button" :disabled="savingMember || loadingMembers || !memberHasMore" @click="nextMemberPage">下一页</button>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
<p v-else class="project-empty">请从左侧选择有权访问的项目</p>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<style scoped src="./ProjectManagement.css"></style>
|
||||
@@ -0,0 +1,208 @@
|
||||
import { computed, onUnmounted, ref, watch } from "vue";
|
||||
import { handleProjectSession, pageSizes, requestProjectAPI } from "./ProjectRequest.js";
|
||||
|
||||
export const projectRoles = [
|
||||
{ value: "project_admin", label: "项目管理员" },
|
||||
{ value: "certificate_admin", label: "证书管理员" },
|
||||
{ value: "deployment_admin", label: "部署管理员" },
|
||||
{ value: "dns_admin", label: "DNS 管理员" },
|
||||
{ value: "audit_viewer", label: "审计查看者" },
|
||||
{ value: "read_only", label: "只读用户" },
|
||||
];
|
||||
|
||||
export function useProjectMembers(project) {
|
||||
const members = ref([]);
|
||||
const accounts = ref([]);
|
||||
const loadingMembers = ref(false);
|
||||
const savingMember = ref(false);
|
||||
const memberError = ref("");
|
||||
const accountError = ref("");
|
||||
const memberNotice = ref("");
|
||||
const accessDenied = ref(false);
|
||||
const memberPageSize = ref(10);
|
||||
const memberPage = ref(0);
|
||||
const cursors = ref([""]);
|
||||
const memberHasMore = ref(false);
|
||||
const nextCursor = ref("");
|
||||
const memberForm = ref({ userID: "", role: "read_only" });
|
||||
const pendingRevoke = ref(null);
|
||||
const canManageMembers = computed(() => Boolean(project.value?.can_manage_members && !accessDenied.value));
|
||||
const accountChoices = computed(() => {
|
||||
const choices = new Map(accounts.value.map((item) => [item.id, { id: item.id, username: item.username }]));
|
||||
for (const item of members.value) {
|
||||
if (item.status === "active") choices.set(item.user_id, { id: item.user_id, username: item.username });
|
||||
}
|
||||
return [...choices.values()];
|
||||
});
|
||||
let scope = 0;
|
||||
let readGeneration = 0;
|
||||
let readController;
|
||||
let accountController;
|
||||
|
||||
function clearPage() {
|
||||
members.value = [];
|
||||
memberHasMore.value = false;
|
||||
nextCursor.value = "";
|
||||
}
|
||||
|
||||
function fail(error) {
|
||||
memberError.value = handleProjectSession(error);
|
||||
if (error.status === 401 || error.status === 403) {
|
||||
accessDenied.value = true;
|
||||
clearPage();
|
||||
accounts.value = [];
|
||||
pendingRevoke.value = null;
|
||||
accountController?.abort();
|
||||
}
|
||||
}
|
||||
|
||||
async function loadMembers() {
|
||||
if (!canManageMembers.value) return;
|
||||
const current = scope;
|
||||
const read = ++readGeneration;
|
||||
readController?.abort();
|
||||
readController = new AbortController();
|
||||
loadingMembers.value = true;
|
||||
memberError.value = "";
|
||||
clearPage();
|
||||
const query = new URLSearchParams({ page_size: String(memberPageSize.value), after: cursors.value[memberPage.value] });
|
||||
try {
|
||||
const result = await requestProjectAPI(`/api/v1/projects/${encodeURIComponent(project.value.id)}/members?${query}`, { signal: readController.signal });
|
||||
if (current !== scope || read !== readGeneration || !canManageMembers.value) return;
|
||||
members.value = result.items || [];
|
||||
memberHasMore.value = Boolean(result.has_more && result.next_cursor);
|
||||
nextCursor.value = result.next_cursor || "";
|
||||
} catch (error) {
|
||||
if (current === scope && read === readGeneration && error.name !== "AbortError") fail(error);
|
||||
} finally {
|
||||
if (current === scope && read === readGeneration) loadingMembers.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadAccounts() {
|
||||
const current = scope;
|
||||
accountController = new AbortController();
|
||||
try {
|
||||
// 复用现有账户可见性接口,不为项目管理员扩大用户目录权限。
|
||||
const result = await requestProjectAPI("/api/v1/users", { signal: accountController.signal });
|
||||
if (current !== scope || !canManageMembers.value) return;
|
||||
accounts.value = (result.items || []).filter((item) => item.status === "active");
|
||||
} catch (error) {
|
||||
if (current !== scope || !canManageMembers.value || error.name === "AbortError") return;
|
||||
if (error.status === 401) fail(error);
|
||||
else accountError.value = "账户建议暂不可用,仍可填写对方提供的账户 ID";
|
||||
}
|
||||
}
|
||||
|
||||
async function changeMemberPageSize(value) {
|
||||
if (savingMember.value || !pageSizes.includes(Number(value))) return;
|
||||
memberPageSize.value = Number(value);
|
||||
memberPage.value = 0;
|
||||
cursors.value = [""];
|
||||
pendingRevoke.value = null;
|
||||
await loadMembers();
|
||||
}
|
||||
|
||||
async function nextMemberPage() {
|
||||
if (loadingMembers.value || savingMember.value || !memberHasMore.value) return;
|
||||
cursors.value = [...cursors.value.slice(0, memberPage.value + 1), nextCursor.value];
|
||||
memberPage.value += 1;
|
||||
pendingRevoke.value = null;
|
||||
await loadMembers();
|
||||
}
|
||||
|
||||
async function previousMemberPage() {
|
||||
if (loadingMembers.value || savingMember.value || memberPage.value === 0) return;
|
||||
memberPage.value -= 1;
|
||||
pendingRevoke.value = null;
|
||||
await loadMembers();
|
||||
}
|
||||
|
||||
async function mutateMember(userID, role, revoke) {
|
||||
if (!canManageMembers.value || savingMember.value || loadingMembers.value) return;
|
||||
if (!/^[a-zA-Z0-9_-]{1,128}$/.test(userID) || !projectRoles.some((item) => item.value === role)) {
|
||||
memberError.value = "请选择有效的账户 ID 和项目角色";
|
||||
return;
|
||||
}
|
||||
const current = scope;
|
||||
const base = `/api/v1/projects/${encodeURIComponent(project.value.id)}/members`;
|
||||
savingMember.value = true;
|
||||
memberError.value = "";
|
||||
memberNotice.value = "";
|
||||
try {
|
||||
await requestProjectAPI(revoke ? `${base}/${encodeURIComponent(userID)}/roles/${encodeURIComponent(role)}` : base, {
|
||||
method: revoke ? "DELETE" : "POST",
|
||||
...(revoke ? {} : { body: JSON.stringify({ user_id: userID, role }) }),
|
||||
});
|
||||
if (current !== scope) return;
|
||||
memberNotice.value = revoke ? "项目角色已撤销" : "项目角色已授予";
|
||||
memberForm.value = { userID: "", role: "read_only" };
|
||||
pendingRevoke.value = null;
|
||||
memberPage.value = 0;
|
||||
cursors.value = [""];
|
||||
await loadMembers();
|
||||
} catch (error) {
|
||||
if (current !== scope) return;
|
||||
fail(error);
|
||||
if (error.status === 409) {
|
||||
const conflict = memberError.value;
|
||||
await loadMembers();
|
||||
if (current === scope && canManageMembers.value && !memberError.value) memberError.value = conflict;
|
||||
}
|
||||
} finally {
|
||||
if (current === scope) savingMember.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function grantMember() {
|
||||
return mutateMember(memberForm.value.userID.trim(), memberForm.value.role, false);
|
||||
}
|
||||
|
||||
function requestRevoke(member, role) {
|
||||
if (!canManageMembers.value || savingMember.value || loadingMembers.value || !member.roles.includes(role)) return;
|
||||
pendingRevoke.value = { userID: member.user_id, username: member.username, role };
|
||||
}
|
||||
|
||||
function confirmRevoke() {
|
||||
const target = pendingRevoke.value;
|
||||
if (target) return mutateMember(target.userID, target.role, true);
|
||||
}
|
||||
|
||||
watch(project, () => {
|
||||
scope += 1;
|
||||
readGeneration += 1;
|
||||
readController?.abort();
|
||||
accountController?.abort();
|
||||
clearPage();
|
||||
accounts.value = [];
|
||||
memberError.value = "";
|
||||
memberNotice.value = "";
|
||||
accountError.value = "";
|
||||
accessDenied.value = false;
|
||||
savingMember.value = false;
|
||||
loadingMembers.value = false;
|
||||
memberPage.value = 0;
|
||||
cursors.value = [""];
|
||||
memberForm.value = { userID: "", role: "read_only" };
|
||||
pendingRevoke.value = null;
|
||||
if (canManageMembers.value) {
|
||||
void loadMembers();
|
||||
void loadAccounts();
|
||||
}
|
||||
}, { immediate: true, flush: "sync" });
|
||||
|
||||
onUnmounted(() => {
|
||||
scope += 1;
|
||||
readGeneration += 1;
|
||||
readController?.abort();
|
||||
accountController?.abort();
|
||||
});
|
||||
|
||||
return {
|
||||
members, accountChoices, loadingMembers, savingMember, memberError, accountError,
|
||||
memberNotice, canManageMembers, memberPageSize, memberPage, memberHasMore, memberForm,
|
||||
projectRoles, pendingRevoke, loadMembers, changeMemberPageSize, nextMemberPage,
|
||||
previousMemberPage, grantMember, requestRevoke, confirmRevoke,
|
||||
roleLabel: (role) => projectRoles.find((item) => item.value === role)?.label || "未知角色",
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
export async function requestProjectAPI(path, options = {}) {
|
||||
const response = await fetch(path, {
|
||||
...options,
|
||||
credentials: "include",
|
||||
cache: "no-store",
|
||||
headers: {
|
||||
...(options.body ? { "Content-Type": "application/json" } : {}),
|
||||
...(options.headers || {}),
|
||||
},
|
||||
});
|
||||
const result = response.status === 204 ? {} : await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
const error = new Error(result.error || "项目请求失败,请稍后重试");
|
||||
error.status = response.status;
|
||||
error.requestID = /^[a-zA-Z0-9_-]{1,128}$/.test(result.request_id || "") ? result.request_id : "";
|
||||
throw error;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export function handleProjectSession(error) {
|
||||
if (error.status === 401) {
|
||||
window.location.assign("/login");
|
||||
return "登录会话已过期,请重新登录";
|
||||
}
|
||||
if (!error.status) return "项目请求失败,请检查网络后重试";
|
||||
const message = error.message || "项目请求失败,请稍后重试";
|
||||
return error.requestID ? `${message}(请求编号:${error.requestID})` : message;
|
||||
}
|
||||
|
||||
export const pageSizes = [5, 10, 15, 30];
|
||||
@@ -324,3 +324,12 @@ button:focus-visible {
|
||||
padding: 18px;
|
||||
}
|
||||
}
|
||||
.user-account-id {
|
||||
display: block;
|
||||
margin-top: 4px;
|
||||
max-width: 300px;
|
||||
color: #68788f;
|
||||
font-size: 12px;
|
||||
overflow-wrap: anywhere;
|
||||
user-select: text;
|
||||
}
|
||||
@@ -24,7 +24,10 @@ defineEmits(["edit", "toggle", "delete"]);
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="item in users" :key="item.id">
|
||||
<td><strong>{{ item.username }}</strong></td>
|
||||
<td>
|
||||
<strong>{{ item.username }}</strong>
|
||||
<small class="user-account-id" title="可将此账户 ID 提供给项目管理员,用于加入项目">账户 ID:{{ item.id }}</small>
|
||||
</td>
|
||||
<td>{{ item.email || "未绑定" }}</td>
|
||||
<td><span class="user-badge">{{ roleLabels[item.role] || item.role }}</span></td>
|
||||
<td><span class="user-status" :class="item.status">{{ statusLabels[item.status] || item.status }}</span></td>
|
||||
|
||||
@@ -24,3 +24,15 @@
|
||||
background: #fff;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.user-workspace-navigation {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
margin: 18px 0;
|
||||
}
|
||||
|
||||
.user-workspace-navigation button[aria-current="page"] {
|
||||
color: #234d9d;
|
||||
border-color: #4c74cc;
|
||||
background: #edf3ff;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
import { ref } from "vue";
|
||||
import { useAccessDenied } from "../AccessDenied/AccessDenied.js";
|
||||
|
||||
export function useUserWorkspace() {
|
||||
const section = ref("account");
|
||||
return { ...useAccessDenied(), section };
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
<script setup>
|
||||
import UserManagement from "./UserManagement.vue";
|
||||
import { useAccessDenied } from "../AccessDenied/AccessDenied.js";
|
||||
import ProjectManagement from "../ProjectManagement/ProjectManagement.vue";
|
||||
import { useUserWorkspace } from "./UserWorkspace.js";
|
||||
|
||||
const { loggingOut, error, logout } = useAccessDenied();
|
||||
const { loggingOut, error, logout, section } = useUserWorkspace();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -14,7 +15,12 @@ const { loggingOut, error, logout } = useAccessDenied();
|
||||
</button>
|
||||
</header>
|
||||
<p v-if="error" role="alert">{{ error }}</p>
|
||||
<UserManagement />
|
||||
<nav class="user-workspace-navigation" aria-label="用户中心导航">
|
||||
<button type="button" :aria-current="section === 'account' ? 'page' : undefined" @click="section = 'account'">账户与密码</button>
|
||||
<button type="button" :aria-current="section === 'projects' ? 'page' : undefined" @click="section = 'projects'">项目与成员</button>
|
||||
</nav>
|
||||
<UserManagement v-if="section === 'account'" />
|
||||
<ProjectManagement v-else-if="section === 'projects'" />
|
||||
</main>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in new issue
Block a user