@oj-module/cli 0.2.2 → 0.2.5

package/templates/web/src/oj-market/components/InstallDialog.tsx

@@ -0,0 +1,112 @@
+import type { IndexRow, TaskRecord } from "../types";
+import { Alert, Button, Modal, Progress, Space, Typography } from "antd";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useMarketClient } from "../api/context";
+import { useInstallTask } from "../hooks/useMarket";
+
+export interface InstallDialogProps {
+	row: IndexRow | null
+	open: boolean
+	onClose: () => void
+	onDone?: (record: TaskRecord) => void
+	/** 显式目标版本（回滚用）；缺省取 row.latest（安装/升级） */
+	version?: string | null
+	/** 动作模式：安装/升级/回滚（仅影响标题文案；回滚 = 对旧版降级安装） */
+	mode?: "install" | "upgrade" | "rollback"
+}
+
+const isTerminal = (r: TaskRecord | null) => r != null && r.status !== "running";
+
+/**
+ * 安装/升级/回滚对话框：触发 POST install → 800ms 轮询 TaskRecord 终态渲染（reason+retryable+hintKey 双语）。
+ *  回滚 = 对已装旧版降级安装（显式 version）；降版迁移差异校验（R12）的可读失败由终态 error 渲染。
+ */
+export function InstallDialog({ row, open, onClose, onDone, version, mode }: InstallDialogProps) {
+	const { t } = useTranslation();
+	const client = useMarketClient();
+	const [taskId, setTaskId] = useState<string | null>(null);
+	const [started, setStarted] = useState(false);
+	const { record, done } = useInstallTask(taskId);
+
+	const targetVersion = version ?? row?.latest ?? null;
+	const title
+		= mode === "rollback"
+			? t("oj-market:rollback:running")
+			: row?.installed
+				? t("oj-market:card:upgrade")
+				: t("oj-market:task:installing");
+
+	// 打开即触发安装（version 缺省取 latest；已装视为升级；显式 version = 回滚降级安装）
+	useEffect(() => {
+		if (open && row && !started) {
+			setStarted(true);
+			client
+				.install({ name: row.name, version: targetVersion, source: "cdn" })
+				.then(res => setTaskId(res.task_id))
+				.catch(e => setTaskId(`__error__${e instanceof Error ? e.message : String(e)}`));
+		}
+		if (!open) {
+			setTaskId(null);
+			setStarted(false);
+		}
+	}, [open, row, started, client, targetVersion]);
+
+	useEffect(() => {
+		if (isTerminal(record) && done)
+			onDone?.(record);
+	}, [record, done, onDone]);
+
+	const terminal = isTerminal(record);
+	const failed = record?.status === "failed" || record?.status === "partial";
+	const errorTask = typeof taskId === "string" && taskId.startsWith("__error__");
+
+	return (
+		<Modal
+			title={title}
+			open={open}
+			onCancel={onClose}
+			footer={terminal ? <Button onClick={onClose}>{t("oj-market:task:close")}</Button> : null}
+			data-testid="install-dialog"
+		>
+			{errorTask && <Alert type="error" message={taskId!.slice("__error__".length)} />}
+			{!errorTask && !record && (
+				<Typography.Text>
+					{t("oj-market:task:installing")}
+					…
+				</Typography.Text>
+			)}
+			{record && (
+				<>
+					<Progress percent={record.progress} status={terminal ? (failed ? "exception" : "success") : "active"} />
+					<div data-testid="install-stage">{record.stage ? t(`oj-market:task:stage.${record.stage}`, record.stage) : record.stage}</div>
+					<div data-testid="install-message">{record.message}</div>
+					{failed && record.error && (
+						<Alert
+							type="error"
+							showIcon
+							message={record.error.reason}
+							description={(
+								<Space direction="vertical">
+									<span>{record.error.retryable ? t("oj-market:task:retryable") : t("oj-market:task:notRetryable")}</span>
+									{record.error.hintKey && <span data-testid="install-hint">{t(record.error.hintKey, record.error.hintKey)}</span>}
+								</Space>
+							)}
+						/>
+					)}
+					{failed && (
+						<Button
+							style={{ marginTop: 12 }}
+							onClick={() => {
+								setTaskId(null);
+								setStarted(false);
+							}}
+						>
+							{t("oj-market:card:retry")}
+						</Button>
+					)}
+				</>
+			)}
+		</Modal>
+	);
+}

