@wix/himalaya-cli 0.1208.0 → 0.1210.0

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 ?? "");