@wix/himalaya-cli 0.1030.0 → 0.1031.0

package/templates/beauty-salon-owner/tier5-src/_shared/owner-bookings.ts

@@ -0,0 +1,20 @@
+import type { WixBooking } from "@himalaya/wix-bookings";
+
+/** The booking statuses an owner still has to show up for. ONE list for every surface that
+ *  says "upcoming appointments" — Home's KPI and Manage's Appointments summary used to ask
+ *  the server two different questions (`$in` these vs `$nin` CANCELED/DECLINED) and Manage
+ *  then trusted whatever came back, so the two screens could disagree on the same business
+ *  (Home 9, Manage 11 on the same hermetic fixtures). */
+export const UPCOMING_BOOKING_STATUSES = ["CONFIRMED", "PENDING", "PENDING_APPROVAL", "WAITING_LIST", "CREATED"];
+
+/** Count the loaded bookings that are still upcoming. Applied to the response even though
+ *  the query already filters: a server (or a fixture) that returns a cancelled or past row
+ *  must not turn it into an appointment the owner is told to expect. */
+export function upcomingBookingCount(bookings: WixBooking[], now: number): number {
+  return bookings.filter((booking) => {
+    if (!UPCOMING_BOOKING_STATUSES.includes((booking.status ?? "").toUpperCase())) return false;
+    const start = booking.startDate || booking.bookedEntity?.slot?.startDate;
+    const ms = start ? new Date(start).getTime() : NaN;
+    return Number.isFinite(ms) && ms >= now;
+  }).length;
+}

package/templates/beauty-salon-owner/tier5-src/_shared/owner-load-error.ts

@@ -1,6 +1,12 @@
 import { copyParam } from "./himi-copy.js";
 
