dsh-config-manager 0.1.1 → 0.1.2

package/lib/client.js

@@ -559,93 +559,93 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"section": "_367UGW_section",
-	"rollbackBox": "_367UGW_rollbackBox",
-	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
-	"badge": "_367UGW_badge",
-	"progressBar": "_367UGW_progressBar",
-	"errorActionLabel": "_367UGW_errorActionLabel",
-	"pathOld": "_367UGW_pathOld",
-	"pathNew": "_367UGW_pathNew",
-	"conflictList": "_367UGW_conflictList",
-	"secretsList": "_367UGW_secretsList",
-	"badgeInfo": "_367UGW_badgeInfo",
-	"empty": "_367UGW_empty",
-	"sectionHeader": "_367UGW_sectionHeader",
-	"errorLine": "_367UGW_errorLine",
-	"actionRow": "_367UGW_actionRow",
 	"input": "_367UGW_input",
-	"iconButton": "_367UGW_iconButton",
-	"warnList": "_367UGW_warnList",
-	"progressDetail": "_367UGW_progressDetail",
-	"reportFooter": "_367UGW_reportFooter",
-	"dshCmSpin": "_367UGW_dshCmSpin",
-	"conflictItem": "_367UGW_conflictItem",
-	"ghostButton": "_367UGW_ghostButton",
-	"conflictId": "_367UGW_conflictId",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"card": "_367UGW_card",
 	"dangerButton": "_367UGW_dangerButton",
-	"radioLabel": "_367UGW_radioLabel",
-	"modeTabs": "_367UGW_modeTabs",
-	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"categoryDesc": "_367UGW_categoryDesc",
-	"progressPercent": "_367UGW_progressPercent",
-	"severityError": "_367UGW_severityError",
+	"badgeInfo": "_367UGW_badgeInfo",
 	"errorReason": "_367UGW_errorReason",
+	"pathMappingList": "_367UGW_pathMappingList",
 	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
-	"errorAction": "_367UGW_errorAction",
-	"formError": "_367UGW_formError",
+	"radioLabel": "_367UGW_radioLabel",
 	"modeTab": "_367UGW_modeTab",
-	"progressBarDone": "_367UGW_progressBarDone",
-	"errorList": "_367UGW_errorList",
-	"progressLabel": "_367UGW_progressLabel",
-	"groupHeader": "_367UGW_groupHeader",
 	"groupLabel": "_367UGW_groupLabel",
-	"viewTabs": "_367UGW_viewTabs",
+	"actionRow": "_367UGW_actionRow",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"groupNote": "_367UGW_groupNote",
+	"dshCmSpin": "_367UGW_dshCmSpin",
 	"progressMeta": "_367UGW_progressMeta",
-	"spinnerLabel": "_367UGW_spinnerLabel",
+	"groupItems": "_367UGW_groupItems",
+	"categoryName": "_367UGW_categoryName",
+	"section": "_367UGW_section",
+	"badgeOk": "_367UGW_badgeOk",
+	"errorList": "_367UGW_errorList",
+	"progressBarDone": "_367UGW_progressBarDone",
+	"conflictItem": "_367UGW_conflictItem",
+	"errorItem": "_367UGW_errorItem",
+	"sectionTitle": "_367UGW_sectionTitle",
+	"sectionBody": "_367UGW_sectionBody",
+	"progressBlock": "_367UGW_progressBlock",
+	"hint": "_367UGW_hint",
+	"hiddenFile": "_367UGW_hiddenFile",
+	"groupList": "_367UGW_groupList",
+	"progressDetail": "_367UGW_progressDetail",
+	"conflictHead": "_367UGW_conflictHead",
+	"errorLine": "_367UGW_errorLine",
+	"optionsCard": "_367UGW_optionsCard",
+	"groupCard": "_367UGW_groupCard",
+	"card": "_367UGW_card",
+	"warnList": "_367UGW_warnList",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"reportFooter": "_367UGW_reportFooter",
+	"errorFooter": "_367UGW_errorFooter",
+	"errorBanner": "_367UGW_errorBanner",
+	"groupHeader": "_367UGW_groupHeader",
+	"categoryItem": "_367UGW_categoryItem",
+	"errorAction": "_367UGW_errorAction",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"secretsList": "_367UGW_secretsList",
+	"viewTab": "_367UGW_viewTab",
+	"progressPercent": "_367UGW_progressPercent",
+	"reportView": "_367UGW_reportView",
 	"conflictDetail": "_367UGW_conflictDetail",
+	"ghostButton": "_367UGW_ghostButton",
+	"checkboxRow": "_367UGW_checkboxRow",
+	"iconButton": "_367UGW_iconButton",
 	"primaryButton": "_367UGW_primaryButton",
-	"optionsCard": "_367UGW_optionsCard",
+	"errorTitle": "_367UGW_errorTitle",
 	"conflictOptions": "_367UGW_conflictOptions",
-	"banner": "_367UGW_banner",
-	"hint": "_367UGW_hint",
-	"categoryItem": "_367UGW_categoryItem",
-	"conflictHead": "_367UGW_conflictHead",
-	"pathMappingList": "_367UGW_pathMappingList",
-	"pathIssueKind": "_367UGW_pathIssueKind",
-	"spinnerWrap": "_367UGW_spinnerWrap",
+	"sectionHeader": "_367UGW_sectionHeader",
 	"progressTrack": "_367UGW_progressTrack",
-	"modeHint": "_367UGW_modeHint",
-	"groupCard": "_367UGW_groupCard",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"formError": "_367UGW_formError",
+	"empty": "_367UGW_empty",
+	"spinner": "_367UGW_spinner",
 	"pathRow": "_367UGW_pathRow",
