@wix/himalaya-cli 0.1582.0 → 0.1584.0

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

@@ -1,3 +1,6 @@
+import { descriptionBody } from "../_shared/rich-body.js";
+import { htmlIsTrivial, htmlPreviewText } from "../_shared/owner-rich-guard.js";
+import { parseRicosJson } from "@himalaya/wix-rich-content";
 // Tier-5 bundle: __HIMI_APP_NAME__ — edit Bookings service (the CRUD "U").
 // Opened from the service detail ("Edit"). EDIT-ONLY — the Bookings v2
 // service-create needs a full nested structure the generated client doesn't
@@ -31,6 +34,10 @@ interface ServiceFormState {
   heading: string;
   name: string;
   description: string;
+  originalDescription: unknown;
+  descriptionProtected: boolean;
+  descriptionEditable: boolean;
+  descriptionNote: string;
   category: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
   writeBusy: boolean;
@@ -79,6 +86,16 @@ function categoryName(s: WixService): string {
   return "";
 }
 
+function descriptionFields(value: unknown, known = true) {
+  const body = descriptionBody(value);
+  const protectedBody = !known || (value != null && (typeof value !== "string" || !!parseRicosJson(value)
+    || !htmlIsTrivial(value) || (!!htmlPreviewText(value).trim() && !body.bodyText)));
+  return { description: body.bodyText, originalDescription: known ? value ?? "" : undefined, descriptionProtected: protectedBody,
+    descriptionEditable: !protectedBody, descriptionNote: protectedBody
+      ? known ? copyParam("ownerServiceForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; the name can be changed here.")
+        : copyParam("ownerServiceForm.descriptionNotLoaded", "The description is not available yet. The name can be changed here.") : "" };
+}
+
 function shape(s: Partial<ServiceFormState>): ServiceFormState {
   const id = typeof s.id === "string" ? s.id : "";
   const savedId = typeof s.savedId === "string" ? s.savedId : id;
@@ -89,6 +106,10 @@ function shape(s: Partial<ServiceFormState>): ServiceFormState {
     heading: s.heading ?? copyParam("ownerServiceForm.headingEdit", "Edit service"),
     name: s.name ?? "",
     description: s.description ?? "",
+    originalDescription: s.originalDescription,
+    descriptionProtected: s.descriptionProtected ?? true,
+    descriptionEditable: s.descriptionProtected === false,
+    descriptionNote: s.descriptionNote ?? copyParam("ownerServiceForm.descriptionNotLoaded", "The description is not available yet. The name can be changed here."),
     category: s.category ?? "",
     status: s.status ?? "idle",
     writeBusy: s.writeBusy ?? false,
@@ -117,6 +138,8 @@ const svc = defineService<ServiceFormState, {
   submit: (s: ServiceFormState, values?: Record<string, unknown>) => Promise<ServiceFormState>;
 }>("himiOwnerLiteServiceForm", {
   state: shape({ id: initialId }),
+  notHydrated: ["originalDescription", "descriptionProtected", "descriptionEditable", "descriptionNote"],
+  perVisit: ["originalDescription", "descriptionProtected", "descriptionEditable", "descriptionNote"],
   actions: {
     load: async (s, arg): Promise<ServiceFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
@@ -130,7 +153,7 @@ const svc = defineService<ServiceFormState, {
           if (d) {
             return shape({
               ...s, id, heading: copyParam("ownerServiceForm.headingEdit", "Edit service"),
-              name: d.name, description: d.description, category: d.category,
+              name: d.name, ...descriptionFields(d.description), category: d.category,
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
           }
@@ -144,7 +167,7 @@ const svc = defineService<ServiceFormState, {
           ...s, id, heading: copyParam("ownerServiceForm.headingEdit", "Edit service"),
           revision: String((svcObj as any).revision ?? ""),
           name: (svcObj as any).name ?? "",
-          description: (svcObj as any).description ?? "",
+          ...descriptionFields((svcObj as any).description),
           category: categoryName(svcObj),
           status: "idle", error: "", savedMessage: "",
         });
@@ -155,7 +178,7 @@ const svc = defineService<ServiceFormState, {
           return shape({
             ...s, id, heading: "Edit service",
             name: String(cached.name ?? cached.title ?? ""),
-            description: String(cached.description ?? ""),
+            ...descriptionFields(cached.description, Object.hasOwn(cached, "description")),
             category: String(cached.category ?? ""),
             status: "idle", error: "", savedMessage: "",
           });
@@ -165,7 +188,7 @@ const svc = defineService<ServiceFormState, {
           if (d) {
             return shape({
               ...s, id, heading: copyParam("ownerServiceForm.headingEdit", "Edit service"),
-              name: d.name, description: d.description, category: d.category,
+              name: d.name, ...descriptionFields(d.description), category: d.category,
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
           }
@@ -177,25 +200,42 @@ const svc = defineService<ServiceFormState, {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const targetId = s.id || (typeof v.id === "string" ? v.id : "");
+      const cached = !s.id && targetId ? await cacheGet(targetId) : null;
+      // Legacy queued payloads arrive without a loaded form. Read the current body before
+      // accepting their text, so replay cannot replace a rich description blindly.
+      if (!s.id && targetId) {
+        try {
+          const service = (await getService(targetId)).service;
+          if (!service?.id) return shape({ ...s, status: "error", error: copyParam("ownerServiceForm.errorNotFound", "Service not found") });
+          s = shape({ ...s, id: targetId, revision: String(service.revision ?? ""),
+            ...descriptionFields(service.description), category: categoryName(service) || String(cached?.category ?? "") });
+        } catch (error) {
+          return shape({ ...s, status: "error", error: ownerWriteError(error), savedMessage: "" });
+        }
+      }
       const name = String(v.name ?? s.name).trim();
       const description = String(v.description ?? s.description).trim();
+      const descriptionEdited = description !== descriptionBody(s.originalDescription).bodyText.trim();
+      if (s.descriptionProtected && descriptionEdited) return shape({ ...s, status: "error", error: s.descriptionNote, savedMessage: "" });
       if (!name) return shape({ ...s, status: "error", error: copyParam("ownerServiceForm.nameRequired", "Name is required"), savedMessage: "" });
       if (!targetId) return shape({ ...s, status: "error", error: copyParam("ownerServiceForm.errorNoService", "No service to edit."), savedMessage: "" });
 
-      const cached = !s.id ? await cacheGet(targetId) : null;
-      const localRow: DbEntity = { ...(cached ?? {}), id: targetId, name, title: name, description, category: s.category || String(cached?.category ?? "") };
+      const localRow: DbEntity = { ...(cached ?? {}), id: targetId, name, title: name,
+        ...(descriptionEdited || s.originalDescription !== undefined ? { description: descriptionEdited ? description : s.originalDescription } : {}),
+        category: s.category || String(cached?.category ?? "") };
       try {
         // v2 PATCH is a masked update requiring the current `revision` (optimistic
         // concurrency), captured from the getService on load. The response wraps
         // the UPDATED entity ({ service }) with its bumped revision — carry it
         // into state, or the SECOND consecutive save would send the stale
         // load-time revision and reject.
-        const res = await updateService(targetId, { name, ...(description ? { description } : {}), ...(s.revision ? { revision: s.revision } : {}) });
+        const res = await updateService(targetId, { name, ...(!s.descriptionProtected && descriptionEdited ? { description } : {}), ...(s.revision ? { revision: s.revision } : {}) });
         const bumped = String((res?.service as { revision?: unknown } | undefined)?.revision ?? "");
         // The local row follows only what Wix confirmed.
         await cachePut(localRow);
         return shape({
           ...s, id: targetId, name, description,
+          originalDescription: descriptionEdited ? description : s.originalDescription,
           revision: bumped || s.revision,
           status: "saved", error: "", savedMessage: copyParam("ownerServiceForm.savedMessage", "Service saved."),
           savedId: targetId,
@@ -211,4 +251,10 @@ const svc = defineService<ServiceFormState, {
   },
 });
 
+// Older binaries ignore notHydrated. Their restored preview must also stay read-only until load.
+if (!(globalThis as { himalaya?: { hydrationOptOut?: boolean } }).himalaya?.hydrationOptOut) {
+  Object.assign(svc.getState(), { originalDescription: undefined, descriptionProtected: true, descriptionEditable: false,
+    descriptionNote: copyParam("ownerServiceForm.descriptionNotLoaded", "The description is not available yet. The name can be changed here.") });
+}
+
 export { svc };

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

@@ -8,7 +8,7 @@ import { queryServices, type WixService } from "@himalaya/wix-bookings";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_shared/owner-load-error.js";
 import { DEMO_SERVICES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
 import { copyParam } from "../_shared/himi-copy.js";
-import { getAll, upsert, type DbEntity } from "../_shared/owner-local-db.js";
+import { get, getAll, upsert, type DbEntity } from "../_shared/owner-local-db.js";
 
 // Last-synced rows are an explicitly incomplete fallback for an unfiltered
 // request during an outage. Filtered pages never claim this cache is complete.
@@ -17,8 +17,10 @@ const ENTITY = "owner_services";
 async function readCachedRows(): Promise<ServiceRow[]> {
   try { return (await getAll(ENTITY)) as unknown as ServiceRow[]; } catch { return []; }
 }
+// A list row carries no description. Merge it over the stored row so a normal refresh keeps the
+// rich body the service form cached, as Products and Events do.
 async function writeCachedRows(rows: ServiceRow[]): Promise<void> {
-  try { for (const r of rows) await upsert(ENTITY, r as unknown as DbEntity); } catch { /* capability not granted → online-only */ }
+  try { for (const r of rows) await upsert(ENTITY, { ...await get(ENTITY, r.id), ...r } as unknown as DbEntity); } catch { /* capability not granted → online-only */ }
 }
 
 interface ServiceRow {