@wix/himalaya-cli 0.1583.0 → 0.1584.0

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

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // Tier-5 bundle: __HIMI_APP_NAME__ — create/edit Store product (the CRUD "C" + "U").
 // Opened from the products list ("New product") or a product detail ("Edit").
 // The Apptestersite catalog is Stores v1 (v3 428s), so this uses the v1 client:
@@ -243,19 +244,23 @@ const svc = defineService<ProductFormState, {
           name: (p as any).name ?? "",
           price: priceOf(p),
           sku: (p as any).sku ?? "",
-          ...((html: string, rich: unknown) => {
+          ...((raw: unknown, rich: unknown) => {
+            const html = typeof raw === "string" ? raw : "";
+            const preview = htmlPreviewText(html);
+            const description = descriptionBody(raw);
+            const legacyRich = !!parseRicosJson(raw) || (raw != null && typeof raw !== "string") || (!!preview.trim() && !description.bodyText);
             // `richDescription` is present only on a Catalog V3 site. V3 is edited in the RichContentEditor;
             // a V3 product whose Ricos document did not come back is edited only when its HTML is trivial
             // (seeded as paragraphs), else locked — fail closed. V1 keeps the plain/locked split: the
             // editor writes Ricos, and a V1 description is HTML.
             const doc = rich === undefined || rich === null ? null : parseRicosJson(rich);
             const hasDoc = !!doc && doc.nodes.length > 0;
-            const text = htmlPreviewText(html);
-            const descriptionMode = rich === undefined ? (htmlIsTrivial(html) ? "plain" as const : "locked" as const)
+            const text = descriptionBody(rich, legacyRich ? description.bodyText : preview).bodyText;
+            const descriptionMode = rich === undefined ? (!legacyRich && htmlIsTrivial(html) ? "plain" as const : "locked" as const)
               : hasDoc || htmlIsTrivial(html) ? "editor" as const : "locked" as const;
-            const descriptionJson = descriptionMode !== "editor" ? "" : hasDoc ? JSON.stringify(rich) : text ? docJson(plainPostBody(text)) : "";
+            const descriptionJson = descriptionMode !== "editor" ? "" : hasDoc ? JSON.stringify(doc) : text ? docJson(plainPostBody(text)) : "";
             return { ...DESCRIPTION_LOADED, description: text, originalDescription: text, descriptionMode, descriptionJson };
-          })(String((p as any).description ?? ""), (p as { richDescription?: unknown }).richDescription),
+          })((p as any).description, (p as { richDescription?: unknown }).richDescription),
           visible: (p as any).visible !== false ? "true" : "false",
           status: "idle",
           error: "",
@@ -265,12 +270,13 @@ const svc = defineService<ProductFormState, {
         // Offline: prefill from the last-synced local cache before the demo/error fallbacks.
         const cached = await cacheGet(id);
         if (cached) {
+          const description = descriptionBody(cached.descriptionJson || cached.bodyJson, descriptionBody(cached.description ?? cached.bodyText ?? cached.summary).bodyText).bodyText;
           return shape({
             ...s, mode: "edit", id, heading: "Edit product",
             name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
-            description: String(cached.description ?? ""), originalDescription: String(cached.description ?? ""), ...DESCRIPTION_LOADED,
-            // A row cached with its document reopens in the editor. An older row has none, so its verdict
-            // decides: plain when it was plain, else locked (it carries no verdict either: fail closed).
+            description, originalDescription: description, ...DESCRIPTION_LOADED,
+            // Only the form's document establishes its editor mode. Detail bodyJson can also come
+            // from a V1 catalog, so it supplies the preview without guessing a V3 write contract.
             ...(cached.descriptionJson ? { descriptionMode: "editor" as const, descriptionJson: String(cached.descriptionJson) }
               : { descriptionMode: cached.descriptionProtected === "false" ? "plain" as const : "locked" as const, descriptionJson: "" }),
             visible: cached.visible === "false" ? "false" : "true",

package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-products/index.ts

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // Tier-5 bundle: __HIMI_APP_NAME__ — Store products management list.
 // Owner/management view of the active business's Wix Stores catalog. Site-scoped
 // through the native wix-native (mode:owner) provider + WixApiCapability, which
@@ -6,11 +7,11 @@
 
 import { compareText } from "../_shared/engine-intl.js";
 import { defineBackendCollection } from "../_shared/collection-service.js";
-import { searchStoreProducts, productImage, productPrice, plainText, type StoreProduct } from "../_shared/himi-store.js";
+import { searchStoreProducts, productImage, productPrice, type StoreProduct } from "../_shared/himi-store.js";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_shared/owner-load-error.js";
 import { DEMO_PRODUCTS, 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";
 
 // Offline-first (data-offline): the owner's last-synced rows are the READ-THROUGH
 // cache for the `owner_products` entity — paint them instantly (works offline),
@@ -24,7 +25,9 @@ async function readCachedRows(): Promise<ProductRow[]> {
   try { return (await getAll(ENTITY)) as unknown as ProductRow[]; } catch { return []; }
 }
 async function writeCachedRows(rows: ProductRow[]): 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, title: r.name } as unknown as DbEntity);
+  } catch { /* capability not granted → online-only */ }
 }
 
 interface ProductRow {
@@ -76,7 +79,7 @@ function normalize(raw: StoreProduct): ProductRow {
   const name = (raw.name || "Untitled product").trim();
   const image = productImage(raw);
   const price = productPrice(raw);
-  const desc = plainText(raw.plainDescription || raw.description);
+  const desc = descriptionBody(raw.description, descriptionBody(raw.plainDescription).bodyText).bodyText;
   return {
     id: raw.id || "",
     name,

package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-service/index.ts

@@ -1,3 +1,5 @@
+import { descriptionBody } from "../_shared/rich-body.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
 // Tier-5 bundle: __HIMI_APP_NAME__ — Bookings service DETAIL (read view).
 // Inner admin page opened from the services list (himi_owner_lite_service_<id>).
 // Fetches the single Bookings v2 service and exposes a flat string state bound by
@@ -35,6 +37,10 @@ interface ServiceState {
   title: string;
   subtitle: string;
   summary: string;
+  bodyJson: string;
+  bodyText: string;
+  hasBodyJson: boolean;
+  noBodyJson: boolean;
   initial: string;
   image: string;
   typeLabel: string;
@@ -99,7 +105,7 @@ function imageOf(s: WixService): string {
 
 /** The fact rows this detail shows (the descriptor"s DETAIL_T5 rows): each publishes
  *  `<key>Blank`, so a fact with no value hides instead of painting a dangling label. */
-const FACT_KEYS = ["typeLabel", "category", "capacity", "description"] as const;
+const FACT_KEYS = ["typeLabel", "category", "capacity"] as const;
 
 function shape(s: Partial<ServiceState>): ServiceState {
   const out = shapeFields(s);
@@ -121,6 +127,10 @@ function shapeFields(s: Partial<ServiceState>): ServiceState {
     title: s.title ?? "",
     subtitle: s.subtitle ?? "",
     summary: s.summary ?? "",
+    bodyJson: s.bodyJson ?? "",
+    bodyText: s.bodyText ?? "",
+    hasBodyJson: !!s.bodyJson,
+    noBodyJson: !s.bodyJson,
     initial: s.initial ?? "?",
     image,
     typeLabel: s.typeLabel ?? "—",
@@ -152,7 +162,9 @@ function demoDetail(s: ServiceState, id: string): ServiceState | null {
     status: "ready",
     title: d.name,
     subtitle: [d.type, d.category].filter(Boolean).join(" · "),
-    summary: d.description,
+    summary: "",
+    bodyText: d.description,
+    bodyJson: "",
     initial: (d.name[0] || "S").toUpperCase(),
     image: "",
     typeLabel: d.type,
@@ -169,20 +181,24 @@ function cachedDetail(s: ServiceState, row: DbEntity): ServiceState {
   const title = String(row.title ?? row.name ?? "");
   const type = String(row.typeLabel ?? "");
   const category = String(row.category ?? "");
+  const body = descriptionBody(row.bodyJson || row.description, descriptionBody(row.bodyText || row.summary).bodyText);
   return shape({
     ...s,
     id: String(row.id),
     status: "ready",
     title,
     subtitle: String(row.subtitle ?? [type, category].filter(Boolean).join(" · ")),
-    summary: String(row.summary ?? row.description ?? ""),
+    summary: "",
+    bodyJson: body.bodyJson,
+    bodyText: body.bodyText,
     initial: String(row.initial ?? (title[0] || "S")).slice(0, 1).toUpperCase(),
     image: String(row.image ?? ""),
     typeLabel: type || "—",
     category: category || "—",
     capacity: String(row.capacity ?? "—"),
-    description: String(row.description ?? "—"),
+    description: body.bodyText || "—",
     error: "",
+    actionMessage: "",
     demoNote: "",
   });
 }
@@ -197,21 +213,24 @@ async function refresh(prev: ServiceState, id: string): Promise<ServiceState> {
   const type = serviceTypeLabel((svc as any).type);
   const category = categoryName(svc) || "—";
   const cap = (svc as any).defaultCapacity;
-  const desc = ((svc as any).description || (svc as any).tagLine || "").trim();
+  const body = descriptionBody((svc as any).description, descriptionBody((svc as any).tagLine).bodyText);
   return shape({
     ...prev,
     id,
     status: "ready",
     title: name,
     subtitle: [type, category !== "—" ? category : ""].filter(Boolean).join(" · "),
-    summary: desc,
+    summary: "",
+    bodyJson: body.bodyJson,
+    bodyText: body.bodyText,
     initial: (name[0] || "S").toUpperCase(),
     image: imageOf(svc),
     typeLabel: type,
     category,
     capacity: cap != null ? `${cap} ${Number(cap) === 1 ? "guest" : "guests"}` : "—",
-    description: desc || "—",
+    description: body.bodyText || "—",
     error: "",
+    actionMessage: "",
     demoNote: "",
   });
 }
@@ -220,9 +239,16 @@ const svc = defineService<ServiceState, {
   load: (s: ServiceState, arg?: unknown) => Promise<ServiceState>;
   retry: (s: ServiceState) => Promise<ServiceState>;
   delete: (s: ServiceState) => Promise<ServiceState>;
+  openLink: (s: ServiceState, arg?: unknown) => Promise<ServiceState>;
 }>("himiOwnerLiteService", {
   state: shape({ status: "loading" }),
   actions: {
+    openLink: async (_state, arg): Promise<ServiceState> => {
+      const opened = await openRichLink(arg);
+      const failed = copyParam("ownerService.linkOpenFailed", "This link could not be opened.");
+      const current = svc.getState();
+      return shape({ ...current, actionMessage: opened ? (current.actionMessage === failed ? "" : current.actionMessage) : failed });
+    },
     load: async (s, arg) => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const id = idFrom(arg, s.id) || inputId();
@@ -284,4 +310,9 @@ const svc = defineService<ServiceState, {
   },
 });
 
+// Hydration shallow-merges older snapshots over defaults; derive both body gates from
+// the restored document before the first paint, without waiting for a load action.
+const bootedBody = svc.getState();
+Object.assign(bootedBody, { hasBodyJson: !!bootedBody.bodyJson, noBodyJson: !bootedBody.bodyJson });
+
 export { svc };

package/templates/gym-fitness-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/gym-fitness-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 {

package/templates/nonprofit-cause/config.ts

@@ -183,6 +183,13 @@ export default defineApp({
         "parentScreenId": "himi_blog",
         "tabId": "home"
       },
+      {
+        "screenId": "himi_notif_settings",
+        "isPublic": true,
+        "paramKeys": [],
+        "parentScreenId": "himi_account",
+        "tabId": "profile"
+      },
       {
         "screenId": "himi_events",
         "isPublic": true,
@@ -254,6 +261,15 @@ export default defineApp({
         "parentScreenId": "himi_groups",
         "tabId": ""
       },
+      {
+        "screenId": "himi_group_about",
+        "isPublic": true,
+        "paramKeys": [
+          "id"
+        ],
+        "parentScreenId": "himi_group",
+        "tabId": ""
+      },
       {
         "screenId": "himi_account",
         "isPublic": true,