camox 0.77.0 → 0.79.0

package/dist/features/studio/components/{ReviewDraftDialog.js → DraftReview.js}

@@ -4,24 +4,28 @@ import { draftMutations } from "../../../lib/queries.js";
 import { studioStore } from "../studioStore.js";
 import { localeName } from "../localeOptions.js";
 import { fixMessage, whereSentence } from "../fixMessage.js";
-import { useLeaveDraft } from "../viewSwitch.js";
 import { draftLabel, plural } from "../draftLabel.js";
+import { PUBLISH_STOPPED } from "../usePublishDraft.js";
 import { useShowInCanvas } from "../showInCanvas.js";
 import { c } from "react/compiler-runtime";
-import { useState } from "react";
-import { PUBLISH_BLOCKED_ERROR } from "@camox/api-contract/drafts";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useMutation } from "@tanstack/react-query";
 import { Button } from "@camox/ui/button";
 import { OctagonX } from "lucide-react";
-import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@camox/ui/dialog";
 import { toast } from "@camox/ui/toaster";
 import { Skeleton } from "@camox/ui/skeleton";
 import { Spinner } from "@camox/ui/spinner";
+import { Popover, PopoverContent, PopoverHeader, PopoverTitle, PopoverTrigger } from "@camox/ui/popover";
+import { voiceAxis, voiceStep } from "@camox/api-contract/voice";
 