package/templates/web/src/oj-market/components/RollbackDialog.tsx

@@ -0,0 +1,79 @@
+import type { IndexRow } from "../types";
+import { Alert, Modal, Radio, Space, Spin, Typography } from "antd";
+import React, { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useMarketHistory } from "../hooks/useMarket";
+import { compareVersions } from "../utils/semver";
+
+export interface RollbackDialogProps {
+	row: IndexRow | null
+	open: boolean
+	onClose: () => void
+	onRollback: (row: IndexRow, version: string) => void
+}
+
+/**
+ * 回滚版本选择（P1-15b）：候选 = 该方案 market_history 出现过且版本 < 已装版本的历史版本
+ * （compareVersions；宿主 CDN 索引版本列表未进 IndexRow 契约，故以历史已装版本为回滚真源）。
+ * 回滚 = 对所选旧版重新安装（降级）；迁移差异校验（R12）的可读失败由 InstallDialog 终态 error 渲染。
+ */
+export function RollbackDialog({ row, open, onClose, onRollback }: RollbackDialogProps) {
+	const { t } = useTranslation();
+	const { status, data } = useMarketHistory();
+	const [selected, setSelected] = useState<string | null>(null);
+
+	const candidates = useMemo(() => {
+		const installed = row?.installed;
+		if (!row || !installed)
+			return [] as string[];
+		const versions = new Set<string>();
+		for (const h of status === "ok" ? data : []) {
+			if (h.solution === row.name && compareVersions(h.version, installed) < 0)
+				versions.add(h.version);
+		}
+		return [...versions].sort((a, b) => compareVersions(b, a)); // 较新的旧版在前
+	}, [row, status, data]);
+
+	useEffect(() => {
+		setSelected(candidates.length ? candidates[0] : null);
+	}, [candidates]);
+
+	const loading = status === "loading";
+
+	return (
+		<Modal
+			title={t("oj-market:rollback:title")}
+			open={open}
+			onCancel={onClose}
+			okText={t("oj-market:rollback:confirm")}
+			cancelText={t("oj-market:confirm:cancel")}
+			okButtonProps={{ danger: true, disabled: !selected }}
+			onOk={() => row && selected && onRollback(row, selected)}
+			data-testid="rollback-dialog"
+		>
+			<Typography.Paragraph>
+				{t("oj-market:rollback:body", { name: row?.name ?? "", installed: row?.installed ?? "-" })}
+			</Typography.Paragraph>
+			<Alert type="warning" showIcon message={t("oj-market:rollback:warning")} style={{ marginBottom: 12 }} />
+			{loading && <Spin />}
+			{!loading && candidates.length === 0 && (
+				<div data-testid="rollback-empty">{t("oj-market:rollback:noCandidates")}</div>
+			)}
+			{!loading && candidates.length > 0 && (
+				<Radio.Group
+					value={selected ?? undefined}
+					onChange={e => setSelected(e.target.value)}
+					data-testid="rollback-versions"
+				>
+					<Space direction="vertical">
+						{candidates.map(v => (
+							<Radio key={v} value={v}>
+								{v}
+							</Radio>
+						))}
+					</Space>
+				</Radio.Group>
+			)}
+		</Modal>
+	);
+}

package/templates/web/src/oj-market/components/UninstallConfirm.tsx

