@wix/himalaya-cli 0.1583.0 → 0.1585.0

package/templates/nonprofit-cause-owner/dev/index.ts

@@ -76893,6 +76893,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": {
@@ -76937,6 +76966,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "multilineMaxLines": 3
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteServiceForm.descriptionProtected"
                       }
                     }
                   ],
@@ -78253,6 +78285,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": {
@@ -78440,70 +78517,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": "What the role involves",
-                                          "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"
-                              }
                             }
                           ]
                         }
@@ -78624,7 +78637,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"
@@ -79089,6 +79103,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             }
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteEvent.noBodyJson"
                       }
                     },
                     {
@@ -80098,6 +80115,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             }
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLitePost.noBodyJson"
                       }
                     },
                     {

package/templates/nonprofit-cause-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/nonprofit-cause-owner/tier5-src/_shared/owner-rich-guard.ts

@@ -0,0 +1,27 @@
+// May a plain owner form round-trip this body? The Ricos and HTML checks are @himalaya/wix-rich-content's;
+// this file adds the read-only previews the forms show for a locked body, and the FAQ's legacy DraftJS answer.
+// Inside the platform source this import is a relative path, so node test runs resolve it; an app's copy
+// imports "@himalaya/wix-rich-content".
+import { htmlIsTrivial } from "@himalaya/wix-rich-content";
+
+export { htmlIsTrivial };
+
+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");
+}
+
+/** 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/nonprofit-cause-owner/tier5-src/himi-owner-lite-event/index.ts

@@ -12,7 +12,7 @@ import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError,
 import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
-import { richBody } from "../_shared/rich-body.js";
+import { descriptionBody } from "../_shared/rich-body.js";
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, type DbEntity } from "../_shared/owner-local-db.js";
 import { blankFlags } from "../_shared/detail-facts.js";
 
@@ -41,6 +41,7 @@ interface EventState {
   bodyJson: string;
   /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
   hasBodyJson: boolean;
+  noBodyJson: boolean;
   /** The description's plain text (the document's own text, else the legacy description). */
   bodyText: string;
   initial: string;
