✨ Add personal acceptance history and persistent slice details

This commit is contained in:
d-robotics 2026-09-30 01:52:51 -07:00
parent 2335bf16f3
commit 137ca6d0b2
8 changed files with 109 additions and 12 deletions

View File

@ -41,3 +41,9 @@
- 真实浏览器:先起 Vite 5173(代理本地 3001),再 `ACCEPTANCE_BROWSER_TEST=1 go test ./internal/api -run '^TestSupplierAcceptanceBrowser$' -count=1 -v`。使用 27018 的随机 `acceptance_browser_test_*` 库、合成视频、进程内随机密码和两家供应商/两个项目;真实登录与接口,不伪造业务响应。结束关闭 API、删除该隔离库。截图和结果在未跟踪的 `local-data/verification/supplier-acceptance/`。
验证证据及基线比较见 [本地验证记录](verification/supplier-acceptance-authorization-20260929.md);上线实测仍需另行授权。
## 本人验收记录与当前切片
最终验收任务池提供与质检一致的“我已验收”入口,按当前项目、工作流及来源筛选展示本人正式通过或退回过的任务,不计入仅领取或保存草稿的任务。记录复用现有决定事件,不迁移历史数据;沿用当前账号的组织和业务读取权限。列表展示任务当前状态,并可筛选“已通过”或“打回”。同一任务多次审查仍展示一张任务卡片,不是逐轮决定日志。
进入该列表暂停连续审查,查看结果不领取任务、不获取编辑权;历史卡片仅提供查看入口。右侧“当前切片/当前画面标注”沿用质检组件,普通与专注布局均展示,切换视频、文件清单等页签时保留当前切片信息。

View File

@ -0,0 +1,19 @@
# 最终验收本人记录与当前切片(2026-09-30)
本地改动,未部署、未推送或创建 PR。基线为 `2335bf16`。
- 最终验收加载本人正式通过/退回的记录,提供“我已验收”标签;退回任务可按“打回”筛选。复用已有事件与权限,不改历史数据。
- 历史查看暂停连续审查,卡片不提供领取或继续处理;URL 选择同步保留历史标签,避免打开后自动跳回“我的任务”。详情禁止写入。
- 复用质检的当前切片/当前画面标注组件,验收视频以外的页签也保留该卡片。
## 验证
- `npx tsc --noEmit`、`npm run build:web` 通过。
- `go test ./internal/api -run 'TestAcceptanceReviewedPoolOwnDecisions|TestReviewedPool' -count=1` 通过;覆盖本人/他人的正式决定区别、通过/退回历史与只读不改状态。
- 真实本地 Vite 5173 + API 3001 + 随机 Mongo 隔离库:`ACCEPTANCE_BROWSER_TEST=1 go test ./internal/api -run '^TestSupplierAcceptanceBrowser$' -count=1 -v` 通过,无页面异常。覆盖实际通过、退回后从“我已验收”查看、只读控制、文件页当前切片,以及原授权/撤权、项目切换、连续接续流程。
- `tests/browser/acceptance-video-layout.mjs` 通过:3 种窗口尺寸(含 1413×615)、普通/专注、左右/双目,共 12 组;当前切片可见与视频播放正常。该布局测试使用合成媒体响应,业务浏览器测试使用真实本地接口。
- 前端全量 631 项,617 通过;14 个失败名称与 `supplier-acceptance-authorization-20260929.md` 中记录的基线一致,无新增项。
浏览器过程中定位并修复了打开历史详情后 URL 同步强制切回“我的任务”的问题。最初账号准备及项目切换存在一次性时序超时,最终整套流程通过;未将这些失败计作通过证据。
本地截图与结果在 `local-data/verification/supplier-acceptance/acceptance-history.png`、`local-data/verification/acceptance-history-layout/`。未触碰公司集群或客户数据。

View File