-/** Host-owned preview input. Absent on native and older hosts. */
+/** Host-owned preview input. Absent on native and older hosts.
+ *
+ *  `"sample"` — the built-in demo records; `"live"` — the viewer's own business over the
+ *  owner rung; `"fixtures"` — a DEV web host over a sealed hermetic gateway, where
+ *  the dev fixtures are the sample data. `"fixtures"` is neither live nor demo, so a
+ *  worker READS through the bridge as it does on a device; it is still a preview host
+ *  (`isOwnerPreviewHost`), so failure copy may name the web preview. */
 function ownerPreviewMode(): unknown {
   return (globalThis as unknown as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.__himiOwnerPreview;
 }

package/templates/beauty-salon-owner/tier5-src/himi-owner-lite-aria/index.ts

@@ -27,6 +27,8 @@
 import { defineService } from "@himalaya/state";
 import { open } from "@himalaya/open-url";
 import { writeText } from "@himalaya/clipboard";
+import { capturePhoto } from "@himalaya/camera";
+import { put } from "@himalaya/presigned-upload";
 import { alert } from "@himalaya/ui";
 import {
   activeSiteId,
@@ -36,7 +38,7 @@ import {
   type AriaPromptChip,
 } from "../_shared/aria-chat.js";
 import { WIDGET_SUBTREE_SLOT } from "../_shared/aria-generic-widget.js";
-import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { OWNER_MODULES, ownerModuleIds, ownerModuleScreen } from "../_shared/owner-modules.js";
 
 const SERVICE = "himiOwnerLiteAria";
@@ -199,6 +201,14 @@ const core = createAriaChat({
     // English. Says no "sign in": the owner already is, and the missing piece is
     // the app's binding, so there is no action for them to take.
     unavailable: () => copyParam("ownerAria.unavailable", "Aria can't reach your Wix account from here."),
+    attachUploading: () => copyParam("ownerAria.attach.uploading", "Uploading…"),
+    attachFailed: () => copyParam("ownerAria.attach.failed", "Couldn't upload"),
+    attachTooMany: (max) => copyTemplate("ownerAria.attach.tooMany", "You can attach up to {max} photos.", { max }),
+    attachUnsupported: () => copyParam("ownerAria.attach.unsupported", "That file type can't be attached."),
+    attachTooLarge: (mb) => copyTemplate("ownerAria.attach.tooLarge", "That photo is too large to attach (up to {mb} MB).", { mb }),
+    attachWaitUploading: () => copyParam("ownerAria.attach.waitUploading", "Wait for your photo to finish uploading."),
+    attachWaitFailed: () => copyParam("ownerAria.attach.waitFailed", "Retry or remove the photo that didn't upload."),
+    attachNeedsText: () => copyParam("ownerAria.attach.needsText", "Add a message to send with your photo."),
     toolFailed: () => copyParam("ownerAria.toolFailed", "Aria couldn't finish that. Try again."),
   },
   clientTools: { confirm: confirmWithOwner, userAgent },
@@ -221,6 +231,25 @@ const core = createAriaChat({
     return screenId ? { screenId } : null;
   },
   poll: { action: `${SERVICE}.tick`, fastMs: FAST_MS, idleMs: IDLE_MS },
+  // Photo attachments. The two device capabilities live HERE rather than
+  // in the shared core so that only a screen which declares them imports them:
+  // `camera` for the picker (it returns the image already re-encoded as JPEG and
+  // scaled to 2048 px on its longest side, which is also what keeps a phone
+  // photo inside the inline upload bound) and `presigned_upload` for the bytes,
+  // which go to a self-authorizing url with no Wix credential attached.
+  attachments: {
+    pick: async (source) => {
+      const asset = await capturePhoto({ source, maxEdgePixels: 2048 });
+      return asset ? { dataUri: asset.uri, mimeType: asset.mime } : null;
+    },
+    put: async (url, base64, contentType) => {
+      const r = await put(url, { base64 }, { contentType, method: "PUT" });
+      return { ok: r.ok, status: r.status };
+    },
+    // A NEW action on the service, not a return value: the upload outlives the
+    // `attach` that started it. `svc` is read at call time, long after it exists.
+    settled: (outcome) => { void svc.attachmentSettled(outcome); },
+  },
 });
 
 const svc = defineService<AriaChatState, {
@@ -252,6 +281,10 @@ const svc = defineService<AriaChatState, {
   widgetPick: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
   widgetQuery: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
   widgetAnswer: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
+  attach: (s: AriaChatState, arg?: AriaActionArg) => Promise<AriaChatState>;
+  attachmentSettled: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
+  removeAttachment: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
+  retryAttachment: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
 }>(SERVICE, {
   state: core.initialState,
   actions: {
@@ -288,6 +321,12 @@ const svc = defineService<AriaChatState, {
     widgetPick: core.widgetPick,
     widgetQuery: core.widgetQuery,
     widgetAnswer: core.widgetAnswer,
+    // The composer's photos. `attachmentSettled` is dispatched by the upload
+    // itself (see `attachments.settled` above), never by the descriptor.
+    attach: core.attach,
+    attachmentSettled: core.attachmentSettled,
+    removeAttachment: core.removeAttachment,
+    retryAttachment: core.retryAttachment,
   },
 });
 

package/templates/beauty-salon-owner/tier5-src/himi-owner-lite-home/index.ts

@@ -8,7 +8,8 @@ import { queryPosts } from "@himalaya/wix-blog";
 import { queryEvents, startDateOf, type WixEvent } from "../_shared/himi-events.js";
 import { countSites } from "@himalaya/wix-site-list";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
-import { queryBookings, type WixBooking } from "@himalaya/wix-bookings";
+import { queryBookings } from "@himalaya/wix-bookings";
+import { UPCOMING_BOOKING_STATUSES, upcomingBookingCount } from "../_shared/owner-bookings.js";
 import { queryMembers } from "@himalaya/wix-members";
 import { queryReviews } from "@himalaya/wix-reviews";
 import { queryReservations } from "@himalaya/wix-table-reservations";
@@ -88,7 +89,6 @@ const PAGE = 100;
 const TODAY_PAGE = 50;
 const EVENT_SCAN_MAX_PAGES = 5;
 const EVENT_SCAN_MAX_RECORDS = 500;
-const UPCOMING_BOOKING_STATUSES = ["CONFIRMED", "PENDING", "PENDING_APPROVAL", "WAITING_LIST", "CREATED"];
 const UPCOMING_RESERVATION_STATUSES = ["HELD", "RESERVED", "REQUESTED"];
 const UPCOMING_EVENT_STATUSES = ["UPCOMING", "SCHEDULED"];
 const ATTENTION_MEMBER_STATUSES = ["PENDING"];
@@ -314,16 +314,6 @@ async function measuredRevenue7d(
   }
 }
 
-function upcomingBookingCount(bookings: WixBooking[], now: number): number {
-  const valid = ["CONFIRMED", "PENDING", "PENDING_APPROVAL", "WAITING_LIST", "CREATED"];
-  return bookings.filter((booking) => {
-    if (!valid.includes((booking.status ?? "").toUpperCase())) return false;
-    const start = booking.startDate || booking.bookedEntity?.slot?.startDate;
-    const ms = start ? new Date(start).getTime() : NaN;
-    return Number.isFinite(ms) && ms >= now;
-  }).length;
-}
-
 function enabledSourcesFrom(value: unknown): HomeSourceId[] | undefined {
   if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
   const holder = value as Record<string, unknown>;

package/templates/beauty-salon-owner/tier5-src/himi-owner-lite-manage/index.ts

@@ -7,7 +7,8 @@ import { defineService, navigate } from '@himalaya/state';
 import { open } from '@himalaya/open-url';
 import { queryStoreProducts } from '../_shared/himi-store.js';
 import { searchOrders } from '@himalaya/wix-ecom';
-import { queryBookings, queryServices } from '@himalaya/wix-bookings';
+import { queryBookings, queryServices, type WixBooking } from '@himalaya/wix-bookings';
+import { UPCOMING_BOOKING_STATUSES, upcomingBookingCount } from '../_shared/owner-bookings.js';
 import { queryEvents, startDateOf } from '../_shared/himi-events.js';
 import { queryPosts, queryDraftPosts } from '@himalaya/wix-blog';
 import { queryQuestionEntries } from '@himalaya/wix-faq';
@@ -90,9 +91,14 @@ async function metricFor(metricKey: string): Promise<Metric> {
       return partialCount(response, 'services');
     }
     case 'appointments': {
-      const now = new Date().toISOString();
-      const response = await queryBookings({ query: { filter: { startDate: { $gte: now }, status: { $nin: ['CANCELED', 'DECLINED'] } }, paging: { limit: PAGE, offset: 0 } } });
-      const metric = partialCount(response, 'bookings');
+      // Same question, same count as Home's "Upcoming appointments" (_shared/owner-bookings).
+      const nowMs = Date.now();
+      const response = await queryBookings({ query: { filter: { startDate: { $gte: new Date(nowMs).toISOString() }, status: { $in: UPCOMING_BOOKING_STATUSES } }, paging: { limit: PAGE, offset: 0 } } });
+      const page = partialCount(response, 'bookings');
+      const loaded = rows(response, 'bookings');
+      // Counted from the loaded page, so it is partial ("+") whenever the server holds more
+      // than that page — by its total, its cursor, or a full page — exactly as Home marks it.
+      const metric = { count: upcomingBookingCount(loaded as WixBooking[], nowMs), hasMore: page.hasMore || page.count > loaded.length || loaded.length >= PAGE };
       return { ...metric, statusText: metric.count
         ? copyTemplate('ownerManage.appointmentsUpcoming', '{count} upcoming', { count: metric.count })
         : copyParam('ownerManage.appointmentsClear', 'No upcoming appointments') };

package/templates/branded-lite/tier5-src/_shared/owner-load-error.ts

@@ -1,6 +1,12 @@
 import { copyParam } from "./himi-copy.js";
 
-/** Host-owned preview input. Absent on native and older hosts. */
+/** Host-owned preview input. Absent on native and older hosts.
+ *
+ *  `"sample"` — the built-in demo records; `"live"` — the viewer's own business over the
+ *  owner rung; `"fixtures"` — a DEV web host over a sealed hermetic gateway, where
+ *  the dev fixtures are the sample data. `"fixtures"` is neither live nor demo, so a
+ *  worker READS through the bridge as it does on a device; it is still a preview host
+ *  (`isOwnerPreviewHost`), so failure copy may name the web preview. */
 function ownerPreviewMode(): unknown {
   return (globalThis as unknown as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.__himiOwnerPreview;
 }

package/templates/community-club/tier5-src/_shared/owner-load-error.ts

@@ -1,6 +1,12 @@
 import { copyParam } from "./himi-copy.js";
 
-/** Host-owned preview input. Absent on native and older hosts. */
+/** Host-owned preview input. Absent on native and older hosts.
+ *
+ *  `"sample"` — the built-in demo records; `"live"` — the viewer's own business over the
+ *  owner rung; `"fixtures"` — a DEV web host over a sealed hermetic gateway, where
+ *  the dev fixtures are the sample data. `"fixtures"` is neither live nor demo, so a
+ *  worker READS through the bridge as it does on a device; it is still a preview host
+ *  (`isOwnerPreviewHost`), so failure copy may name the web preview. */
 function ownerPreviewMode(): unknown {
   return (globalThis as unknown as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.__himiOwnerPreview;
 }

package/templates/community-club-owner/config.ts

@@ -37,7 +37,7 @@ export default defineApp({
     actions: "http://localhost:8190/v1/actions",
     sync: "http://localhost:8190/v1/sync",
   },
-  capabilities: ["live_activity","push","share","secure_storage","open_url","local_database","clipboard","ui"],
+  capabilities: ["live_activity","push","share","secure_storage","open_url","local_database","clipboard","ui","camera","presigned_upload"],
   designTokensPath: "./tokens.json",
   navigation: {
     "navKind": "responsive",

package/templates/community-club-owner/dev/index.ts

@@ -50387,7 +50387,7 @@ const SCREENS = runtimeSetting({
                           "itemsPath": "$service:himiOwnerLiteManage.recents",
                           "items": [
                             {
-                              "id": "",
+                              "id": "himi_owner_lite.manage.recent.$item.id",
                               "body": {
                                 "package": "himalaya",
                                 "type": "VStack",
@@ -50532,7 +50532,7 @@ const SCREENS = runtimeSetting({
                                           "spacing": 14,
                                           "children": [
                                             {
-                                              "id": "",
+                                              "id": "himi_owner_lite.manage.recent.create.$item.id",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Text",
@@ -50557,7 +50557,7 @@ const SCREENS = runtimeSetting({
                                               }
                                             },
                                             {
-                                              "id": "",
+                                              "id": "himi_owner_lite.manage.recent.handoff.$item.id",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Text",
@@ -50693,7 +50693,7 @@ const SCREENS = runtimeSetting({
                                   "itemsPath": "$item.areas",
                                   "items": [
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite.manage.area.$item.id",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "VStack",
@@ -50838,7 +50838,7 @@ const SCREENS = runtimeSetting({
                                                   "spacing": 14,
                                                   "children": [
                                                     {
-                                                      "id": "",
+                                                      "id": "himi_owner_lite.manage.area.create.$item.id",
                                                       "body": {
                                                         "package": "himalaya",
                                                         "type": "Text",
@@ -50863,7 +50863,7 @@ const SCREENS = runtimeSetting({
                                                       }
                                                     },
                                                     {
-                                                      "id": "",
+                                                      "id": "himi_owner_lite.manage.area.handoff.$item.id",
                                                       "body": {
                                                         "package": "himalaya",
                                                         "type": "Text",
@@ -51643,7 +51643,7 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "items": [
                     {
-                      "id": "",
+                      "id": "ol_drawer_nav.$item.id",
                       "body": {
                         "package": "himalaya",
                         "type": "ListItem",
@@ -51695,7 +51695,7 @@ const SCREENS = runtimeSetting({
                         "props": {
                           "items": [
                             {
-                              "id": "",
+                              "id": "ol_drawer_attention.$item.id",
                               "body": {
                                 "package": "himalaya",
                                 "type": "ListItem",
@@ -55256,6 +55256,45 @@ const SCREENS = runtimeSetting({
                                 }
                               }
                             },
+                            {
+                              "id": "himi_owner_lite_aria.msg_attach_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 0,
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$item.notUser"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$item.attachText",
+                                          "style": "footnote",
+                                          "color": "textSecondary",
+                                          "maxLines": 3
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.attachHidden"
+                              }
+                            },
                             {
                               "id": "himi_owner_lite_aria.msg_$item.id.link1",
                               "body": {
@@ -58836,6 +58875,203 @@ const SCREENS = runtimeSetting({
                 }
               }
             },
+            {
+              "id": "himi_owner_lite_aria.attachments.bound",
+              "body": {
+                "package": "himalaya",
+                "type": "LazyList",
+                "props": {
+                  "itemsPath": "$service:himiOwnerLiteAria.attachments",
+                  "horizontal": true,
+                  "spacing": 8,
+                  "items": [
+                    {
+                      "id": "himi_owner_lite_aria.attachment_$item.id",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 4,
+                          "children": [
+                            {
+                              "id": "himi_owner_lite_aria.attachment_thumb_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Image",
+                                "props": {
+                                  "url": "$item.thumbUrl",
+                                  "width": 72,
+                                  "height": 72,
+                                  "contentMode": "fill",
+                                  "shape": "rounded",
+                                  "contentDescription": "$item.name"
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.thumbHidden"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.statusText",
+                                  "style": "caption",
+                                  "color": "textSecondary",
+                                  "maxLines": 2
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.statusHidden"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "children": [
+                                    {
+                                      "id": "himi_owner_lite_aria.attachment_retry_$item.id",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Retry",
+                                          "style": "caption",
+                                          "color": "accentPrimary",
+                                          "maxLines": 1
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "onTap": {
+                                          "actionId": "tier5.himiOwnerLiteAria.retryAttachment",
+                                          "params": {
+                                            "id": "$item.id"
+                                          }
+                                        },
+                                        "hiddenPath": "$item.retryHidden"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_owner_lite_aria.attachment_remove_$item.id",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "close",
+                                          "size": 14,
+                                          "tint": "textSecondary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "onTap": {
+                                          "actionId": "tier5.himiOwnerLiteAria.removeAttachment",
+                                          "params": {
+                                            "id": "$item.id"
+                                          }
+                                        },
+                                        "accessibilityLabel": "Remove photo"
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "width": 72
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiOwnerLiteAria.attachmentsHidden",
+                "padding": {
+                  "leading": 0,
+                  "trailing": 0,
+                  "top": 8,
+                  "bottom": 0
+                }
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 16,
+                  "children": [
+                    {
+                      "id": "himi_owner_lite_aria.attach.library",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "image",
+                          "size": 22,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "onTap": {
+                          "actionId": "tier5.himiOwnerLiteAria.attach",
+                          "params": {
+                            "source": "library"
+                          }
+                        },
+                        "accessibilityLabel": "Add a photo"
+                      }
+                    },
+                    {
+                      "id": "himi_owner_lite_aria.attach.camera",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "camera",
+                          "size": 22,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "onTap": {
+                          "actionId": "tier5.himiOwnerLiteAria.attach",
+                          "params": {
+                            "source": "camera"
+                          }
+                        },
+                        "accessibilityLabel": "Take a photo"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 0,
+                  "trailing": 0,
+                  "top": 8,
+                  "bottom": 0
+                }
+              }
+            },
             {
               "id": "form_aria",
               "body": {
@@ -58921,7 +59157,9 @@ const SCREENS = runtimeSetting({
         "wix_api",
         "open_url",
         "clipboard",
-        "ui"
+        "ui",
+        "camera",
+        "presigned_upload"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"