@wix/himalaya-cli 0.1583.0 → 0.1584.0

package/templates/beauty-salon/tier5-src/himi-store-product/index.ts

@@ -16,6 +16,7 @@ import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
 import { isProductSaved, toggleSavedProduct } from "../_shared/himi-store-saved.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
 import { descriptionBody } from "../_shared/rich-body.js";
+import { PRODUCT_DETAIL_FIELDS, productInfoSections, type ProductInfoSection } from "../_shared/store-product-info.js";
 
 // Offline-first (data-offline): the detail is a public READ-THROUGH — when the live
 // product fetch fails (offline) fall back to the last-synced row the catalog cached
@@ -231,6 +232,7 @@ interface S {
   wasPriceEmpty: boolean;
   noSku: boolean;
   skuLabel: string;
+  infoSections: ProductInfoSection[];
   returnPolicyBody: string;
   shippingInfoBody: string;
   noReturnPolicyBody: boolean;
@@ -544,6 +546,7 @@ const svc = defineService<S, {
     wasPriceEmpty: false,
     skuLabel: "",
     noSku: true,
+    infoSections: [],
     returnPolicyBody: "",
     shippingInfoBody: "",
     noReturnPolicyBody: true,
@@ -631,7 +634,7 @@ const svc = defineService<S, {
         // Storage problems must not prevent browsing or buying a product.
         let saved = false;
         try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
-        s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, optionValidationRequest: 0, optionValidationTarget: "", galleryIndex: 0, returnPolicyExpanded: false, shippingInfoExpanded: false };
+        s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, optionValidationRequest: 0, optionValidationTarget: "", galleryIndex: 0, returnPolicyExpanded: false, shippingInfoExpanded: false, ...(id !== lastLoadedId ? { infoSections: [] } : {}) };
         // A fresh navigation into the product resets any quantity left over
         // from a previous visit to the same worker instance.
         if (!id) {
@@ -648,8 +651,8 @@ const svc = defineService<S, {
         void cartCount.then((n) => { cartKnown = n; }, () => {});
         // The live product read goes out FIRST too — the local-db read below must never delay it.
         // Settled into a value so a failure is handled where it is awaited, never unhandled.
-        // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
-        const live = getStoreProduct(id, ["DESCRIPTION", "PRODUCT_CHOICES_DISPLAY_IMAGE"]).then(
+        // Widen the default fieldset with the V3 Ricos description, the Product Info sections and choice-linked images (a V1 catalog ignores them).
+        const live = getStoreProduct(id, [...PRODUCT_DETAIL_FIELDS, "PRODUCT_CHOICES_DISPLAY_IMAGE"]).then(
           (r) => ({ ok: true as const, r }),
           () => ({ ok: false as const }),
         );
@@ -712,6 +715,7 @@ const svc = defineService<S, {
             ...sale,
             commercePrice: sale.price,
             skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
+            infoSections: productInfoSections(p, base.infoSections),
             returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
             shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
             ...productBody(p),
@@ -746,6 +750,7 @@ const svc = defineService<S, {
             price: String(synced.subtitle ?? ""),
             wasPrice: "",
             skuLabel: "",
+            infoSections: [],
             returnPolicyBody: "",
             shippingInfoBody: "",
             description: "",
@@ -768,6 +773,12 @@ const svc = defineService<S, {
       const quantity = parseQuantity(argValue(arg, "value"));
       return quantity ? derive({ ...s, quantity }) : s;
     },
+    toggleInfoSection: (s, arg) => {
+      const id = argValue(arg, "id");
+      if (!s.infoSections.some(section => section.id === id && !section.noTitle)) return s;
+      return derive({ ...s, infoSections: s.infoSections.map(section => section.id === id
+        ? { ...section, expanded: !section.expanded, collapsed: section.expanded } : section) });
+    },
     toggleReturnPolicy: s => derive({ ...s, returnPolicyExpanded: !s.returnPolicyExpanded }),
     toggleShippingInfo: s => derive({ ...s, shippingInfoExpanded: !s.shippingInfoExpanded }),
     // One chip row per option group. `group` is the descriptor slot ("1".."3");

package/templates/beauty-salon/tier5-src/wix-spaces-plan-detail/index.ts

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // Tier-5 bundle: Wix Spaces clone — Pricing plan detail (ON-DEVICE, site-scoped).
 // himalaya.input.id carries the plan id.
 //
@@ -53,7 +54,7 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesPlanDetail",
         const p = await readPlan(id);
         if (!p) return { ...s, status: "ready", ...presence("missing") };
         const perks = (p.perks?.values ?? []).map((v) => `• ${v}`).join("\n");
-        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: p.description || "", perks, ...presence("found") };
+        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: descriptionBody(p.description).bodyText, perks, ...presence("found") };
       } catch (e) { return { ...s, status: "ready", ...presenceAfterError(e) }; }
     },
   },

package/templates/beauty-salon/tier5-src/wix-spaces-whats-new/index.ts

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // Tier-5 bundle: Wix Spaces clone — What's New (ON-DEVICE, account-level).
 import { defineService } from "@himalaya/state";
 import { withEmptyFlags } from "../_shared/empty-flags.js";
@@ -8,7 +9,7 @@ interface S { status: "loading" | "ready"; items: Row[]; emptyText: string; /**
 
 function norm(a: WixAnnouncement, i: number): Row {
   const aa = a as unknown as { id?: string; title?: string; bodyText?: string; description?: string };
-  return { id: aa.id || `a${i}`, name: aa.title || "Announcement", subtitle: aa.description || aa.bodyText || "" };
+  return { id: aa.id || `a${i}`, name: aa.title || "Announcement", subtitle: descriptionBody(aa.description, descriptionBody(aa.bodyText).bodyText).bodyText };
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", withEmptyFlags({

package/templates/beauty-salon-owner/dev/index.ts

@@ -80795,6 +80795,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 }
               }
             },
+            {
+              "id": "service_form.description_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteServiceForm.descriptionNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "service_form.description_preview",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiOwnerLiteServiceForm.description",
+                  "style": "body",
+                  "maxLines": 8,
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteServiceForm.descriptionEditable"
+              }
+            },
             {
               "id": "service_form.form",
               "body": {
@@ -80839,6 +80868,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "multilineMaxLines": 3
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteServiceForm.descriptionProtected"
                       }
                     }
                   ],
@@ -82857,6 +82889,51 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       }
                     },
+                    {
+                      "id": "product_body",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:himiOwnerLiteProduct.bodyJson",
+                          "onLink": {
+                            "actionId": "tier5.himiOwnerLiteProduct.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiOwnerLiteProduct.bodyText",
+                                "style": "body",
+                                "color": "textPrimary",
+                                "collapseWhenEmpty": true
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteProduct.noBodyJson"
+                      }
+                    },
+                    {
+                      "id": "product_body_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiOwnerLiteProduct.bodyText",
+                          "style": "body",
+                          "color": "textPrimary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteProduct.hasBodyJson"
+                      }
+                    },
                     {
                       "id": "product_info_card",
                       "body": {
@@ -83279,7 +83356,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -83859,6 +83937,51 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       }
                     },
+                    {
+                      "id": "service_body",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:himiOwnerLiteService.bodyJson",
+                          "onLink": {
+                            "actionId": "tier5.himiOwnerLiteService.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiOwnerLiteService.bodyText",
+                                "style": "body",
+                                "color": "textPrimary",
+                                "collapseWhenEmpty": true
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteService.noBodyJson"
+                      }
+                    },
+                    {
+                      "id": "service_body_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiOwnerLiteService.bodyText",
+                          "style": "body",
+                          "color": "textPrimary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteService.hasBodyJson"
+                      }
+                    },
                     {
                       "id": "service_info_card",
                       "body": {
@@ -84046,70 +84169,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               "modifiers": {
                                 "hiddenPath": "$service:himiOwnerLiteService.capacityBlank"
                               }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Divider",
-                                "props": {}
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiOwnerLiteService.descriptionNoDivider"
-                              }
-                            },
-                            {
-                              "id": "service_row_description",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 0,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "Description",
-                                          "style": "footnote",
-                                          "color": "textSecondary"
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "padding": {
-                                          "trailing": 10
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiOwnerLiteService.description",
-                                          "style": "bodyEmphasis",
-                                          "maxLines": 1,
-                                          "collapseWhenEmpty": true
-                                        }
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiOwnerLiteService.descriptionBlank"
-                              }
                             }
                           ]
                         }
@@ -84230,7 +84289,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -84695,6 +84755,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             }
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLitePost.noBodyJson"
                       }
                     },
                     {

package/templates/beauty-salon-owner/tier5-src/_shared/collection-contract.ts

@@ -19,6 +19,8 @@ export interface CollectionConfig {
   /** Numeric 0–5 row field rendered as a Rating (accessible "N out of 5") instead of
    *  folding a "★★★★☆" glyph string into the metadata line, so screen readers get a value. */
   rating?: string;
+  /** Domain-provided calendar text and its unavailable flag, kept separate from media. */
+  dateBadge?: { text: string; hidden: string };
   sectioned?: boolean;
   view: 'list' | 'grid';
   backendQuery?: boolean;
@@ -38,7 +40,13 @@ export interface CollectionConfig {
   /** The card's primary verb, shown as a visible button beside the overflow.
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
-  primaryVerb?: { label: string; screenId?: string };
+  primaryVerb?: { label: string; screenId?: string;
+    /** A row field holding THIS row's verb label (Register, RSVP, Buy Tickets…); `label` stays the fallback copy. */
+    labelPath?: string;
+    /** A row boolean that hides the verb on rows that offer no action (an event with no registration). */
+    hiddenPath?: string };
+  /** The worker action that shares a row (`tier5.<service>.<name>` with `{ id }`): adds Share to the card's overflow menu. */
+  shareAction?: string;
   /** A TIME-BOUND entity (an event, a booking, a reservation): the boolean row field the
    *  DOMAIN sets once the record has finished — computed by the same rule as the row's own
    *  "Past" label, in the same place, so the two cannot disagree. A finished
@@ -73,7 +81,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search by booking ID', countNoun: ['booking', 'bookings'], filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' }, endedWhen: 'isPast' },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', dateBadge: { text: 'dateBadge', hidden: 'noDateBadge' }, gridColumns: 1, view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register', labelPath: 'actionLabel', hiddenPath: 'noAction' }, shareAction: 'share', endedWhen: 'isPast' },
   himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
@@ -208,7 +216,15 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
       ...(config.endedWhen ? (() => {
         const ended = row[config.endedWhen] === true || (config.endedWhen === 'isPast' && row.statusLabel === 'Past');
         return { collectionEnded: ended, collectionNotEnded: !ended };
-      })() : {}) })),
+      })() : {}),
+      // A row restored from state saved by an older build has no badge flag. An unset hidden flag
+      // fails open and would paint an empty chip, so it reads as "no badge" until a refresh.
+      ...(config.dateBadge && typeof row[config.dateBadge.hidden] !== 'boolean'
+        ? { [config.dateBadge.text]: '', [config.dateBadge.hidden]: true } : {}),
+      // Same for a per-row verb: an unset hidden flag fails open and would show a verb with an unresolved
+      // label, so a row without the flag offers no action until a refresh establishes one.
+      ...(config.primaryVerb?.hiddenPath && typeof row[config.primaryVerb.hiddenPath] !== 'boolean'
+        ? { ...(config.primaryVerb.labelPath ? { [config.primaryVerb.labelPath]: '' } : {}), [config.primaryVerb.hiddenPath]: true } : {}) })),
     filters, loaded: rows.length,
   };
 }

package/templates/beauty-salon-owner/tier5-src/himi-owner-lite-post/index.ts

@@ -55,6 +55,7 @@ interface PostState {
   bodyJson: string;
   /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
   hasBodyJson: boolean;
+  noBodyJson: boolean;
   /** Plain text of the body: RichContent's `fallback`, and the offline copy's body. */
   bodyText: string;
   // Info rows
@@ -151,6 +152,7 @@ function shapeFields(s: Partial<PostState>): PostState {
     image,
     bodyJson: s.bodyJson ?? "",
     hasBodyJson: !!s.bodyJson,
+    noBodyJson: !s.bodyJson,
     bodyText: s.bodyText ?? "",
     postStatus: s.postStatus ?? statusLabel(raw),
     category: s.category ?? "—",
@@ -485,4 +487,9 @@ if ((globalThis as { himalaya?: { hydrationOptOut?: unknown } }).himalaya?.hydra
   if (booted && typeof booted === "object") Object.assign(booted, { deletePending: false, noDeleteConfirmation: true });
 }
 
+// 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/beauty-salon-owner/tier5-src/himi-owner-lite-product/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__ — Store product DETAIL + show/hide (visibility).
 // Inner admin page opened from the products list (himi_owner_lite_product_<id>).
 // Uses the Stores v1 client (the Apptestersite catalog is v1; v3 428s) — getProduct
@@ -6,7 +8,7 @@
 
 import { defineService } from "@himalaya/state";
 import { getProduct, updateProduct, deleteProduct, type WixProduct } from "@himalaya/wix-stores";
-import { plainText, productImage, wixMediaUrl, WIX_DETAIL_IMAGE, type StoreProduct } from "../_shared/himi-store.js";
+import { productImage, wixMediaUrl, WIX_DETAIL_IMAGE, type StoreProduct } from "../_shared/himi-store.js";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError, isNotFound } from "../_shared/owner-load-error.js";
 import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
@@ -33,6 +35,10 @@ interface ProductState {
   title: string;
   subtitle: string;
   summary: string;
+  bodyJson: string;
+  bodyText: string;
+  hasBodyJson: boolean;
+  noBodyJson: boolean;
   initial: string;
   image: string;
   // Info rows
@@ -133,6 +139,10 @@ function shapeFields(s: Partial<ProductState>): ProductState {
     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,
     price: s.price ?? "—",
@@ -170,7 +180,9 @@ function demoDetail(s: ProductState, id: string): ProductState | null {
     status: "ready",
     title: d.name,
     subtitle: d.visible ? "Visible in store" : "Hidden from store",
-    summary: d.description,
+    summary: "",
+    bodyText: d.description,
+    bodyJson: "",
     initial: (d.name[0] || "?").toUpperCase(),
     image: "",
     price: d.price,
@@ -190,7 +202,9 @@ function cacheRow(s: ProductState): DbEntity {
     name: s.title,
     title: s.title,
     subtitle: s.subtitle,
-    summary: s.summary,
+    summary: s.bodyText,
+    bodyJson: s.bodyJson,
+    bodyText: s.bodyText,
     initial: s.initial,
     image: s.image,
     price: s.price,
@@ -204,6 +218,7 @@ function cacheRow(s: ProductState): DbEntity {
 /** Rehydrate a ready detail from a last-synced local row (offline read fallback). */
 function cachedDetail(s: ProductState, row: DbEntity): ProductState {
   const visible = row.visible !== "false";
+  const body = descriptionBody(row.bodyJson || row.description, descriptionBody(row.bodyText || row.summary).bodyText);
   const title = String(row.title ?? row.name ?? "");
   return shape({
     ...s,
@@ -211,7 +226,9 @@ function cachedDetail(s: ProductState, row: DbEntity): ProductState {
     status: "ready",
     title,
     subtitle: String(row.subtitle ?? (visible ? "Visible in store" : "Hidden from store")),
-    summary: String(row.summary ?? ""),
+    summary: "",
+    bodyJson: body.bodyJson,
+    bodyText: body.bodyText,
     initial: String(row.initial ?? (title[0] || "?")).slice(0, 1).toUpperCase(),
     image: String(row.image ?? ""),
     price: String(row.price ?? "—"),
@@ -220,25 +237,29 @@ function cachedDetail(s: ProductState, row: DbEntity): ProductState {
     inventory: String(row.inventory ?? "—"),
     visibleRaw: visible,
     error: "",
+    actionMessage: "",
     demoNote: "",
   });
 }
 
 async function refresh(prev: ProductState, id: string, actionMessage = ""): Promise<ProductState> {
-  const res = await getProduct(id);
+  const res = await getProduct(id, { richDescription: true });
   const p = (res.product ?? res) as WixProduct;
   if (!p || !(p as any).id) {
     return shape({ ...prev, id, status: "error", title: "", error: copyParam("ownerProduct.errorNotFound", "product not found"), actionMessage });
   }
   const name = ((p as any).name || "Untitled product").trim();
   const visible = (p as any).visible !== false;
+  const body = descriptionBody((p as { richDescription?: unknown }).richDescription ?? (p as any).description, descriptionBody((p as any).description || (p as any).plainDescription).bodyText);
   return shape({
     ...prev,
     id,
     status: "ready",
     title: name,
     subtitle: visible ? "Visible in store" : "Hidden from store",
-    summary: plainText((p as any).description || ""),
+    summary: "",
+    bodyJson: body.bodyJson,
+    bodyText: body.bodyText,
     initial: (name[0] || "?").toUpperCase(),
     image: imageOf(p),
     price: priceOf(p),
@@ -300,6 +321,7 @@ const svc = defineService<ProductState, {
   show: (s: ProductState) => Promise<ProductState>;
   hide: (s: ProductState) => Promise<ProductState>;
   delete: (s: ProductState) => Promise<ProductState>;
+  openLink: (s: ProductState, arg?: unknown) => Promise<ProductState>;
   cancelDelete: (s: ProductState) => Promise<ProductState>;
   confirmDelete: (s: ProductState) => Promise<ProductState | undefined>;
 }>("himiOwnerLiteProduct", {
@@ -308,6 +330,12 @@ const svc = defineService<ProductState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: [...DELETE_RUN_KEYS],
   actions: {
+    openLink: async (_state, arg): Promise<ProductState> => {
+      const opened = await openRichLink(arg);
+      const failed = copyParam("ownerProduct.linkOpenFailed", "This link could not be opened.");
+      const current = svc.getState();
+      return shape({ ...current, actionMessage: opened ? (current.actionMessage === failed ? "" : current.actionMessage) : failed });
+    },
     load: async (s0, arg) => {
       const s = disarm(s0);
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
@@ -394,4 +422,9 @@ if ((globalThis as { himalaya?: { hydrationOptOut?: unknown } }).himalaya?.hydra
   if (booted && typeof booted === "object") Object.assign(booted, { deletePending: false, noDeleteConfirmation: true });
 }
 
+// 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/beauty-salon-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",