diff --git a/apps/server/src/modules/acquisition-organize/__tests__/subscription.test.ts b/apps/server/src/modules/acquisition-organize/__tests__/subscription.test.ts index e92e6844..2d477e59 100644 --- a/apps/server/src/modules/acquisition-organize/__tests__/subscription.test.ts +++ b/apps/server/src/modules/acquisition-organize/__tests__/subscription.test.ts @@ -129,7 +129,7 @@ describe.skipIf(!hasPg)("订阅增强(真实 PG + mock qB + 临时目录)", () = ).toEqual([{ unit_keys: ["s1e2"] }]); const dt1 = await submit(p1); - const dt2 = await submit(p2); + await submit(p2); expect((await slotRow(slotId)).status).toBe("downloading"); await completeAndImport(e1.hash, dt1); // E01 入库,但 E02 仍在途:Slot 显示在途阶段而不是静止态;分集账本登记 E01 diff --git a/apps/web/app/components/library/subscriptions-policy.tsx b/apps/web/app/components/library/subscriptions-policy.tsx index 3c392277..ce4a7af5 100644 --- a/apps/web/app/components/library/subscriptions-policy.tsx +++ b/apps/web/app/components/library/subscriptions-policy.tsx @@ -417,76 +417,74 @@ function PolicyDetailSheet({ description={rev ? {rev.policyKey} : null} footer={ rev ? ( - <> - {rev.status === "draft" ? ( - <> - - + rev.status === "draft" ? ( + <> + + + + + 发布 + + } + title={`发布 ${rev.policyKey} r${rev.revision}?`} + description={PUBLISH_NOTICE} + confirmLabel="授权并发布" + onConfirm={() => + publish + .mutateAsync({ id: rev.id, expectedRevision: rev.revision }) + .then(() => toast.success(`r${rev.revision} 已发布并生效`)) + .catch((e) => { + toast.error(errorMessage(e)); + throw e; + }) + } + > + {!pv?.success ? ( +

+ 这个草案还没有预览结果,建议先预览确认影响范围。 +

+ ) : null} +
+ + ) : ( + <> + + {rev.status === "superseded" || rev.status === "rolled_back" ? ( - - 发布 + } - title={`发布 ${rev.policyKey} r${rev.revision}?`} - description={PUBLISH_NOTICE} - confirmLabel="授权并发布" + title={`回滚到 r${rev.revision}?`} + description={`将以 r${rev.revision} 的内容发布一个新版本,当前已发布版本标记为已回滚。${PUBLISH_NOTICE}`} + confirmLabel="回滚并发布" onConfirm={() => - publish - .mutateAsync({ id: rev.id, expectedRevision: rev.revision }) - .then(() => toast.success(`r${rev.revision} 已发布并生效`)) + rollback + .mutateAsync(rev.id) + .then((n) => toast.success(`已回滚,新版本 r${n.revision} 生效`)) + .then(onClose) .catch((e) => { toast.error(errorMessage(e)); throw e; }) } - > - {!pv?.success ? ( -

- 这个草案还没有预览结果,建议先预览确认影响范围。 -

- ) : null} -
- - ) : ( - <> - - {rev.status === "superseded" || rev.status === "rolled_back" ? ( - - - 回滚到此版本 - - } - title={`回滚到 r${rev.revision}?`} - description={`将以 r${rev.revision} 的内容发布一个新版本,当前已发布版本标记为已回滚。${PUBLISH_NOTICE}`} - confirmLabel="回滚并发布" - onConfirm={() => - rollback - .mutateAsync(rev.id) - .then((n) => toast.success(`已回滚,新版本 r${n.revision} 生效`)) - .then(onClose) - .catch((e) => { - toast.error(errorMessage(e)); - throw e; - }) - } - /> - ) : null} - - )} - + /> + ) : null} + + ) ) : null } >