@wix/himalaya-cli 0.1071.0 → 0.1073.0

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -8,7 +8,11 @@
 
 import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
-import { normalizeEvent, eventDescription } from "../_shared/himi-events.js";
+import { normalizeEvent } from "../_shared/himi-events.js";
+import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
+// Not owner-post-content's hasRichBody: Events v3 sends default paragraphData on EVERY paragraph
+// (which hasRichBody reads as formatting) and a documentStyle it never looks at.
+import { ricosIsPlain } from "../_shared/owner-rich-guard.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
@@ -35,7 +39,17 @@ interface EventFormState {
   id: string;
   heading: string;
   title: string;
+  /** [rico] #3363 — the Events v3 Ricos `description` as text (read with `fields=TEXTS`). While
+   *  `descriptionProtected`, it is a read-only preview. */
   description: string;
+  /** The description as loaded (or last saved). A save writes `description` only when the
+   *  submitted value differs from it, so an untouched body is never re-written. */
+  originalDescription: string;
+  /** A Ricos description with formatting or media the plain field would flatten: it loads locked,
+   *  the descriptor shows a preview + `descriptionNote`, and an edit is refused. */
+  descriptionProtected: boolean;
+  descriptionEditable: boolean;
+  descriptionNote: string;
   when: string;
   location: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
@@ -94,6 +108,10 @@ function shape(s: Partial<EventFormState>): EventFormState {
     heading: s.heading ?? copyParam("ownerEventForm.headingEdit", "Edit event"),
     title: s.title ?? "",
     description: s.description ?? "",
+    originalDescription: s.originalDescription ?? s.description ?? "",
+    descriptionProtected: s.descriptionProtected ?? false,
+    descriptionEditable: !(s.descriptionProtected ?? false),
+    descriptionNote: s.descriptionProtected ? copyParam("ownerEventForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; the title can be changed here.") : "",
     when: s.when ?? "—",
     location: s.location ?? "—",
     status: s.status ?? "idle",
@@ -145,7 +163,8 @@ const svc = defineService<EventFormState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        const res = await getEvent(id);
+        // `TEXTS` is the v3 fieldset that returns the Ricos `description`; a bare GET omits it.
+        const res = await getEvent(id, { fields: ["TEXTS"] });
         const ev = (res.event ?? res) as WixEvent;
         if (!ev || !(ev as any).id) {
           return shape({ ...s, mode, id, status: "error", error: copyParam("ownerEventForm.errorNotFound", "Event not found") });
@@ -157,7 +176,14 @@ const svc = defineService<EventFormState, {
           id,
           heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
           title: ev.title ?? "",
-          description: (eventDescription(ev) || "").trim(),
+          // The v3 Ricos `description` only: `shortDescription` and `about` are separate fields
+          // this form never writes, so showing them here would invite an edit that lands elsewhere.
+          ...(() => {
+            const raw = (ev as unknown as { description?: unknown }).description;
+            const doc = raw && typeof raw === "object" && Array.isArray((raw as { nodes?: unknown }).nodes) ? raw as Parameters<typeof postBodyText>[0] : null;
+            const text = doc ? postBodyText(doc) : typeof raw === "string" ? raw.trim() : "";
+            return { description: text, originalDescription: text, descriptionProtected: doc ? !ricosIsPlain(doc as { nodes?: unknown; documentStyle?: unknown }) : false };
+          })(),
           when: row.dateLine || "—",
           location: row.location || "—",
           status: "idle",
@@ -172,6 +198,8 @@ const svc = defineService<EventFormState, {
             ...s, mode, id, heading: "Edit event",
             title: String(cached.title ?? cached.name ?? ""),
             description: String(cached.description ?? ""),
+            // An older cached row carries no verdict, so it stays locked: fail closed.
+            originalDescription: String(cached.description ?? ""), descriptionProtected: cached.descriptionProtected !== "false",
             when: String(cached.when ?? cached.dateLine ?? "—"),
             location: String(cached.location ?? "—"),
             status: "idle", error: "", savedMessage: "",
@@ -195,18 +223,23 @@ const svc = defineService<EventFormState, {
       const v = values ?? {};
       const title = String(v.title ?? s.title).trim();
       const description = String(v.description ?? s.description).trim();
+      // A queue replay boots a FRESH worker (empty baseline), so it carries the original verdict.
+      const descriptionEdited = typeof v.descriptionEdited === "string" ? v.descriptionEdited === "true" : description !== s.originalDescription.trim();
+      if (descriptionEdited && s.descriptionProtected) return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerEventForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
       if (!title) return shape({ ...s, status: "error", error: copyParam("ownerEventForm.titleRequired", "Title is required"), savedMessage: "" });
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerEventForm.errorNoEvent", "No event to edit."), savedMessage: "" });
 
       // updateEvent(id, event) wraps the body as { event } internally, so pass the
-      // event fields directly. Only the text the form can safely edit is written.
-      const event: any = {
-        title,
-        ...(description ? { description } : {}),
+      // event fields directly. Only the text the form can safely edit is written: the
+      // description only when edited, and always as a Ricos document (never a string).
+      // A local structural type, not WixEventWrite: templates compile against the
+      // PUBLISHED SDK until its next release.
+      const event: { title: string; description?: { nodes: unknown[] } } = {
+        title, ...(descriptionEdited ? { description: description ? plainPostBody(description) as { nodes: unknown[] } : { nodes: [] } } : {}),
       };
 
       // Optimistic local write — the detail/list repaint from cache immediately.
-      const localRow: DbEntity = { id: s.id, name: title, title, description, when: s.when, location: s.location };
+      const localRow: DbEntity = { id: s.id, name: title, title, description, descriptionProtected: String(s.descriptionProtected), when: s.when, location: s.location };
       await cachePut(localRow);
       try {
         await updateEvent(s.id, event);
@@ -217,6 +250,7 @@ const svc = defineService<EventFormState, {
           heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
           title,
           description,
+          originalDescription: descriptionEdited ? description : s.originalDescription,
           status: "saved",
           error: "",
           savedMessage: copyParam("ownerEventForm.savedMessage", "Event saved."),
@@ -230,10 +264,10 @@ const svc = defineService<EventFormState, {
           if (s.demoNote) return demoRefusal(s);
           // Real device offline: the optimistic cache row already shows; queue the
           // write to replay (WriteQueue, idempotent) when connectivity returns.
-          await queueWrite("tier5.himiOwnerLiteEventForm.submit", { id: s.id, title, description });
+          await queueWrite("tier5.himiOwnerLiteEventForm.submit", { id: s.id, title, description, descriptionEdited: String(descriptionEdited) });
           return shape({
             ...s, mode: "edit", id: s.id, heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
-            title, description, status: "saved", error: "",
+            title, description, originalDescription: descriptionEdited ? description : s.originalDescription, status: "saved", error: "",
             savedMessage: copyParam("ownerEventForm.savedOffline", "Saved offline — will sync when you reconnect."),
             savedId: s.id,
           });