@wix/himalaya-cli 0.1151.0 → 0.1153.0

package/templates/restaurant-owner/tier5-src/himi-owner-lite-event/index.ts

@@ -11,7 +11,9 @@ import { normalizeEvent, eventDescription } from "../_shared/himi-events.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
-import { get as dbGet, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
+import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 
 // Offline-first (data-offline): the event DETAIL falls back to the last-synced
 // local `owner_events` row (put by the event form's write-behind) on a failed
@@ -20,6 +22,7 @@ import { get as dbGet, remove as dbRemove, enqueue as dbEnqueue, type DbEntity }
 // ENQUEUED for replay on reconnect. Every local-db call is wrapped so a build
 // without the `local_database` grant behaves exactly as before (online-only).
 const ENTITY = "owner_events";
+async function cachePut(row: DbEntity): Promise<void> { try { await dbUpsert(ENTITY, row); } catch { /* capability not granted */ } }
 async function cacheDrop(id: string): Promise<void> { try { await dbRemove(ENTITY, id); } catch { /* capability not granted */ } }
 async function cacheGet(id: string): Promise<DbEntity | null> { try { return await dbGet(ENTITY, id); } catch { return null; } }
 async function queueWrite(actionId: string, params: Record<string, string>): Promise<void> { try { await dbEnqueue(actionId, params); } catch { /* capability not granted */ } }
@@ -33,6 +36,13 @@ interface EventState {
   title: string;
   subtitle: string;
   summary: string;
+  // Body ([rico] #3499) — RichContent binds bodyJson; the plain text shows when there is no document.
+  /** The v3 Ricos `description` (read with `fields=TEXTS`) as ONE document string; "" when there is none. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** The description's plain text (the document's own text, else the legacy description). */
+  bodyText: string;
   initial: string;
   image: string;
   dateLine: string;
@@ -55,6 +65,17 @@ 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.
+ *  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 } : {
+    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,
+  });
+}
 function idFrom(arg: unknown, fallback = ""): string {
   return typeof arg === "string" ? arg : String((arg as any)?.id ?? fallback);
 }
