@wix/himalaya-cli 0.1071.0 → 0.1072.0

package/templates/owner-lite/dev/index.ts

@@ -73734,6 +73734,35 @@ const SCREENS = runtimeSetting({
                 }
               }
             },
+            {
+              "id": "faq_question.answer_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteFaqQuestionForm.answerNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "faq_question.answer_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteFaqQuestionForm.answer",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteFaqQuestionForm.answerEditable"
+              }
+            },
             {
               "id": "faq_question.form",
               "body": {
@@ -73779,6 +73808,9 @@ const SCREENS = runtimeSetting({
                             "autoCapitalization": "sentences"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteFaqQuestionForm.answerProtected"
                       }
                     },
                     {
@@ -73946,6 +73978,35 @@ const SCREENS = runtimeSetting({
                 }
               }
             },
+            {
+              "id": "faq_question.answer_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteFaqQuestionForm.answerNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "faq_question.answer_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteFaqQuestionForm.answer",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteFaqQuestionForm.answerEditable"
+              }
+            },
             {
               "id": "faq_question.form",
               "body": {
@@ -73991,6 +74052,9 @@ const SCREENS = runtimeSetting({
                             "autoCapitalization": "sentences"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteFaqQuestionForm.answerProtected"
                       }
                     },
                     {
@@ -78045,6 +78109,35 @@ const SCREENS = runtimeSetting({
                 }
               }
             },
+            {
+              "id": "product_form.description_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteProductForm.descriptionNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "product_form.description_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteProductForm.description",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditable"
+              }
+            },
             {
               "id": "product_form.form",
               "body": {
@@ -78131,6 +78224,9 @@ const SCREENS = runtimeSetting({
                             "multilineMaxLines": 3
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
                       }
                     }
                   ],
@@ -78658,6 +78754,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 }
               }
             },
+            {
+              "id": "product_form.description_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteProductForm.descriptionNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "product_form.description_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteProductForm.description",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditable"
+              }
+            },
             {
               "id": "product_form.form",
               "body": {
@@ -78744,6 +78869,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "multilineMaxLines": 3
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
                       }
                     }
                   ],
@@ -79182,6 +79310,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 }
               }
             },
+            {
+              "id": "event_form.description_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteEventForm.descriptionNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "event_form.description_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteEventForm.description",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteEventForm.descriptionEditable"
+              }
+            },
             {
               "id": "event_form.form",
               "body": {
@@ -79226,6 +79383,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "multilineMaxLines": 3
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteEventForm.descriptionProtected"
                       }
                     }
                   ],
@@ -84882,6 +85042,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 }
               }
             },