@ -127,3 +127,41 @@ func TestReviewedPoolProjectsAggregateAcceptanceWithoutChangingSource(t *testing
}
check("accepted")
}
func TestAcceptanceReviewedPoolOwnDecisions(t *testing.T) {
for _, status := range []domain.HumanItemStatus{domain.HumanItemAccepted, domain.HumanItemRejected} {
t.Run(string(status), func(t *testing.T) {
f := sharedAcceptanceFixture(t)
f.item.Status = status
if err := f.store.UpsertHumanItem(f.ctx, f.item); err != nil {
t.Fatal(err)
}
url := "/api/human-items?pool=reviewed&stageId=" + f.item.CurrentStageID
res := f.request("GET", url, f.reviewer, nil)
if res.Code != 200 || strings.Contains(res.Body.String(), f.item.ID) {
t.Fatalf("unreviewed leak: %d %s", res.Code, res.Body.String())
}
for _, actor := range []string{"another-reviewer", f.reviewer.ID} {
event := "approved"
if status == domain.HumanItemRejected {
event = "rejected"
}
if err := f.store.AppendHumanEvent(f.ctx, domain.HumanEventRecord{ID: actor, OrganizationID: f.item.OrganizationID, ItemID: f.item.ID, ActorUserID: actor, EventType: event}); err != nil {
t.Fatal(err)
}
res = f.request("GET", url, f.reviewer, nil)
if res.Code != 200 || strings.Contains(res.Body.String(), f.item.ID) != (actor == f.reviewer.ID) {
t.Fatalf("own history: %d %s", res.Code, res.Body.String())
}
}
res = f.request("GET", "/api/human-items/"+f.item.ID, f.reviewer, nil)
if res.Code != 200 {
t.Fatalf("history detail: %d %s", res.Code, res.Body.String())
}
unchanged, _ := f.store.GetHumanItem(f.ctx, f.item.ID)
if unchanged.Status != status || unchanged.AssignedUserID != "" {
t.Fatal("history mutated task")
}
})
}
}

View File

