@wix/himalaya-cli 0.1582.0 → 0.1583.0

package/templates/beauty-salon/tier5-src/himi-booking-time/index.ts

@@ -17,6 +17,7 @@ import { displayName, getMyData, type WixMyData } from "@himalaya/wix-users";
 import { formatServicePrice, serviceIsChargeable } from "../_shared/wix-service-price.js";
 import { stashCopy, copyParam, copyPlural, copyTemplate } from "../_shared/himi-copy.js";
 import { upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "@himalaya/local-db";
+import { locationChoice, readSharedLocationResult, writeSharedLocation } from "../_shared/booking-location.js";
 import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
 import { emitHostEvent, hostEventInstant } from "../_shared/host-events.js";
 import { availabilityBeyond, courseReadWindows, courseSessionsAvailability, courseWindowOpen, slotIdAt } from "../_shared/himi-bookings.js";
@@ -71,6 +72,9 @@ interface SlotRow {
   locKey: string;
   locLabel: string;
   locSub: string;
+  /** The location as every bookings screen keys it (`booking-location.ts`): what the shared
+   *  choice of Services and the Agenda names. "" when it has none. */
+  locPlace: string;
 }
 
 /** One time in a staff group: a pill with three looks. */
@@ -523,6 +527,7 @@ function slotRows(entries: ReadonlyArray<{ slot?: WixBookingSlotFull; bookable?:
       locKey: loc.key,
       locLabel: loc.label,
       locSub: loc.sub,
+      locPlace: locationChoice(slot.location as Parameters<typeof locationChoice>[0]).key,
     });
   }
   return { rows, slots, waitlist };
@@ -552,9 +557,9 @@ function locationMatches(row: SlotRow, locationId: string): boolean {
 
 /** Every distinct location of the window's times (the greyed ones read so far included), in the
  *  order they first appear. */
-function windowLocations(): Array<{ key: string; label: string; sub: string }> {
-  const seen = new Map<string, { key: string; label: string; sub: string }>();
-  for (const row of [...allRows, ...[...greyByDay.values()].flat()]) if (row.locKey && !seen.has(row.locKey)) seen.set(row.locKey, { key: row.locKey, label: row.locLabel, sub: row.locSub });
+function windowLocations(): Array<{ key: string; label: string; sub: string; place: string }> {
+  const seen = new Map<string, { key: string; label: string; sub: string; place: string }>();
+  for (const row of [...allRows, ...[...greyByDay.values()].flat()]) if (row.locKey && !seen.has(row.locKey)) seen.set(row.locKey, { key: row.locKey, label: row.locLabel, sub: row.locSub, place: row.locPlace });
   return [...seen.values()];
 }
 
@@ -1236,8 +1241,17 @@ const svc = defineService<S, {
         // A location with no times left (greyed ones included) goes back to "All locations", and so
         // does a filter that would hide the time this load restores (a host's start, a guest's pick).
         const restored = startRow ?? picked;
-        const locationId = windowLocations().some((l) => l.key === chosen.locationId) && (!restored || locationMatches(restored, chosen.locationId))
-          ? chosen.locationId : "";
+        // The location chosen on any bookings screen (this one writes its choices there too), matched
+        // by the key they all share; this screen's own choice only when the store cannot answer. A
+        // pooled worker re-shown later otherwise kept an older choice than Services' newer one.
+        // A place the other screens cannot name (the client's own place) is never written there, so
+        // this screen keeps it rather than lose it to the shared value.
+        const shared = await readSharedLocationResult();
+        const own = windowLocations().find((l) => l.key === chosen.locationId);
+        const preferred = own && !own.place ? own.key
+          : shared ? (shared.id ? windowLocations().find((l) => l.place === shared.id)?.key ?? "" : "") : chosen.locationId;
+        const locationId = windowLocations().some((l) => l.key === preferred) && (!restored || locationMatches(restored, preferred))
+          ? preferred : "";
         return derive(withDay({
           ...next,
           days,
@@ -1322,6 +1336,12 @@ const svc = defineService<S, {
       const keep = allRows.some((row) => row.dayKey === s.selectedDay && row.selectable && locationMatches(row, locationId));
       const first = allRows.filter((row) => row.selectable && locationMatches(row, locationId)).sort(byDay)[0];
       const revision = ++dayRevision;
+      // Kept for Services and the Agenda, which filter by the same location. Not awaited (it never
+      // throws): the choice shows at once, and a search still running settles as it always has.
+      // A place with no shared key (the client's place) is this screen's alone: Services and the
+      // Agenda keep their own choice instead of falling back to "All locations".
+      const picked = windowLocations().find((l) => l.key === locationId);
+      if (!locationId || picked?.place) void writeSharedLocation({ id: picked?.place ?? "", label: picked?.label ?? "" });
       if (keep || !first) return derive(next);
       if (lastService?.type !== "CLASS") await loadGreyDay(s.id, first.dayKey);
       // A newer day or location choice made during the read wins.