camox 0.66.0 → 0.67.0

package/dist/features/runtime/pageApp.js

@@ -9,6 +9,7 @@ import { CoreCamoxProvider } from "../provider/CoreCamoxProvider.js";
 import { CuratedPageContent } from "../page/CuratedPageContent.js";
 import { DerivedPageContent } from "../page/DerivedPageContent.js";
 import { UnplacedBlockContent } from "../page/UnplacedBlockContent.js";
+import { UnplacedLayoutContent } from "../page/UnplacedLayoutContent.js";
 import { EditingFallbackSlot } from "./editingFallback.js";
 import { PageNavigationProvider } from "./pageNavigation.js";
 import { RuntimeChromeSlot } from "./runtimeChromeLoader.js";
@@ -252,9 +253,9 @@ function _temp2() {
 function _temp() {
 	return true;
 }
-/** The page's blocks, read-only, or the look document's one unplaced block. */
+/** The page's blocks, read-only, or the look document's unplaced block or Layout. */
 function PageContent(t0) {
-	const $ = c(6);
+	const $ = c(9);
 	const { camoxApp, input } = t0;
 	if (input.lookBlock) {
 		let t1;
@@ -265,24 +266,37 @@ function PageContent(t0) {
 		} else t1 = $[1];
 		return t1;
 	}
-	if (input.derived) {
+	if (input.lookLayout) {
 		let t1;
-		if ($[2] !== camoxApp || $[3] !== input.derived) {
-			t1 = /* @__PURE__ */ jsx(DerivedPageContent, {
+		if ($[2] !== camoxApp || $[3] !== input.lookLayout) {
+			t1 = /* @__PURE__ */ jsx(UnplacedLayoutContent, {
 				camoxApp,
-				derived: input.derived
+				lookLayout: input.lookLayout
 			});
 			$[2] = camoxApp;
-			$[3] = input.derived;
+			$[3] = input.lookLayout;
 			$[4] = t1;
 		} else t1 = $[4];
 		return t1;
 	}
+	if (input.derived) {
+		let t1;
+		if ($[5] !== camoxApp || $[6] !== input.derived) {
+			t1 = /* @__PURE__ */ jsx(DerivedPageContent, {
+				camoxApp,
+				derived: input.derived
+			});
+			$[5] = camoxApp;
+			$[6] = input.derived;
+			$[7] = t1;
+		} else t1 = $[7];
+		return t1;
+	}
 	let t1;
-	if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
+	if ($[8] === Symbol.for("react.memo_cache_sentinel")) {
 		t1 = /* @__PURE__ */ jsx(CuratedPageContent, {});
-		$[5] = t1;
-	} else t1 = $[5];
+		$[8] = t1;
+	} else t1 = $[8];
 	return t1;
 }
 function StudioLoadError() {

package/dist/features/runtime/runtime.d.ts

@@ -6,6 +6,7 @@ import { AnalyticsProviders } from "./analytics.js";
 import { RuntimeOwnedRouteKind } from "./runtimeRoutes.js";
 import { StudioRenderInput } from "./studioApp.js";
 import { DraftRead, MemberProject, PageHead, createServerApiClient } from "../routes/pageRuntime.js";
+import { LookPlaceholderHeight } from "@camox/api-contract/drafts";
 import { UseHeadInput } from "unhead/types";
 //#region src/features/runtime/runtime.d.ts
 /** The studio's own routes, rather than a page or the Canvas. */
@@ -39,6 +40,18 @@ export interface PageRenderInput extends DraftRead {
    * instead of a page. Its block bundle is in the dehydrated state.
    */
   lookBlock?: string;
+  /**
+   * The look document's Layout Definition mode: the curated Layout it shows around no page, its
+   * blocks' bundles in the dehydrated state, with a placeholder `placeholder` tall where a page's
+   * content goes.
+   */
+  lookLayout?: {
+    layoutId: string;
+    layout: Awaited<ReturnType<ReturnType<typeof createServerApiClient>["layouts"]["getUnplaced"]>>["layout"];
+    placeholder: LookPlaceholderHeight;
+    path: string;
+    projectName: string;
+  };
   /**
    * Whether this is the look document (ADR 0032), whose client only shows the draft: it asks
    * nothing about a session and offers no sign-in, which would add requests to its captures.

package/dist/features/runtime/runtime.js

@@ -27,7 +27,7 @@ import { getPageBlockTypes } from "./pageBlockTypes.js";
 import { withPageUrls } from "./structuredData.js";
 import { curatedPageDescription, pageRecords, placedBlockNodes, withStructuredData } from "./pageGraph.js";
 import { createProjectLogoResponse, projectLogo } from "./projectLogo.js";
-import { DRAFT_SEARCH_PARAM, LOCALE_HEADER, LOOK_BLOCK_DEFINITION_PARAM, LOOK_CONTENT_PARAM, LOOK_LOCALE_PARAM, LOOK_PATH_PARAM, LOOK_SETTINGS_PARAM, UNPLACED_BLOCK_ID } from "@camox/api-contract/drafts";
+import { DRAFT_SEARCH_PARAM, LOCALE_HEADER, LOOK_BLOCKS_PARAM, LOOK_BLOCK_DEFINITION_PARAM, LOOK_CONTENT_PARAM, LOOK_LAYOUT_DEFINITION_PARAM, LOOK_LOCALE_PARAM, LOOK_PATH_PARAM, LOOK_PLACEHOLDER_HEIGHTS, LOOK_PLACEHOLDER_PARAM, LOOK_SETTINGS_PARAM, UNPLACED_BLOCK_ID } from "@camox/api-contract/drafts";
 import { QueryClient, dehydrate } from "@tanstack/react-query";
 import { createHead, renderSSRHead } from "@unhead/react/server";
 
@@ -571,6 +571,7 @@ async function createLookDocumentResponse(request, options) {
 	if (!lookToken || !draftId || !apiUrl || !authenticationUrl || !projectUuid || !renderPage) return lookNotFound();
 	const tag = searchParams.get(LOOK_LOCALE_PARAM)?.toLowerCase();
 	const blockDefinition = searchParams.get(LOOK_BLOCK_DEFINITION_PARAM);
+	const layoutDefinition = searchParams.get(LOOK_LAYOUT_DEFINITION_PARAM);
 	const queryClient = new QueryClient();
 	let locales;
 	let locale;
@@ -590,7 +591,7 @@ async function createLookDocumentResponse(request, options) {
 			projectUuid,
 			queryClient
 		};
-		shown = blockDefinition ? await lookAtBlockDefinition(request, options, reading, blockDefinition) : await lookAtPage(request, options, reading);
+		shown = layoutDefinition ? await lookAtLayoutDefinition(request, options, reading, layoutDefinition) : blockDefinition ? await lookAtBlockDefinition(request, options, reading, blockDefinition) : await lookAtPage(request, options, reading);
 	} catch (error) {
 		if (isAuthSessionError(error) || isNotFoundError(error)) return lookNotFound();
 		throw error;
@@ -806,6 +807,61 @@ async function lookAtBlockDefinition(request, options, reading, type) {
 		lookBlock: UNPLACED_BLOCK_ID
 	};
 }
+/**
+* The look document's Layout Definition mode: the curated Layout `layoutId` around no page, its
+* blocks with their default content and Block Settings and the overrides the URL gives merged on,
+* by the API, which checks them against their schemas and refuses a Singleton or Derived Layout,
+* answering its message. Where a page's content goes, a labelled placeholder as tall as the URL
+* says. Its path is the Locale's home, which links resolve against.
+*/
+async function lookAtLayoutDefinition(request, options, reading, layoutId) {
+	const { apiUrl, lookToken, draftId, locale, projectUuid, queryClient } = reading;
+	const { searchParams } = new URL(request.url);
+	const blocks = overrideParam(searchParams, LOOK_BLOCKS_PARAM);
+	if (!blocks.ok) return lookRefused(blocks.error);
+	const placeholder = searchParams.get(LOOK_PLACEHOLDER_PARAM) ?? LOOK_PLACEHOLDER_HEIGHTS[0];
+	if (!LOOK_PLACEHOLDER_HEIGHTS.includes(placeholder)) return lookRefused(`The placeholder is ${LOOK_PLACEHOLDER_HEIGHTS.join(" or ")}.`);
+	const studioCache = createServerStudioCache(queryClient, {
+		apiUrl,
+		lookToken,
+		locale
+	});
+	const inDraft = { in: draftId };
+	let shared;
+	try {
+		[shared] = await Promise.all([createServerApiClient(apiUrl, {
+			lookToken,
+			draftId,
+			locale
+		}).layouts.getUnplaced({
+			projectUuid,
+			layoutId,
+			blocks: blocks.value
+		}), studioCache.ensure(reads.pageList({ projectUuid }), inDraft).catch(() => null)]);
+	} catch (error) {
+		if (isBadRequestError(error)) return lookRefused(error.message);
+		throw error;
+	}
+	studioCache.land(reads.layoutStructure({
+		projectUuid,
+		layoutId
+	}), shared, inDraft);
+	const pathname = localizedPath("/", locale);
+	return {
+		head: {},
+		href: lookHref(request, options, pathname, draftId).href,
+		layoutIdentity: null,
+		loaderData: null,
+		pathname,
+		lookLayout: {
+			layoutId,
+			layout: shared.layout,
+			placeholder,
+			path: pathname,
+			projectName: shared.projectName
+		}
+	};
+}
 /** Whether an API error refused the request's input, such as an override its schema refuses. */
 function isBadRequestError(error) {
 	const { code, status } = error ?? {};

package/dist/features/studio/components/ContentFindings.js

@@ -0,0 +1,397 @@
+import { useCurrentDraftId } from "../../../lib/draft-scope.js";
+import { useViewLocale } from "../../../lib/view-locale-context.js";
+import { AuthContext } from "../../../lib/auth.js";
+import { reads, useReadQuery } from "../../../lib/studio-reads.js";
+import { patrolMutations } from "../../../lib/queries.js";
+import { studioStore } from "../studioStore.js";
+import { askAgentMessage, dismissLabel, findingSentenceInPlace, fixLabel } from "../findingSentence.js";
+import { useShowInCanvas } from "../showInCanvas.js";
+import { c } from "react/compiler-runtime";
+import * as React from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useMutation } from "@tanstack/react-query";
+import { Button } from "@camox/ui/button";
+import { CircleAlert } from "lucide-react";
+import { toast } from "@camox/ui/toaster";
+import { Alert, AlertDescription, AlertTitle } from "@camox/ui/alert";
+
+//#region src/features/studio/components/ContentFindings.tsx
+/** The open findings of the Patrol viewed in a subject, in the locale viewed. */
+function useContentFindings(subject) {
+	const $ = c(22);
+	const { projectUuid } = React.useContext(AuthContext);
+	let t0;
+	if ($[0] !== projectUuid) {
+		t0 = reads.project({ projectUuid });
+		$[0] = projectUuid;
+		$[1] = t0;
+	} else t0 = $[1];
+	const { data: project } = useReadQuery(t0);
+	let t1;
+	if ($[2] !== project?.id) {
+		t1 = reads.patrol({ projectId: project?.id ?? 0 });
+		$[2] = project?.id;
+		$[3] = t1;
+	} else t1 = $[3];
+	const t2 = project !== void 0 && subject !== null;
+	let t3;
+	if ($[4] !== t2) {
+		t3 = { enabled: t2 };
+		$[4] = t2;
+		$[5] = t3;
+	} else t3 = $[5];
+	const { data: view } = useReadQuery(t1, t3);
+	const viewed = useViewLocale().locale;
+	let t4;
+	if ($[6] !== project?.id) {
+		t4 = reads.localeList({ projectId: project?.id ?? 0 });
+		$[6] = project?.id;
+		$[7] = t4;
+	} else t4 = $[7];
+	const t5 = project !== void 0 && subject !== null;
+	let t6;
+	if ($[8] !== t5) {
+		t6 = { enabled: t5 };
+		$[8] = t5;
+		$[9] = t6;
+	} else t6 = $[9];
+	const { data: locales } = useReadQuery(t4, t6);
+	let t7;
+	if ($[10] !== locales || $[11] !== viewed.isDefault || $[12] !== viewed.tag) {
+		t7 = viewed.isDefault ? locales?.find(_temp)?.tag ?? viewed.tag : viewed.tag;
+		$[10] = locales;
+		$[11] = viewed.isDefault;
+		$[12] = viewed.tag;
+		$[13] = t7;
+	} else t7 = $[13];
+	const tag = t7;
+	let t8;
+	if ($[14] !== subject || $[15] !== tag || $[16] !== view?.patrollers) {
+		t8 = subject === null ? [] : (view?.patrollers ?? []).flatMap((patroller) => patroller.findings.filter((finding) => finding.subject.entity === subject.entity && finding.subject.id === subject.id && finding.locale === tag).map((finding_0) => ({
+			...finding_0,
+			role: patroller.role
+		})));
+		$[14] = subject;
+		$[15] = tag;
+		$[16] = view?.patrollers;
+		$[17] = t8;
+	} else t8 = $[17];
+	const findings = t8;
+	const t9 = project?.id;
+	const t10 = view?.patrolDraft ?? null;
+	let t11;
+	if ($[18] !== findings || $[19] !== t10 || $[20] !== t9) {
+		t11 = {
+			projectId: t9,
+			patrolDraft: t10,
+			findings
+		};
+		$[18] = findings;
+		$[19] = t10;
+		$[20] = t9;
+		$[21] = t11;
+	} else t11 = $[21];
+	return t11;
+}
+function _temp(locale) {
+	return locale.isDefault;
+}
+/** What a field's row says of its findings, such as "2 findings", or nothing without any. */
+function findingsHint(view, field) {
+	const count = view.findings.filter((finding) => finding.field === field).length;
+	if (count === 0) return void 0;
+	return count === 1 ? "1 finding" : `${count} findings`;
+}
+/**
+* The findings in one field of a subject, as `useContentFindings` reads them, under that field's
+* editor. Without `field`, those in none of `fields`: about the subject as a whole.
+*/
+function ContentFindings(t0) {
+	const $ = c(20);
+	const { view, field, fields, className } = t0;
+	const { projectId, patrolDraft, findings } = view;
+	let t1;
+	let t2;
+	let t3;
+	let t4;
+	if ($[0] !== className || $[1] !== field || $[2] !== fields || $[3] !== findings || $[4] !== patrolDraft || $[5] !== projectId) {
+		t4 = Symbol.for("react.early_return_sentinel");
+		bb0: {
+			let t5;
+			if ($[10] !== field || $[11] !== fields) {
+				t5 = (finding) => field === void 0 ? !fields.includes(finding.field) : finding.field === field;
+				$[10] = field;
+				$[11] = fields;
+				$[12] = t5;
+			} else t5 = $[12];
+			const shown = findings.filter(t5);
+			if (projectId === void 0 || shown.length === 0) {
+				t4 = null;
+				break bb0;
+			}
+			t1 = true;
+			t2 = className ?? "space-y-2 px-2 pb-4";
+			let t6;
+			if ($[13] !== patrolDraft || $[14] !== projectId) {
+				t6 = (finding_0) => /* @__PURE__ */ jsx(FindingAlert, {
+					projectId,
+					finding: finding_0,
+					patrolDraft
+				}, finding_0.id);
+				$[13] = patrolDraft;
+				$[14] = projectId;
+				$[15] = t6;
+			} else t6 = $[15];
+			t3 = shown.map(t6);
+		}
+		$[0] = className;
+		$[1] = field;
+		$[2] = fields;
+		$[3] = findings;
+		$[4] = patrolDraft;
+		$[5] = projectId;
+		$[6] = t1;
+		$[7] = t2;
+		$[8] = t3;
+		$[9] = t4;
+	} else {
+		t1 = $[6];
+		t2 = $[7];
+		t3 = $[8];
+		t4 = $[9];
+	}
+	if (t4 !== Symbol.for("react.early_return_sentinel")) return t4;
+	let t5;
+	if ($[16] !== t1 || $[17] !== t2 || $[18] !== t3) {
+		t5 = /* @__PURE__ */ jsx("div", {
+			"data-content-findings": t1,
+			className: t2,
+			children: t3
+		});
+		$[16] = t1;
+		$[17] = t2;
+		$[18] = t3;
+		$[19] = t5;
+	} else t5 = $[19];
+	return t5;
+}
+function FindingAlert(t0) {
+	const $ = c(44);
+	const { projectId, finding, patrolDraft } = t0;
+	const draftId = useCurrentDraftId();
+	let t1;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = {
+			...patrolMutations.applyFix(),
+			onSuccess: _temp2,
+			onError: _temp3
+		};
+		$[0] = t1;
+	} else t1 = $[0];
+	const applyFix = useMutation(t1);
+	let t2;
+	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
+		t2 = {
+			...patrolMutations.dismissFinding(),
+			onError: _temp4
+		};
+		$[1] = t2;
+	} else t2 = $[1];
+	const dismiss = useMutation(t2);
+	const busy = applyFix.isPending || dismiss.isPending;
+	const fixesHere = draftId !== null && (!finding.live || draftId === patrolDraft?.id);
+	let t3;
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t3 = /* @__PURE__ */ jsx(CircleAlert, {});
+		$[2] = t3;
+	} else t3 = $[2];
+	let t4;
+	if ($[3] !== finding) {
+		t4 = findingSentenceInPlace(finding);
+		$[3] = finding;
+		$[4] = t4;
+	} else t4 = $[4];
+	let t5;
+	if ($[5] !== t4) {
+		t5 = /* @__PURE__ */ jsx(AlertTitle, {
+			className: "text-xs font-normal",
+			children: t4
+		});
+		$[5] = t4;
+		$[6] = t5;
+	} else t5 = $[6];
+	let t6;
+	if ($[7] !== finding.role) {
+		t6 = /* @__PURE__ */ jsx("p", { children: finding.role });
+		$[7] = finding.role;
+		$[8] = t6;
+	} else t6 = $[8];
+	let t7;
+	if ($[9] !== applyFix || $[10] !== busy || $[11] !== finding.fix || $[12] !== finding.id || $[13] !== fixesHere || $[14] !== projectId) {
+		t7 = fixesHere && finding.fix && /* @__PURE__ */ jsx(Button, {
+			variant: "outline",
+			size: "xs",
+			disabled: busy,
+			onClick: () => applyFix.mutate({
+				projectId,
+				findingId: finding.id
+			}),
+			children: fixLabel(finding.fix)
+		});
+		$[9] = applyFix;
+		$[10] = busy;
+		$[11] = finding.fix;
+		$[12] = finding.id;
+		$[13] = fixesHere;
+		$[14] = projectId;
+		$[15] = t7;
+	} else t7 = $[15];
+	let t8;
+	if ($[16] !== finding || $[17] !== fixesHere) {
+		t8 = fixesHere && /* @__PURE__ */ jsx(Button, {
+			variant: "outline",
+			size: "xs",
+			onClick: () => studioStore.trigger.askAgent({ text: askAgentMessage(finding, finding.role) }),
+			children: "Ask the agent"
+		});
+		$[16] = finding;
+		$[17] = fixesHere;
+		$[18] = t8;
+	} else t8 = $[18];
+	let t9;
+	if ($[19] !== draftId || $[20] !== finding || $[21] !== patrolDraft) {
+		t9 = draftId === null && patrolDraft && /* @__PURE__ */ jsx(OpenInPatrolDraft, {
+			finding,
+			patrolDraft
+		});
+		$[19] = draftId;
+		$[20] = finding;
+		$[21] = patrolDraft;
+		$[22] = t9;
+	} else t9 = $[22];
+	let t10;
+	if ($[23] !== dismiss || $[24] !== finding.id || $[25] !== projectId) {
+		t10 = () => dismiss.mutate({
+			projectId,
+			findingId: finding.id
+		});
+		$[23] = dismiss;
+		$[24] = finding.id;
+		$[25] = projectId;
+		$[26] = t10;
+	} else t10 = $[26];
+	let t11;
+	if ($[27] !== finding.about) {
+		t11 = dismissLabel(finding.about);
+		$[27] = finding.about;
+		$[28] = t11;
+	} else t11 = $[28];
+	let t12;
+	if ($[29] !== busy || $[30] !== t10 || $[31] !== t11) {
+		t12 = /* @__PURE__ */ jsx(Button, {
+			variant: "ghost",
+			size: "xs",
+			disabled: busy,
+			onClick: t10,
+			children: t11
+		});
+		$[29] = busy;
+		$[30] = t10;
+		$[31] = t11;
+		$[32] = t12;
+	} else t12 = $[32];
+	let t13;
+	if ($[33] !== t12 || $[34] !== t7 || $[35] !== t8 || $[36] !== t9) {
+		t13 = /* @__PURE__ */ jsxs("span", {
+			className: "mt-1.5 flex flex-wrap gap-1",
+			children: [
+				t7,
+				t8,
+				t9,
+				t12
+			]
+		});
+		$[33] = t12;
+		$[34] = t7;
+		$[35] = t8;
+		$[36] = t9;
+		$[37] = t13;
+	} else t13 = $[37];
+	let t14;
+	if ($[38] !== t13 || $[39] !== t6) {
+		t14 = /* @__PURE__ */ jsxs(AlertDescription, {
+			className: "text-xs",
+			children: [t6, t13]
+		});
+		$[38] = t13;
+		$[39] = t6;
+		$[40] = t14;
+	} else t14 = $[40];
+	let t15;
+	if ($[41] !== t14 || $[42] !== t5) {
+		t15 = /* @__PURE__ */ jsxs(Alert, {
+			"data-content-finding": true,
+			variant: "warning",
+			className: "px-3 py-2",
+			children: [
+				t3,
+				t5,
+				t14
+			]
+		});
+		$[41] = t14;
+		$[42] = t5;
+		$[43] = t15;
+	} else t15 = $[43];
+	return t15;
+}
+function _temp4(error_0) {
+	return toast.error(error_0.message || "Could not dismiss it");
+}
+function _temp3(error) {
+	return toast.error(error.message || "Could not apply the fix");
+}
+function _temp2(t0) {
+	const { applied } = t0;
+	if (!applied) toast.info("The link changed since it was checked, so it's being checked again.");
+}
+/** Opens the Patrol Draft on a Live finding's field, as the Canvas shows it there. */
+function OpenInPatrolDraft(t0) {
+	const $ = c(9);
+	const { finding, patrolDraft } = t0;
+	const showInCanvas = useShowInCanvas();
+	const { place } = finding;
+	if (place?.kind !== "page") return null;
+	let t1;
+	if ($[0] !== finding.field || $[1] !== finding.fieldKind || $[2] !== finding.locale || $[3] !== patrolDraft.id || $[4] !== place.blockId || $[5] !== place.itemId || $[6] !== place.pageId || $[7] !== showInCanvas) {
+		t1 = /* @__PURE__ */ jsx(Button, {
+			variant: "outline",
+			size: "xs",
+			onClick: () => void showInCanvas({
+				pageId: place.pageId,
+				locale: finding.locale,
+				blockId: place.blockId,
+				itemId: place.itemId,
+				field: {
+					name: finding.field,
+					kind: finding.fieldKind
+				},
+				draft: patrolDraft.id
+			}),
+			children: "Open the Patrol Draft"
+		});
+		$[0] = finding.field;
+		$[1] = finding.fieldKind;
+		$[2] = finding.locale;
+		$[3] = patrolDraft.id;
+		$[4] = place.blockId;
+		$[5] = place.itemId;
+		$[6] = place.pageId;
+		$[7] = showInCanvas;
+		$[8] = t1;
+	} else t1 = $[8];
+	return t1;
+}
+
+//#endregion
+export { ContentFindings, findingsHint, useContentFindings };