@lmzhen/dsh-evolution-merge-ui 0.30.20 → 0.30.22

package/lib/client.js

@@ -236,6 +236,7 @@ window.__ModuleLoader__.load({
 			...row.verifySubState === void 0 ? {} : { verifySubState: row.verifySubState },
 			...row.skipKind === void 0 ? {} : { skipKind: row.skipKind },
 			...row.bodies === void 0 ? {} : { bodies: row.bodies.map((body) => ({
+				...body.rowId === void 0 ? {} : { rowId: body.rowId },
 				name: body.name,
 				side: body.side
 			})) },
@@ -296,8 +297,8 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
-		async function body(name, side) {
-			const answer = await requestWire(HOST_ROUTES.body + "?name=" + encodeURIComponent(name) + "&side=" + side);
+		async function body(name, side, rowId) {
+			const answer = await requestWire(HOST_ROUTES.body + (rowId === void 0 ? "?name=" + encodeURIComponent(name) : "?id=" + encodeURIComponent(rowId)) + "&side=" + side);
 			if (!answer.ok) {
 				if (answer.failure.kind === "problem" && answer.failure.code === "bad-query" && (answer.failure.message ?? "").includes("multiple merge rows")) return {
 					ok: false,
@@ -1157,7 +1158,7 @@ window.__ModuleLoader__.load({
 				fallback: mergeFallback,
 				capability: mergeCapability,
 				t
-			}), settings?.platform === void 0 ? (0, react.createElement)(ReadOnlySetting, {
+			}), (0, react.createElement)(ReadOnlySetting, {
 				section: "platform-write",
 				label: t("settings.platformWrite"),
 				value: platformFallback,
@@ -1166,17 +1167,10 @@ window.__ModuleLoader__.load({
 				note: t("settings.platformWriteLinkHint"),
 				link: true,
 				t
-			}) : (0, react.createElement)(EditableSetting, {
-				form: settings.platform,
-				field: "enabled",
-				label: t("settings.platformWrite"),
-				fallback: platformFallback,
-				capability: platformCapability,
-				t
-			}), settings?.merge === void 0 || settings?.platform === void 0 ? (0, react.createElement)("a", {
+			}), settings?.merge === void 0 ? (0, react.createElement)("a", {
 				"data-role": "settings-link",
 				href: "#/settings"
-			}, t("settings.openPlatform")) : null, (0, react.createElement)("p", { "data-role": "settings-readonly" }, settings?.merge === void 0 || settings?.platform === void 0 ? t("settings.readonly") : t("settings.live")));
+			}, t("settings.openPlatform")) : null, (0, react.createElement)("p", { "data-role": "settings-readonly" }, settings?.merge === void 0 ? t("settings.readonly") : t("settings.live")));
 		}
 		function rowNode(row, store, t, copy, sort) {
 			const facts = [
@@ -1246,14 +1240,14 @@ window.__ModuleLoader__.load({
 					type: "button",
 					"data-role": "body-a",
 					onClick: () => {
-						store.openBody(bodyA.name, bodyA.side);
+						store.openBody(bodyA.name, bodyA.side, bodyA.rowId);
 					}
 				}, "A"), bodyB === void 0 ? null : (0, react.createElement)("button", {
 					key: "b",
 					type: "button",
 					"data-role": "body-b",
 					onClick: () => {
-						store.openBody(bodyB.name, bodyB.side);
+						store.openBody(bodyB.name, bodyB.side, bodyB.rowId);
 					}
 				}, "B")];
 			})(), actions)));
@@ -1717,7 +1711,7 @@ window.__ModuleLoader__.load({
 				if (current.nextCursor === void 0 || current.status === "loading" || this.snapshot.viewState === "blocked") return;
 				this.loadQueue(this.snapshot.queue, this.snapshot.expiredOnly, current.nextCursor);
 			}
-			async openBody(name, side) {
+			async openBody(name, side, rowId) {
 				const token = ++this.overlayToken;
 				this.set({
 					...this.snapshot,
@@ -1728,7 +1722,7 @@ window.__ModuleLoader__.load({
 						status: "loading"
 					}
 				});
-				const outcome = await this.source.body(name, side);
+				const outcome = await this.source.body(name, side, rowId);
 				if (this.disposed || token !== this.overlayToken) return;
 				if (!outcome.ok) {
 					if (outcome.failure.kind === "blocked") {

package/lib/types/client/MergeStore.d.ts

@@ -3,7 +3,7 @@ import type { MergeBody, MergeFailure, MergeHistoryItem, MergeOutcome, MergeQueu
 export interface MergeSource {
     view(): Promise<MergeOutcome<MergeViewPayload>>;
     rows(queue: MergeQueue, cursor?: string, expiredOnly?: boolean): Promise<MergeOutcome<QueuePage>>;
-    body(name: string, side: 'live' | 'archive'): Promise<MergeOutcome<MergeBody>>;
+    body(name: string, side: 'live' | 'archive', rowId?: string): Promise<MergeOutcome<MergeBody>>;
     history(): Promise<MergeOutcome<{
         items: MergeHistoryItem[];
     }>>;
@@ -66,7 +66,7 @@ export declare class MergeStore {
     toggleExpired(): void;
     refresh(): void;
     loadMore(): void;
-    openBody(name: string, side: 'live' | 'archive'): Promise<void>;
+    openBody(name: string, side: 'live' | 'archive', rowId?: string): Promise<void>;
     openHistory(): Promise<void>;
     closeOverlay(): void;
     dispose(): void;

package/lib/types/client/api.d.ts

@@ -116,6 +116,7 @@ export interface MergeRowView {
     verifySubState?: 'queued' | 'running' | 'failed' | 'cancelled';
     skipKind?: 'agent-keep' | 'human-reject' | 'over-limit' | 'forced';
     bodies?: {
+        rowId?: string;
         name: string;
         side: 'live' | 'archive';
     }[];
@@ -175,7 +176,7 @@ export type MergeOutcome<T> = {
 export declare const isBlocked: (failure: MergeFailure) => failure is MergeBlocked;
 export declare function view(): Promise<MergeOutcome<MergeViewPayload>>;
 export declare function rows(queue: MergeQueue, cursor?: string, expiredOnly?: boolean): Promise<MergeOutcome<QueuePage>>;
-export declare function body(name: string, side: 'live' | 'archive'): Promise<MergeOutcome<MergeBody>>;
+export declare function body(name: string, side: 'live' | 'archive', rowId?: string): Promise<MergeOutcome<MergeBody>>;
 export declare function history(): Promise<MergeOutcome<{
     items: MergeHistoryItem[];
 }>>;

package/package.json

@@ -11,7 +11,7 @@
       ]
     }
   },
-  "version": "0.30.20",
+  "version": "0.30.22",
   "publishConfig": {
     "access": "public"
   },