@@ -68,15 +69,15 @@ interface EventState {
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/** [rico] #3499 — keep the description's plain text with the event's cached row, so the offline detail shows it.
+/** [rico] #3499 — keep the description pair with the event's cached row, so the offline detail shows it.
  *  Merged into the row the events list (or the form) wrote rather than replacing it; with no row yet, the
  *  loaded detail's own fields become one. */
 async function cacheBodyText(s: EventState): Promise<void> {
   if (s.status !== "ready" || !s.id) return;
   const prev = await cacheGet(s.id);
-  await cachePut(prev ? { ...prev, bodyText: s.bodyText } : {
+  await cachePut(prev ? { ...prev, bodyText: s.bodyText, bodyJson: s.bodyJson } : {
     id: s.id, title: s.title, subtitle: s.subtitle, image: s.image, dateLine: s.dateLine, location: s.location,
-    statusLabel: s.statusLabel, registration: s.registration, bodyText: s.bodyText,
+    statusLabel: s.statusLabel, registration: s.registration, bodyText: s.bodyText, bodyJson: s.bodyJson,
   });
 }
 function idFrom(arg: unknown, fallback = ""): string {
@@ -132,6 +133,7 @@ function shapeFields(s: Partial<EventState>): EventState {
     summary: s.summary ?? "",
     bodyJson: s.bodyJson ?? "",
     hasBodyJson: !!s.bodyJson,
+    noBodyJson: !s.bodyJson,
     bodyText: s.bodyText ?? "",
     initial: s.initial ?? "?",
     image,
@@ -186,6 +188,7 @@ function cachedDetail(s: EventState, row: DbEntity): EventState {
   const title = String(row.title ?? row.name ?? "");
   const dateLine = String(row.dateLine ?? row.when ?? "");
   const location = String(row.location ?? "");
+  const body = descriptionBody(row.bodyJson || row.description, descriptionBody(row.bodyText ?? row.summary).bodyText);
   return shape({
     ...s,
     id: String(row.id),
@@ -193,8 +196,8 @@ function cachedDetail(s: EventState, row: DbEntity): EventState {
     title,
     subtitle: String(row.subtitle ?? [dateLine, location].filter((x) => x && x !== "—").join(" · ")),
     summary: "",
-    bodyJson: "",
-    bodyText: String(row.bodyText ?? row.summary ?? row.description ?? ""),
+    bodyJson: body.bodyJson,
+    bodyText: body.bodyText,
     initial: String(row.initial ?? (title[0] || "?")).slice(0, 1).toUpperCase(),
     image: String(row.image ?? ""),
     dateLine: dateLine || "—",
@@ -216,9 +219,9 @@ async function refresh(prev: EventState, id: string): Promise<EventState> {
   }
   const row = normalizeEvent(ev); // reuses date/location/status normalization
   const image = /^https?:\/\//.test(row.image) ? row.image : "";
-  const { bodyJson, bodyText } = richBody((ev as unknown as { description?: unknown }).description, (eventDescription(ev) || "").trim());
+  const { bodyJson, bodyText } = descriptionBody((ev as unknown as { description?: unknown }).description, descriptionBody(eventDescription({ ...ev, description: undefined })).bodyText);
   // The teaser stays above the body only when it says something the body does not.
-  const teaser = String((ev as any).shortDescription ?? "").trim();
+  const teaser = descriptionBody((ev as any).shortDescription).bodyText;
   return shape({
     ...prev,
     id,
@@ -358,4 +361,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/nonprofit-cause-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // Tier-5 bundle: __HIMI_APP_NAME__ — Events event EDIT form (the CRUD "U" only).
 // Modeled on himi-blog-owner-editor. Opened from the event detail ("Edit").
 //
@@ -222,12 +223,16 @@ const svc = defineService<EventFormState, {
           // 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() : "";
+            const doc = parseRicosJson(raw);
+            const text = descriptionBody(raw).bodyText;
             // Edited in the RichContentEditor, seeded with the event's own document byte for byte (never
             // re-encoded); a legacy string seeds as paragraphs, and none seeds an empty editor.
-            return { ...DESCRIPTION_LOADED, description: text, originalDescription: text, descriptionMode: "editor" as const,
-              descriptionJson: doc ? JSON.stringify(raw) : text ? docJson(plainPostBody(text)) : "" };
+            // A description that looks like a serialized document but does not read as one (malformed JSON,
+            // or an object that is not a document) is locked, as on the Product form: an empty editor would
+            // let a save replace it. A blank or tag-only string stays editable so the owner can write the first one.
+            const unreadable = !doc && !text && raw != null && (typeof raw !== "string" || /^\s*[{[]/.test(raw));
+            return { ...DESCRIPTION_LOADED, description: text, originalDescription: text, descriptionMode: unreadable ? "locked" as const : "editor" as const,
+              descriptionJson: unreadable ? "" : doc ? JSON.stringify(doc) : text ? docJson(plainPostBody(text)) : "" };
           })(),
           when: row.dateLine || "—",
           location: row.location || "—",
@@ -239,14 +244,18 @@ const svc = defineService<EventFormState, {
         // Offline: prefill from the last-synced local cache before the demo/error fallbacks.
         const cached = await cacheGet(id);
         if (cached) {
+          // Only `descriptionJson` is the document as Wix returned it. The detail's `bodyJson` is the encoder's
+          // DISPLAY copy (media resized to urls), so it feeds the preview text and never seeds the editor.
+          const doc = parseRicosJson(cached.descriptionJson);
+          const description = descriptionBody(doc ?? cached.bodyJson, descriptionBody(cached.description ?? cached.bodyText ?? cached.summary).bodyText).bodyText;
           return shape({
             ...s, mode, id, heading: "Edit event",
             title: String(cached.title ?? cached.name ?? ""),
-            description: String(cached.description ?? ""),
-            originalDescription: String(cached.description ?? ""), ...DESCRIPTION_LOADED,
+            description,
+            originalDescription: 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).
-            ...(cached.descriptionJson ? { descriptionMode: "editor" as const, descriptionJson: String(cached.descriptionJson) }
+            ...(doc ? { descriptionMode: "editor" as const, descriptionJson: JSON.stringify(doc) }
               : { descriptionMode: cached.descriptionProtected === "false" ? "plain" as const : "locked" as const, descriptionJson: "" }),
             when: String(cached.when ?? cached.dateLine ?? "—"),
             location: String(cached.location ?? "—"),

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-events/index.ts

@@ -9,7 +9,7 @@ import { normalizeEvent, type EventRow } from "../_shared/himi-events.js";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_shared/owner-load-error.js";
 import { DEMO_EVENTS, 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.
@@ -19,7 +19,9 @@ async function readCachedRows(): Promise<EventRow[]> {
   try { return (await getAll(ENTITY)) as unknown as EventRow[]; } catch { return []; }
 }
 async function writeCachedRows(rows: EventRow[]): 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 EventsState {

package/templates/nonprofit-cause-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/nonprofit-cause-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 };