+            {
+              "id": "faq_question.answer_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteFaqQuestionForm.answerNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "faq_question.answer_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteFaqQuestionForm.answer",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteFaqQuestionForm.answerEditable"
+              }
+            },
             {
               "id": "faq_question.form",
               "body": {
@@ -84927,6 +85116,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "autoCapitalization": "sentences"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteFaqQuestionForm.answerProtected"
                       }
                     },
                     {

package/templates/owner-lite/tier5-src/_shared/owner-rich-guard.ts

@@ -0,0 +1,64 @@
+// [rico] #3363 — may a plain owner form round-trip this body? Ricos uses owner-post-content's
+// hasRichBody; these cover the Stores HTML description and the FAQ's legacy DraftJS answer.
+// [rico] #3365 moves htmlIsTrivial into @himalaya/wix-rich-content with these exact semantics.
+
+/** A tag opener (`<p`, `</p`, `<!--`), as opposed to a bare `<` in prose ("cups < 8 cm"). */
+const TAG = /<[a-z!/?]/i;
+
+/** True when a plain text field can hold this HTML without losing anything: empty, bare text
+ *  (no tag — a lone `<` in prose is text), or exactly one attribute-less `<p>…</p>` with no
+ *  inner tags. */
+export function htmlIsTrivial(html: string | null | undefined): boolean {
+  const s = (html ?? "").trim();
+  return !s || !TAG.test(s) || /^<p>[^<>]*<\/p>$/.test(s);
+}
+
+const ENTITIES: Record<string, string> = { "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": "\"", "&#39;": "'" };
+
+/** Read-only preview text for an HTML body: block closes become lines, tags are stripped (a bare
+ *  `<` in prose is kept), the basic entities decode, and blank lines drop. */
+export function htmlPreviewText(html: string | null | undefined): string {
+  return (html ?? "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|h[1-6]|li|div|blockquote|pre|tr)>/gi, "\n")
+    .replace(/<\/?[a-z!?][^>]*>/gi, "").replace(/&(nbsp|amp|lt|gt|quot|#39);/g, (m) => ENTITIES[m] ?? m)
+    .split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
+}
+
+type RicosNode = { type?: unknown; nodes?: unknown; textData?: { decorations?: unknown }; paragraphData?: unknown; [key: string]: unknown };
+const onlyKeys = (o: object, allowed: string[]) => Object.keys(o).every((k) => allowed.includes(k));
+const emptyObject = (v: unknown) => v === undefined || (!!v && typeof v === "object" && Object.keys(v as object).length === 0);
+
+/** The paragraph styling a PLAIN paragraph still carries on the Ricos wire (Events v3 sends
+ *  `{ textStyle: { textAlignment: "AUTO" }, indentation: 0 }` on every paragraph). */
+function defaultParagraphData(pd: unknown): boolean {
+  if (pd === undefined) return true;
+  if (!pd || typeof pd !== "object" || !onlyKeys(pd, ["textStyle", "indentation"])) return false;
+  const { textStyle, indentation } = pd as { textStyle?: unknown; indentation?: unknown };
+  if (indentation !== undefined && indentation !== 0) return false;
+  if (textStyle === undefined) return true;
+  if (!textStyle || typeof textStyle !== "object" || !onlyKeys(textStyle, ["textAlignment"])) return false;
+  const align = (textStyle as { textAlignment?: unknown }).textAlignment;
+  return align === undefined || align === "AUTO";
+}
+
+/** True when a plain text field can round-trip this Ricos document: no document styling, and
+ *  only paragraphs of undecorated text whose paragraph data is the wire default. Anything else —
+ *  a heading, list, link, bold run, media node, alignment or indent — is rich. */
+export function ricosIsPlain(doc: { nodes?: unknown; documentStyle?: unknown } | null | undefined): boolean {
+  if (!doc || !emptyObject(doc.documentStyle)) return false;
+  const nodes = Array.isArray(doc.nodes) ? (doc.nodes as RicosNode[]) : [];
+  return nodes.every((n) => !!n && typeof n === "object" && n.type === "PARAGRAPH"
+    && onlyKeys(n, ["type", "id", "nodes", "paragraphData"]) && defaultParagraphData(n.paragraphData)
+    && (Array.isArray(n.nodes) ? (n.nodes as RicosNode[]) : []).every((t) => !!t && typeof t === "object" && t.type === "TEXT"
+      && onlyKeys(t, ["type", "id", "textData", "nodes"]) && (!Array.isArray(t.nodes) || t.nodes.length === 0)
+      && !(Array.isArray(t.textData?.decorations) && t.textData.decorations.length)));
+}
+
+/** Preview text for a legacy DraftJS document: its `blocks[].text` joined by a blank line, or ""
+ *  when the payload is not DraftJS JSON (never a throw). */
+export function draftjsText(raw: string | null | undefined): string {
+  try {
+    const doc = JSON.parse(raw ?? "") as { blocks?: Array<{ text?: unknown }> } | null;
+    const blocks = Array.isArray(doc?.blocks) ? doc.blocks : [];
+    return blocks.map((b) => (typeof b?.text === "string" ? b.text : "")).join("\n\n").trim();
+  } catch { return ""; }
+}

package/templates/owner-lite/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,
           });

package/templates/owner-lite/tier5-src/himi-owner-lite-faq-question-form/index.ts

@@ -1,17 +1,30 @@
 // Paging loops carry a seen-cursor guard: a server that repeats a cursor would
 // otherwise spin forever and leave a create/submit permanently pending.
 import { defineService } from "@himalaya/state";
-import { createQuestionEntry, getQuestionEntry, queryCategories, queryQuestionEntries, updateQuestionEntry, type WixCategory } from "@himalaya/wix-faq";
+import { createQuestionEntry, getQuestionEntry, queryCategories, queryQuestionEntries, updateQuestionEntry, type WixCategory, type WixQuestionEntry } from "@himalaya/wix-faq";
+import { postBodyText } from "../_shared/owner-post-content.js";
+import { draftjsText } from "../_shared/owner-rich-guard.js";
 
-interface State { id: string; revision: string; mode: "create" | "edit"; heading: string; question: string; answer: string; categoryId: string; statusValue: "VISIBLE" | "HIDDEN"; categoryOptions: Array<{id:string;label:string}>; error: string; conflict: boolean; noConflict: boolean; savedMessage: string; savedId: string; }
+interface State { id: string; revision: string; mode: "create" | "edit"; heading: string; question: string; answer: string; categoryId: string; statusValue: "VISIBLE" | "HIDDEN"; categoryOptions: Array<{id:string;label:string}>; error: string; conflict: boolean; noConflict: boolean; savedMessage: string; savedId: string; answerFormat: "plain" | "rich" | "draftjs"; answerProtected: boolean; answerEditable: boolean; answerNote: string; }
 const input = ((globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input) ?? {};
 const msg = (e: unknown) => String((e as { message?: unknown })?.message ?? e);
 const isConflict = (e: unknown) => /\b409\b|conflict|revision/i.test(msg(e));
 const offline = (e: unknown) => /offline|network|connect|bridge|fetch/i.test(msg(e));
+// [rico] #3363 — the answer is a one-of (draftjs | richContent | plainText) and this form edits plainText
+// only. A rich or DraftJS answer loads LOCKED: `answer` holds its read-only preview, the required check
+// is skipped, and plainText stays out of the PATCH and its fieldMask. #3373 replaces the lock with the editor.
+const RICH_ANSWER_NOTE = "This answer has formatting or media. Edit it in your site dashboard to keep that content intact; the question, category and visibility can be changed here.";
+const RICH_ANSWER_ERROR = "This answer has formatting or media. Edit it in your site dashboard to keep that content intact.";
+// A locked answer whose only content is media/embeds has no preview text. `answer` is also the
+// hidden (required) field's bound value, so it must never be empty while locked.
+const MEDIA_ONLY_ANSWER = "This answer has media but no text.";
+const answerOf = (q: WixQuestionEntry): { answerFormat: State["answerFormat"]; answer: string } =>
+  q.richContent ? { answerFormat: "rich", answer: postBodyText(q.richContent as unknown as Parameters<typeof postBodyText>[0]) || MEDIA_ONLY_ANSWER }
+  : q.draftjs ? { answerFormat: "draftjs", answer: draftjsText(q.draftjs) || MEDIA_ONLY_ANSWER } : { answerFormat: "plain", answer: q.plainText ?? "" };
 async function categories(): Promise<WixCategory[]> { const out: WixCategory[]=[]; let cursor=""; const seen=new Set<string>(); do { const r=await queryCategories({query:{cursorPaging:{limit:100,...(cursor?{cursor}:{})},sort:[{fieldName:"sortOrder",order:"ASC"}]}}); out.push(...(r.categories??[])); const next=r.pagingMetadata?.cursors?.next??"";if(!next||seen.has(next))break;seen.add(next);cursor=next; } while(cursor); return out; }
 async function appendOrder(): Promise<number> { let max=-1,cursor=""; const seen=new Set<string>(); do { const r=await queryQuestionEntries({contentFormat:"PLAIN_TEXT",query:{cursorPaging:{limit:100,...(cursor?{cursor}:{})}}}); for(const q of r.questionEntries??[]) max=Math.max(max,q.sortOrder??-1); const next=r.pagingMetadata?.cursors?.next??"";if(!next||seen.has(next))break;seen.add(next);cursor=next; } while(cursor); return max+1; }
-const shape=(s:Partial<State>):State=>({ id:s.id??input.id??"", revision:s.revision??"", mode:s.mode??((s.id??input.id)?"edit":"create"), heading:s.heading??((s.id??input.id)?"Edit question":"New question"), question:s.question??"", answer:s.answer??"", categoryId:s.categoryId??"", statusValue:s.statusValue??"HIDDEN", categoryOptions:s.categoryOptions??[], error:s.error??"", conflict:s.conflict??false, noConflict:!(s.conflict??false), savedMessage:s.savedMessage??"", savedId:s.savedId??"" });
+const shape=(s:Partial<State>):State=>({ id:s.id??input.id??"", revision:s.revision??"", mode:s.mode??((s.id??input.id)?"edit":"create"), heading:s.heading??((s.id??input.id)?"Edit question":"New question"), question:s.question??"", answer:s.answer??"", categoryId:s.categoryId??"", statusValue:s.statusValue??"HIDDEN", categoryOptions:s.categoryOptions??[], error:s.error??"", conflict:s.conflict??false, noConflict:!(s.conflict??false), savedMessage:s.savedMessage??"", savedId:s.savedId??"", ...(() => { const f = s.answerFormat ?? "plain"; return { answerFormat: f, answerProtected: f !== "plain", answerEditable: f === "plain", answerNote: f !== "plain" ? RICH_ANSWER_NOTE : "" }; })() });
 const svc=defineService<State,{load:(s:State,a?:unknown)=>Promise<State>;submit:(s:State,v?:Record<string,unknown>)=>Promise<State>}>("himiOwnerLiteFaqQuestionForm",{state:shape({}),actions:{
- load:async(s,a)=>{const id=input.id||String((a as {id?:unknown})?.id??s.id);try{const cats=await categories();const options=cats.map(c=>({id:c.id??"",label:c.title?.trim()||"Untitled category"}));if(!id)return shape({...s,mode:"create",categoryOptions:options,statusValue:"HIDDEN"});const q=(await getQuestionEntry(id)).questionEntry;if(!q) return shape({...s,id,error:"Question not found",categoryOptions:options});return shape({...s,id,revision:q.revision??"",mode:"edit",heading:"Edit question",question:q.question??"",answer:q.plainText??"",categoryId:q.categoryId??"",statusValue:q.status==="VISIBLE"?"VISIBLE":"HIDDEN",categoryOptions:options,error:"",conflict:false});}catch(e){return shape({...s,id,error:offline(e)?"Connect to the internet to load this question.":msg(e)});}},
- submit:async(s,v)=>{const question=String(v?.question??s.question).trim(),answer=String(v?.answer??s.answer).trim(),categoryId=String(v?.categoryId??s.categoryId),statusValue=String(v?.status??s.statusValue)==="VISIBLE"?"VISIBLE":"HIDDEN";if(!question||!answer)return shape({...s,error:"Question and answer are required.",savedMessage:""});try{if(s.mode==="edit"){if(!s.revision)return shape({...s,error:"Refresh before saving; this question has no current revision.",conflict:true});const r=await updateQuestionEntry(s.id,{questionEntry:{id:s.id,revision:s.revision,question,plainText:answer,categoryId,status:statusValue},fieldMask:["question","plainText","categoryId","status"]});return shape({...s,revision:r.questionEntry?.revision??s.revision,question,answer,categoryId,statusValue,error:"",conflict:false,savedMessage:"Question saved.",savedId:s.id});}const r=await createQuestionEntry({questionEntry:{question,plainText:answer,categoryId,status:statusValue,sortOrder:await appendOrder()}});return shape({...s,id:r.questionEntry?.id??"",revision:r.questionEntry?.revision??"",mode:"edit",heading:"Edit question",question,answer,categoryId,statusValue,error:"",savedMessage:"Question created.",savedId:r.questionEntry?.id??""});}catch(e){if(isConflict(e))return shape({...s,error:"This question changed elsewhere. Refresh before saving again.",conflict:true,savedMessage:""});return shape({...s,error:offline(e)?"Connect to the internet and try again. This change was not queued.":msg(e),savedMessage:""});}}
+ load:async(s,a)=>{const id=input.id||String((a as {id?:unknown})?.id??s.id);try{const cats=await categories();const options=cats.map(c=>({id:c.id??"",label:c.title?.trim()||"Untitled category"}));if(!id)return shape({...s,mode:"create",categoryOptions:options,statusValue:"HIDDEN"});const q=(await getQuestionEntry(id)).questionEntry;if(!q) return shape({...s,id,error:"Question not found",categoryOptions:options});return shape({...s,id,revision:q.revision??"",mode:"edit",heading:"Edit question",question:q.question??"",...answerOf(q),categoryId:q.categoryId??"",statusValue:q.status==="VISIBLE"?"VISIBLE":"HIDDEN",categoryOptions:options,error:"",conflict:false});}catch(e){return shape({...s,id,error:offline(e)?"Connect to the internet to load this question.":msg(e)});}},
+ submit:async(s,v)=>{const question=String(v?.question??s.question).trim(),answer=String(v?.answer??s.answer).trim(),categoryId=String(v?.categoryId??s.categoryId),statusValue=String(v?.status??s.statusValue)==="VISIBLE"?"VISIBLE":"HIDDEN";const locked=s.mode==="edit"&&s.answerProtected;if(locked&&answer!==s.answer.trim())return shape({...s,error:RICH_ANSWER_ERROR,savedMessage:""});if(!question||(!locked&&!answer))return shape({...s,error:"Question and answer are required.",savedMessage:""});try{if(s.mode==="edit"){if(!s.revision)return shape({...s,error:"Refresh before saving; this question has no current revision.",conflict:true});const r=await updateQuestionEntry(s.id,{questionEntry:locked?{id:s.id,revision:s.revision,question,categoryId,status:statusValue}:{id:s.id,revision:s.revision,question,plainText:answer,categoryId,status:statusValue},fieldMask:locked?["question","categoryId","status"]:["question","plainText","categoryId","status"]});return shape({...s,revision:r.questionEntry?.revision??s.revision,question,answer:locked?s.answer:answer,categoryId,statusValue,error:"",conflict:false,savedMessage:"Question saved.",savedId:s.id});}const r=await createQuestionEntry({questionEntry:{question,plainText:answer,categoryId,status:statusValue,sortOrder:await appendOrder()}});return shape({...s,id:r.questionEntry?.id??"",revision:r.questionEntry?.revision??"",mode:"edit",heading:"Edit question",question,answer,categoryId,statusValue,error:"",savedMessage:"Question created.",savedId:r.questionEntry?.id??""});}catch(e){if(isConflict(e))return shape({...s,error:"This question changed elsewhere. Refresh before saving again.",conflict:true,savedMessage:""});return shape({...s,error:offline(e)?"Connect to the internet and try again. This change was not queued.":msg(e),savedMessage:""});}}
 }}); export {svc,appendOrder};

package/templates/owner-lite/tier5-src/himi-owner-lite-product-form/index.ts

@@ -16,7 +16,7 @@ import {
   type WixProductWrite,
 } from "@himalaya/wix-stores";
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
-import { plainText } from "../_shared/himi-store.js";
+import { htmlIsTrivial, htmlPreviewText } from "../_shared/owner-rich-guard.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch, editablePrice } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
@@ -46,6 +46,14 @@ interface ProductFormState {
   price: string;
   sku: string;
   description: string;
+  /** [rico] #3363 — the description as loaded (or last saved). A save sends `description` only
+   *  when the submitted value differs from it, so an untouched body is never re-written. */
+  originalDescription: string;
+  /** A rich HTML description (more than one bare `<p>`) the plain field would flatten: it loads
+   *  locked, the descriptor shows `description` as a preview + `descriptionNote`, and an edit is refused. */
+  descriptionProtected: boolean;
+  descriptionEditable: boolean;
+  descriptionNote: string;
   visible: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
   error: string;
@@ -115,6 +123,10 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
     price: s.price ?? "",
     sku: s.sku ?? "",
     description: s.description ?? "",
+    originalDescription: s.originalDescription ?? s.description ?? "",
+    descriptionProtected: s.descriptionProtected ?? false,
+    descriptionEditable: !(s.descriptionProtected ?? false),
+    descriptionNote: s.descriptionProtected ? copyParam("ownerProductForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; name, price and SKU can be changed here.") : "",
     visible: s.visible ?? "true",
     status: s.status ?? "idle",
     error: s.error ?? "",
@@ -177,7 +189,7 @@ const svc = defineService<ProductFormState, {
           name: (p as any).name ?? "",
           price: priceOf(p),
           sku: (p as any).sku ?? "",
-          description: plainText((p as any).description || ""),
+          ...((html: string) => ({ description: htmlPreviewText(html), originalDescription: htmlPreviewText(html), descriptionProtected: !htmlIsTrivial(html) }))(String((p as any).description ?? "")),
           visible: (p as any).visible !== false ? "true" : "false",
           status: "idle",
           error: "",
@@ -190,6 +202,8 @@ const svc = defineService<ProductFormState, {
           return shape({
             ...s, mode: "edit", id, heading: "Edit product",
             name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
+            // An older cached row carries no verdict, so it stays locked: fail closed.
+            description: String(cached.description ?? ""), originalDescription: String(cached.description ?? ""), descriptionProtected: cached.descriptionProtected !== "false",
             visible: cached.visible === "false" ? "false" : "true",
             status: "idle", error: "", savedMessage: "",
           });
@@ -217,6 +231,9 @@ const svc = defineService<ProductFormState, {
       const price = editablePrice(rawPrice);
       const sku = String(v.sku ?? s.sku).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("ownerProductForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
       const visible = boolString(v.visible, s.visible) === "true";
       if (!name) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.nameRequired", "Name is required"), savedMessage: "" });
       const priceNum = Number(price);
@@ -232,12 +249,12 @@ const svc = defineService<ProductFormState, {
         priceData: { price: priceNum, currency: CURRENCY },
         visible,
         ...(sku ? { sku } : {}),
-        ...(description ? { description } : {}),
+        ...(descriptionEdited ? { description } : {}),
         ...(s.mode === "edit" && s.id ? {} : { productType: "physical" }),
       };
 
       // Optimistic local write — the list repaints from cache immediately (offline or not).
-      const localRow = (id: string): DbEntity => ({ id, name, price, sku, visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
+      const localRow = (id: string): DbEntity => ({ id, name, price, sku, description, descriptionProtected: s.descriptionProtected ? "true" : "false", visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
       const localId = s.mode === "edit" && s.id ? s.id : `local-${Date.now()}`;
       await cachePut(localRow(localId));
       try {
@@ -259,6 +276,7 @@ const svc = defineService<ProductFormState, {
           price,
           sku,
           description,
+          originalDescription: descriptionEdited ? description : s.originalDescription,
           visible: visible ? "true" : "false",
           status: "saved",
           error: "",
@@ -273,9 +291,10 @@ const svc = defineService<ProductFormState, {
           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.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, visible: String(visible), mode: s.mode });
+          await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, description, descriptionEdited: String(descriptionEdited), visible: String(visible), mode: s.mode });
           return shape({
             ...s, mode: "edit", id: localId, name, price, sku, description,
+            originalDescription: descriptionEdited ? description : s.originalDescription,
             visible: visible ? "true" : "false", status: "saved", error: "",
             savedMessage: copyParam("ownerProductForm.savedOffline", "Saved offline — will sync when you reconnect."),
             savedId: localId,