@@ -0,0 +1,74 @@
+import type { IndexRow, UninstallImpact } from "../types";
+import { Alert, Modal, Spin, Typography } from "antd";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useMarketClient } from "../api/context";
+
+export interface UninstallConfirmProps {
+	row: IndexRow | null
+	open: boolean
+	onClose: () => void
+	onConfirmed: (row: IndexRow) => void
+}
+
+/**
+ * 卸载二次确认（P3 U1 语义前移）：打开即拉取影响面预检清单（受影响角色/用户计数），
+ * 供 superadmin 二次确认。空锁/级联由服务端（P1-15a）统一把关，UI 仅做可读呈现。
+ */
+export function UninstallConfirm({ row, open, onClose, onConfirmed }: UninstallConfirmProps) {
+	const { t } = useTranslation();
+	const client = useMarketClient();
+	const [impact, setImpact] = useState<UninstallImpact | null>(null);
+	const [loading, setLoading] = useState(false);
+	const [error, setError] = useState<string | null>(null);
+
+	useEffect(() => {
+		if (!open || !row)
+			return;
+		setLoading(true);
+		setError(null);
+		setImpact(null);
+		client
+			.uninstallImpact(row.name)
+			.then(setImpact)
+			.catch(e => setError(e instanceof Error ? e.message : String(e)))
+			.finally(() => setLoading(false));
+	}, [open, row, client]);
+
+	return (
+		<Modal
+			title={t("oj-market:confirm:uninstallTitle")}
+			open={open}
+			onCancel={onClose}
+			okText={t("oj-market:confirm:ok")}
+			cancelText={t("oj-market:confirm:cancel")}
+			okButtonProps={{ danger: true }}
+			onOk={() => row && onConfirmed(row)}
+			data-testid="uninstall-confirm"
+		>
+			<Typography.Paragraph>
+				{t("oj-market:confirm:uninstallBody", { name: row?.name ?? "" })}
+			</Typography.Paragraph>
+			{loading && <Spin tip={t("oj-market:confirm:impactTitle")} />}
+			{error && <Alert type="warning" message={error} />}
+			{impact && (
+				<div data-testid="uninstall-impact">
+					<Typography.Text strong>{t("oj-market:confirm:impactTitle")}</Typography.Text>
+					<div>
+						{t("oj-market:history:colAction.uninstall")}
+						:
+						{impact.affectedRoles}
+						{" "}
+						·
+						{t("oj-market:history:colOperator")}
+						:
+						{impact.affectedUsers}
+					</div>
+					{impact.affectedRoles === 0 && impact.affectedUsers === 0 && (
+						<Typography.Text type="secondary">{t("oj-market:confirm:impactEmpty")}</Typography.Text>
+					)}
+				</div>
+			)}
+		</Modal>
+	);
+}

package/templates/web/src/oj-market/entry.ts

@@ -0,0 +1,27 @@
+import { defineModule } from "@oj-module/runtime";
+import MarketApp from "./pages/MarketApp";
+
+// 方案市场前端模块（第一方专用，R29：消费 /api/_platform/market/* 编排面，第三方方案不得仿照此调用面）。
+// 菜单标题走 i18next 命名空间语法 "<moduleName>:menu.<key>"（i18n 资源在 locales/，安装时随包注册）。
+export default defineModule({
+	name: "oj-market",
+	description: "oj 方案市场应用——卡片展示/安装/卸载/历史（第一方专用，R29）",
+	version: "0.1.0",
+	routes: [
+		{
+			path: "/oj-market",
+			handle: { layout: "container", order: 200, title: "oj-market:menu.main" },
+			children: [
+				{
+					index: true,
+					Component: MarketApp,
+					handle: { title: "oj-market:menu.main" },
+				},
+			],
+		},
+	],
+	i18n: {
+		"zh-CN": () => import("./locales/zh-CN.json"),
+		"en-US": () => import("./locales/en-US.json"),
+	},
+});

package/templates/web/src/oj-market/hooks/useMarket.ts

