开发检查点:收尾项目生命周期并接入资源读取隔离,待统一测试
This commit is contained in:
1 parent
fd767b23c3
commit
709c1ef063
27 files changed
+785
-68
No files matched your search
@@ -1,10 +1,9 @@
|
||||
import { computed, onUnmounted, ref, watch } from "vue";
|
||||
import { handleProjectSession, requestProjectAPI } from "./ProjectRequest.js";
|
||||
|
||||
export function useProjectLifecycle(project, canCreateProject, busy, refresh) {
|
||||
export function useProjectLifecycle(project, canCreateProject, busy, refresh, savingProject = ref(false)) {
|
||||
const projectEditor = ref(null);
|
||||
const pendingDeleteProject = ref(null);
|
||||
const savingProject = ref(false);
|
||||
const lifecycleError = ref("");
|
||||
const lifecycleNotice = ref("");
|
||||
const canEditProject = computed(() => Boolean(project.value?.can_manage_project));
|
||||
@@ -87,7 +86,9 @@ export function useProjectLifecycle(project, canCreateProject, busy, refresh) {
|
||||
if (!form || !(form.create ? canCreateProject.value : canEditProject.value && form.id === project.value?.id)) return;
|
||||
const name = form.name.trim();
|
||||
const description = form.description.trim();
|
||||
if (!name || [...name].length > 128 || [...description].length > 4096 || /[\u0000-\u001f\u007f]/.test(name)) {
|
||||
if (!name || [...name].length > 128 || [...description].length > 4096
|
||||
|| /[\u0000-\u001f\u007f-\u009f]/.test(name)
|
||||
|| /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/.test(description)) {
|
||||
lifecycleError.value = "请填写有效项目名称(最多 128 字),说明最多 4096 字";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4,10 +4,50 @@ import { ref } from "vue";
|
||||
import { mountComposable, deferred } from "../../test-support/mount.js";
|
||||
import { useProjectLifecycle } from "./ProjectLifecycle.js";
|
||||
import { useProjectManagement } from "./ProjectManagement.js";
|
||||
import { useProjectMembers } from "./ProjectMembers.js";
|
||||
|
||||
const projectA = { id: "project-a", name: "项目甲", description: "说明", can_manage_project: true, can_delete_project: true, can_manage_members: false };
|
||||
const projectB = { ...projectA, id: "project-b", name: "项目乙" };
|
||||
|
||||
test("项目保存期间,成员操作函数也拒绝变更和翻页", async (t) => {
|
||||
const project = ref({ ...projectA, can_manage_members: true });
|
||||
const busy = ref(false);
|
||||
const calls = [];
|
||||
const { state } = await mountComposable(t, () => useProjectMembers(project, busy), async (path, options) => {
|
||||
calls.push([path, options.method]);
|
||||
return Response.json({ items: [], has_more: true, next_cursor: "member-next" });
|
||||
});
|
||||
const before = calls.length;
|
||||
busy.value = true;
|
||||
state.memberForm.value = { userID: "target", role: "read_only" };
|
||||
await state.grantMember();
|
||||
state.requestRevoke({ user_id: "target", username: "目标", roles: ["read_only"] }, "read_only");
|
||||
await state.nextMemberPage();
|
||||
await state.changeMemberPageSize(30);
|
||||
assert.equal(calls.length, before);
|
||||
assert.equal(state.pendingRevoke.value, null);
|
||||
assert.equal(state.memberPage.value, 0);
|
||||
assert.equal(state.memberPageSize.value, 10);
|
||||
});
|
||||
|
||||
test("项目资料拒绝控制字符但说明允许换行和制表符", async (t) => {
|
||||
const calls = [];
|
||||
const { state } = await setup(t, async (_path, options) => {
|
||||
calls.push(JSON.parse(options.body));
|
||||
return Response.json({ id: "created" }, { status: 201 });
|
||||
});
|
||||
state.openProjectEditor(true);
|
||||
for (const [name, description] of [["项目\u0085名称", "说明"], ["项目", "说明\u000b内容"], ["项目", "说明\u009f内容"]]) {
|
||||
Object.assign(state.projectEditor.value, { name, description });
|
||||
await state.saveProject();
|
||||
assert.equal(calls.length, 0);
|
||||
assert.ok(state.lifecycleError.value);
|
||||
}
|
||||
Object.assign(state.projectEditor.value, { name: "项目", description: "第一行\n第二行\t内容" });
|
||||
await state.saveProject();
|
||||
assert.deepEqual(calls, [{ name: "项目", description: "第一行\n第二行\t内容" }]);
|
||||
});
|
||||
|
||||
async function setup(t, fetcher, refresh = async () => {}) {
|
||||
const project = ref({ ...projectA });
|
||||
const canCreate = ref(true);
|
||||
|
||||
@@ -14,9 +14,10 @@ export function useProjectManagement() {
|
||||
const projectHasMore = ref(false);
|
||||
const projectNextCursor = ref("");
|
||||
const canCreateProject = ref(false);
|
||||
const members = useProjectMembers(selectedProject);
|
||||
const savingProject = ref(false);
|
||||
const members = useProjectMembers(selectedProject, savingProject);
|
||||
const lifecycle = useProjectLifecycle(selectedProject, canCreateProject,
|
||||
computed(() => loadingProjects.value || members.savingMember.value), refreshAfterMutation);
|
||||
computed(() => loadingProjects.value || members.savingMember.value), refreshAfterMutation, savingProject);
|
||||
let generation = 0;
|
||||
let controller;
|
||||
|
||||
|
||||
@@ -42,6 +42,36 @@ test("完整成员页面可渲染中文、多个角色、权限拒绝和确认
|
||||
assert.match(html, /当前没有成员管理权限/);
|
||||
assert.doesNotMatch(html, /project-grant-form/);
|
||||
assert.doesNotMatch(html, /unexpected/);
|
||||
|
||||
state.canCreateProject.value = true;
|
||||
state.openProjectEditor(true);
|
||||
state.projectEditor.value.name = '<img src=x onerror="unexpected">';
|
||||
state.projectEditor.value.description = "第一行\n第二行";
|
||||
html = await renderPage();
|
||||
assert.match(html, /aria-label="项目资料"/);
|
||||
assert.match(html, /maxlength="128"/);
|
||||
assert.match(html, /maxlength="4096"/);
|
||||
assert.match(html, /第一行\n第二行/);
|
||||
assert.match(html, /<img/);
|
||||
assert.doesNotMatch(html, /<img src=x/);
|
||||
state.savingProject.value = true;
|
||||
html = await renderPage();
|
||||
assert.match(html, /正在保存……/);
|
||||
assert.match(html, /<input[^>]*disabled/);
|
||||
assert.match(html, /<textarea[^>]*disabled/);
|
||||
state.savingProject.value = false;
|
||||
state.cancelProjectAction();
|
||||
state.selectedProject.value = { ...projectA, can_manage_project: true, can_delete_project: true };
|
||||
state.requestDeleteProject();
|
||||
html = await renderPage();
|
||||
assert.match(html, /确认删除项目/);
|
||||
assert.match(html, /默认项目不能删除/);
|
||||
assert.doesNotMatch(html, /project-editor/);
|
||||
state.selectedProject.value = { ...projectA, can_manage_project: false, can_delete_project: false };
|
||||
state.openProjectEditor();
|
||||
state.requestDeleteProject();
|
||||
html = await renderPage();
|
||||
assert.doesNotMatch(html, /确认删除项目|aria-label="项目资料"/);
|
||||
});
|
||||
|
||||
test("账户页提供本人可分享的账户 ID,不要求用户查看数据库", async () => {
|
||||
|
||||
@@ -10,7 +10,7 @@ export const projectRoles = [
|
||||
{ value: "read_only", label: "只读用户" },
|
||||
];
|
||||
|
||||
export function useProjectMembers(project) {
|
||||
export function useProjectMembers(project, projectBusy = ref(false)) {
|
||||
const members = ref([]);
|
||||
const accounts = ref([]);
|
||||
const loadingMembers = ref(false);
|
||||
@@ -95,7 +95,7 @@ export function useProjectMembers(project) {
|
||||
}
|
||||
|
||||
async function changeMemberPageSize(value) {
|
||||
if (savingMember.value || !pageSizes.includes(Number(value))) return;
|
||||
if (projectBusy.value || savingMember.value || !pageSizes.includes(Number(value))) return;
|
||||
memberPageSize.value = Number(value);
|
||||
memberPage.value = 0;
|
||||
cursors.value = [""];
|
||||
@@ -104,7 +104,7 @@ export function useProjectMembers(project) {
|
||||
}
|
||||
|
||||
async function nextMemberPage() {
|
||||
if (loadingMembers.value || savingMember.value || !memberHasMore.value) return;
|
||||
if (projectBusy.value || loadingMembers.value || savingMember.value || !memberHasMore.value) return;
|
||||
cursors.value = [...cursors.value.slice(0, memberPage.value + 1), nextCursor.value];
|
||||
memberPage.value += 1;
|
||||
pendingRevoke.value = null;
|
||||
@@ -112,14 +112,14 @@ export function useProjectMembers(project) {
|
||||
}
|
||||
|
||||
async function previousMemberPage() {
|
||||
if (loadingMembers.value || savingMember.value || memberPage.value === 0) return;
|
||||
if (projectBusy.value || 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 (projectBusy.value || !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;
|
||||
@@ -159,7 +159,7 @@ export function useProjectMembers(project) {
|
||||
}
|
||||
|
||||
function requestRevoke(member, role) {
|
||||
if (!canManageMembers.value || savingMember.value || loadingMembers.value || !member.roles.includes(role)) return;
|
||||
if (projectBusy.value || !canManageMembers.value || savingMember.value || loadingMembers.value || !member.roles.includes(role)) return;
|
||||
pendingRevoke.value = { userID: member.user_id, username: member.username, role };
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user