@wix/himalaya-cli 0.1582.0 → 0.1584.0

package/templates/events-meetups-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/events-meetups-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/events-meetups-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/gym-fitness/config.ts

@@ -293,6 +293,13 @@ export default defineApp({
         "parentScreenId": "himi_blog",
         "tabId": "home"
       },
+      {
+        "screenId": "himi_notif_settings",
+        "isPublic": true,
+        "paramKeys": [],
+        "parentScreenId": "himi_account",
+        "tabId": "profile"
+      },
       {
         "screenId": "himi_events",
         "isPublic": true,
@@ -506,7 +513,7 @@ export default defineApp({
   // Your on-device database. It must declare every entity a worker reads or writes,
   // or those calls fail closed — keep it in step with `local_database` above.
   dataSchema: {
-    "version": 2,
+    "version": 3,
     "entities": [
       {
         "name": "products",
@@ -587,6 +594,25 @@ export default defineApp({
           }
         ]
       },
+      {
+        "name": "booking_prefs",
+        "encrypted": false,
+        "fields": [
+          {
+            "name": "id",
+            "type": "string",
+            "required": true
+          },
+          {
+            "name": "locationId",
+            "type": "string"
+          },
+          {
+            "name": "locationLabel",
+            "type": "string"
+          }
+        ]
+      },
       {
         "name": "cms_collections",
         "encrypted": false,