forked from longtao.wu/droboticflow
🩹 Refresh conflicting review drafts and simplify recovery messages
This commit is contained in:
parent
1b4d815b36
commit
7d00eeefbd
25
docs/review-draft-conflict-recovery.md
Normal file
25
docs/review-draft-conflict-recovery.md
Normal file
@ -0,0 +1,25 @@
|
||||
# 审查批注冲突恢复与提示
|
||||
|
||||
2026-09-29,适用于质检与最终验收的共享批注组件。
|
||||
|
||||
## 已确认与未确认
|
||||
|
||||
线上指定任务存在已完成的保存回执和版本 1 的问题记录,而客户截图仍显示 0 个已保存问题。
|
||||
提示来自服务端 review_draft_version_conflict,表示请求所带草稿版本不是当前版本;不是正式决定记录大小超限。
|
||||
未采集到发生时的完整浏览器请求链,不能确定由多页面操作、重新进入、响应延迟或其他状态切换中的哪一种造成页面落后。
|
||||
|
||||
本地真实 hook 浏览器复现确认:首次保存收到版本冲突时,旧实现不读取最新草稿,继续保留旧版本和旧列表;自动读取只在未确认操作的重试分支执行。因此反复点击保存可能反复遇到同一冲突。
|
||||
|
||||
## 修复
|
||||
|
||||
- 首次或重试保存遇到明确版本冲突,都自动读取最新列表。读取结果仍受任务、被审版本和页面代次保护。
|
||||
- 若相同问题 ID 与内容已保存,则按成功处理并清空输入,不重复新增。
|
||||
- 若有其他修改,只更新列表并保留输入,让用户检查后再次保存;不自动重发、不覆盖其他问题。
|
||||
- 最新列表读取失败或标注版本变化时,保留当前文字,给出明确的更新/重新打开操作。
|
||||
- 新版使用“更新问题列表”“查看提交结果”等操作文字;兼容显示旧版已持久化的错误提示。
|
||||
|
||||
## 验证
|
||||
|
||||
node tests/browser/review-draft-conflict.mjs 在修复前捕获旧版本仍为 0 的失败;修复后覆盖其他修改、同条已保存、读取失败、标注版本变化。
|
||||
node tests/browser/review-decision-failure.mjs 覆盖质检/终审确认失败解除限制、成功结果恢复及未知结果保护。
|
||||
本次不改变后端并发校验和客户数据,不自动部署或提交 PR。
|
||||
@ -62,7 +62,13 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock
|
||||
<div className="flex flex-wrap items-center justify-between gap-2">
|
||||
<strong>审查问题</strong>
|
||||
<span role="status" className="text-xs text-slate-500">
|
||||
{review.saving ? "保存中" : review.dirty ? "未保存" : review.message || "已保存"}
|
||||
{review.loading
|
||||
? "正在加载"
|
||||
: review.saving
|
||||
? "保存中"
|
||||
: review.dirty
|
||||
? "未保存"
|
||||
: review.message || (review.draft ? "已保存" : "尚未加载")}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
@ -196,7 +202,7 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock
|
||||
)}
|
||||
{review.recoverable && (
|
||||
<div className="flex items-center justify-between gap-2 rounded border border-amber-300 p-2 text-xs text-amber-700">
|
||||
<span className="truncate">有未确认保存的文字:{review.recoverable.text.slice(0, 40)}</span>
|
||||
<span className="truncate">这些文字可能还没保存:{review.recoverable.text.slice(0, 40)}</span>
|
||||
<button type="button" onClick={review.restoreRecoverable} className="shrink-0 underline">
|
||||
恢复未保存内容
|
||||
</button>
|
||||
@ -233,7 +239,7 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock
|
||||
</div>
|
||||
{review.previousText && (
|
||||
<details className="text-xs text-amber-700">
|
||||
<summary>被审版本已变化,旧版未保存文字保留于此</summary>
|
||||
<summary>标注已更新,查看之前未保存的文字</summary>
|
||||
<p className="whitespace-pre-wrap">{review.previousText}</p>
|
||||
</details>
|
||||
)}
|
||||
@ -241,17 +247,23 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock
|
||||
<p role="alert" className="text-xs text-rose-600">
|
||||
{review.error}
|
||||
<button type="button" onClick={() => void review.reload()} className="ml-2 underline">
|
||||
核对已保存草稿
|
||||
更新问题列表
|
||||
</button>
|
||||
</p>
|
||||
)}
|
||||
{!review.error && /请先|已核对上次保存/.test(review.message) && (
|
||||
{!review.error && /请先|之前的文字已保存/.test(review.message) && (
|
||||
<p role="alert" className="text-xs text-amber-700">
|
||||
{review.message}
|
||||
</p>
|
||||
)}
|
||||
<div className="min-h-0 max-h-36 overflow-y-auto border-t pt-2" aria-label="本次问题列表">
|
||||
<p className="mb-1 text-xs text-slate-500">{review.draft?.problems.length || 0} 个已保存问题</p>
|
||||
<p className="mb-1 text-xs text-slate-500">
|
||||
{review.loading
|
||||
? "正在加载问题列表…"
|
||||
: review.draft
|
||||
? `${review.draft.problems.length} 个已保存问题`
|
||||
: "问题列表尚未加载"}
|
||||
</p>
|
||||
<div role="listbox" aria-label="已保存问题" aria-orientation="vertical">
|
||||
{(review.draft?.problems || []).map((problem) => (
|
||||
<button
|
||||
|
||||
@ -2,6 +2,13 @@ import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { APIError } from "../services/api/client";
|
||||
import { reviewDecisionApi, type ReviewDecisionReceipt } from "../services/api/review-decision";
|
||||
|
||||
function failedDecisionMessage(error?: string) {
|
||||
if (!error || error.includes("提交前校验未通过")) return "这次审核没有提交成功,已保存的问题还在。请检查后重新提交。";
|
||||
if (error.includes("记录过大")) return "这条任务暂时无法提交,已保存的问题还在。请联系管理员处理。";
|
||||
if (error.includes("记录保存失败")) return "这次审核没有提交成功,已保存的问题还在。请稍后重试。";
|
||||
return error;
|
||||
}
|
||||
|
||||
export type ReviewDecisionRequest = {
|
||||
itemId: string;
|
||||
taskId?: string;
|
||||
@ -55,11 +62,11 @@ export function useReviewDecision(
|
||||
const stored = JSON.parse(localStorage.getItem(storageKey) || "null") as PendingReviewDecision | null;
|
||||
pendingRef.current = stored;
|
||||
setPending(stored);
|
||||
setMessage(stored ? "存在尚未核对的正式决定,请先核对原提交。" : "");
|
||||
setMessage(stored ? "上次审核提交还没确认结果,请点击“查看提交结果”。" : "");
|
||||
} catch {
|
||||
pendingRef.current = null;
|
||||
setPending(null);
|
||||
setMessage("无法读取原提交记录,请核对任务状态。");
|
||||
setMessage("暂时找不到上次提交记录,请重新打开任务查看。");
|
||||
}
|
||||
return () => {
|
||||
resolver.current?.(null);
|
||||
@ -95,12 +102,12 @@ export function useReviewDecision(
|
||||
else if (receipt.status === "failed_before_effects") {
|
||||
setFailureVersion((v) => v + 1);
|
||||
writePending(null, key);
|
||||
setMessage(receipt.error || "原提交未产生正式变更,请修正后重新提交。");
|
||||
setMessage(failedDecisionMessage(receipt.error));
|
||||
resolver.current?.(null);
|
||||
resolver.current = null;
|
||||
} else {
|
||||
setFailureVersion((v) => v + 1);
|
||||
setMessage("原决定仍在处理中,已暂停连续审查;可再次核对。");
|
||||
setMessage("上次提交还在处理中,连续审查已暂停。请稍后点击“查看提交结果”。");
|
||||
}
|
||||
} catch (cause) {
|
||||
if (key !== keyRef.current) return;
|
||||
@ -109,10 +116,10 @@ export function useReviewDecision(
|
||||
setCanRetry(missing);
|
||||
setMessage(
|
||||
missing
|
||||
? "尚未查到受理记录。可继续核对,或重试同一次提交。"
|
||||
? "暂未查到上次提交。可点击“查看提交结果”,或“重试提交”。"
|
||||
: cause instanceof Error
|
||||
? cause.message
|
||||
: "暂时无法核对原提交。",
|
||||
: "暂时查不到提交结果,请稍后重试。",
|
||||
);
|
||||
} finally {
|
||||
if (key === keyRef.current) {
|
||||
@ -129,10 +136,10 @@ export function useReviewDecision(
|
||||
busyRef.current = true;
|
||||
setBusy(true);
|
||||
setConfirmation(null);
|
||||
setMessage("正在提交并核对结果…");
|
||||
setMessage("正在提交,请稍等…");
|
||||
try {
|
||||
const headers = headersRef.current?.();
|
||||
if (!headers) throw new Error("请重新打开原任务并取得编辑权后重试;原提交标识已保留。");
|
||||
if (!headers) throw new Error("请重新打开刚才的任务,在可以编辑后重试提交。");
|
||||
// Persist before dispatch. If storage fails, no formal request is issued.
|
||||
writePending(request, key);
|
||||
await reviewDecisionApi.send(request.path, { ...request.payload, operationId: request.operationId }, headers);
|
||||
@ -141,12 +148,12 @@ export function useReviewDecision(
|
||||
if (receipt.status === "completed") finish(request, receipt, key);
|
||||
else {
|
||||
setFailureVersion((v) => v + 1);
|
||||
setMessage("服务端已受理,尚未确认完成;请核对原提交。");
|
||||
setMessage("提交正在处理,请点击“查看提交结果”。");
|
||||
}
|
||||
} catch (cause) {
|
||||
if (key !== keyRef.current) return;
|
||||
setFailureVersion((v) => v + 1);
|
||||
setMessage(cause instanceof Error ? cause.message : "提交结果未知,请核对原提交。");
|
||||
setMessage(cause instanceof Error ? cause.message : "暂时无法确认是否提交成功,请点击“查看提交结果”。");
|
||||
// A transport failure is never evidence that the request had no effect.
|
||||
if (cause instanceof APIError) {
|
||||
try {
|
||||
@ -155,7 +162,7 @@ export function useReviewDecision(
|
||||
if (receipt.status === "completed") finish(request, receipt, key);
|
||||
else if (receipt.status === "failed_before_effects") {
|
||||
writePending(null, key);
|
||||
setMessage(receipt.error || "原提交未产生正式变更,草稿已保留,请重试。");
|
||||
setMessage(failedDecisionMessage(receipt.error));
|
||||
resolver.current?.(null);
|
||||
resolver.current = null;
|
||||
}
|
||||
@ -182,7 +189,7 @@ export function useReviewDecision(
|
||||
const request = useCallback(
|
||||
(input: ReviewDecisionRequest, headers: () => HeadersInit): Promise<ReviewDecisionReceipt | null> => {
|
||||
if (pendingRef.current || busyRef.current || resolver.current) {
|
||||
setMessage("请先处理当前确认或核对原提交。");
|
||||
setMessage("请先完成确认;如有上次未完成的提交,请点击“查看提交结果”。");
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
headersRef.current = headers;
|
||||
|
||||
@ -116,7 +116,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
/** F/Enter-another/leave protection: pending writes reconcile first, dirty text asks. */
|
||||
const protect = useCallback((intent: (() => void) | null) => {
|
||||
if (activeSave.current !== null || pendingSave.current) {
|
||||
setMessage("请先核对当前保存结果,再切换或离开。");
|
||||
setMessage("请先确认这次批注是否保存成功,再切换任务。");
|
||||
return false;
|
||||
}
|
||||
if (dirtyRef.current) {
|
||||
@ -170,19 +170,19 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
.then(({ draft: loaded }) => {
|
||||
if (!isCurrent(requestEpoch, contextKey, generation)) return;
|
||||
if (loaded.resultVersion !== sessionRef.current.snapshot?.resultVersion) {
|
||||
setError("被审结果已变化,请重新打开任务核对。");
|
||||
setError("标注内容已更新,请重新打开任务。");
|
||||
return;
|
||||
}
|
||||
setDraft(loaded);
|
||||
if (pendingSave.current) {
|
||||
setMessage("上次保存尚未确认,当前文字仍保留;再次保存将仅重试原操作。");
|
||||
setMessage("暂时无法确认是否保存成功。文字还在,请点击“更新问题列表”。");
|
||||
return;
|
||||
}
|
||||
setMessage(loaded.version > 0 ? "已恢复已保存的审查草稿" : "尚无已保存问题");
|
||||
setMessage(loaded.version > 0 ? "已加载保存的问题" : "尚无已保存问题");
|
||||
})
|
||||
.catch((cause) => {
|
||||
if (isCurrent(requestEpoch, contextKey, generation))
|
||||
setError(cause instanceof Error ? cause.message : "加载审查草稿失败");
|
||||
setError(cause instanceof Error ? cause.message : "问题列表加载失败,请点击“更新问题列表”重试。");
|
||||
})
|
||||
.finally(() => {
|
||||
if (isCurrent(requestEpoch, contextKey, generation)) setLoading(false);
|
||||
@ -226,7 +226,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
const beginProblem = useCallback(
|
||||
(position?: ReviewPosition | null) => {
|
||||
if (!sessionRef.current.writable) {
|
||||
setMessage("本页为只读审查,接管后才能记录问题。");
|
||||
setMessage("当前页面不能编辑,请点击“在本页接管审查”。");
|
||||
return false;
|
||||
}
|
||||
// A delete confirmation owns the keyboard until it is resolved.
|
||||
@ -454,7 +454,9 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
/** Apply a verified authoritative draft after a confirmed write. */
|
||||
const applyAuthoritative = useCallback(
|
||||
(authoritative: ReviewDraft, operation: PendingOperation) => {
|
||||
draftRef.current = authoritative;
|
||||
setDraft(authoritative);
|
||||
setError("");
|
||||
pendingSave.current = null;
|
||||
const active = editorRef.current;
|
||||
if (operation.kind === "delete") {
|
||||
@ -469,7 +471,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
}
|
||||
const stored = authoritative.problems.find((p) => p.id === operation.problemId);
|
||||
if (!stored) {
|
||||
setError("已保存但未在回读中找到该问题,请核对草稿。");
|
||||
setError("列表还没显示这条问题,请点击“更新问题列表”查看。");
|
||||
return false;
|
||||
}
|
||||
setRecoverable((current) => (current?.id === stored.id ? null : current));
|
||||
@ -484,7 +486,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
}
|
||||
// Text changed while an older operation reconciled; keep it editable.
|
||||
setEditor({ ...active, baseline: stored.text });
|
||||
setMessage("已核对上次保存,当前修改仍未保存;请核对后再次保存。");
|
||||
setMessage("之前的文字已保存,你刚修改的文字还未保存。");
|
||||
return false;
|
||||
}
|
||||
// Late success after the user left the input: update the list only, never reopen.
|
||||
@ -503,12 +505,12 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
const expected = contextRef.current;
|
||||
const expectedGeneration = session.snapshot?.generation || 0;
|
||||
if (!enabled || !loaded || !session.writable || loading) {
|
||||
setMessage("当前页面不能保存,请先取得编辑权并等待草稿加载。");
|
||||
setMessage("暂时不能保存,请等问题列表加载完成,并确认当前页面可以编辑。");
|
||||
return false;
|
||||
}
|
||||
// Writes are serial; watching stays usable while one is in flight.
|
||||
if (activeSave.current !== null) {
|
||||
setMessage("正在核对上一次保存,请稍候。");
|
||||
setMessage("正在确认上次保存结果,请稍等。");
|
||||
return false;
|
||||
}
|
||||
const previous = pendingSave.current?.context === expected ? pendingSave.current : null;
|
||||
@ -535,13 +537,13 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
setMessage(kind === "save" ? "正在保存…" : "正在删除…");
|
||||
const current = () => isCurrent(request, expected, expectedGeneration);
|
||||
let phase: "read" | "write" = "read";
|
||||
let operation: PendingOperation | null = null;
|
||||
try {
|
||||
let operation: PendingOperation;
|
||||
if (previous) {
|
||||
// Never replace an uncertain operation with a newly edited payload.
|
||||
const { draft: authoritative } = await reviewDraftApi.get(itemId);
|
||||
if (!current()) return false;
|
||||
if (authoritative.resultVersion !== loaded.resultVersion) throw new Error("被审结果已变化,请重新核对。");
|
||||
if (authoritative.resultVersion !== loaded.resultVersion) throw new Error("标注内容已更新,请重新打开任务。");
|
||||
if (operationApplied(authoritative, previous)) {
|
||||
const settled = applyAuthoritative(authoritative, previous);
|
||||
if (previous.kind === "save" && active && previous.problemId === active.id && settled === false)
|
||||
@ -598,7 +600,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
readback.draft.version !== saved.draft.version ||
|
||||
readback.draft.resultVersion !== saved.draft.resultVersion
|
||||
)
|
||||
throw new Error("草稿已变化,请重新核对已保存内容。");
|
||||
throw new Error("问题列表有更新,请点击“更新问题列表”。");
|
||||
return applyAuthoritative(readback.draft, operation);
|
||||
} catch (cause) {
|
||||
if (!current()) return false;
|
||||
@ -607,13 +609,10 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
// write never landed. Other 409 codes (write-in-progress, session,
|
||||
// operation conflict) stay unknown: the original operation remains
|
||||
// pending and no second payload is ever issued for it.
|
||||
const conflictRetry = Boolean(
|
||||
previous &&
|
||||
cause instanceof APIError &&
|
||||
cause.status === 409 &&
|
||||
cause.code === "review_draft_version_conflict",
|
||||
const versionConflict = Boolean(
|
||||
cause instanceof APIError && cause.status === 409 && cause.code === "review_draft_version_conflict",
|
||||
);
|
||||
if (conflictRetry) pendingSave.current = null;
|
||||
if (versionConflict) pendingSave.current = null;
|
||||
// A definitive rejection of a fresh operation cannot have committed this
|
||||
// request. A rejected retry of an uncertain original stays pending: the
|
||||
// original may still have landed, so only核对/重试 may settle it.
|
||||
@ -628,10 +627,10 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
)
|
||||
pendingSave.current = null;
|
||||
setError(
|
||||
conflictRetry
|
||||
? "上次保存未写入,草稿已有其他修改;请核对最新草稿后再次保存。"
|
||||
versionConflict
|
||||
? "问题列表有更新。你的文字还在,请点击“更新问题列表”后再保存。"
|
||||
: previous
|
||||
? `上次保存尚未确认,可能与其他修改冲突:${cause instanceof Error ? cause.message : "请核对草稿"}`
|
||||
? `暂时无法确认上次是否保存成功:${cause instanceof Error ? cause.message : "请点击“更新问题列表”"}`
|
||||
: cause instanceof Error
|
||||
? cause.message
|
||||
: kind === "save"
|
||||
@ -639,24 +638,37 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
: "删除失败",
|
||||
);
|
||||
setMessage(
|
||||
kind === "save" ? "保存未确认,文字已保留;恢复未保存内容可继续编辑。" : "删除未确认,请核对草稿后重试。",
|
||||
kind === "save"
|
||||
? "暂时无法确认是否保存成功,文字已保留。"
|
||||
: "暂时无法确认是否删除成功,请点击“更新问题列表”。",
|
||||
);
|
||||
// Late failure after the user left the input: offer recovery without stealing focus.
|
||||
if (kind === "save" && active && editorRef.current?.id !== active.id) setRecoverable(active);
|
||||
if (previous) recoverFrom(previous);
|
||||
if (conflictRetry) {
|
||||
if (versionConflict) {
|
||||
// Load the authoritative draft so an explicit retry targets the
|
||||
// current version instead of looping on the stale one.
|
||||
try {
|
||||
const { draft: authoritative } = await reviewDraftApi.get(itemId);
|
||||
if (!current()) return false;
|
||||
if (authoritative.resultVersion === loaded.resultVersion) {
|
||||
// A lost UI update can leave the first attempt stale too. Read
|
||||
// once, never silently resubmit or replace someone else's text.
|
||||
const attempted = previous || operation;
|
||||
if (attempted && operationApplied(authoritative, attempted)) {
|
||||
return applyAuthoritative(authoritative, attempted);
|
||||
}
|
||||
draftRef.current = authoritative;
|
||||
setDraft(authoritative);
|
||||
const activeNow = editorRef.current;
|
||||
if (activeNow && !activeNow.isNew) {
|
||||
const match = authoritative.problems.find((p) => p.id === activeNow.id);
|
||||
if (match) setEditor({ ...activeNow, baseline: match.text });
|
||||
}
|
||||
setError("问题列表已更新,你的文字还在。请检查后再点“保存批注”。");
|
||||
setMessage("未保存");
|
||||
} else {
|
||||
setError("标注内容已更新,你的文字还在。请重新打开任务。");
|
||||
}
|
||||
} catch {
|
||||
// The conflict error stays visible; manual 核对 remains available.
|
||||
@ -690,13 +702,14 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
const { draft: loaded } = await reviewDraftApi.get(itemId);
|
||||
if (!current()) return;
|
||||
if (loaded.resultVersion !== sessionRef.current.snapshot?.resultVersion) {
|
||||
setError("被审结果已变化,请重新取得编辑权后核对。");
|
||||
setError("标注内容已更新,请重新打开任务。");
|
||||
return;
|
||||
}
|
||||
setDraft(loaded);
|
||||
draftRef.current = loaded;
|
||||
const pending = pendingSave.current;
|
||||
if (pending && !operationApplied(loaded, pending)) {
|
||||
setError("上次保存尚未确认,当前文字已保留;再次保存将仅重试原操作。");
|
||||
setError("暂时无法确认是否保存成功。文字还在,再次保存不会重复新增。");
|
||||
return;
|
||||
}
|
||||
const confirmed = pending;
|
||||
@ -717,7 +730,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
if (dirtyRef.current) setEditor({ ...active, baseline: match.text });
|
||||
else setEditor({ ...match, baseline: match.text });
|
||||
}
|
||||
setMessage(active && dirtyRef.current ? "已读取最新草稿,当前文字保留;请核对后保存。" : "已读取最新草稿");
|
||||
setMessage(active && dirtyRef.current ? "问题列表已更新,你的文字还在,请检查后保存。" : "问题列表已更新");
|
||||
} catch (cause) {
|
||||
if (current()) setError(cause instanceof Error ? cause.message : "重新读取失败");
|
||||
} finally {
|
||||
@ -754,7 +767,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
// In-flight operations still reconcile; only the input exits.
|
||||
setRecoverable(active);
|
||||
closeEditor();
|
||||
setMessage("已退出输入;保存结果核对后会提示,可从提示恢复文字。");
|
||||
setMessage("已退出输入,正在确认保存结果。文字仍保留,可从提示中恢复。");
|
||||
focusWorkbench();
|
||||
return;
|
||||
}
|
||||
@ -777,7 +790,7 @@ export function useReviewDraft(itemId: string, userId: string, enabled: boolean,
|
||||
return false;
|
||||
}
|
||||
if (activeSave.current !== null || pendingSave.current) {
|
||||
setMessage("请先核对当前保存结果,再删除问题。");
|
||||
setMessage("请先点击“更新问题列表”,确认上次保存结果后再删除。");
|
||||
return false;
|
||||
}
|
||||
if (editorRef.current?.id === problemId && dirtyRef.current && !protect(() => requestDelete(problemId)))
|
||||
|
||||
@ -4518,7 +4518,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
|
||||
disabled={reviewDecision.busy}
|
||||
onClick={() => void reviewDecision.reconcile()}
|
||||
>
|
||||
核对原提交
|
||||
查看提交结果
|
||||
</button>
|
||||
{reviewDecision.canRetry && (
|
||||
<button
|
||||
@ -4531,7 +4531,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
|
||||
}
|
||||
onClick={() => reviewDecision.retry(reviewSession.headers)}
|
||||
>
|
||||
重试原提交
|
||||
重试提交
|
||||
</button>
|
||||
)}
|
||||
</>
|
||||
|
||||
@ -53,12 +53,12 @@ try {
|
||||
await page.getByRole("button", { name: "审核通过", exact: true }).click();
|
||||
await page.getByRole("dialog", { name: "确认审查决定", exact: true }).waitFor();
|
||||
await page.keyboard.press("Enter");
|
||||
await page.getByRole("button", { name: "核对原提交", exact: true }).waitFor();
|
||||
await page.getByRole("button", { name: "查看提交结果", exact: true }).waitFor();
|
||||
await page.getByRole("button", { name: "开始/继续审查", exact: true }).waitFor();
|
||||
assert.equal(posts.length, 1);
|
||||
assert.equal(queue.filter((c) => c.action === "next").length, 0);
|
||||
await page.getByRole("button", { name: "核对原提交", exact: true }).click();
|
||||
await page.getByRole("button", { name: "核对原提交", exact: true }).waitFor({ state: "hidden" });
|
||||
await page.getByRole("button", { name: "查看提交结果", exact: true }).click();
|
||||
await page.getByRole("button", { name: "查看提交结果", exact: true }).waitFor({ state: "hidden" });
|
||||
const receipt = await page.evaluate(
|
||||
async ({ id, op }) => {
|
||||
const r = await fetch(`/api/human-items/${id}/review-operations/${op}`);
|
||||
|
||||
124
tests/browser/review-draft-conflict.mjs
Normal file
124
tests/browser/review-draft-conflict.mjs
Normal file
@ -0,0 +1,124 @@
|
||||
// Local-only hook regression: synthetic responses, no customer API calls.
|
||||
import assert from "node:assert/strict";
|
||||
import { createServer } from "vite";
|
||||
import { chromium } from "playwright";
|
||||
|
||||
const server = await createServer({
|
||||
configFile: false,
|
||||
server: { allowedHosts: ["review-errors.test"], host: "127.0.0.1", port: 5198 },
|
||||
plugins: [
|
||||
{
|
||||
name: "review-error-harness",
|
||||
configureServer(server) {
|
||||
server.middlewares.use("/review-error-test", async (_req, res) => {
|
||||
res.setHeader("Content-Type", "text/html");
|
||||
res.end(
|
||||
await server.transformIndexHtml(
|
||||
"/review-error-test",
|
||||
`<div id="root"></div><script type="module">
|
||||
import React from 'react';
|
||||
import {createRoot} from 'react-dom/client';
|
||||
import {useReviewDraft} from '/src/hooks/useReviewDraft.ts';
|
||||
import {reviewDraftApi} from '/src/services/api/review-draft.ts';
|
||||
import {APIError} from '/src/services/api/client.ts';
|
||||
window.serverDraft={itemId:'item',resultVersion:'result',version:0,problems:[]};window.writes=[];
|
||||
reviewDraftApi.get=async()=>{if(window.failRead)throw new Error("offline");return {draft:structuredClone(window.serverDraft)};};
|
||||
reviewDraftApi.save=async(_item,payload)=>{
|
||||
window.writes.push(structuredClone(payload));
|
||||
if(window.scenario==='read-fails')window.failRead=true;
|
||||
if(payload.version!==window.serverDraft.version)throw new APIError('已保存草稿已有新版本,请核对后再保存',409,'review_draft_version_conflict');
|
||||
window.serverDraft={...window.serverDraft,...payload,version:payload.version+1};return {draft:structuredClone(window.serverDraft)};
|
||||
};
|
||||
function App(){window.review=useReviewDraft('item','user',true,{writable:true,snapshot:{generation:1,resultVersion:'result'},headers:()=>({}),handleError:()=>{}});return React.createElement('div',null,window.review.error||window.review.message);}
|
||||
createRoot(document.getElementById('root')).render(React.createElement(App));
|
||||
</script>`,
|
||||
),
|
||||
);
|
||||
});
|
||||
},
|
||||
},
|
||||
],
|
||||
optimizeDeps: { noDiscovery: true, entries: [], include: ["react", "react-dom/client"] },
|
||||
});
|
||||
let browser;
|
||||
try {
|
||||
console.log("starting local harness");
|
||||
await server.listen();
|
||||
console.log("launching browser");
|
||||
browser = await chromium.launch({
|
||||
executablePath: process.env.BROWSER_PATH || "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
|
||||
headless: true,
|
||||
args: ["--no-proxy-server", "--host-resolver-rules=MAP review-errors.test 127.0.0.1"],
|
||||
});
|
||||
console.log("browser launched");
|
||||
const page = await browser.newPage();
|
||||
page.setDefaultTimeout(15000);
|
||||
page.on("pageerror", (error) => console.error(error.message));
|
||||
const base = server.resolvedUrls.local[0].replace("127.0.0.1", "review-errors.test");
|
||||
for (const scenario of ["other-change", "already-saved", "read-fails", "result-changed"]) {
|
||||
console.log("scenario", scenario);
|
||||
await page.goto(base + "review-error-test");
|
||||
await page.waitForFunction(() => window.review?.draft && !window.review.loading);
|
||||
await page.evaluate(() => window.review.beginProblem({ time: 0, sliceId: "slice", timeBasis: "capture-seconds" }));
|
||||
await page.waitForFunction(() => window.review.scopePicker);
|
||||
await page.evaluate(() => window.review.confirmScope("task"));
|
||||
await page.waitForFunction(() => window.review.editor);
|
||||
await page.evaluate(() => window.review.setText("当前输入"));
|
||||
await page.waitForFunction(() => window.review.editor.text === "当前输入");
|
||||
await page.evaluate((scenario) => {
|
||||
const e = window.review.editor;
|
||||
window.scenario = scenario;
|
||||
window.serverDraft = {
|
||||
...window.serverDraft,
|
||||
version: 1,
|
||||
resultVersion: scenario === "result-changed" ? "new-result" : "result",
|
||||
problems: [
|
||||
scenario === "already-saved"
|
||||
? { id: e.id, scope: e.scope, text: e.text, atSeconds: 0 }
|
||||
: { id: "other", scope: "task", text: "其他已保存问题", atSeconds: 0 },
|
||||
],
|
||||
};
|
||||
}, scenario);
|
||||
await page.evaluate(() => window.review.save());
|
||||
if (scenario === "read-fails" || scenario === "result-changed") {
|
||||
assert.equal(await page.evaluate(() => window.review.draft.version), 0);
|
||||
assert.equal(await page.evaluate(() => window.review.editor.text), "当前输入");
|
||||
assert.equal(await page.evaluate(() => window.writes.length), 1);
|
||||
assert.match(
|
||||
await page.evaluate(() => window.review.error),
|
||||
scenario === "read-fails" ? /更新问题列表/ : /重新打开任务/,
|
||||
);
|
||||
if (scenario === "read-fails") {
|
||||
await page.evaluate(() => {
|
||||
window.failRead = false;
|
||||
return window.review.reload();
|
||||
});
|
||||
assert.equal(await page.evaluate(() => window.review.draft.version), 1);
|
||||
}
|
||||
console.log("PASS", scenario, "input retained and no silent write");
|
||||
continue;
|
||||
}
|
||||
assert.equal(
|
||||
await page.evaluate(() => window.review.draft.version),
|
||||
1,
|
||||
"conflict must refresh the stale list automatically",
|
||||
);
|
||||
assert.equal(await page.evaluate(() => window.writes.length), 1, "never auto-resubmit conflicting content");
|
||||
if (scenario === "already-saved") {
|
||||
assert.equal(await page.evaluate(() => window.review.editor), null, "confirmed saved text closes editor");
|
||||
assert.equal(await page.evaluate(() => window.review.error), "");
|
||||
} else {
|
||||
assert.equal(await page.evaluate(() => window.review.editor.text), "当前输入", "unsaved input preserved");
|
||||
await page.evaluate(() => window.review.save());
|
||||
assert.deepEqual(await page.evaluate(() => window.serverDraft.problems.map((p) => p.text)), [
|
||||
"其他已保存问题",
|
||||
"当前输入",
|
||||
]);
|
||||
assert.equal(await page.evaluate(() => window.writes[1].version), 1);
|
||||
}
|
||||
console.log("PASS", scenario, "automatic read, no silent overwrite, no duplicate problem");
|
||||
}
|
||||
} finally {
|
||||
await browser?.close();
|
||||
await server.close();
|
||||
}
|
||||
@ -142,7 +142,7 @@ try {
|
||||
await panel.getByRole("button", { name: "保存批注", exact: true }).click();
|
||||
await panel
|
||||
.getByRole("alert")
|
||||
.filter({ hasText: /已核对上次保存|请核对最新草稿/ })
|
||||
.filter({ hasText: /之前的文字已保存|问题列表已更新/ })
|
||||
.waitFor();
|
||||
assert.ok(
|
||||
(await read()).draft.problems.some((p) => p.text === newer),
|
||||
|
||||
@ -150,7 +150,7 @@ try {
|
||||
await page.unroute("**/review-draft");
|
||||
await input.fill("断网之后新增的文字,不能替代未核对的原操作");
|
||||
await panel.getByRole("button", { name: "保存批注", exact: true }).click();
|
||||
await panel.getByText(/已核对上次保存/).waitFor();
|
||||
await panel.getByText(/之前的文字已保存/).waitFor();
|
||||
saved = (await read()).draft;
|
||||
assert.ok(
|
||||
saved.problems.some((p) => p.text === "模拟断网后保留的批注"),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user