@@ -0,0 +1,91 @@
+import type { IndexRow, MarketHistory, TaskRecord } from "../types";
+import { useCallback, useEffect, useState } from "react";
+import { useMarketClient } from "../api/context";
+import { poll } from "../utils/poll";
+
+/** 加载态三态（空态/加载/错误）统一建模，便于组件 DRY 渲染 */
+export type LoadState<T> = { status: "loading" } | { status: "ok", data: T } | { status: "error", error: string };
+
+/** 卡片索引加载（含重试）；消费 GET /_platform/market/index */
+export function useMarketIndex(): LoadState<IndexRow[]> & { retry: () => void } {
+	const client = useMarketClient();
+	const [state, setState] = useState<LoadState<IndexRow[]>>({ status: "loading" });
+
+	const load = useCallback(() => {
+		let active = true;
+		setState({ status: "loading" });
+		client
+			.index()
+			.then(data => active && setState({ status: "ok", data }))
+			.catch(e => active && setState({ status: "error", error: e instanceof Error ? e.message : String(e) }));
+		return () => {
+			active = false;
+		};
+	}, [client]);
+
+	useEffect(() => load(), [load]);
+
+	return { ...state, retry: load };
+}
+
+/** 任务轮询：给定 task_id，800ms 轮询至终态（done/failed/partial）；超时不抛，返回当前值 */
+export function useInstallTask(taskId: string | null): {
+	record: TaskRecord | null
+	done: boolean
+} {
+	const client = useMarketClient();
+	const [record, setRecord] = useState<TaskRecord | null>(null);
+	const [done, setDone] = useState(false);
+
+	useEffect(() => {
+		if (!taskId)
+			return;
+		let active = true;
+		setRecord(null);
+		setDone(false);
+		poll(
+			() => client.task(taskId),
+			r => r.status !== "running",
+			{ intervalMs: 800, timeoutMs: 30 * 60 * 1000 },
+		)
+			.then(rec => active && setRecord(rec))
+			.catch(e => active && setRecord({
+				id: taskId,
+				name: "",
+				version: "",
+				status: "failed",
+				stage: null,
+				progress: 0,
+				message: e instanceof Error ? e.message : String(e),
+				stages: [],
+			}))
+			.finally(() => active && setDone(true));
+		return () => {
+			active = false;
+		};
+	}, [client, taskId]);
+
+	return { record, done };
+}
+
+/** 市场操作历史加载（只读消费本仓端点） */
+export function useMarketHistory(): LoadState<MarketHistory[]> & { retry: () => void } {
+	const client = useMarketClient();
+	const [state, setState] = useState<LoadState<MarketHistory[]>>({ status: "loading" });
+
+	const load = useCallback(() => {
+		let active = true;
+		setState({ status: "loading" });
+		client
+			.history()
+			.then(data => active && setState({ status: "ok", data }))
+			.catch(e => active && setState({ status: "error", error: e instanceof Error ? e.message : String(e) }));
+		return () => {
+			active = false;
+		};
+	}, [client]);
+
+	useEffect(() => load(), [load]);
+
+	return { ...state, retry: load };
+}

package/templates/web/src/oj-market/locales/en-US.json

@@ -0,0 +1,100 @@
+{
+	"menu": {
+		"main": "Market"
+	},
+	"perm": {
+		"view": "View solution market"
+	},
+	"role": {
+		"viewer": "Solution market viewer"
+	},
+	"settings": {
+		"group": {
+			"display": "Display preferences"
+		},
+		"display": {
+			"greeting": "Greeting"
+		}
+	},
+	"card": {
+		"title": "Solution Market",
+		"subtitle": "Browse, install and manage oj solutions",
+		"loading": "Loading cards…",
+		"empty": "No solutions available (market address not configured or index empty)",
+		"error": "Failed to load cards",
+		"retry": "Retry",
+		"version": "Version",
+		"latest": "Latest",
+		"installed": "Installed",
+		"notInstalled": "Not installed",
+		"enabled": "Enabled",
+		"disabled": "Disabled",
+		"upgradable": "Upgradable",
+		"details": "Details",
+		"history": "History",
+		"install": "Install",
+		"uninstall": "Uninstall",
+		"enable": "Enable",
+		"disable": "Disable",
+		"upgrade": "Upgrade",
+		"rollback": "Rollback"
+	},
+	"task": {
+		"installing": "Installing",
+		"uninstalling": "Uninstalling",
+		"progress": "Progress",
+		"stage": "Stage",
+		"status": {
+			"running": "Running",
+			"done": "Done",
+			"failed": "Failed",
+			"partial": "Partial"
+		},
+		"reason": "Reason",
+		"retryable": "Retryable",
+		"notRetryable": "Not retryable",
+		"hint": "Hint",
+		"close": "Close",
+		"viewLog": "View log"
+	},
+	"confirm": {
+		"uninstallTitle": "Confirm uninstall",
+		"uninstallBody": "Uninstalling \"{{name}}\" affects the roles and users below, and the site must keep at least one locked module. This cannot be undone. Continue?",
+		"impactTitle": "Impact pre-check",
+		"impactEmpty": "No affected roles or users (orphan solution)",
+		"cancel": "Cancel",
+		"ok": "Confirm uninstall"
+	},
+	"rollback": {
+		"title": "Rollback version",
+		"running": "Rolling back",
+		"body": "Pick a prior version to roll \"{{name}}\" back to (currently installed {{installed}}). Rollback reinstalls the chosen older version; if the migration diff check (R12) fails you will get a readable error.",
+		"selectLabel": "Target version",
+		"noCandidates": "No earlier version in history to roll back to",
+		"confirm": "Confirm rollback",
+		"warning": "Rollback reinstalls the chosen older version; it is rejected if the older migration is irreversible."
+	},
+	"history": {
+		"title": "Operation history",
+		"empty": "No records yet",
+		"colSolution": "Solution",
+		"colVersion": "Version",
+		"colAction": "Action",
+		"colStatus": "Status",
+		"colOperator": "Operator",
+		"colTime": "Time",
+		"action": {
+			"install": "Install",
+			"uninstall": "Uninstall",
+			"enable": "Enable",
+			"disable": "Disable",
+			"upgrade": "Upgrade",
+			"rollback": "Rollback"
+		},
+		"status": {
+			"done": "Done",
+			"failed": "Failed",
+			"partial": "Partial"
+		}
+	}
+}

