@wix/himalaya-cli 0.817.0 → 0.819.0

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

@@ -2569,183 +2569,6 @@ const SCREENS = runtimeSetting({
                         "accessibilityLabel": "himi_account.saved"
                       }
                     },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
-                        "props": {
-                          "spacing": 8,
-                          "alignment": "leading",
-                          "children": [
-                            {
-                              "id": "himi_account.sites_title",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "$service:himiStoreAccount.sitesTitle",
-                                  "style": "title3"
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Switch the active site. Home and verticals reload under that site.",
-                                  "style": "footnote",
-                                  "color": "textSecondary"
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_account.sites",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "LazyList",
-                                "props": {
-                                  "itemsPath": "$service:himiStoreAccount.sites",
-                                  "spacing": 8,
-                                  "items": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "HStack",
-                                        "props": {
-                                          "spacing": 12,
-                                          "children": [
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Image",
-                                                "props": {
-                                                  "url": "$item.image",
-                                                  "width": 48,
-                                                  "height": 48,
-                                                  "contentMode": "fill",
-                                                  "shape": "rounded",
-                                                  "contentDescription": ""
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "VStack",
-                                                "props": {
-                                                  "spacing": 2,
-                                                  "alignment": "leading",
-                                                  "children": [
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.name",
-                                                          "style": "bodyEmphasis",
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      }
-                                                    },
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.role",
-                                                          "style": "caption",
-                                                          "color": "textSecondary",
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      }
-                                                    }
-                                                  ]
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Spacer",
-                                                "props": {}
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.activeLabel",
-                                                  "style": "caption",
-                                                  "color": "accentPrimary",
-                                                  "collapseWhenEmpty": true
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Icon",
-                                                "props": {
-                                                  "name": "chevron_right",
-                                                  "size": 16,
-                                                  "tint": "textTertiary"
-                                                }
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "background": {
-                                          "token": "surfaceElevated"
-                                        },
-                                        "border": {
-                                          "width": 1,
-                                          "color": {
-                                            "token": "border"
-                                          }
-                                        },
-                                        "cornerRadius": 8,
-                                        "padding": {
-                                          "leading": 12,
-                                          "trailing": 12,
-                                          "top": 10,
-                                          "bottom": 10
-                                        },
-                                        "onTap": {
-                                          "actionId": "tier5.himiStoreAccount.selectSite",
-                                          "params": {
-                                            "siteId": "$item.id"
-                                          }
-                                        },
-                                        "pressFeedback": "scale",
-                                        "haptic": "light",
-                                        "accessibilityLabel": "himi_account.site_row"
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "hiddenPath": "$service:himiStoreAccount.noSites"
-                      }
-                    },
                     {
                       "id": "",
                       "body": {
@@ -3243,10 +3066,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiStoreAccount.refresh",
-          "params": {
-            "defaultSiteId": "development-site"
-          }
+          "actionId": "tier5.himiStoreAccount.refresh"
         }
       }
     },

package/templates/community-club/tier5-src/himi-store-account/index.ts

@@ -1,30 +1,24 @@
 // Tier-5 bundle: himi-store — visitor/member account state.
+//
+// SINGLE-SITE BY DESIGN. A Branded Lite build talks to exactly one Wix site, and the
+// binding is the baked Headless `clientId` itself:
+// there is no metaSiteId to move and Wix will not route a consumer token minted for one
+// client at another site. This worker therefore has no site picker — Profile used to carry
+// a "Your sites" list that dispatched `branded_lite.select_site`, which changed the
+// `wix-site-id` header and nothing else, so every read stayed on the baked site while the
+// UI claimed otherwise. Managing several businesses is Owner Lite's job (account auth, a
+// real Sites List, and per-call site scope via `site.forSite`).
 import { defineService } from "@himalaya/state";
 import { dispatch } from "@himalaya/dispatch";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
-import { querySites } from "@himalaya/wix-site-list";
-import { forgetCatalogVersion } from "@himalaya/wix-stores";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 
-const ACTIVE_SITE_KEY = "himi.brandedLite.activeSiteId";
-
-interface StorageLike {
-  getItem(key: string): string | null;
-  setItem(key: string, value: string): void;
-}
-
 interface AuthRouteInput {
   intent?: string;
   contextName?: string;
   returnScreenId?: string;
   returnId?: string;
-  defaultSiteId?: string;
-}
-
-function storage(): StorageLike | undefined {
-  const host = globalThis as { himalaya?: { storage?: StorageLike }; localStorage?: StorageLike };
-  return host.himalaya?.storage ?? host.localStorage;
 }
 
 /** Mid-flow open params land on `himalaya.input` (paramKeys on himi_account). */
@@ -33,40 +27,6 @@ function routeInput(): AuthRouteInput {
   return input && typeof input === "object" ? input : {};
 }
 
-interface SiteRow {
-  id: string;
-  name: string;
-  role: string;
-  image: string;
-  isActive: boolean;
-  notActive: boolean;
-  activeLabel: string;
-}
-
-function siteThumb(id: string): string {
-  return id ? `https://www.wix.com/site-thumbnail/${id}` : "";
-}
-
-function readActiveSiteId(fallback = ""): string {
-  try {
-    return (storage()?.getItem(ACTIVE_SITE_KEY) || "").trim() || fallback;
-  } catch {
-    return fallback;
-  }
-}
-
-function writeActiveSiteId(id: string): void {
-  try {
-    storage()?.setItem(ACTIVE_SITE_KEY, id);
-  } catch { /* ignore */ }
-}
-
-function defaultSiteIdFromArg(arg: unknown): string {
-  if (!arg || typeof arg !== "object") return "";
-  const raw = (arg as { defaultSiteId?: unknown }).defaultSiteId;
-  return typeof raw === "string" ? raw.trim() : "";
-}
-
 function strField(arg: unknown, key: string): string {
   if (!arg || typeof arg !== "object") return "";
   const raw = (arg as Record<string, unknown>)[key];
@@ -144,37 +104,6 @@ function authHeadline(s: S, isRegistering: boolean, isRecovering: boolean): { au
   }
 }
 
-async function loadSites(activeId: string, fallbackId: string): Promise<SiteRow[]> {
-  const active = activeId || fallbackId;
-  try {
-    const sitesRes = await querySites({ query: { cursorPaging: { limit: 50 } } });
-    const rows = (sitesRes.sites ?? []).map((site): SiteRow => {
-      const id = site.id || "";
-      const isActive = !!active && id === active;
-      return {
-        id,
-        name: site.displayName || site.name || id,
-        role: isActive ? copyParam("storeAccount.siteRoleActive", "Current") : copyParam("storeAccount.siteRoleMember", "Site"),
-        image: siteThumb(id),
-        isActive,
-        notActive: !isActive,
-        activeLabel: isActive ? copyParam("storeAccount.siteActiveBadge", "Active") : "",
-      };
-    }).filter((r) => !!r.id);
-    if (rows.length) return rows;
-  } catch { /* fall through to seed */ }
-  if (!fallbackId) return [];
-  return [{
-    id: fallbackId,
-    name: copyParam("storeAccount.siteFallbackName", "This site"),
-    role: copyParam("storeAccount.siteRoleActive", "Current"),
-    image: siteThumb(fallbackId),
-    isActive: true,
-    notActive: false,
-    activeLabel: copyParam("storeAccount.siteActiveBadge", "Active"),
-  }];
-}
-
 interface S {
   status: "loading" | "ready";
   isMember: boolean;
@@ -224,20 +153,12 @@ interface S {
   activityEmptyText: string;
   hasActivity: boolean;
   noActivity: boolean;
-  sitesTitle: string;
-  sites: SiteRow[];
-  hasSites: boolean;
-  noSites: boolean;
-  activeSiteId: string;
-  defaultSiteId: string;
 }
 
 function derive(s: S): S {
   const isRegistering = !!s.isRegistering;
   const isRecovering = !!s.isRecovering;
   const hasActivity = s.activityRows.length > 0;
-  const sites = s.sites ?? [];
-  const hasSites = s.isMember && sites.length > 0;
   const headline = authHeadline(s, isRegistering, isRecovering);
   const hasReturnPath = !!s.isMember && !!s.returnScreenId;
   return {
@@ -252,10 +173,6 @@ function derive(s: S): S {
     hideSignInChoices: isRegistering || isRecovering,
     hasActivity,
     noActivity: !hasActivity,
-    sites,
-    hasSites,
-    noSites: !hasSites,
-    sitesTitle: copyParam("storeAccount.sitesTitle", "Your sites"),
     authTitle: headline.authTitle,
     authBody: headline.authBody,
     hasReturnPath,
@@ -307,19 +224,15 @@ async function orderRows(memberEmail: string): Promise<AccountActivityRow[]> {
 }
 
 async function probe(s: S, arg?: unknown): Promise<S> {
-  const defaultSiteId = defaultSiteIdFromArg(arg) || s.defaultSiteId || "";
   const intent = authIntentFromArg(arg, s);
   const profile = await loadMemberProfile(copyParam("storeAccount.guestDetail", "Sign in to keep your cart and orders connected."));
   let activityRows: AccountActivityRow[] = [];
-  let sites: SiteRow[] = [];
-  const activeSiteId = readActiveSiteId(defaultSiteId);
   if (profile.isMember) {
     try {
       activityRows = await orderRows(profile.memberEmail);
     } catch {
       activityRows = [];
     }
-    sites = await loadSites(activeSiteId, defaultSiteId);
   }
   return derive({
     ...s,
@@ -344,9 +257,6 @@ async function probe(s: S, arg?: unknown): Promise<S> {
     activityEmptyText: profile.isMember
       ? copyParam("storeAccount.activityEmptyMember", "No previous orders for this member yet.")
       : copyParam("storeAccount.activityEmptyGuest", "Sign in to see orders."),
-    sites,
-    activeSiteId,
-    defaultSiteId,
   });
 }
 
@@ -389,7 +299,6 @@ const svc = defineService<S, {
   signIn: (s: S) => Promise<S>;
   register: (s: S) => Promise<S>;
   signOut: (s: S) => Promise<S>;
-  selectSite: (s: S, arg?: unknown) => Promise<S>;
 }>("himiStoreAccount", {
   state: derive({
     status: "loading",
@@ -432,12 +341,6 @@ const svc = defineService<S, {
     activityEmptyText: "No previous orders for this member yet.",
     hasActivity: false,
     noActivity: true,
-    sitesTitle: "Your sites",
-    sites: [],
-    hasSites: false,
-    noSites: true,
-    activeSiteId: "",
-    defaultSiteId: "",
   }),
   actions: {
     load: (s, arg) => { stashCopy(arg); return probe(s, arg); },
@@ -521,7 +424,6 @@ const svc = defineService<S, {
         // user logs out. This is the one transition that unmounts Email too, so unlike
         // the mode switches it clears BOTH tokens.
         ...NO_FOCUS_ALL,
-        sites: [] as SiteRow[],
         activityRows: [] as AccountActivityRow[],
         activityEmptyText: copyParam("storeAccount.activityEmptyGuest", "Sign in to see orders."),
         authIntent: "",
@@ -531,40 +433,6 @@ const svc = defineService<S, {
       };
       return derive(cleared);
     },
-    selectSite: async (s, arg) => {
-      const siteId = typeof arg === "string"
-        ? arg.trim()
-        : strOf((arg as { siteId?: unknown; id?: unknown })?.siteId
-          ?? (arg as { siteId?: unknown; id?: unknown })?.id).trim();
-      if (!siteId || siteId === s.activeSiteId) return derive(s);
-      writeActiveSiteId(siteId);
-      // The Stores SDK persists the resolved catalog version app-wide, and the new
-      // site may run the other one. This is the only place that knows the site
-      // changed, so it is the only place that can say so.
-      //
-      // Cleared BEFORE the dispatch because native may remount us before it settles,
-      // and again AFTER it, because a read interleaving that await would re-resolve
-      // against the bridge that has not been re-scoped yet and re-persist the value
-      // we just dropped. Both are cheap; missing either leaves a wrong answer behind.
-      forgetCatalogVersion();
-      const sites = (s.sites ?? []).map((row) => {
-        const isActive = row.id === siteId;
-        return {
-          ...row,
-          isActive,
-          notActive: !isActive,
-          role: isActive
-            ? copyParam("storeAccount.siteRoleActive", "Current")
-            : copyParam("storeAccount.siteRoleMember", "Site"),
-          activeLabel: isActive ? copyParam("storeAccount.siteActiveBadge", "Active") : "",
-        };
-      });
-      try {
-        await dispatch("branded_lite.select_site", { siteId });
-      } catch { /* native may remount before the promise settles */ }
-      forgetCatalogVersion();
-      return derive({ ...s, activeSiteId: siteId, sites });
-    },
   },
 });