@@ -97,6 +118,9 @@ function shape(s: Partial<EventState>): EventState {
     title: s.title ?? "",
     subtitle: s.subtitle ?? "",
     summary: s.summary ?? "",
+    bodyJson: s.bodyJson ?? "",
+    hasBodyJson: !!s.bodyJson,
+    bodyText: s.bodyText ?? "",
     initial: s.initial ?? "?",
     image,
     dateLine: s.dateLine ?? "—",
@@ -128,7 +152,9 @@ function demoDetail(s: EventState, id: string): EventState | null {
     status: "ready",
     title: d.title,
     subtitle: [d.dateLine, d.location].filter(Boolean).join(" · "),
-    summary: d.description,
+    summary: "",
+    bodyJson: "",
+    bodyText: d.description,
     initial: (d.title[0] || "?").toUpperCase(),
     image: "",
     dateLine: d.dateLine,
@@ -151,7 +177,9 @@ function cachedDetail(s: EventState, row: DbEntity): EventState {
     status: "ready",
     title,
     subtitle: String(row.subtitle ?? [dateLine, location].filter((x) => x && x !== "—").join(" · ")),
-    summary: String(row.summary ?? row.description ?? ""),
+    summary: "",
+    bodyJson: "",
+    bodyText: String(row.bodyText ?? row.summary ?? row.description ?? ""),
     initial: String(row.initial ?? (title[0] || "?")).slice(0, 1).toUpperCase(),
     image: String(row.image ?? ""),
     dateLine: dateLine || "—",
@@ -164,21 +192,27 @@ function cachedDetail(s: EventState, row: DbEntity): EventState {
 }
 
 async function refresh(prev: EventState, id: string): Promise<EventState> {
-  const res = await getEvent(id);
+  // A bare read returns the base fieldset: DETAILS adds `shortDescription` (the teaser and the legacy body),
+  // TEXTS the Ricos `description`.
+  const res = await getEvent(id, { fields: ["DETAILS", "TEXTS"] });
   const ev = (res.event ?? res) as WixEvent;
   if (!ev || !(ev as any).id) {
     return shape({ ...prev, id, status: "error", title: "", error: copyParam("ownerEvent.errorNotFound", "event not found") });
   }
   const row = normalizeEvent(ev); // reuses date/location/status normalization
   const image = /^https?:\/\//.test(row.image) ? row.image : "";
-  const desc = (eventDescription(ev) || "").trim();
+  const { bodyJson, bodyText } = richBody((ev as unknown as { description?: unknown }).description, (eventDescription(ev) || "").trim());
+  // The teaser stays above the body only when it says something the body does not.
+  const teaser = String((ev as any).shortDescription ?? "").trim();
   return shape({
     ...prev,
     id,
     status: "ready",
     title: row.title,
     subtitle: [row.dateLine, row.location].filter((x) => x && x !== "—").join(" · "),
-    summary: desc,
+    summary: teaser && teaser !== bodyText.trim() ? teaser : "",
+    bodyJson,
+    bodyText,
     initial: (row.title[0] || "?").toUpperCase(),
     image,
     dateLine: row.dateLine || "—",
@@ -194,6 +228,7 @@ const svc = defineService<EventState, {
   load: (s: EventState, arg?: unknown) => Promise<EventState>;
   retry: (s: EventState) => Promise<EventState>;
   delete: (s: EventState) => Promise<EventState>;
+  openLink: (s: EventState, arg?: unknown) => Promise<EventState>;
 }>("himiOwnerLiteEvent", {
   state: shape({ status: "loading" }),
   actions: {
@@ -208,7 +243,9 @@ const svc = defineService<EventState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        return await refresh(shape({ ...s, id, status: "loading" }), id);
+        const loaded = await refresh(shape({ ...s, id, status: "loading" }), id);
+        await cacheBodyText(loaded);
+        return loaded;
       } catch (e) {
         // Offline: fall back to the last-synced local row before the demo/error paths.
         const cached = await cacheGet(id);
@@ -229,7 +266,9 @@ const svc = defineService<EventState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        return await refresh(shape({ ...s, status: "loading" }), s.id);
+        const loaded = await refresh(shape({ ...s, status: "loading" }), s.id);
+        await cacheBodyText(loaded);
+        return loaded;
       } catch (e) {
         const cached = await cacheGet(s.id);
         if (cached) return cachedDetail(s, cached);
@@ -256,6 +295,11 @@ const svc = defineService<EventState, {
         return shape({ ...s, actionMessage: ownerLoadError(e) });
       }
     },
+    // [rico] #3499 — a link tapped in the RichContent description.
+    openLink: async (s, arg) => shape({
+      ...s,
+      actionMessage: (await openRichLink(arg)) ? "" : copyParam("ownerEvent.linkOpenFailed", "This link could not be opened."),
+    }),
   },
 });
 

package/templates/retail-store/dev/index.ts

@@ -1419,7 +1419,8 @@ const SCREENS = runtimeSetting({
           "params": {
             "verticals": "[\"store\",\"blog\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Shop the collection\",\"dataSource\":\"storeFirst.section0\"},{\"id\":\"section_1\",\"label\":\"Explore\",\"dataSource\":\"storeFirst.section1\"},{\"id\":\"section_2\",\"label\":\"Shop\",\"dataSource\":\"storeFirst.section2\"}]",
-            "ownerDefaultLayout": "storeFirst"
+            "ownerDefaultLayout": "storeFirst",
+            "copy": "{\"home.profileBody\":\"Sign in for orders and saved posts.\"}"
           }
         }
       }
@@ -1470,7 +1471,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "Text",
                 "props": {
-                  "text": "Orders, bookings, RSVPs and saved content in one place.",
+                  "text": "Orders and saved content in one place.",
                   "style": "body",
                   "color": "textSecondary"
                 }
@@ -2694,7 +2695,10 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiStoreAccount.refresh"
+          "actionId": "tier5.himiStoreAccount.refresh",
+          "params": {
+            "copy": "{\"account.subtitle\":\"Orders and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — your cart stays with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — your cart stays with you.\"}"
+          }
         }
       }
     },

package/templates/yoga-studio/dev/index.ts

@@ -2350,7 +2350,7 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"bookings\",\"programs\",\"plans\",\"events\",\"blog\"]",
             "homeModules": "[{\"id\":\"member_progress\",\"label\":\"Today's schedule\",\"dataSource\":\"member.bookings.schedule\",\"emptyWhen\":[\"hideMemberProgress\"]},{\"id\":\"up_next\",\"label\":\"Up next\",\"dataSource\":\"member.bookings\",\"emptyWhen\":[\"hideNextBooking\",\"hidePersonalError\"]},{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Today's schedule\",\"dataSource\":\"calmStudio.section0\",\"emptyWhen\":[\"noTodaysClasses\"]},{\"id\":\"section_1\",\"label\":\"Your practice\",\"dataSource\":\"calmStudio.section1\"}]",
             "ownerDefaultLayout": "calmStudio",
-            "copy": "{\"home.bookClassCta\":\"Reserve your spot\",\"home.onboardingBody\":\"Reserve classes, follow programs, and join retreats — all from one calm place.\",\"home.practiceTitle\":\"Your practice\",\"home.retreatsTitle\":\"Retreats & workshops\",\"home.scheduleTitle\":\"Today's schedule\",\"home.teachersCaption\":\"Your teachers\"}"
+            "copy": "{\"home.bookClassCta\":\"Reserve your spot\",\"home.onboardingBody\":\"Reserve classes, follow programs, and join retreats — all from one calm place.\",\"home.practiceTitle\":\"Your practice\",\"home.profileBody\":\"Sign in for bookings, RSVPs, memberships, programs and saved posts.\",\"home.retreatsTitle\":\"Retreats & workshops\",\"home.scheduleTitle\":\"Today's schedule\",\"home.teachersCaption\":\"Your teachers\"}"
           }
         }
       }
