@wix/himalaya-cli 0.1145.0 → 0.1146.0

package/templates/yoga-studio/tier5-src/himi-events-detail/index.ts

@@ -35,6 +35,8 @@ import {
 } from "../_shared/himi-events";
 import { initials } from "../_shared/himi-text.js";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
 
 interface MapMarker {
   latitude: number;
@@ -88,7 +90,13 @@ interface S {
   initial: string;
   when: string;
   location: string;
+  /** The plain-text description: RichContent's fallback, the calendar notes, and what shows with no document. */
   description: string;
+  /** [rico] #3372 — the v3 Ricos `description` (read with `fields=TEXTS`) as ONE document string for
+   *  RichContent; "" when the event has none or the encoder rejected it. */
+  descriptionJson: string;
+  /** descriptionJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasDescriptionJson: boolean;
   image: string;
   hasImage: boolean;
   noImage: boolean;
@@ -212,6 +220,7 @@ function derive(s: S): S {
   const hasAttendees = s.attendeeAvatars.length > 0;
   return {
     ...s,
+    hasDescriptionJson: s.descriptionJson !== "",
     noMap: !s.mapUrl,
     hasMapMarkers,
     noMapMarkers: !hasMapMarkers,
@@ -357,6 +366,14 @@ async function attendeeSummary(eventId: string): Promise<{ goingLabel: string; a
   }
 }
 
+/** The description pair: the v3 Ricos `description` for RichContent, and its plain text. A string description
+ *  (or none) keeps `eventDescription`'s legacy read, with no document. */
+function eventBody(e: WixEvent): { description: string; descriptionJson: string } {
+  const legacy = eventDescription(e);
+  const { bodyJson, bodyText } = richBody((e as unknown as { description?: unknown }).description, legacy);
+  return { description: bodyText, descriptionJson: bodyJson };
+}
+
 /** getEvent returns the slim BASE fieldset (no `registration`); enrich from the
  *  richer query when the type is unknown — best-effort, find-by-id. */
 async function enrichRegistration(id: string, e: WixEvent): Promise<WixEvent> {
@@ -364,7 +381,11 @@ async function enrichRegistration(id: string, e: WixEvent): Promise<WixEvent> {
   try {
     const list = await queryEvents({ limit: 100 });
     const match = (list.events ?? []).find((candidate) => candidate.id === id);
-    return match ?? e;
+    if (!match) return e;
+    // [rico] #3372 — the query's rows are read without TEXTS, so they carry no Ricos `description`: keep the
+    // one this detail fetched, or the enrichment would silently drop the document on every real site.
+    const description = (e as unknown as { description?: unknown }).description;
+    return description === undefined ? match : ({ ...match, description } as unknown as WixEvent);
   } catch {
     return e;
   }
@@ -377,6 +398,8 @@ const svc = defineService<S, {
   openRegistration: (s: S) => Promise<S>;
   share: (s: S) => Promise<S>;
   addToCalendar: (s: S) => Promise<S>;
+  /** [rico] #3372 — RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (s: S, arg?: unknown) => Promise<S>;
 }>("himiEventDetail", {
   state: derive({
     status: "loading",
@@ -386,6 +409,8 @@ const svc = defineService<S, {
     when: "",
     location: "",
     description: "",
+    descriptionJson: "",
+    hasDescriptionJson: false,
     image: "",
     hasImage: false,
     noImage: true,
@@ -433,7 +458,8 @@ const svc = defineService<S, {
       const id = s.id || inputId();
       if (!id) return derive({ ...s, status: "ready", errored: true });
       try {
-        const res = await getEvent(id);
+        // TEXTS adds the Ricos `description` to the base fieldset (a bare read returns none).
+        const res = await getEvent(id, { fields: ["TEXTS"] });
         let e = ((res as unknown as { event?: WixEvent }).event ?? res) as WixEvent;
         e = await enrichRegistration(id, e);
         const attendees = await attendeeSummary(id);
@@ -460,7 +486,9 @@ const svc = defineService<S, {
           initial: (title.trim()[0] || "E").toUpperCase(),
           when: eventWhen(e),
           location: eventLocation(e),
-          description: eventDescription(e),
+          // The Ricos description when the event has one (its own text is the plain copy); the legacy
+          // string fields otherwise.
+          ...eventBody(e),
           image,
           hasImage: !!image,
           noImage: !image,
@@ -491,6 +519,9 @@ const svc = defineService<S, {
             initial: (title.trim()[0] || "E").toUpperCase(),
             when: cached.dateLine,
             location: cached.location,
+            // The cached list row carries no description: an offline retry of THIS event keeps the pair it
+            // already shows, and any other event's is cleared together, so neither half can linger alone.
+            ...(s.id === id ? {} : { description: "", descriptionJson: "" }),
             image: cached.image,
             hasImage: !!cached.image,
             noImage: !cached.image,
@@ -665,6 +696,12 @@ const svc = defineService<S, {
         return derive({ ...s, actionMessage: copyParam("event.calendarAddFailed", "Could not add this event to calendar."), isAddingCalendar: false });
       }
     },
+    // Only http(s), mailto and tel links reach open_url; a refused link, or one nothing opened, says so, and a
+    // link that opens clears an earlier message.
+    openLink: async (s, arg) => derive({
+      ...s,
+      actionMessage: (await openRichLink(arg)) ? "" : copyParam("event.linkOpenFailed", "This link could not be opened."),
+    }),
   },
 });
 svc.load();

package/templates/yoga-studio-owner/tier5-src/_shared/rich-body.ts

@@ -14,15 +14,21 @@ export interface RichBody {
   bodyText: string;
 }
 
+/** [rico] #3372 — the media width for a document drawn in a LIST row (a feed post, a comment, a CMS item): the
+ *  list-image size (WIX_LIST_IMAGE), so a scrolling list never downloads every image at detail size. */
+export const ROW_IMAGE_WIDTH = 1000;
+
 /** Prepares `richContent` (a Ricos document, as a Wix API returns it, or its JSON string). No document, or one
  *  that is not a document, gives `{ bodyJson: "", bodyText: fallback }`. A document past the viewer's limits
  *  gives bodyJson "" and its plain text — except one rejected as too deep, which is not walked again (the
- *  plain-text walk has no depth limit), so `fallback` stands in for it. */
-export function richBody(richContent: unknown, fallback = ""): RichBody {
+ *  plain-text walk has no depth limit), so `fallback` stands in for it. `imageWidth` sizes its media (default
+ *  the 1400 px detail budget). */
+export function richBody(richContent: unknown, fallback = "", imageWidth = 1400): RichBody {
   const doc = parseRicosJson(richContent);
   if (!doc) return { bodyJson: "", bodyText: fallback };
-  // 1400 px — the detail-image budget, which is also the encoder's maximum.
-  const { json, rejected } = encodeRichContent(doc, { imageWidth: 1400 });
+  // 1400 px by default — the detail-image budget, which is also the encoder's maximum; list rows pass
+  // ROW_IMAGE_WIDTH.
+  const { json, rejected } = encodeRichContent(doc, { imageWidth });
   const text = rejected === "too_deep" ? "" : ricosToPlainText(doc);
   return { bodyJson: json, bodyText: text || fallback };
 }