package/templates/web/src/oj-market/locales/zh-CN.json

@@ -0,0 +1,100 @@
+{
+	"menu": {
+		"main": "方案市场"
+	},
+	"perm": {
+		"view": "查看方案市场"
+	},
+	"role": {
+		"viewer": "方案市场查看者"
+	},
+	"settings": {
+		"group": {
+			"display": "显示偏好"
+		},
+		"display": {
+			"greeting": "问候语"
+		}
+	},
+	"card": {
+		"title": "方案市场",
+		"subtitle": "浏览、安装与管理 oj 方案",
+		"loading": "卡片加载中…",
+		"empty": "市场暂无可用方案（未配置市场地址或索引为空）",
+		"error": "卡片加载失败",
+		"retry": "重试",
+		"version": "版本",
+		"latest": "最新",
+		"installed": "已装",
+		"notInstalled": "未安装",
+		"enabled": "已启用",
+		"disabled": "已停用",
+		"upgradable": "可升级",
+		"details": "详情",
+		"history": "历史",
+		"install": "安装",
+		"uninstall": "卸载",
+		"enable": "启用",
+		"disable": "停用",
+		"upgrade": "升级",
+		"rollback": "回滚"
+	},
+	"task": {
+		"installing": "安装中",
+		"uninstalling": "卸载中",
+		"progress": "进度",
+		"stage": "阶段",
+		"status": {
+			"running": "进行中",
+			"done": "完成",
+			"failed": "失败",
+			"partial": "部分完成"
+		},
+		"reason": "原因",
+		"retryable": "可重试",
+		"notRetryable": "不可重试",
+		"hint": "提示",
+		"close": "关闭",
+		"viewLog": "查看日志"
+	},
+	"confirm": {
+		"uninstallTitle": "确认卸载",
+		"uninstallBody": "卸载「{{name}}」将影响以下角色与用户，且站点至少保留一个已锁模块。此操作不可撤销，确定继续？",
+		"impactTitle": "影响面预检",
+		"impactEmpty": "无受影响角色或用户（孤立方案）",
+		"cancel": "取消",
+		"ok": "确认卸载"
+	},
+	"rollback": {
+		"title": "回滚版本",
+		"running": "回滚中",
+		"body": "选择「{{name}}」要回滚到的历史版本（当前已装 {{installed}}）。回滚即按所选旧版重新安装，迁移差异校验（R12）不通过时会给出可读失败。",
+		"selectLabel": "目标版本",
+		"noCandidates": "无更早的历史版本可回滚",
+		"confirm": "确认回滚",
+		"warning": "回滚会按所选旧版重新安装；若旧版迁移不可逆将被拒绝。"
+	},
+	"history": {
+		"title": "操作历史",
+		"empty": "暂无操作记录",
+		"colSolution": "方案",
+		"colVersion": "版本",
+		"colAction": "操作",
+		"colStatus": "状态",
+		"colOperator": "操作人",
+		"colTime": "时间",
+		"action": {
+			"install": "安装",
+			"uninstall": "卸载",
+			"enable": "启用",
+			"disable": "停用",
+			"upgrade": "升级",
+			"rollback": "回滚"
+		},
+		"status": {
+			"done": "成功",
+			"failed": "失败",
+			"partial": "部分"
+		}
+	}
+}