-//#region src/features/studio/components/ReviewDraftDialog.tsx
-/** Where a subject sits: its page or layout, or the files, which belong to neither. */
+//#region src/features/studio/components/DraftReview.tsx
+/**
+* Where a subject sits: its page or layout, or the files, the languages or memory (the Voice
+* included), which belong to none.
+*/
 function ownerName(owner, entity) {
+	if (entity === "locale") return "Languages";
+	if (entity === "memory" || entity === "voiceAxis") return "Memory";
 	if (!owner) return entity === "file" ? "Files" : "Elsewhere";
 	if (owner.kind === "layout") return `Layout ${owner.name}`;
 	if (owner.kind === "syncedBlock") return `Synced block ${owner.title}`;
@@ -201,25 +205,6 @@ function _temp3(problem) {
 	const place = problemPlace(problem);
 	return place ? `${problem.label} · ${place}` : problem.label;
 }
-const PUBLISH_FAILED = "The publish couldn't finish on Camox's side, and Live is as it was. Try again.";
-/**
-* Whether a publish request failed on Camox's side rather than being refused: a server error,
-* or no answer at all. Either way the publish applied nothing.
-*/
-const failedOnCamoxSide = (error) => {
-	const status = error.status;
-	return typeof status !== "number" || status >= 500;
-};
-/**
-* Why the last publish with code stopped, when it isn't a blocker, which the review shows
-* instead.
-*/
-const PUBLISH_STOPPED = {
-	revisionChanged: "The draft's code changed while publishing, so the publish stopped and Live is as it was. Publish again.",
-	liveCodeMoved: "Live's code changed while publishing, and the draft took too long to take it in, so the publish stopped and Live is as it was. Try again.",
-	conflictsChanged: PUBLISH_FAILED,
-	failed: PUBLISH_FAILED
-};
 /**
 * The review's plain lines under the blockers: each language the publish holds off Live until
 * it's translated, and why the last publish stopped.
@@ -230,11 +215,86 @@ function reviewLines(preview) {
 	const stopped = code?.publishAborted && !code.publishing ? code.publishAborted : null;
 	return [...held, ...stopped && PUBLISH_STOPPED[stopped] ? [PUBLISH_STOPPED[stopped]] : []];
 }
-/** What Publish sends: the revision a draft with code shows, which publishing ships. */
-const publishInput = (projectId, shown) => ({
-	projectId,
-	...shown.code?.revision && { revision: shown.code.revision }
-});
+const MEMORY_CHANGE_LABELS = {
+	added: "Added",
+	changed: "Changed",
+	deleted: "Deleted"
+};
+/** A Voice Axis the draft moves, as it reads: "Humor: Earnest → Light". */
+function voiceLine({ axis, before, after }) {
+	const stepName = (key) => voiceStep(axis, key).name;
+	return `${voiceAxis(axis).name}: ${stepName(before)} → ${stepName(after)}`;
+}
+/**
+* What publishing the draft changes in memory: each Voice Axis it moves, from Live's step to the
+* draft's, then the memories it adds, changes and deletes, each with its text, and Live's before a
+* change. Nothing when it changes neither.
+*/
+function MemoryChanges(t0) {
+	const $ = c(8);
+	const { voice, changes } = t0;
+	if (voice.length === 0 && changes.length === 0) return null;
+	let t1;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = /* @__PURE__ */ jsx("h3", {
+			className: "text-sm font-medium",
+			children: "Memory"
+		});
+		$[0] = t1;
+	} else t1 = $[0];
+	let t2;
+	if ($[1] !== voice) {
+		t2 = voice.map(_temp4);
+		$[1] = voice;
+		$[2] = t2;
+	} else t2 = $[2];
+	let t3;
+	if ($[3] !== changes) {
+		t3 = changes.map(_temp5);
+		$[3] = changes;
+		$[4] = t3;
+	} else t3 = $[4];
+	let t4;
+	if ($[5] !== t2 || $[6] !== t3) {
+		t4 = /* @__PURE__ */ jsxs("section", {
+			"data-memory-changes": true,
+			className: "flex flex-col gap-2",
+			children: [t1, /* @__PURE__ */ jsxs("ul", {
+				className: "flex flex-col gap-2",
+				children: [t2, t3]
+			})]
+		});
+		$[5] = t2;
+		$[6] = t3;
+		$[7] = t4;
+	} else t4 = $[7];
+	return t4;
+}
+function _temp5(memory) {
+	return /* @__PURE__ */ jsxs("li", {
+		className: "flex flex-col gap-0.5 rounded-lg border p-3 text-sm",
+		children: [
+			/* @__PURE__ */ jsx("span", {
+				className: "text-muted-foreground text-xs",
+				children: MEMORY_CHANGE_LABELS[memory.change]
+			}),
+			/* @__PURE__ */ jsx("p", {
+				className: cn(memory.change === "deleted" && "text-muted-foreground line-through"),
+				children: memory.text
+			}),
+			memory.before !== void 0 && /* @__PURE__ */ jsxs("p", {
+				className: "text-muted-foreground text-xs",
+				children: ["Was: ", memory.before]
+			})
+		]
+	}, memory.id);
+}
+function _temp4(change) {
+	return /* @__PURE__ */ jsx("li", {
+		className: "rounded-lg border p-3 text-sm",
+		children: /* @__PURE__ */ jsx("p", { children: voiceLine(change) })
+	}, change.axis);
+}
 /**
 * The draft's overview: the bullets AI wrote about its changes, in full, saying it's updating
 * while they describe an older version of the draft. While
@@ -250,7 +310,7 @@ function DraftOverview(t0) {
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
 		t1 = {
 			...draftMutations.retryOverview(),
-			onError: _temp4
+			onError: _temp6
 		};
 		$[0] = t1;
 	} else t1 = $[0];
@@ -271,7 +331,7 @@ function DraftOverview(t0) {
 	if (overview.status === "ready") {
 		let t2;
 		if ($[3] !== overview.bullets) {
-			t2 = overview.bullets.map(_temp5);
+			t2 = overview.bullets.map(_temp7);
 			$[3] = overview.bullets;
 			$[4] = t2;
 		} else t2 = $[4];
@@ -312,7 +372,7 @@ function DraftOverview(t0) {
 	if (overview.status === "failed") {
 		let t2;
 		if ($[12] !== changes) {
-			t2 = new Set(changes.map(_temp6));
+			t2 = new Set(changes.map(_temp8));
 			$[12] = changes;
 			$[13] = t2;
 		} else t2 = $[13];
@@ -415,28 +475,28 @@ function DraftOverview(t0) {
 	} else t2 = $[34];
 	return t2;
 }
-function _temp6(change) {
-	return change.entity === "locale" ? "Languages" : ownerName(change.owner, change.entity);
+function _temp8(change) {
+	return ownerName(change.owner, change.entity);
 }
-function _temp5(bullet, index) {
+function _temp7(bullet, index) {
 	return /* @__PURE__ */ jsx("li", { children: bullet }, index);
 }
