@wix/himalaya-cli 0.1612.0 → 0.1614.0

package/templates/retail-store/tier5-src/himi-branded-lite-home/index.ts

@@ -9,7 +9,14 @@ import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { queryServices, type WixService } from "@himalaya/wix-bookings";
 import { getPost, queryPosts, type WixPost } from "@himalaya/wix-blog";
 import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
-import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
+import {
+  listMyParticipations,
+  participationsByProgram,
+  queryJoinApplications,
+  queryPrograms,
+  type WixProgram,
+} from "@himalaya/wix-online-programs";
+import { getMyMember } from "@himalaya/wix-members";
 import { listFeedItems, type WixFeedItem, type WixFeedProfile } from "@himalaya/wix-social-feed";
 import { queryItems as queryMenuItems, querySections as queryMenuSections } from "@himalaya/wix-restaurants";
 import { normalizeEvent, queryEvents } from "../_shared/himi-events.js";
@@ -166,6 +173,13 @@ interface ProgramCard {
   noImage: boolean;
 }
 
+/** A member's own program state, kept separate from the visitor catalog cards. */
+interface MemberProgramCard extends ProgramCard {
+  stateLabel: string;
+  progressFraction: number;
+  hideProgress: boolean;
+}
+
 /** A communityPulse latest-activity Carousel card (design §4.5). */
 interface FeedHighlight {
   id: string;
@@ -308,6 +322,8 @@ interface State {
   noNextEvent: boolean;
   homePrograms: ProgramCard[];
   noHomePrograms: boolean;
+  memberPrograms: MemberProgramCard[];
+  noMemberPrograms: boolean;
   /** The videos module's carousel — the newest ready Wix Video videos, the channels
    *  taking turns. Guarded on `videos`; same silent-fail contract. */
   homeVideos: (WixVideoCard & CaptionFlags)[];
@@ -549,6 +565,7 @@ interface ExtrasSignal {
   upcomingEvents: EventEntry[];
   nextEventCards: NextEventCard[];
   homePrograms: ProgramCard[];
+  memberPrograms: MemberProgramCard[];
   homeVideos: (WixVideoCard & CaptionFlags)[];
   feedHighlights: FeedHighlight[];
   memberAvatars: CoachAvatar[];
@@ -559,8 +576,17 @@ interface ExtrasSignal {
   menuCategories: MenuCategory[];
 }
 
+let homeProgramCandidates: { generation: number; programs: WixProgram[] } = { generation: 0, programs: [] };
+/** A finite number from a progress field, or `fallback` when the read left it out or sent junk. */
+function finiteOr(value: unknown, fallback: number): number {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+
+/** How many microtask turns `memberProgramsLoaded` waits for refresh's own result to land (see the action). */
+const MEMBER_PROGRAMS_APPLY_RETRIES = 50;
+
 function emptyExtrasSignal(): ExtrasSignal {
-  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
+  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], memberPrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
 }
 
 /** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
@@ -670,13 +696,13 @@ async function fetchUpcomingEvents(): Promise<{ entries: EventEntry[]; nextEvent
   }
 }
 
-async function fetchHomePrograms(): Promise<ProgramCard[]> {
+async function fetchHomePrograms(): Promise<{ cards: ProgramCard[]; programs: WixProgram[] }> {
   try {
     const response = await queryPrograms({ cursorPaging: { limit: 12 } });
-    return (response.programs ?? [])
+    const programs = (response.programs ?? [])
       .filter((p: WixProgram) => ((p.state ?? p.status ?? "").toUpperCase()) !== "DRAFT")
-      .slice(0, 6)
-      .map((p: WixProgram) => {
+      .slice(0, 12);
+    const cards = programs.slice(0, 6).map((p: WixProgram) => {
         const desc = (p as { description?: unknown }).description;
         const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
         const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
@@ -692,7 +718,112 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
           noImage: !image,
         };
       });
+    return { cards, programs };
   } catch {
+    return { cards: [], programs: [] };
+  }
+}
+
+/** Member state is best-effort Home enrichment: visitors and unsupported member sessions
+ * collapse the rail, while the public Programs section remains available. */
+async function fetchMemberProgramCards(programs: WixProgram[]): Promise<MemberProgramCard[]> {
+  try {
+    const member = await memberAccess();
+    if (!member.email) return [];
+    const memberId = (await getMyMember()).member?.id;
+    if (!memberId) return [];
+
+    const [participantResult, applicationResult] = await Promise.allSettled([
+      listMyParticipations(memberId, { maxPages: 2 }),
+      queryJoinApplications({ memberId, limit: 100 }),
+    ]);
+    // These are independent member reads. An unverified participant-query permission
+    // must not also hide applications that the member-scoped endpoint can return.
+    const participants = participantResult.status === "fulfilled" ? participantResult.value : [];
+    const applications = applicationResult.status === "fulfilled" ? applicationResult.value : { joinApplications: [] };
+    const participation = participationsByProgram(participants);
+    // An application that already became a participant keeps its status and carries `participantId`
+    // (the SDK's PENDING_JOIN_APPLICATION_STATUSES note): the participation is the standing, and a member
+    // who later left must not read as "Approved" from the application that once admitted them. Newest
+    // first, one per program, and only programs with no participation of their own — so the admitted
+    // rows a joined member accumulates never take the lookup slots of a real pending request.
+    const applicationByProgram = new Map<string, { status?: string }>();
+    for (const application of applications.joinApplications ?? []) {
+      if (!application.programId || application.participantId || participation.has(application.programId)) continue;
+      if (!applicationByProgram.has(application.programId)) applicationByProgram.set(application.programId, application);
+    }
+    // The public catalog preview is intentionally capped at 12. Resolve the
+    // member's six most recent enrolled programs and six open applications
+    // outside that window in one filtered query so both remain visible.
+    const knownIds = new Set(programs.map((program) => program.id).filter((id): id is string => !!id));
+    const participantProgramIds = [...participation.keys()].slice(0, 6);
+    const applicationProgramIds = [...applicationByProgram.keys()].filter((id) => !participantProgramIds.includes(id)).slice(0, 6);
+    const candidateIds = [...participantProgramIds, ...applicationProgramIds].slice(0, 12);
+    const missingIds = candidateIds.filter((id) => !knownIds.has(id));
+    const extraPrograms = missingIds.length
+      ? await queryPrograms({ filter: { id: { $in: missingIds } }, cursorPaging: { limit: missingIds.length } })
+          .then((response) => response.programs ?? []).catch(() => [])
+      : [];
+    const memberPrograms = [...programs, ...extraPrograms.filter((program) => !!program.id && !knownIds.has(program.id))];
+    await assertMemberAccess(member);
+
+    return memberPrograms.flatMap((program) => {
+      if (!program.id) return [];
+      const participant = participation.get(program.id);
+      const application = applicationByProgram.get(program.id);
+      if (!participant && !application) return [];
+      const desc = (program as { description?: unknown }).description;
+      const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
+      const name = cleanTitle(program.settings?.title ?? nestedTitle ?? program.title) || copyParam("home.programFallbackName", "Program");
+      const image = programImage(program);
+      // Progress may be absent (a `fields` the read did not ask for, or a program with no steps): the
+      // bar then sits at 0 and the label comes from `progressStatus`, never from NaN arithmetic.
+      const available = finiteOr(participant?.progress?.totalStepsAvailable, 0);
+      const completed = finiteOr(participant?.progress?.totalStepsCompleted, 0);
+      const percentage = finiteOr(participant?.progress?.completionPercentage, Number.NaN);
+      const hasProgress = available > 0 || Number.isFinite(percentage);
+      const rawFraction = available > 0 ? completed / available : Number.isFinite(percentage) ? percentage / 100 : 0;
+      const progressFraction = Math.max(0, Math.min(1, rawFraction));
+      let stateLabel: string;
+      if (participant) {
+        const enrollmentStatus = (participant.enrollmentStatus ?? "").toUpperCase();
+        const progressStatus = (participant.progressStatus ?? "").toUpperCase();
+        stateLabel = enrollmentStatus === "SUSPENDED"
+          ? copyParam("home.memberProgramSuspended", "Access paused")
+          : progressStatus === "COMPLETED" || enrollmentStatus === "COMPLETED"
+          ? copyParam("home.memberProgramCompleted", "Completed")
+          : progressStatus === "FAILED"
+            ? copyParam("home.memberProgramFailed", "Failed")
+          : progressStatus === "IN_PROGRESS" || (progressStatus !== "NOT_STARTED" && progressFraction > 0)
+            ? copyParam("home.memberProgramInProgress", "In progress")
+            : copyParam("home.memberProgramNotStarted", "Not started");
+      } else {
+        const status = (application?.status ?? "").toUpperCase();
+        stateLabel = status === "INVITED"
+          ? copyParam("home.memberProgramInvited", "Invitation")
+          : status === "APPROVED"
+            ? copyParam("home.memberProgramApproved", "Approved")
+            : status === "SUSPENDED"
+              ? copyParam("home.memberProgramSuspended", "Access paused")
+            : copyParam("home.memberProgramPending", "Request pending");
+      }
+      return [{
+        id: program.id,
+        name,
+        description: "",
+        image,
+        initial: initials(name),
+        hasImage: !!image,
+        noImage: !image,
+        stateLabel,
+        progressFraction,
+        hideProgress: !hasProgress || !participant || (participant.enrollmentStatus ?? "").toUpperCase() === "SUSPENDED",
+      }];
+    });
+  } catch (error) {
+    // The member rail is optional; never let a member-state refusal blank public Home.
+    const status = (error as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(error))?.[1];
+    console.warn("[home.member-programs] member state unavailable", status !== undefined ? `HTTP ${String(status)}` : (error as { name?: string } | null)?.name ?? "unknown");
     return [];
   }
 }
@@ -747,7 +878,7 @@ function groupCard(group: WixGroup): GroupCard {
   };
 }
 
-async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
+async function fetchExtrasSignal(arg: unknown, generation: number): Promise<ExtrasSignal> {
   const verticals = parseVerticals(arg);
   const extras = emptyExtrasSignal();
   const jobs: Promise<void>[] = [];
@@ -758,7 +889,12 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
     }));
   }
   if (verticals.includes("programs")) {
-    jobs.push(fetchHomePrograms().then((cards) => { extras.homePrograms = cards; }));
+    jobs.push(fetchHomePrograms().then(({ cards, programs }) => {
+      extras.homePrograms = cards;
+      // An older refresh can finish this query after a newer one. Keep its
+      // candidates from replacing the current generation's member-read input.
+      if (generation === refreshGen) homeProgramCandidates = { generation, programs };
+    }));
   }
   if (verticals.includes("videos") && !videoSurfaceRefused) {
     const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
@@ -883,6 +1019,7 @@ function derive(state: State): State {
     noUpcomingEvents: state.upcomingEvents.length === 0,
     noNextEvent: state.nextEventCards.length === 0,
     noHomePrograms: state.homePrograms.length === 0,
+    noMemberPrograms: state.memberPrograms.length === 0,
     noHomeVideos: state.homeVideos.length === 0,
     noFeedHighlights: state.feedHighlights.length === 0,
     noMemberAvatars: state.memberAvatars.length === 0,
@@ -977,6 +1114,8 @@ function baseState(): State {
     noNextEvent: true,
     homePrograms: [],
     noHomePrograms: true,
+    memberPrograms: [],
+    noMemberPrograms: true,
     homeVideos: [],
     noHomeVideos: true,
     feedHighlights: [],
@@ -1026,7 +1165,7 @@ async function refreshPublic(state: State, arg?: unknown): Promise<State | undef
   // failure just collapses their blocks), so a store outage cannot blank them
   // and vice versa. paramValue() stashes the appear params on first read, so the
   // arg-less fallback below still resolves the stashed verticals.
-  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg), fetchSavedSignal(arg)]);
+  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg, gen), fetchSavedSignal(arg)]);
   if (gen !== refreshGen) return undefined;
   // A screen that declares no "store" vertical renders no products rail, so there is
   // nothing to fetch and nothing that could be "not loaded" — skip the call outright