-	"fieldLabel": "_367UGW_fieldLabel",
-	"statRow": "_367UGW_statRow",
+	"pathIssueKind": "_367UGW_pathIssueKind",
+	"sectionSubtitle": "_367UGW_sectionSubtitle",
+	"badgeError": "_367UGW_badgeError",
+	"conflictId": "_367UGW_conflictId",
+	"viewTabs": "_367UGW_viewTabs",
+	"modeHint": "_367UGW_modeHint",
+	"pathOld": "_367UGW_pathOld",
 	"field": "_367UGW_field",
+	"statRow": "_367UGW_statRow",
+	"banner": "_367UGW_banner",
+	"fieldLabel": "_367UGW_fieldLabel",
+	"modeTabs": "_367UGW_modeTabs",
+	"progressBar": "_367UGW_progressBar",
+	"errorActionLabel": "_367UGW_errorActionLabel",
+	"pathNew": "_367UGW_pathNew",
+	"spinnerLabel": "_367UGW_spinnerLabel",
+	"rollbackBox": "_367UGW_rollbackBox",
 	"reportText": "_367UGW_reportText",
-	"groupList": "_367UGW_groupList",
-	"sectionBody": "_367UGW_sectionBody",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"viewBody": "_367UGW_viewBody",
+	"severityError": "_367UGW_severityError",
+	"conflictList": "_367UGW_conflictList",
 	"badgeWarn": "_367UGW_badgeWarn",
-	"badgeError": "_367UGW_badgeError",
-	"errorBanner": "_367UGW_errorBanner",
-	"spinner": "_367UGW_spinner",
-	"sectionTitle": "_367UGW_sectionTitle",
-	"badgeOk": "_367UGW_badgeOk",
-	"hiddenFile": "_367UGW_hiddenFile",
-	"reportView": "_367UGW_reportView",
-	"groupItems": "_367UGW_groupItems",
-	"errorItem": "_367UGW_errorItem",
+	"progressLabel": "_367UGW_progressLabel",
+	"secretFields": "_367UGW_secretFields",
 	"pathValue": "_367UGW_pathValue",
-	"progressBlock": "_367UGW_progressBlock",
-	"errorTitle": "_367UGW_errorTitle",
-	"errorFooter": "_367UGW_errorFooter",
-	"groupNote": "_367UGW_groupNote",
-	"viewBody": "_367UGW_viewBody",
-	"viewTab": "_367UGW_viewTab",
-	"categoryName": "_367UGW_categoryName",
-	"secretFields": "_367UGW_secretFields"
+	"badge": "_367UGW_badge"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -1633,6 +1633,19 @@ var ConflictCollector = class {
 	}
 };
 //#endregion
+//#region src/ui/flow.ts
+/**
+* 计算下一阶段：在 `list`（适用阶段的有序列表）中取 `from` 的下一项。
+* - `from` 不在列表中（如来自 preview 页）→ 取第一项；
+* - `from` 已是最后一项（confirm）→ 原地返回；
+* - 绝不回退：已完成阶段不会因仍适用而被再次命中。
+*/
+function nextFlowPhase(list, from) {
+	if (list.length === 0) return "confirm";
+	const idx = list.indexOf(from);
+	return list[Math.min(idx + 1, list.length - 1)] ?? "confirm";
+}
+//#endregion
 //#region src/client/import/ConflictList.tsx
 /**
 * 冲突决策列表（规范 §11，绑 src/ui/conflict-view.ts 的 ConflictCollector）。
@@ -1820,6 +1833,7 @@ function PathMappingForm({ issues, initial, t, onChange }) {
 * 中间阶段（conflicts/path-mapping/secrets）是 UI 层流程页，wizard 的 decisions 由
 * 对应组件收集后写入。
 */
+/** 中间流程阶段（wizard.step 之外的 UI 层页面）——定义见 src/ui/flow.ts */
 const SCORE_LABEL = {
 	excellent: "Excellent",
 	good: "Good",
@@ -1896,13 +1910,22 @@ function ImportWizardView({ api, t }) {
 	const hasConflicts = (snapshot.plan?.items ?? []).some((i) => i.kind === "Conflict");
 	const hasPathIssues = (snapshot.analysis?.pathIssues.length ?? 0) > 0;
 	const hasSecrets = (snapshot.plan?.missingSecrets.length ?? 0) > 0;
-	/** 从某阶段完成后进入的下一个阶段（跳过空阶段；from 之前的阶段不再进入） */
-	const nextPhase = (from) => {
-		if (from !== "conflicts" && hasConflicts) return "conflicts";
-		if (from !== "path-mapping" && hasPathIssues) return "path-mapping";
-		if (from !== "secrets" && hasSecrets) return "secrets";
-		return "confirm";
+	/**
+	* 适用阶段的有序列表（仅含需要用户处理 + 确认页）。
+	* hasConflicts/hasPathIssues/hasSecrets 基于原始 analysis/plan（Dry Run 产物），
+	* 在流程中不会因已解决而重算——所以导航必须只前进（见 nextFlowPhase），
+	* 而不是靠"当前阶段 != X"判定（那会让已完成阶段被重新命中、跳回上一步）。
+	*/
+	const applicablePhases = () => {
+		const list = [];
+		if (hasConflicts) list.push("conflicts");
+		if (hasPathIssues) list.push("path-mapping");
+		if (hasSecrets) list.push("secrets");
+		list.push("confirm");
+		return list;
 	};
+	/** 从某阶段完成后进入的下一个阶段：只前进（from 不在列表时取第一项） */
+	const nextPhase = (from) => nextFlowPhase(applicablePhases(), from);
 	/** 选择并上传 ZIP → wizard.selectZip（analyzing → compatibility） */
 	const onPickFile = async (file) => {
 		if (file === void 0) return;