-function _temp4(error) {
+function _temp6(error) {
 	return toast.error(error.message || "Could not summarize the draft");
 }
 /**
-* The review's body is tall enough for a typical overview from the start, so the dialog doesn't
-* grow once it's written. A longer one scrolls within the dialog's own limit.
+* The review's body is tall enough for a typical overview from the start, so the popover doesn't
+* grow once it's written. A longer one scrolls within the space above the bar.
 */
-const REVIEW_BODY_HEIGHT = "min-h-52";
+const REVIEW_BODY_HEIGHT = "min-h-40";
 /**
-* Reviews a draft before publishing it whole (ADR 0009, ADR 0043). Publish is held only by
-* blockers or an empty draft, never by work Camox still runs. Once the draft ends, the studio
-* switches to Live.
+* Reviews a draft's pending changes (ADR 0009, ADR 0043) in a popover above `trigger`, the Draft
+* Bar's count of them. The bar's Publish opens it too, when blockers or a stopped publish left the
+* draft as it was. It publishes nothing itself.
 */
-function ReviewDraftDialog(t0) {
-	const $ = c(66);
-	const { projectId, draftId, open, onOpenChange } = t0;
+function DraftReview(t0) {
+	const $ = c(51);
+	const { projectId, draftId, open, onOpenChange, trigger, anchor } = t0;
 	let t1;
 	if ($[0] !== draftId || $[1] !== projectId) {
 		t1 = reads.publishPreview({
@@ -471,62 +531,8 @@ function ReviewDraftDialog(t0) {
 		$[9] = t4;
 	} else t4 = $[9];
 	const draft = useReadQuery(t3, t4);
-	const leaveDraft = useLeaveDraft();
 	const showInCanvas = useShowInCanvas();
-	const [failed, setFailed] = useState(false);
-	let t5;
-	let t6;
-	if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = draftMutations.publish();
-		t6 = () => setFailed(false);
-		$[10] = t5;
-		$[11] = t6;
-	} else {
-		t5 = $[10];
-		t6 = $[11];
-	}
-	let t7;
-	if ($[12] !== leaveDraft || $[13] !== onOpenChange || $[14] !== preview) {
-		t7 = (result) => {
-			if ("publishing" in result && result.publishing) return preview.refetch();
-			if (!result.empty) {
-				onOpenChange(false);
-				return leaveDraft(result.ended);
-			}
-			toast.info("This draft has no changes, so there is nothing to publish.");
-			preview.refetch();
-		};
-		$[12] = leaveDraft;
-		$[13] = onOpenChange;
-		$[14] = preview;
-		$[15] = t7;
-	} else t7 = $[15];
-	let t8;
-	if ($[16] !== preview) {
-		t8 = (error) => {
-			if (failedOnCamoxSide(error)) setFailed(true);
-			else if (error.code !== PUBLISH_BLOCKED_ERROR) toast.error(error.message);
-			preview.refetch();
-		};
-		$[16] = preview;
-		$[17] = t8;
-	} else t8 = $[17];
-	let t9;
-	if ($[18] !== t7 || $[19] !== t8) {
-		t9 = {
-			...t5,
-			onMutate: t6,
-			onSuccess: t7,
-			onError: t8
-		};
-		$[18] = t7;
-		$[19] = t8;
-		$[20] = t9;
-	} else t9 = $[20];
-	const publish = useMutation(t9);
 	const data = preview.data;
-	const empty = !!data && data.changes.length === 0 && !data.code;
-	const publishing = publish.isPending || !!data?.code?.publishing;
 	let T0;
 	let T1;
 	let t10;
@@ -534,40 +540,43 @@ function ReviewDraftDialog(t0) {
 	let t12;
 	let t13;
 	let t14;
-	let t15;
-	if ($[21] !== data || $[22] !== draft.data || $[23] !== failed || $[24] !== onOpenChange || $[25] !== open || $[26] !== projectId || $[27] !== publishing || $[28] !== showInCanvas) {
+	let t5;
+	let t6;
+	let t7;
+	let t8;
+	let t9;
+	if ($[10] !== anchor || $[11] !== data || $[12] !== draft.data || $[13] !== onOpenChange || $[14] !== open || $[15] !== projectId || $[16] !== showInCanvas || $[17] !== trigger) {
 		const lines = data ? reviewLines(data) : [];
-		if (failed && !lines.includes(PUBLISH_FAILED)) lines.push(PUBLISH_FAILED);
-		T1 = Dialog;
-		t14 = open;
-		if ($[37] !== onOpenChange || $[38] !== publishing) {
-			t15 = (next) => (next || !publishing) && onOpenChange(next);
-			$[37] = onOpenChange;
-			$[38] = publishing;
-			$[39] = t15;
-		} else t15 = $[39];
-		T0 = DialogContent;
-		t10 = "flex max-h-[85vh] flex-col gap-4 sm:max-w-xl";
-		t11 = !publishing;
-		let t16;
-		if ($[40] !== draft.data) {
-			t16 = draft.data ? draftLabel(draft.data) : "Draft";
-			$[40] = draft.data;
-			$[41] = t16;
-		} else t16 = $[41];
-		if ($[42] !== t16) {
-			t12 = /* @__PURE__ */ jsx(DialogHeader, {
-				className: "pr-8",
-				children: /* @__PURE__ */ jsx(DialogTitle, {
-					className: "truncate text-base",
-					children: t16
-				})
-			});
-			$[42] = t16;
-			$[43] = t12;
-		} else t12 = $[43];
-		t13 = data ? /* @__PURE__ */ jsxs("div", {
-			className: cn("-mx-6 flex flex-col gap-4 overflow-y-auto px-6", REVIEW_BODY_HEIGHT),
+		T1 = Popover;
+		t12 = open;
+		t13 = onOpenChange;
+		if ($[30] !== trigger) {
+			t14 = /* @__PURE__ */ jsx(PopoverTrigger, { render: trigger });
+			$[30] = trigger;
+			$[31] = t14;
+		} else t14 = $[31];
+		T0 = PopoverContent;
+		t5 = "top";
+		t6 = "start";
+		t7 = 8;
+		t8 = anchor;
+		t9 = "max-h-[min(36rem,var(--available-height))] w-[min(28rem,calc(100vw-2rem))] gap-3 overflow-y-auto";
+		let t15;
+		if ($[32] !== draft.data) {
+			t15 = draft.data ? draftLabel(draft.data) : "Draft";
+			$[32] = draft.data;
+			$[33] = t15;
+		} else t15 = $[33];
+		if ($[34] !== t15) {
+			t10 = /* @__PURE__ */ jsx(PopoverHeader, { children: /* @__PURE__ */ jsx(PopoverTitle, {
+				className: "truncate",
+				children: t15
+			}) });
+			$[34] = t15;
+			$[35] = t10;
+		} else t10 = $[35];
+		t11 = data ? /* @__PURE__ */ jsxs("div", {
+			className: cn("flex flex-col gap-4", REVIEW_BODY_HEIGHT),
 			children: [
 				/* @__PURE__ */ jsx(DraftOverview, {
 					projectId,
@@ -580,100 +589,87 @@ function ReviewDraftDialog(t0) {
 						showInCanvas(target);
 					}
 				}),
-				lines.map(_temp7)
+				lines.map(_temp9),
+				/* @__PURE__ */ jsx(MemoryChanges, {
+					voice: data.voiceChanges,
+					changes: data.memoryChanges
+				})
 			]
 		}) : /* @__PURE__ */ jsx("div", {
 			className: cn("flex items-center justify-center", REVIEW_BODY_HEIGHT),
 			children: /* @__PURE__ */ jsx(Spinner, { className: "text-muted-foreground" })
 		});
-		$[21] = data;
-		$[22] = draft.data;
-		$[23] = failed;
-		$[24] = onOpenChange;
-		$[25] = open;
-		$[26] = projectId;
-		$[27] = publishing;
-		$[28] = showInCanvas;
-		$[29] = T0;
-		$[30] = T1;
-		$[31] = t10;
-		$[32] = t11;
-		$[33] = t12;
-		$[34] = t13;
-		$[35] = t14;
-		$[36] = t15;
+		$[10] = anchor;
+		$[11] = data;
+		$[12] = draft.data;
+		$[13] = onOpenChange;
+		$[14] = open;
+		$[15] = projectId;
+		$[16] = showInCanvas;
+		$[17] = trigger;
+		$[18] = T0;
+		$[19] = T1;
+		$[20] = t10;
+		$[21] = t11;
+		$[22] = t12;
+		$[23] = t13;
+		$[24] = t14;
+		$[25] = t5;
+		$[26] = t6;
+		$[27] = t7;
+		$[28] = t8;
+		$[29] = t9;
 	} else {
-		T0 = $[29];
-		T1 = $[30];
-		t10 = $[31];
-		t11 = $[32];
-		t12 = $[33];
-		t13 = $[34];
-		t14 = $[35];
-		t15 = $[36];
+		T0 = $[18];
+		T1 = $[19];
+		t10 = $[20];
+		t11 = $[21];
+		t12 = $[22];
+		t13 = $[23];
+		t14 = $[24];
+		t5 = $[25];
+		t6 = $[26];
+		t7 = $[27];
+		t8 = $[28];
+		t9 = $[29];
 	}
-	const t16 = !data || data.blockers.length > 0 || empty || publishing;
-	let t17;
-	if ($[44] !== data || $[45] !== projectId || $[46] !== publish) {
-		t17 = () => data && publish.mutate(publishInput(projectId, data));
-		$[44] = data;
-		$[45] = projectId;
-		$[46] = publish;
-		$[47] = t17;
-	} else t17 = $[47];
-	let t18;
-	if ($[48] !== publishing) {
-		t18 = publishing ? /* @__PURE__ */ jsx(Spinner, {}) : null;
-		$[48] = publishing;
-		$[49] = t18;
-	} else t18 = $[49];
-	let t19;
-	if ($[50] !== t16 || $[51] !== t17 || $[52] !== t18) {
-		t19 = /* @__PURE__ */ jsx(DialogFooter, { children: /* @__PURE__ */ jsxs(Button, {
-			disabled: t16,
-			onClick: t17,
-			children: [t18, "Publish"]
-		}) });
-		$[50] = t16;
-		$[51] = t17;
-		$[52] = t18;
-		$[53] = t19;
-	} else t19 = $[53];
-	let t20;
-	if ($[54] !== T0 || $[55] !== t10 || $[56] !== t11 || $[57] !== t12 || $[58] !== t13 || $[59] !== t19) {
-		t20 = /* @__PURE__ */ jsxs(T0, {
-			className: t10,
-			showCloseButton: t11,
-			children: [
-				t12,
-				t13,
-				t19
-			]
+	let t15;
+	if ($[36] !== T0 || $[37] !== t10 || $[38] !== t11 || $[39] !== t5 || $[40] !== t6 || $[41] !== t7 || $[42] !== t8 || $[43] !== t9) {
+		t15 = /* @__PURE__ */ jsxs(T0, {
+			side: t5,
+			align: t6,
+			sideOffset: t7,
+			anchor: t8,
+			className: t9,
+			children: [t10, t11]
 		});
-		$[54] = T0;
-		$[55] = t10;
-		$[56] = t11;
-		$[57] = t12;
-		$[58] = t13;
-		$[59] = t19;
-		$[60] = t20;
-	} else t20 = $[60];
-	let t21;
-	if ($[61] !== T1 || $[62] !== t14 || $[63] !== t15 || $[64] !== t20) {
-		t21 = /* @__PURE__ */ jsx(T1, {
-			open: t14,
-			onOpenChange: t15,
-			children: t20
+		$[36] = T0;
+		$[37] = t10;
+		$[38] = t11;
+		$[39] = t5;
+		$[40] = t6;
+		$[41] = t7;
+		$[42] = t8;
+		$[43] = t9;
+		$[44] = t15;
+	} else t15 = $[44];
+	let t16;
+	if ($[45] !== T1 || $[46] !== t12 || $[47] !== t13 || $[48] !== t14 || $[49] !== t15) {
+		t16 = /* @__PURE__ */ jsxs(T1, {
+			open: t12,
+			onOpenChange: t13,
+			children: [t14, t15]
 		});
-		$[61] = T1;
-		$[62] = t14;
-		$[63] = t15;
-		$[64] = t20;
-		$[65] = t21;
-	} else t21 = $[65];
-	return t21;
+		$[45] = T1;
+		$[46] = t12;
+		$[47] = t13;
+		$[48] = t14;
+		$[49] = t15;
+		$[50] = t16;
+	} else t16 = $[50];
+	return t16;
 }
-function _temp7(line) {
+function _temp9(line) {
 	return /* @__PURE__ */ jsx("p", {
 		className: "text-sm text-amber-700 dark:text-amber-400",
 		"data-review-line": true,
@@ -682,4 +678,4 @@ function _temp7(line) {
 }
 
 //#endregion
-export { ReviewDraftDialog, fixBlockersMessage };
+export { DraftReview, fixBlockersMessage };