@ -870,7 +870,7 @@ export function FinalAcceptanceWorkspace({
</div>
<aside className="space-y-5 border-t border-[color:var(--app-border)] p-4 @min-[980px]:overflow-y-auto @min-[980px]:border-l @min-[980px]:border-t-0">
<h3 className="text-sm font-semibold">验收面板</h3>
{tab === "media" && <ReviewCaptionDetails caption={reviewCaption} />}
<ReviewCaptionDetails caption={reviewCaption} />
{reviewProblemPanel}
<details className="review-evidence-details" open={focusedLayout ? undefined : true}>
<summary>验收依据与记录</summary>

View File

@ -830,7 +830,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
// A bookmarked/reloaded owned task belongs to My Tasks. The blind pool
// deliberately contains no cards and must not clear this selection.
if ((blindAnnotator && (requestedTaskId || workPage)) || (reviewOnly && (requestedTaskId || requestedAcceptanceId)))
setTaskPoolView("mine");
setTaskPoolView((current) => (current === "reviewed" ? current : "mine"));
}, [blindAnnotator, reviewOnly, requestedTaskId, requestedAcceptanceId, workPage]);
const [randomClaimBusy, setRandomClaimBusy] = useState(false);
const [workBuffer, setWorkBuffer] = useState<AnnotationWorkBuffer>({
@ -1683,7 +1683,9 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
? deriveDetailedTaskStatus(task, item)
: item.status === "accepted"
? "accepted"
: "pending_acceptance";
: item.status === "rejected"
? "rework"
: "pending_acceptance";
return taskStatusFilter === "all" || status === taskStatusFilter;
},
[workspaceMode, tasks, requestedCaptureDirectory, taskSearch, taskStatusFilter],
@ -1797,7 +1799,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
// (waiting after the last decision retired it, or paused before a manual
// resume). An invisible active/waiting queue must not be possible.
const reviewOrdinaryContinuationVisible =
!reviewFocused && reviewOnly && (reviewSessionEnabled || reviewContinuation.engaged);
!reviewFocused && taskPoolView !== "reviewed" && reviewOnly && (reviewSessionEnabled || reviewContinuation.engaged);
// Spec rule 10: an explicit claim/continue entry auto-starts the queue once,
// only after this page owns the review write lease and the task context is
// loaded. Refresh, direct URL and readonly preview never mark intent, and
@ -5162,8 +5164,10 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
[
["available", blindAnnotator ? "随机领取" : "可领取", poolCounts.available],
["mine", "我的任务", poolCounts.mine],
...(reviewOnly && workspaceMode !== "acceptance"
? ([["reviewed", "我已审核", poolCounts.reviewed]] as const)
...(reviewOnly
? ([
["reviewed", workspaceMode === "acceptance" ? "我已验收" : "我已审核", poolCounts.reviewed],
] as const)
: []),
...(isManager ? ([["all", "全部任务", poolCounts.all]] as const) : []),
] as Array<[TaskPoolView, string, number]>
@ -5171,7 +5175,11 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
<button
key={value}
type="button"
onClick={() => setTaskPoolView(value)}
onClick={() => {
if (!reviewDraftGuardRef.current()) return;
if (value === "reviewed") reviewContinuation.pause();
setTaskPoolView(value);
}}
data-testid={`human-task-pool-${value}`}
aria-pressed={taskPoolView === value}
className={`rounded-lg border px-3 py-2 text-xs transition-colors ${taskPoolView === value ? "border-blue-500 bg-blue-50 text-blue-600 dark:bg-blue-500/10 dark:text-blue-200 font-medium" : "border-[color:var(--app-border)] text-slate-600 hover:text-slate-900 dark:text-gray-400 dark:hover:text-white"}`}
@ -5257,12 +5265,13 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
captureDirectoriesFromHumanTask(item)[0] || item.display?.projectName || "Capture 验收任务"
}
selected={expandedDeliveryPackageId === item.id}
mine={item.assignedUserId === currentUser?.id}
mine={taskPoolView !== "reviewed" && item.assignedUserId === currentUser?.id}
assignee={
users.find((user) => user.id === item.assignedUserId)?.name ||
(item.assignedUserId === currentUser?.id ? currentUser?.name || "" : "已领取")
}
claimable={
taskPoolView !== "reviewed" &&
!isManager &&
!item.assignedUserId &&
["ready", "rework", "submitted"].includes(item.status) &&
@ -5561,7 +5570,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
cameraPreferenceKey={currentUser?.id || ""}
viewportSuspended={viewportPaused}
mine={mine}
writeLocked={reviewWriteLocked || Boolean(reviewDecision.pending)}
writeLocked={taskPoolView === "reviewed" || reviewWriteLocked || Boolean(reviewDecision.pending)}
reviewProblemPanel={reviewProblemPanel}
onReviewNavigate={reviewDraft.onNavigate}
onReviewPositionChange={reviewDraft.onPosition}

View File

@ -54,10 +54,10 @@ export const humanLoopApi = {
reviewed: [],
};
}
const [available, mine] = await Promise.all(
["available", "mine"].map((pool) => listAcceptancePool({ ...filters, pool: pool as "available" | "mine" })),
const [available, mine, reviewed] = await Promise.all(
(["available", "mine", "reviewed"] as const).map((pool) => listAcceptancePool({ ...filters, pool })),
);
return { available, mine, all: [], reviewed: [] };
return { available, mine, all: [], reviewed };
},
getItem: (id: string) =>
apiRequest<{

View File

@ -117,6 +117,8 @@ try {
console.log(`Checking ${viewport.width}x${viewport.height}, focused=${focused}`);
await page.goto(base + "/__acceptance_video_layout?focused=" + focused);
await page.waitForFunction(() => [...document.querySelectorAll("video")].some((v) => v.readyState >= 2));
assert.equal(await page.getByTestId("review-current-slice").innerText(), "布局测试");
assert.equal(await page.getByTestId("review-current-slice").isVisible(), true);
for (const camera of focused ? ["left", "right", "both"] : ["left"]) {
if (focused)
await page

View File

@ -227,6 +227,29 @@ try {
assert.equal(third.body.item.projectId, "acceptance-project-a");
assert.ok(calls.some((c) => c.scope === "project" && c.projectId === "acceptance-project-a" && c.action === "next"));
reports.push("refresh pause; specific-project queue; save opinion and reject; continue within filter");
const history = await review.ctx.newPage();
await history.goto(base + "/plugins/annotation-qa/workflows/all/acceptance");
await history.getByTestId("human-task-pool-reviewed").click();
const approvedCard = history.locator(`[data-item-id="${before}"]`);
const rejectedCard = history.locator(`[data-item-id="${rejected}"]`);
await approvedCard.waitFor();
await rejectedCard.waitFor();
assert.match(await approvedCard.innerText(), /已完成/);
assert.match(await rejectedCard.innerText(), /已打回/);
active = history;
await rejectedCard.getByRole("button", { name: "查看结果", exact: true }).click();
await history.getByTestId("review-current-slice").waitFor();
assert.ok((await history.getByTestId("review-current-slice").innerText()).trim());
for (const name of ["验收通过", "打回质检"]) {
const buttons = history.getByRole("button", { name, exact: true });
for (const button of await buttons.all()) assert.equal(await button.isDisabled(), true);
}
await history.getByRole("button", { name: "文件清单", exact: true }).click();
assert.equal(await history.getByTestId("review-current-slice").isVisible(), true);
await history.screenshot({ path: out + "/acceptance-history.png", fullPage: true });
await history.close();
active = p;
reports.push("own approved/rejected history, read-only results, current slice remains visible in file view");
// Revoke through the actual admin confirmation, then finish the current
// round. The queue must explain why it will not claim another task.
await admin.page.reload();