@@ -1186,8 +1325,17 @@ async function refresh(state: State, arg?: unknown): Promise<State | undefined>
   void refreshPersonal(generation, arg);
   const publicState = await refreshPublic(state, arg);
   if (!publicState || generation !== personalGeneration) return undefined;
+  // The member-only read runs after public Home has landed. It is deliberately not awaited:
+  // a slow member endpoint must not hold the public catalog or hero behind authentication.
+  const programCandidates = homeProgramCandidates;
+  if (programCandidates.generation === refreshGen && parseVerticals(arg).includes("programs")) {
+    void fetchMemberProgramCards(programCandidates.programs).then((rows) => {
+      void svc.memberProgramsLoaded({ generation: programCandidates.generation, rows });
+    });
+  }
   const current = svc.getState();
-  return derive({ ...publicState, nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
+  return derive({ ...publicState, memberPrograms: current.memberPrograms, noMemberPrograms: current.noMemberPrograms,
+    nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
     memberProgressLabel: current.memberProgressLabel, memberProgressFraction: current.memberProgressFraction,
     hideMemberProgress: current.hideMemberProgress, personalError: current.personalError, hidePersonalError: current.hidePersonalError,
     // The weekly goal is PERSONAL (member bookings); the public refresh resets it, so keep it.
@@ -1214,6 +1362,7 @@ const svc = defineService<State, {
   refresh: (state: State, arg?: unknown) => Promise<State | undefined>;
   dismissOnboarding: (state: State) => State;
   clearPersonal: (state: State) => State;
+  memberProgramsLoaded: (state: State, arg: { generation: number; rows: MemberProgramCard[]; attempt?: number }) => State | undefined;
   openShopCategory: (state: State, arg?: unknown) => State;
   personalLoaded: (state: State, arg: { generation: number; rows: MemberBookingRow[]; progress: { label: string; fraction: number }; error: boolean; weekly: { count: number; fraction: number; label: string } | null }) => State;
   categoriesLoaded: (state: State, arg: { generation: number; categories: StoreCategoryCard[] }) => State | undefined;
@@ -1221,10 +1370,27 @@ const svc = defineService<State, {
   state: baseState(),
   // The host's site is read fresh at every boot: a snapshot of the last session's site must not
   // decide this one's verticals or name (an owner installs or removes one; another site opens).
-  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories"],
+  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories", "memberPrograms", "noMemberPrograms"],
+  // A member's standing never reaches the on-device snapshot either: the next boot may be another member's.
+  notPersisted: ["memberPrograms", "noMemberPrograms"],
   actions: {
-    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, personalError: false, hidePersonalError: true,
+    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, memberPrograms: [], noMemberPrograms: true, personalError: false, hidePersonalError: true,
       weeklyClassCount: 0, weeklyClassGoalFraction: 0, weeklyGoalLabel: "" }),
+    // The member read starts inside `refresh` and, for a visitor (identity answers synchronously),
+    // resolves within the same microtask turn — BEFORE the runtime has applied refresh's own result.
+    // The `state` handed here is then refresh's PRE-state (status "loading", every rail empty), and
+    // spreading it wrote a loading home over the ready one; the description-projection test caught
+    // exactly that. So an early arrival re-queues itself (a microtask at a time, bounded) until the
+    // state it would spread is the applied one. A stale generation keeps the current state
+    // (`undefined`), never its own stale snapshot.
+    memberProgramsLoaded: (state, arg) => {
+      if (arg.generation !== refreshGen) return undefined;
+      if (state.status === "loading" && (arg.attempt ?? 0) < MEMBER_PROGRAMS_APPLY_RETRIES) {
+        void Promise.resolve().then(() => svc.memberProgramsLoaded({ ...arg, attempt: (arg.attempt ?? 0) + 1 }));
+        return undefined;
+      }
+      return derive({ ...state, memberPrograms: arg.rows, noMemberPrograms: arg.rows.length === 0 });
+    },
     openShopCategory: (state, arg) => {
       const category = String((arg as { category?: unknown } | undefined)?.category ?? "");
       if (!category) return state;

package/templates/yoga-studio/dev/index.ts

@@ -2270,6 +2270,198 @@ const SCREENS = runtimeSetting({
                                                             ]
                                                           }
                                                         }
+                                                      },
+                                                      {
+                                                        "id": "himi_branded_home.member_programs_section",
+                                                        "body": {
+                                                          "package": "himalaya",
+                                                          "type": "VStack",
+                                                          "props": {
+                                                            "spacing": 10,
+                                                            "alignment": "leading",
+                                                            "children": [
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "VStack",
+                                                                  "props": {
+                                                                    "spacing": 3,
+                                                                    "alignment": "leading",
+                                                                    "children": [
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "Text",
+                                                                          "props": {
+                                                                            "text": "Your programs",
+                                                                            "style": "title3"
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "himi_branded_home.member_programs",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Carousel",
+                                                                  "props": {
+                                                                    "itemsPath": "$service:himiBrandedHome.memberPrograms",
+                                                                    "items": [
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "VStack",
+                                                                          "props": {
+                                                                            "spacing": 8,
+                                                                            "alignment": "leading",
+                                                                            "children": [
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Image",
+                                                                                  "props": {
+                                                                                    "url": "$item.image",
+                                                                                    "fillWidth": true,
+                                                                                    "height": 108,
+                                                                                    "contentMode": "fill",
+                                                                                    "contentDescription": "$item.name"
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "cornerRadius": 8,
+                                                                                  "fillMaxWidth": true,
+                                                                                  "hiddenPath": "$item.noImage"
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "himi_branded_home.member_program.initial",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "ZStack",
+                                                                                  "props": {
+                                                                                    "alignment": "center",
+                                                                                    "children": [
+                                                                                      {
+                                                                                        "id": "",
+                                                                                        "body": {
+                                                                                          "package": "himalaya",
+                                                                                          "type": "Icon",
+                                                                                          "props": {
+                                                                                            "name": "photo",
+                                                                                            "size": 28,
+                                                                                            "tint": "accentPrimary"
+                                                                                          }
+                                                                                        },
+                                                                                        "modifiers": {
+                                                                                          "accessibilityRole": "decorative"
+                                                                                        }
+                                                                                      }
+                                                                                    ]
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "width": 108,
+                                                                                  "height": 108,
+                                                                                  "background": {
+                                                                                    "token": "accentSurface"
+                                                                                  },
+                                                                                  "cornerRadius": 16,
+                                                                                  "hiddenPath": "$item.hasImage"
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Text",
+                                                                                  "props": {
+                                                                                    "text": "$item.name",
+                                                                                    "style": "bodyEmphasis",
+                                                                                    "maxLines": 2
+                                                                                  }
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Text",
+                                                                                  "props": {
+                                                                                    "text": "$item.stateLabel",
+                                                                                    "style": "footnote",
+                                                                                    "color": "textSecondary",
+                                                                                    "maxLines": 1
+                                                                                  }
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "ProgressBar",
+                                                                                  "props": {
+                                                                                    "progress": 0,
+                                                                                    "progressPath": "$item.progressFraction",
+                                                                                    "tint": "accentPrimary",
+                                                                                    "trackColor": "surfaceTertiary"
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "accessibilityLabel": "$item.name",
+                                                                                  "accessibilityValue": "$item.stateLabel",
+                                                                                  "hiddenPath": "$item.hideProgress"
+                                                                                }
+                                                                              }
+                                                                            ]
+                                                                          }
+                                                                        },
+                                                                        "modifiers": {
+                                                                          "background": {
+                                                                            "token": "surfaceElevated"
+                                                                          },
+                                                                          "border": {
+                                                                            "width": 1,
+                                                                            "color": {
+                                                                              "token": "border"
+                                                                            }
+                                                                          },
+                                                                          "cornerRadius": 8,
+                                                                          "padding": {
+                                                                            "leading": 10,
+                                                                            "trailing": 10,
+                                                                            "top": 10,
+                                                                            "bottom": 10
+                                                                          },
+                                                                          "width": 200,
+                                                                          "onTap": {
+                                                                            "actionId": "himi.open",
+                                                                            "params": {
+                                                                              "screenId": "himi_program",
+                                                                              "id": "$item.id"
+                                                                            }
+                                                                          },
+                                                                          "pressFeedback": "scale",
+                                                                          "haptic": "light",
+                                                                          "accessibilityLabel": "$item.name"
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        },
+                                                        "modifiers": {
+                                                          "hiddenPath": "$service:himiBrandedHome.noMemberPrograms"
+                                                        }
                                                       }
                                                     ]
                                                   }