@wix/himalaya-cli 0.1209.0 → 0.1210.0

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

@@ -20,13 +20,23 @@
 import { defineService } from "@himalaya/state";
 import { serializeForAgent } from "@himalaya/agent";
 import { activeScreenFromInput, attentionRow, navRow, withDerived, type DrawerState } from "./logic.js";
+import { fallbackNameFrom, selectedSiteName } from "../_shared/owner-selected-site.js";
 
 /** The shell passes the screen it is showing as worker input, so the drawer can mark
  *  that destination selected the way the declarative drawer does. */
 const hostActiveScreen = () => activeScreenFromInput((globalThis as { himalaya?: { input?: unknown } }).himalaya?.input);
 
+/** Cold-start name from the descriptor's onAppear params (provisioning identity). */
+let fallbackBusinessName = "";
+
+/** "Which site am I on": the business picked on Sites, else the fallback. */
+const currentSiteName = () => selectedSiteName(fallbackBusinessName);
+
 const drawer = defineService<DrawerState, {
-  /** Re-read the active screen from host input (root onAppear). An explicit
+  /** The panel opened (root onAppear): re-read the live site and the active screen.
+   *  `arg.businessName` is the cold-start fallback for the site name. */
+  refresh: (s: DrawerState, arg?: unknown) => DrawerState;
+  /** Re-read the active screen from host input. An explicit
    *  `{ screenId }` wins, for a host that pushes the change instead. */
   syncActive: (s: DrawerState, args?: { screenId?: string }) => DrawerState;
   /** First tap on "Mark all handled": ask before hiding anything. */
@@ -37,7 +47,7 @@ const drawer = defineService<DrawerState, {
   clearAttention: (s: DrawerState) => DrawerState;
 }>("drawer", {
   state: withDerived({
-    siteName: "My Site",
+    siteName: currentSiteName(),
     nav: [
       navRow("drawer_home", "Home", "home", "himi_owner_lite_home"),
       // Between Home and Manage deliberately: analytics answers "how is the
@@ -55,6 +65,15 @@ const drawer = defineService<DrawerState, {
     activeScreenId: hostActiveScreen(),
   }),
   actions: {
+    refresh: (s, arg) => {
+      fallbackBusinessName = fallbackNameFrom(arg, fallbackBusinessName);
+      const screenId = (arg as { screenId?: unknown } | undefined)?.screenId;
+      return snap(withDerived({
+        ...s,
+        siteName: currentSiteName(),
+        activeScreenId: typeof screenId === "string" ? screenId : hostActiveScreen(),
+      }));
+    },
     syncActive: (s, args) => snap(withDerived({
       ...s,
       activeScreenId: typeof args?.screenId === "string" ? args.screenId : hostActiveScreen(),

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

@@ -21,6 +21,8 @@ import { getSiteAnalytics, getSiteTimeZone, localDateRange, localDateOf, localMi
 import { ownerDisplayError, isBridgeUnavailable, isOwnerPreviewDemo } from "../_shared/owner-load-error.js";
 import { DEMO_DASHBOARD, DEMO_NOTE, DEMO_TODAY } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { fallbackNameFrom, selectedSiteName } from "../_shared/owner-selected-site.js";
+import { settleBusinessSwitch } from "../_shared/owner-site-pick.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
 import {
   attentionRecords,
@@ -51,6 +53,9 @@ interface SourceState {
 }
 
 interface HomeState {
+  /** The business the header names: the one picked on Sites, else the descriptor's
+   *  build-time fallback. */
+  businessName: string;
   attention: TodayRecord[];
   schedule: TodayRecord[];
   allSchedule: TodayRecord[];
@@ -101,11 +106,18 @@ const SOURCE_LABELS: Record<HomeSourceId, string> = {
   reviews: "Reviews", reservations: "Reservations",
 };
 
+/** Cold-start name from the descriptor's onAppear params (provisioning identity). */
+let fallbackBusinessName = "";
+/** Resolved once per load, not per shape: a storage read is a host round-trip, and the
+ *  picked business only changes between loads (the picker is another screen). */
+let currentBusinessName = selectedSiteName("");
+
 function shape(s: Partial<HomeState>): HomeState {
   const status = s.status ?? "ready";
   const isLoading = status === "loading";
   return {
     status,
+    businessName: currentBusinessName,
     attention: s.attention ?? [],
     schedule: s.schedule ?? [],
     allSchedule: s.allSchedule ?? s.schedule ?? [],
@@ -834,8 +846,19 @@ const svc = defineService<HomeState, {
   })) }),
   actions: {
     load: async (s, arg) => {
+      // FIRST, before anything reads the catalog: a business pick `replace`s onto
+      // Home, and the shell scopes the bridge to the picked business before it
+      // navigates, so this load is the first code that runs on the new site. A Stores
+      // catalog version persisted from the OLD site during that gap is dropped here.
+      settleBusinessSwitch();
       stashCopy(arg);
-      const sources = enabledSourcesFrom(arg) ?? [...HOME_SOURCE_IDS];
+      fallbackBusinessName = fallbackNameFrom(arg, fallbackBusinessName);
+      // Re-read here: Home's root is not remounted when the owner switches business,
+      // and the picker records the selection from a different worker.
+      currentBusinessName = selectedSiteName(fallbackBusinessName);
+      // An argless re-load (the host refreshing a warm root after the owner switches
+      // business) keeps the sources the descriptor enabled rather than widening to all.
+      const sources = enabledSourcesFrom(arg) ?? activeSources;
       return loadDashboard(shape({ ...s, status: "loading" }), sources);
     },
     retry: async (s) => loadDashboard(shape({ ...s, status: "loading" }), activeSources),

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

@@ -16,9 +16,13 @@ import { queryOwnerModule } from '../_shared/owner-module-data.js';
 import { OWNER_MODULES, ownerModuleId } from '../_shared/owner-modules.js';
 import { localPreferences } from '../_shared/local-preferences.js';
 import { stashCopy, copyParam, copyTemplate } from '../_shared/himi-copy.js';
+import { fallbackNameFrom, selectedSiteName } from '../_shared/owner-selected-site.js';
 import { DASHBOARD_PATHS, deriveManage, parseAreas, recentAreas, rememberArea, withMetrics, type ManageArea, type Metric } from './logic.js';
 
 interface State {
+  /** The business the header names: the one picked on Sites, else the descriptor's
+   *  build-time fallback. */
+  businessName: string;
   /** `loading` until the descriptor has delivered the areas, then
    *  `ready`. The descriptor keys a FragmentSlot on it whose DEFAULT case is the
    *  skeleton, so an unresolved path (worker not booted yet) is loading too —
@@ -178,6 +182,11 @@ async function metricFor(metricKey: string): Promise<Metric> {
   }
 }
 
+/** Cold-start name from the descriptor's onAppear params (provisioning identity). */
+let fallbackBusinessName = '';
+/** Resolved per load/refresh, not per derive (a storage read is a host round-trip). */
+let currentBusinessName = selectedSiteName('');
+
 function derive(state: State, areas = state.areas): State {
   const next = deriveManage(
     areas,
@@ -191,7 +200,7 @@ function derive(state: State, areas = state.areas): State {
   // areas arrive — or when this app provisions none at all — there is nothing a
   // filter could have excluded, so "Clear filters" would be a lie.
   const noEmpty = next.noEmpty || state.status !== 'ready' || areas.length === 0;
-  return { ...state, ...next, noEmpty, recents, hasRecents: recents.length > 0, noRecents: recents.length === 0 };
+  return { ...state, ...next, noEmpty, recents, hasRecents: recents.length > 0, noRecents: recents.length === 0, businessName: currentBusinessName };
 }
 
 // Loads are not serialized: on a warm reappearance the host's bare refresh and
@@ -261,6 +270,7 @@ const svc = defineService<State, {
   handoff: (s: State, arg?: unknown) => Promise<State>;
 }>('himiOwnerLiteManage', {
   state: {
+    businessName: currentBusinessName,
     status: 'loading',
     areas: [], results: [], sections: [], recents: [], query: '', group: 'all',
     // 'All' is always a valid filter, so the chip row paints from the first frame
@@ -271,6 +281,10 @@ const svc = defineService<State, {
   actions: {
     load: async (state, arg) => {
       stashCopy(arg);
+      fallbackBusinessName = fallbackNameFrom(arg, fallbackBusinessName);
+      // Re-read on every load: this worker stays warm across tab switches, and the
+      // picker records the selection from another worker.
+      currentBusinessName = selectedSiteName(fallbackBusinessName);
       // A `load` with no areas comes from the host, not the descriptor: the
       // warm-worker refresh lifecycle calls it bare. Before the areas are known
       // it must not settle (that derived "0 business areas" and painted the
@@ -278,7 +292,7 @@ const svc = defineService<State, {
       if (!('areas' in read(arg))) {
         return state.status === 'ready'
           ? loadMetrics(derive({ ...state, isLoading: true, notLoading: false, summaryNote: '', handoffError: '' }))
-          : state;
+          : { ...state, businessName: currentBusinessName };
       }
       const parsed = (() => { try { return JSON.parse(str(arg, 'areas') || '[]'); } catch { return []; } })();
       const areas = parseAreas(parsed);
@@ -286,8 +300,12 @@ const svc = defineService<State, {
     },
     // Refresh re-reads summaries for KNOWN areas. Before the descriptor has
     // delivered them there is nothing to refresh, and settling here would open
-    // the skeleton gate over an empty hub.
-    refresh: async state => state.status !== 'ready' ? state : loadMetrics(derive({ ...state, isLoading: true, notLoading: false, summaryNote: '', handoffError: '' })),
+    // the skeleton gate over an empty hub. The business name is a local read, so
+    // it is re-read either way.
+    refresh: async state => {
+      currentBusinessName = selectedSiteName(fallbackBusinessName);
+      return state.status !== 'ready' ? { ...state, businessName: currentBusinessName } : loadMetrics(derive({ ...state, isLoading: true, notLoading: false, summaryNote: '', handoffError: '' }));
+    },
     search: (state, arg) => derive({ ...state, query: str(arg, 'value').slice(0, 256) }),
     filter: (state, arg) => {
       const ids = read(arg).selectedIds;

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

@@ -30,6 +30,7 @@ import { searchOrders } from "@himalaya/wix-ecom";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo } from "../_shared/owner-load-error.js";
 import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
+import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
 
 /** Mirrors the Home dashboard's "needs attention" definition, so a number here means the
  *  same thing it means after the owner drills into that business. */
@@ -205,6 +206,7 @@ async function loadRollup(): Promise<OverviewState> {
 const svc = defineService<OverviewState, {
   load: (s: OverviewState, arg?: unknown) => Promise<OverviewState>;
   retry: (s: OverviewState) => Promise<OverviewState>;
+  pick: (s: OverviewState, arg?: unknown) => OverviewState;
 }>("himiOwnerLiteOverview", {
   state: shape({ status: "loading" }),
   actions: {
@@ -213,6 +215,12 @@ const svc = defineService<OverviewState, {
       return loadRollup();
     },
     retry: async () => loadRollup(),
+    // Drilling into one business is the ONLY thing that moves the active business —
+    // the same switch the Sites list makes (scope, name it, reset to Home).
+    pick: (s, arg) => {
+      const { msid, name } = pickedSite(arg);
+      return pickSite(s, msid, name || s.rows.find((r) => r.id === msid)?.name || "");
+    },
   },
 });
 

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

@@ -1,18 +1,18 @@
 // Tier-5 bundle: __HIMI_APP_NAME__ — Sites List (multi-site chooser).
 // ACCOUNT-level: `site-list/v2/sites/query` authorizes on the owner wixSession2
 // cookie alone (no per-site signed-instance), so this loads before any business
-// is picked. Each row's `id` IS the site's metaSiteId — the shell's Router reads
-// it as the `business` param and scopes the Wix bridge to it (SiteInstanceStore
-// mints that site's User signed-instance for the management verticals).
+// is picked. Each row's `id` IS the site's metaSiteId — `pick` records the row's
+// name for the chrome and hands the shell a `business`-carrying `replace` onto Home;
+// the shell's Router scopes the Wix bridge to it (SiteInstanceStore mints that site's
+// User signed-instance for the management verticals).
 
 import { defineService } from "@himalaya/state";
 import { querySites, type WixSite } from "@himalaya/wix-site-list";
-import { site } from "@himalaya/wix-platform";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo } from "../_shared/owner-load-error.js";
 import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "../_shared/owner-local-db.js";
-import { forgetCatalogVersion } from "@himalaya/wix-stores";
+import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
 
 // Offline-first (data-offline): the owner's last-synced businesses are the
 // READ-THROUGH cache for the `sites` entity — paint them instantly (works
@@ -139,17 +139,16 @@ async function loadList(s: SitesState): Promise<SitesState> {
   }
 }
 
-function msidFrom(arg: unknown): string {
-  return typeof arg === "string"
-    ? arg
-    : String((arg as { business?: string; id?: string })?.business ?? (arg as { id?: string })?.id ?? "");
+/** The picked row's display name: the row passes it, else it is looked up in the list. */
+function nameFor(s: SitesState, msid: string, passed: string): string {
+  return passed || s.allSites.find((r) => r.id === msid)?.name || "";
 }
 
 const svc = defineService<SitesState, {
   load: (s: SitesState, arg?: unknown) => Promise<SitesState>;
   retry: (s: SitesState) => Promise<SitesState>;
   search: (s: SitesState, arg?: unknown) => Promise<SitesState>;
-  pick: (s: SitesState, arg?: unknown) => Promise<SitesState>;
+  pick: (s: SitesState, arg?: unknown) => SitesState;
 }>("himiOwnerLiteSites", {
   state: shape({ status: "loading" }),
   actions: {
@@ -158,27 +157,11 @@ const svc = defineService<SitesState, {
       return loadList(shape({ ...s, status: "loading" }));
     },
     retry: async (s) => loadList(shape({ ...s, status: "loading" })),
-    // SP-1: worker-callable active-site scoping. A row can dispatch this instead of
-    // the declarative `himi.open{business}` param to scope the wixApi bridge to the
-    // picked business via the wix_platform capability (resolves after the mint), then
-    // the shell navigates to Home. Proves the T5-worker → setActiveSite path.
-    pick: async (s, arg) => {
-      const msid = msidFrom(arg);
-      if (msid) {
-        // Scoping the bridge to another business points it at another SITE, which may
-        // run the other Stores catalog. The resolved version is persisted app-wide and
-        // routes WRITES, which have no 428 retry — so it has to be dropped here, not
-        // just on the consumer-side site picker.
-        //
-        // Cleared on BOTH sides of the await: before, in case native remounts us
-        // before it settles; after, because a read interleaving it would re-resolve
-        // against the bridge that has not been re-scoped yet and re-persist the value
-        // we just dropped.
-        forgetCatalogVersion();
-        await site.setActiveSite(msid);
-        forgetCatalogVersion();
-      }
-      return s;
+    // Picking a business (every Sites row dispatches this): record its name for the
+    // chrome, then reset to the Home root; the shell scopes the bridge.
+    pick: (s, arg) => {
+      const { msid, name } = pickedSite(arg);
+      return pickSite(s, msid, nameFor(s, msid, name));
     },
     search: async (s, arg) => {
       const q = typeof arg === "string" ? arg : String((arg as { value?: string; query?: string })?.value ?? (arg as { query?: string })?.query ?? "");