@wix/himalaya-cli 0.1392.0 → 0.1394.0

package/templates/events-meetups/tier5-src/himi-branded-lite-group/index.ts

@@ -4,8 +4,8 @@ import { getMember } from "@himalaya/wix-members";
 import { signedInEmail } from "../_shared/himi-account";
 import { initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
-import { get as dbGet, upsert as dbUpsert, enqueue as dbEnqueue, type DbEntity } from "@himalaya/local-db";
-import { isBridgeUnavailable } from "../_shared/owner-load-error";
+import { get as dbGet, upsert as dbUpsert, type DbEntity } from "@himalaya/local-db";
+import { isOfflineFailure, writeMayHaveLanded } from "../_shared/owner-load-error";
 
 interface MemberAvatar {
   initials: string;
@@ -13,11 +13,12 @@ interface MemberAvatar {
 }
 
 // Offline-first (data-offline): the group detail READS through the shared `groups`
-// cache (get by id) so a previously-synced group still renders offline, and join/leave
-// are WRITE-BEHIND — the membership is written OPTIMISTICALLY to the local store, then
-// the Wix mutation is attempted; if the bridge/network is unreachable the mutation is
-// ENQUEUED for replay on reconnect. Every local-db call is wrapped (try/catch) so a
-// build without the `local_database` grant behaves exactly as before (online-only).
+// cache (get by id) so a previously-synced group still renders offline. Join/leave
+// are SERVER-CONFIRMED: the cached membership changes only after Wix accepts it; a
+// failed one leaves it alone and tells the member why. No host replays a queued
+// write, so nothing is queued.
+// Every local-db call is wrapped so a build without the `local_database` grant
+// behaves exactly as before (online-only).
 const ENTITY = "groups";
 async function readCachedGroup(id: string): Promise<DbEntity | null> {
   try { return await dbGet(ENTITY, id); } catch { return null; }
@@ -41,9 +42,6 @@ async function cachePutMembership(state: State, joined: boolean): Promise<void>
     await dbUpsert(ENTITY, { ...existing, id: state.id, joined: joined ? "true" : "false" });
   } catch { /* capability not granted */ }
 }
-async function queueWrite(actionId: string, params: Record<string, string>): Promise<void> {
-  try { await dbEnqueue(actionId, params); } catch { /* capability not granted */ }
-}
 
 interface State {
   status: "loading" | "ready" | "error";
@@ -242,17 +240,19 @@ const svc = defineService<State, {
       if (state.privacy !== "Public" && state.privacy !== "Unknown") {
         return membershipState({ ...state, message: copyParam("group.privateInviteMessage", "Private groups are available by invitation.") }, false, true);
       }
-      // Optimistic local write — persist the joined membership so it survives offline.
-      await cachePutMembership(state, true);
       try {
         await joinGroup(state.id);
+        // Wix confirmed it: persist the joined membership so it survives offline.
+        await cachePutMembership(state, true);
         return membershipState({ ...state, message: copyParam("group.joinedMessage", "You joined the group.") }, true, true);
       } catch (e) {
-        if (isBridgeUnavailable(e)) {
-          // Offline / no bridge: the optimistic cache already reflects the join; queue
-          // the write to replay (WriteQueue, idempotent) when connectivity returns.
-          await queueWrite("tier5.himiBrandedGroup.join", { id: state.id });
-          return membershipState({ ...state, message: copyParam("group.joinedOfflineMessage", "You joined the group — it will sync when you reconnect.") }, true, true);
+        if (isOfflineFailure(e)) {
+          return membershipState({ ...state, message: copyParam("group.offlineFailedMessage", "You’re offline — nothing was saved. Try again when you reconnect.") }, false, true);
+        }
+        // It may have landed: neither "joined" nor "could not". (No "refresh to check": a load
+        // does not read the membership back.)
+        if (writeMayHaveLanded(e)) {
+          return membershipState({ ...state, message: copyParam("group.joinUnconfirmedMessage", "Wix didn’t confirm this, so you may already have joined the group.") }, false, true);
         }
         return membershipState({ ...state, message: copyParam("group.joinFailedMessage", "The group could not be joined. Try again.") }, false, true);
       }
@@ -260,17 +260,17 @@ const svc = defineService<State, {
     leave: async (state) => {
       const signedIn = Boolean(await signedInEmail());
       if (!signedIn) return membershipState({ ...state, message: copyParam("group.manageSignInMessage", "Sign in from Profile to manage groups.") }, state.isJoined, false);
-      // Optimistic local write — persist the left membership so it survives offline.
-      await cachePutMembership(state, false);
       try {
         await leaveGroup(state.id);
+        // Wix confirmed it: persist the left membership so it survives offline.
+        await cachePutMembership(state, false);
         return membershipState({ ...state, message: copyParam("group.leftMessage", "You left the group.") }, false, true);
       } catch (e) {
-        if (isBridgeUnavailable(e)) {
-          // Offline / no bridge: the optimistic cache already reflects the leave; queue
-          // the write to replay (WriteQueue, idempotent) when connectivity returns.
-          await queueWrite("tier5.himiBrandedGroup.leave", { id: state.id });
-          return membershipState({ ...state, message: copyParam("group.leftOfflineMessage", "You left the group — it will sync when you reconnect.") }, false, true);
+        if (isOfflineFailure(e)) {
+          return membershipState({ ...state, message: copyParam("group.offlineFailedMessage", "You’re offline — nothing was saved. Try again when you reconnect.") }, true, true);
+        }
+        if (writeMayHaveLanded(e)) {
+          return membershipState({ ...state, message: copyParam("group.leaveUnconfirmedMessage", "Wix didn’t confirm this, so you may already have left the group.") }, true, true);
         }
         return membershipState({ ...state, message: copyParam("group.leaveFailedMessage", "The group could not be left. Try again.") }, true, true);
       }

package/templates/events-meetups-owner/dev/index.ts

@@ -51899,106 +51899,6 @@ const SCREENS = runtimeSetting({
                           ]
                         }
                       }
-                    },
-                    {
-                      "id": "himi_owner_lite_account.role",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "HStack",
-                        "props": {
-                          "spacing": 0,
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Role",
-                                  "style": "footnote",
-                                  "color": "textSecondary"
-                                }
-                              },
-                              "modifiers": {
-                                "padding": {
-                                  "trailing": 10
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Spacer",
-                                "props": {}
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Organiser",
-                                  "style": "bodyEmphasis",
-                                  "maxLines": 1,
-                                  "collapseWhenEmpty": true
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_owner_lite_account.plan",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "HStack",
-                        "props": {
-                          "spacing": 0,
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Plan",
-                                  "style": "footnote",
-                                  "color": "textSecondary"
-                                }
-                              },
-                              "modifiers": {
-                                "padding": {
-                                  "trailing": 10
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Spacer",
-                                "props": {}
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Business",
-                                  "style": "bodyEmphasis",
-                                  "maxLines": 1,
-                                  "collapseWhenEmpty": true
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      }
                     }
                   ]
                 }
@@ -52094,6 +51994,28 @@ const SCREENS = runtimeSetting({
                       "modifiers": {
                         "hiddenPath": "$service:himiOwnerLiteAccount.noTerms"
                       }
+                    },
+                    {
+                      "id": "himi_owner_lite_account.deleteAccount",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Delete account",
+                          "style": "plain",
+                          "fullWidth": true,
+                          "role": "destructive",
+                          "action": {
+                            "actionId": "tier5.himiOwnerLiteAccount.openLink",
+                            "params": {
+                              "kind": "deleteAccount"
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteAccount.noDeleteAccount"
+                      }
                     }
                   ]
                 }
@@ -52165,6 +52087,7 @@ const SCREENS = runtimeSetting({
             "supportUrl": "https://www.wix.com/support",
             "privacyUrl": "https://www.wix.com/about/privacy",
             "termsUrl": "https://www.wix.com/about/terms-of-use",
+            "deleteAccountUrl": "https://manage.wix.com/account/account-settings",
             "businessName": "__HIMI_APP_NAME__",
             "copy": "{\"ownerAccount.roleValue\":\"Organiser\",\"ownerAccount.subtitle\":\"Event organiser\"}"
           }
@@ -63441,6 +63364,258 @@ const SCREENS = runtimeSetting({
       "bundleVersion": "0.0.1"
     }
   },
+  "himi_owner_lite_widget_today_small": {
+    "screenId": "himi_owner_lite_widget_today_small",
+    "renderer": "sdui_intent",
+    "title": "Today widget (small)",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "telemetryScreenName": "himi_owner_lite_widget_today_small",
+    "payload": {
+      "id": "himi_owner_lite_widget_today_small.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 4,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "owner_widget.small.header",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 4,
+                  "children": [
+                    {
+                      "id": "owner_widget.small.icon",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "calendar",
+                          "size": 12,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "owner_widget.small.title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Today",
+                          "style": "caption",
+                          "color": "textSecondary",
+                          "maxLines": 1
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "id": "owner_widget.small.message",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerToday.message",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "maxLines": 3
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerToday.hideMessage"
+              }
+            },
+            {
+              "id": "owner_widget.small.spacer",
+              "body": {
+                "package": "himalaya",
+                "type": "Spacer",
+                "props": {}
+              }
+            },
+            {
+              "id": "owner_widget.small.counts",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerToday.countsShort",
+                  "style": "caption",
+                  "maxLines": 1,
+                  "monospacedDigits": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerToday.message"
+              }
+            }
+          ]
+        }
+      }
+    },
+    "input": {
+      "verticals": ""
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-owner-lite-today",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
+  "himi_owner_lite_widget_today_medium": {
+    "screenId": "himi_owner_lite_widget_today_medium",
+    "renderer": "sdui_intent",
+    "title": "Today widget (medium)",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "telemetryScreenName": "himi_owner_lite_widget_today_medium",
+    "payload": {
+      "id": "himi_owner_lite_widget_today_medium.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 6,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "owner_widget.medium.header_row",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 4,
+                  "children": [
+                    {
+                      "id": "owner_widget.medium.icon",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "calendar",
+                          "size": 12,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "owner_widget.medium.header",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerToday.header",
+                          "style": "caption",
+                          "color": "textSecondary",
+                          "maxLines": 1
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "id": "owner_widget.medium.message",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerToday.message",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "maxLines": 3
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerToday.hideMessage"
+              }
+            },
+            {
+              "id": "owner_widget.medium.spacer",
+              "body": {
+                "package": "himalaya",
+                "type": "Spacer",
+                "props": {}
+              }
+            },
+            {
+              "id": "owner_widget.medium.divider",
+              "body": {
+                "package": "himalaya",
+                "type": "Divider",
+                "props": {}
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerToday.message"
+              }
+            },
+            {
+              "id": "owner_widget.medium.counts",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 8,
+                  "children": [
+                    {
+                      "id": "owner_widget.medium.counts_spacer",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerToday.message"
+              }
+            }
+          ]
+        }
+      }
+    },
+    "input": {
+      "verticals": ""
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-owner-lite-today",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
   "himi_owner_lite_wrist_home": {
     "screenId": "himi_owner_lite_wrist_home",
     "renderer": "sdui_intent",

package/templates/events-meetups-owner/himalaya.content.json

@@ -154,6 +154,12 @@
     "himi_owner_lite_sites": {
       "displayName": "Sites"
     },
+    "himi_owner_lite_widget_today_medium": {
+      "displayName": "Today widget (medium)"
+    },
+    "himi_owner_lite_widget_today_small": {
+      "displayName": "Today widget (small)"
+    },
     "himi_owner_lite_wrist_home": {
       "displayName": "Next up"
     },

package/templates/events-meetups-owner/tier5-src/_shared/owner-account.ts

@@ -15,10 +15,13 @@ export interface AccountState {
   supportUrl: string;
   privacyUrl: string;
   termsUrl: string;
+  /** Wix's own account-deletion destination (App Store 5.1.1(v)). */
+  deleteAccountUrl: string;
   /** hiddenPath flags — TRUE hides, so each is phrased negatively. */
   noSupport: boolean;
   noPrivacy: boolean;
   noTerms: boolean;
+  noDeleteAccount: boolean;
 }
 
 /** Only absolute http(s) URLs are openable; anything else is treated as absent. */
@@ -37,13 +40,14 @@ export function ownerLineOf(name: string, email: string): string {
 
 export function shapeAccount(s: Partial<AccountState>): AccountState {
   const supportUrl = safeUrl(s.supportUrl), privacyUrl = safeUrl(s.privacyUrl), termsUrl = safeUrl(s.termsUrl);
+  const deleteAccountUrl = safeUrl(s.deleteAccountUrl);
   return {
     status: s.status ?? "loading",
     businessName: s.businessName ?? "",
     ownerLine: s.ownerLine ?? "",
     versionLine: s.versionLine ?? "",
     error: s.error ?? "",
-    supportUrl, privacyUrl, termsUrl,
-    noSupport: !supportUrl, noPrivacy: !privacyUrl, noTerms: !termsUrl,
+    supportUrl, privacyUrl, termsUrl, deleteAccountUrl,
+    noSupport: !supportUrl, noPrivacy: !privacyUrl, noTerms: !termsUrl, noDeleteAccount: !deleteAccountUrl,
   };
 }

package/templates/events-meetups-owner/tier5-src/_shared/owner-booking-respond.ts

@@ -0,0 +1,82 @@
+// Accept / Decline ONE booking request — the write shared by the two __HIMI_APP_NAME__ surfaces that
+// answer a request without opening the booking screen: the paired watch (`himi-owner-lite-wrist`)
+// and the notification's action buttons (`himi-owner-lite-nav`).
+//
+// Both follow the same rules:
+//   • the press names the business it was shown for, and is REFUSED unless that is the business
+//     the phone has active — a site switched between delivery and press must never confirm
+//     another business's booking;
+//   • the write itself is addressed at that business (`wix-site-id`), so even a switch that lands
+//     between the check and the request cannot move it;
+//   • only a request still pending is written, at the revision Wix last reported.
+
+import { getBooking, confirmBooking, declineBooking } from "@himalaya/wix-bookings";
+
+type Rec = Record<string, unknown>;
+
+/** The statuses that are waiting on the owner. */
+export const PENDING_BOOKING_STATUSES: ReadonlySet<string> = new Set(["PENDING", "PENDING_APPROVAL", "WAITING_LIST"]);
+
+export type BookingResponse = "confirm" | "decline";
+
+/** A press may write only for the business the phone has active. Fails CLOSED: a press that
+ *  names no business, or a host that cannot say which one is active, writes nothing. */
+export function isForActiveBusiness(siteId: string, activeSiteId: string): boolean {
+  return !!siteId && !!activeSiteId && siteId === activeSiteId;
+}
+
+/** Wix refused the write because the booking moved on (another revision, already handled). */
+export function isStaleBookingWrite(e: unknown): boolean {
+  return /revision|\b409\b|ABORTED|conflict/i.test(String((e as Error)?.message ?? e));
+}
+
+/** Confirm or decline `bookingId` at `revision`, addressed at `siteId`. Rejects without a
+ *  request when `siteId` is empty: an unaddressed write would land on whatever business the
+ *  ambient bridge is scoped to. */
+export function writeBookingResponse(kind: BookingResponse, bookingId: string, revision: string, siteId: string): Promise<unknown> {
+  const site = siteId.trim();
+  if (!site) return Promise.reject(new Error("writeBookingResponse: a booking write must name its business"));
+  const opts = { site };
+  return kind === "confirm" ? confirmBooking(bookingId, revision, opts) : declineBooking(bookingId, revision, false, opts);
+}
+
+export type BookingResponseOutcome =
+  | "confirmed" | "declined"
+  /** Not written: no booking id, or a press for a business other than the active one. */
+  | "refused"
+  /** Not written: the booking is no longer waiting on the owner (or no longer exists). */
+  | "notPending"
+  /** Not written: Wix reported a newer revision between the read and the write. */
+  | "stale"
+  /** Not written: the read or the write failed. */
+  | "failed";
+
+function str(r: Rec | undefined, key: string): string {
+  const v = r?.[key];
+  return typeof v === "string" ? v : typeof v === "number" ? String(v) : "";
+}
+
+/** Answer a request known only by id — a notification carries no revision, so the booking is
+ *  read first (from the business the press names) and written only while it is still pending. */
+export async function respondToBookingById(
+  kind: BookingResponse,
+  bookingId: string,
+  siteId: string,
+  activeSiteId: string,
+): Promise<BookingResponseOutcome> {
+  if (!bookingId || !isForActiveBusiness(siteId, activeSiteId)) return "refused";
+  let booking: Rec | undefined;
+  try {
+    booking = ((await getBooking(bookingId, { site: siteId })) as unknown as { booking?: Rec } | undefined)?.booking;
+  } catch {
+    return "failed";
+  }
+  const revision = str(booking, "revision");
+  if (!booking || !revision || !PENDING_BOOKING_STATUSES.has(str(booking, "status"))) return "notPending";
+  try {
+    await writeBookingResponse(kind, bookingId, revision, siteId);
+  } catch (e) {
+    return isStaleBookingWrite(e) ? "stale" : "failed";
+  }
+  return kind === "confirm" ? "confirmed" : "declined";
+}