@@ -2401,7 +2401,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "Text",
                 "props": {
-                  "text": "Orders, bookings, RSVPs and saved content in one place.",
+                  "text": "Bookings, RSVPs, memberships, programs and saved content in one place.",
                   "style": "body",
                   "color": "textSecondary"
                 }
@@ -3802,7 +3802,10 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiStoreAccount.refresh"
+          "actionId": "tier5.himiStoreAccount.refresh",
+          "params": {
+            "copy": "{\"account.subtitle\":\"Bookings, RSVPs, memberships, programs and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — bookings, RSVPs, memberships and programs stay with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — bookings, RSVPs, memberships and programs stay with you.\"}"
+          }
         }
       }
     },

package/templates/yoga-studio-owner/dev/index.ts

@@ -73229,6 +73229,48 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       }
                     },
+                    {
+                      "id": "event_body",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:himiOwnerLiteEvent.bodyJson",
+                          "onLink": {
+                            "actionId": "tier5.himiOwnerLiteEvent.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiOwnerLiteEvent.bodyText",
+                                "style": "body",
+                                "color": "textPrimary",
+                                "collapseWhenEmpty": true
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "event_body_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiOwnerLiteEvent.bodyText",
+                          "style": "body",
+                          "color": "textPrimary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteEvent.hasBodyJson"
+                      }
+                    },
                     {
                       "id": "event_info_card",
                       "body": {
@@ -73567,7 +73609,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"

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

@@ -11,7 +11,9 @@ import { normalizeEvent, eventDescription } from "../_shared/himi-events.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
-import { get as dbGet, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
+import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 
 // Offline-first (data-offline): the event DETAIL falls back to the last-synced
 // local `owner_events` row (put by the event form's write-behind) on a failed
@@ -20,6 +22,7 @@ import { get as dbGet, remove as dbRemove, enqueue as dbEnqueue, type DbEntity }
 // ENQUEUED for replay on reconnect. Every local-db call is wrapped so a build
 // without the `local_database` grant behaves exactly as before (online-only).
 const ENTITY = "owner_events";
+async function cachePut(row: DbEntity): Promise<void> { try { await dbUpsert(ENTITY, row); } catch { /* capability not granted */ } }
 async function cacheDrop(id: string): Promise<void> { try { await dbRemove(ENTITY, id); } catch { /* capability not granted */ } }
 async function cacheGet(id: string): Promise<DbEntity | null> { try { return await dbGet(ENTITY, id); } catch { return null; } }
 async function queueWrite(actionId: string, params: Record<string, string>): Promise<void> { try { await dbEnqueue(actionId, params); } catch { /* capability not granted */ } }
@@ -33,6 +36,13 @@ interface EventState {
   title: string;
   subtitle: string;
   summary: string;
+  // Body ([rico] #3499) — RichContent binds bodyJson; the plain text shows when there is no document.
+  /** The v3 Ricos `description` (read with `fields=TEXTS`) as ONE document string; "" when there is none. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** The description's plain text (the document's own text, else the legacy description). */
+  bodyText: string;
   initial: string;
   image: string;
   dateLine: string;
@@ -55,6 +65,17 @@ 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.
+ *  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 } : {
+    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,
+  });
+}
 function idFrom(arg: unknown, fallback = ""): string {
   return typeof arg === "string" ? arg : String((arg as any)?.id ?? fallback);
 }
@@ -97,6 +118,9 @@ function shape(s: Partial<EventState>): EventState {
     title: s.title ?? "",
     subtitle: s.subtitle ?? "",
     summary: s.summary ?? "",
+    bodyJson: s.bodyJson ?? "",
+    hasBodyJson: !!s.bodyJson,
+    bodyText: s.bodyText ?? "",
     initial: s.initial ?? "?",
     image,
     dateLine: s.dateLine ?? "—",
@@ -128,7 +152,9 @@ function demoDetail(s: EventState, id: string): EventState | null {
     status: "ready",
     title: d.title,
     subtitle: [d.dateLine, d.location].filter(Boolean).join(" · "),
-    summary: d.description,
+    summary: "",
+    bodyJson: "",
+    bodyText: d.description,
     initial: (d.title[0] || "?").toUpperCase(),
     image: "",
     dateLine: d.dateLine,
@@ -151,7 +177,9 @@ function cachedDetail(s: EventState, row: DbEntity): EventState {
     status: "ready",
     title,
     subtitle: String(row.subtitle ?? [dateLine, location].filter((x) => x && x !== "—").join(" · ")),
-    summary: String(row.summary ?? row.description ?? ""),
+    summary: "",
+    bodyJson: "",
+    bodyText: String(row.bodyText ?? row.summary ?? row.description ?? ""),
     initial: String(row.initial ?? (title[0] || "?")).slice(0, 1).toUpperCase(),
     image: String(row.image ?? ""),
     dateLine: dateLine || "—",
@@ -164,21 +192,27 @@ function cachedDetail(s: EventState, row: DbEntity): EventState {
 }
 
 async function refresh(prev: EventState, id: string): Promise<EventState> {
-  const res = await getEvent(id);
+  // A bare read returns the base fieldset: DETAILS adds `shortDescription` (the teaser and the legacy body),
+  // TEXTS the Ricos `description`.
+  const res = await getEvent(id, { fields: ["DETAILS", "TEXTS"] });
   const ev = (res.event ?? res) as WixEvent;
   if (!ev || !(ev as any).id) {
     return shape({ ...prev, id, status: "error", title: "", error: copyParam("ownerEvent.errorNotFound", "event not found") });
   }
   const row = normalizeEvent(ev); // reuses date/location/status normalization
   const image = /^https?:\/\//.test(row.image) ? row.image : "";
-  const desc = (eventDescription(ev) || "").trim();
+  const { bodyJson, bodyText } = richBody((ev as unknown as { description?: unknown }).description, (eventDescription(ev) || "").trim());
+  // The teaser stays above the body only when it says something the body does not.
+  const teaser = String((ev as any).shortDescription ?? "").trim();
   return shape({
     ...prev,
     id,
     status: "ready",
     title: row.title,
     subtitle: [row.dateLine, row.location].filter((x) => x && x !== "—").join(" · "),
-    summary: desc,
+    summary: teaser && teaser !== bodyText.trim() ? teaser : "",
+    bodyJson,
+    bodyText,
     initial: (row.title[0] || "?").toUpperCase(),
     image,
     dateLine: row.dateLine || "—",
@@ -194,6 +228,7 @@ const svc = defineService<EventState, {
   load: (s: EventState, arg?: unknown) => Promise<EventState>;
   retry: (s: EventState) => Promise<EventState>;
   delete: (s: EventState) => Promise<EventState>;
+  openLink: (s: EventState, arg?: unknown) => Promise<EventState>;
 }>("himiOwnerLiteEvent", {
   state: shape({ status: "loading" }),
   actions: {
@@ -208,7 +243,9 @@ const svc = defineService<EventState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        return await refresh(shape({ ...s, id, status: "loading" }), id);
+        const loaded = await refresh(shape({ ...s, id, status: "loading" }), id);
+        await cacheBodyText(loaded);
+        return loaded;
       } catch (e) {
         // Offline: fall back to the last-synced local row before the demo/error paths.
         const cached = await cacheGet(id);
@@ -229,7 +266,9 @@ const svc = defineService<EventState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        return await refresh(shape({ ...s, status: "loading" }), s.id);
+        const loaded = await refresh(shape({ ...s, status: "loading" }), s.id);
+        await cacheBodyText(loaded);
+        return loaded;
       } catch (e) {
         const cached = await cacheGet(s.id);
         if (cached) return cachedDetail(s, cached);
@@ -256,6 +295,11 @@ const svc = defineService<EventState, {
         return shape({ ...s, actionMessage: ownerLoadError(e) });
       }
     },
+    // [rico] #3499 — a link tapped in the RichContent description.
+    openLink: async (s, arg) => shape({
+      ...s,
+      actionMessage: (await openRichLink(arg)) ? "" : copyParam("ownerEvent.linkOpenFailed", "This link could not be opened."),
+    }),
   },
 });