@wix/himalaya-cli 0.1612.0 → 0.1614.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/dev-server/src/builder.d.ts +5 -0
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/sdk/ui/src/index.d.ts +53 -13
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/ts/src/schema.d.ts +15 -1
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/core.mjs +4 -2
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/ui.mjs +31 -5
- package/dist/cli.mjs +2189 -1377
- package/dist/preview-assets.generated.bin +0 -0
- package/fixtures/wix-canned.json +4 -0
- package/guides/component-reference.json +7 -4
- package/guides/component-reference.md +16 -2
- package/guides/designing-himi-screens.md +4 -1
- package/guides/getting-started.md +3 -2
- package/guides/hhp.md +2 -2
- package/guides/himi-json-output.md +3 -0
- package/guides/himi-skill.md +3 -2
- package/guides/himi-test.md +65 -2
- package/guides/one-app-to-himi-app.md +1 -1
- package/guides/recipe-form-submit.md +9 -0
- package/guides/sdk-reference.json +28 -4
- package/package.json +2 -2
- package/stdlib/fonts/catalog.json +141 -0
- package/templates/beauty-salon/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/branded-lite/dev/index.ts +192 -0
- package/templates/branded-lite/l10n/en.json +1 -1
- package/templates/branded-lite/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/community-club/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/events-meetups/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/gym-fitness/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/nonprofit-cause/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/podcast-creator/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/portfolio-creative/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/restaurant/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/retail-store/tier5-src/himi-branded-lite-home/index.ts +178 -12
- package/templates/yoga-studio/dev/index.ts +192 -0
- package/templates/yoga-studio/tier5-src/himi-branded-lite-home/index.ts +178 -12
|
@@ -9,7 +9,14 @@ import { withIapPresentation } from "../_shared/iap-presentation.js";
|
|
|
9
9
|
import { queryServices, type WixService } from "@himalaya/wix-bookings";
|
|
10
10
|
import { getPost, queryPosts, type WixPost } from "@himalaya/wix-blog";
|
|
11
11
|
import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
listMyParticipations,
|
|
14
|
+
participationsByProgram,
|
|
15
|
+
queryJoinApplications,
|
|
16
|
+
queryPrograms,
|
|
17
|
+
type WixProgram,
|
|
18
|
+
} from "@himalaya/wix-online-programs";
|
|
19
|
+
import { getMyMember } from "@himalaya/wix-members";
|
|
13
20
|
import { listFeedItems, type WixFeedItem, type WixFeedProfile } from "@himalaya/wix-social-feed";
|
|
14
21
|
import { queryItems as queryMenuItems, querySections as queryMenuSections } from "@himalaya/wix-restaurants";
|
|
15
22
|
import { normalizeEvent, queryEvents } from "../_shared/himi-events.js";
|
|
@@ -166,6 +173,13 @@ interface ProgramCard {
|
|
|
166
173
|
noImage: boolean;
|
|
167
174
|
}
|
|
168
175
|
|
|
176
|
+
/** A member's own program state, kept separate from the visitor catalog cards. */
|
|
177
|
+
interface MemberProgramCard extends ProgramCard {
|
|
178
|
+
stateLabel: string;
|
|
179
|
+
progressFraction: number;
|
|
180
|
+
hideProgress: boolean;
|
|
181
|
+
}
|
|
182
|
+
|
|
169
183
|
/** A communityPulse latest-activity Carousel card (design §4.5). */
|
|
170
184
|
interface FeedHighlight {
|
|
171
185
|
id: string;
|
|
@@ -308,6 +322,8 @@ interface State {
|
|
|
308
322
|
noNextEvent: boolean;
|
|
309
323
|
homePrograms: ProgramCard[];
|
|
310
324
|
noHomePrograms: boolean;
|
|
325
|
+
memberPrograms: MemberProgramCard[];
|
|
326
|
+
noMemberPrograms: boolean;
|
|
311
327
|
/** The videos module's carousel — the newest ready Wix Video videos, the channels
|
|
312
328
|
* taking turns. Guarded on `videos`; same silent-fail contract. */
|
|
313
329
|
homeVideos: (WixVideoCard & CaptionFlags)[];
|
|
@@ -549,6 +565,7 @@ interface ExtrasSignal {
|
|
|
549
565
|
upcomingEvents: EventEntry[];
|
|
550
566
|
nextEventCards: NextEventCard[];
|
|
551
567
|
homePrograms: ProgramCard[];
|
|
568
|
+
memberPrograms: MemberProgramCard[];
|
|
552
569
|
homeVideos: (WixVideoCard & CaptionFlags)[];
|
|
553
570
|
feedHighlights: FeedHighlight[];
|
|
554
571
|
memberAvatars: CoachAvatar[];
|
|
@@ -559,8 +576,17 @@ interface ExtrasSignal {
|
|
|
559
576
|
menuCategories: MenuCategory[];
|
|
560
577
|
}
|
|
561
578
|
|
|
579
|
+
let homeProgramCandidates: { generation: number; programs: WixProgram[] } = { generation: 0, programs: [] };
|
|
580
|
+
/** A finite number from a progress field, or `fallback` when the read left it out or sent junk. */
|
|
581
|
+
function finiteOr(value: unknown, fallback: number): number {
|
|
582
|
+
return typeof value === "number" && Number.isFinite(value) ? value : fallback;
|
|
583
|
+
}
|
|
584
|
+
|
|
585
|
+
/** How many microtask turns `memberProgramsLoaded` waits for refresh's own result to land (see the action). */
|
|
586
|
+
const MEMBER_PROGRAMS_APPLY_RETRIES = 50;
|
|
587
|
+
|
|
562
588
|
function emptyExtrasSignal(): ExtrasSignal {
|
|
563
|
-
return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
|
|
589
|
+
return { upcomingEvents: [], nextEventCards: [], homePrograms: [], memberPrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
|
|
564
590
|
}
|
|
565
591
|
|
|
566
592
|
/** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
|
|
@@ -670,13 +696,13 @@ async function fetchUpcomingEvents(): Promise<{ entries: EventEntry[]; nextEvent
|
|
|
670
696
|
}
|
|
671
697
|
}
|
|
672
698
|
|
|
673
|
-
async function fetchHomePrograms(): Promise<ProgramCard[]> {
|
|
699
|
+
async function fetchHomePrograms(): Promise<{ cards: ProgramCard[]; programs: WixProgram[] }> {
|
|
674
700
|
try {
|
|
675
701
|
const response = await queryPrograms({ cursorPaging: { limit: 12 } });
|
|
676
|
-
|
|
702
|
+
const programs = (response.programs ?? [])
|
|
677
703
|
.filter((p: WixProgram) => ((p.state ?? p.status ?? "").toUpperCase()) !== "DRAFT")
|
|
678
|
-
.slice(0,
|
|
679
|
-
|
|
704
|
+
.slice(0, 12);
|
|
705
|
+
const cards = programs.slice(0, 6).map((p: WixProgram) => {
|
|
680
706
|
const desc = (p as { description?: unknown }).description;
|
|
681
707
|
const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
|
|
682
708
|
const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
|
|
@@ -692,7 +718,112 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
|
|
|
692
718
|
noImage: !image,
|
|
693
719
|
};
|
|
694
720
|
});
|
|
721
|
+
return { cards, programs };
|
|
695
722
|
} catch {
|
|
723
|
+
return { cards: [], programs: [] };
|
|
724
|
+
}
|
|
725
|
+
}
|
|
726
|
+
|
|
727
|
+
/** Member state is best-effort Home enrichment: visitors and unsupported member sessions
|
|
728
|
+
* collapse the rail, while the public Programs section remains available. */
|
|
729
|
+
async function fetchMemberProgramCards(programs: WixProgram[]): Promise<MemberProgramCard[]> {
|
|
730
|
+
try {
|
|
731
|
+
const member = await memberAccess();
|
|
732
|
+
if (!member.email) return [];
|
|
733
|
+
const memberId = (await getMyMember()).member?.id;
|
|
734
|
+
if (!memberId) return [];
|
|
735
|
+
|
|
736
|
+
const [participantResult, applicationResult] = await Promise.allSettled([
|
|
737
|
+
listMyParticipations(memberId, { maxPages: 2 }),
|
|
738
|
+
queryJoinApplications({ memberId, limit: 100 }),
|
|
739
|
+
]);
|
|
740
|
+
// These are independent member reads. An unverified participant-query permission
|
|
741
|
+
// must not also hide applications that the member-scoped endpoint can return.
|
|
742
|
+
const participants = participantResult.status === "fulfilled" ? participantResult.value : [];
|
|
743
|
+
const applications = applicationResult.status === "fulfilled" ? applicationResult.value : { joinApplications: [] };
|
|
744
|
+
const participation = participationsByProgram(participants);
|
|
745
|
+
// An application that already became a participant keeps its status and carries `participantId`
|
|
746
|
+
// (the SDK's PENDING_JOIN_APPLICATION_STATUSES note): the participation is the standing, and a member
|
|
747
|
+
// who later left must not read as "Approved" from the application that once admitted them. Newest
|
|
748
|
+
// first, one per program, and only programs with no participation of their own — so the admitted
|
|
749
|
+
// rows a joined member accumulates never take the lookup slots of a real pending request.
|
|
750
|
+
const applicationByProgram = new Map<string, { status?: string }>();
|
|
751
|
+
for (const application of applications.joinApplications ?? []) {
|
|
752
|
+
if (!application.programId || application.participantId || participation.has(application.programId)) continue;
|
|
753
|
+
if (!applicationByProgram.has(application.programId)) applicationByProgram.set(application.programId, application);
|
|
754
|
+
}
|
|
755
|
+
// The public catalog preview is intentionally capped at 12. Resolve the
|
|
756
|
+
// member's six most recent enrolled programs and six open applications
|
|
757
|
+
// outside that window in one filtered query so both remain visible.
|
|
758
|
+
const knownIds = new Set(programs.map((program) => program.id).filter((id): id is string => !!id));
|
|
759
|
+
const participantProgramIds = [...participation.keys()].slice(0, 6);
|
|
760
|
+
const applicationProgramIds = [...applicationByProgram.keys()].filter((id) => !participantProgramIds.includes(id)).slice(0, 6);
|
|
761
|
+
const candidateIds = [...participantProgramIds, ...applicationProgramIds].slice(0, 12);
|
|
762
|
+
const missingIds = candidateIds.filter((id) => !knownIds.has(id));
|
|
763
|
+
const extraPrograms = missingIds.length
|
|
764
|
+
? await queryPrograms({ filter: { id: { $in: missingIds } }, cursorPaging: { limit: missingIds.length } })
|
|
765
|
+
.then((response) => response.programs ?? []).catch(() => [])
|
|
766
|
+
: [];
|
|
767
|
+
const memberPrograms = [...programs, ...extraPrograms.filter((program) => !!program.id && !knownIds.has(program.id))];
|
|
768
|
+
await assertMemberAccess(member);
|
|
769
|
+
|
|
770
|
+
return memberPrograms.flatMap((program) => {
|
|
771
|
+
if (!program.id) return [];
|
|
772
|
+
const participant = participation.get(program.id);
|
|
773
|
+
const application = applicationByProgram.get(program.id);
|
|
774
|
+
if (!participant && !application) return [];
|
|
775
|
+
const desc = (program as { description?: unknown }).description;
|
|
776
|
+
const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
|
|
777
|
+
const name = cleanTitle(program.settings?.title ?? nestedTitle ?? program.title) || copyParam("home.programFallbackName", "Program");
|
|
778
|
+
const image = programImage(program);
|
|
779
|
+
// Progress may be absent (a `fields` the read did not ask for, or a program with no steps): the
|
|
780
|
+
// bar then sits at 0 and the label comes from `progressStatus`, never from NaN arithmetic.
|
|
781
|
+
const available = finiteOr(participant?.progress?.totalStepsAvailable, 0);
|
|
782
|
+
const completed = finiteOr(participant?.progress?.totalStepsCompleted, 0);
|
|
783
|
+
const percentage = finiteOr(participant?.progress?.completionPercentage, Number.NaN);
|
|
784
|
+
const hasProgress = available > 0 || Number.isFinite(percentage);
|
|
785
|
+
const rawFraction = available > 0 ? completed / available : Number.isFinite(percentage) ? percentage / 100 : 0;
|
|
786
|
+
const progressFraction = Math.max(0, Math.min(1, rawFraction));
|
|
787
|
+
let stateLabel: string;
|
|
788
|
+
if (participant) {
|
|
789
|
+
const enrollmentStatus = (participant.enrollmentStatus ?? "").toUpperCase();
|
|
790
|
+
const progressStatus = (participant.progressStatus ?? "").toUpperCase();
|
|
791
|
+
stateLabel = enrollmentStatus === "SUSPENDED"
|
|
792
|
+
? copyParam("home.memberProgramSuspended", "Access paused")
|
|
793
|
+
: progressStatus === "COMPLETED" || enrollmentStatus === "COMPLETED"
|
|
794
|
+
? copyParam("home.memberProgramCompleted", "Completed")
|
|
795
|
+
: progressStatus === "FAILED"
|
|
796
|
+
? copyParam("home.memberProgramFailed", "Failed")
|
|
797
|
+
: progressStatus === "IN_PROGRESS" || (progressStatus !== "NOT_STARTED" && progressFraction > 0)
|
|
798
|
+
? copyParam("home.memberProgramInProgress", "In progress")
|
|
799
|
+
: copyParam("home.memberProgramNotStarted", "Not started");
|
|
800
|
+
} else {
|
|
801
|
+
const status = (application?.status ?? "").toUpperCase();
|
|
802
|
+
stateLabel = status === "INVITED"
|
|
803
|
+
? copyParam("home.memberProgramInvited", "Invitation")
|
|
804
|
+
: status === "APPROVED"
|
|
805
|
+
? copyParam("home.memberProgramApproved", "Approved")
|
|
806
|
+
: status === "SUSPENDED"
|
|
807
|
+
? copyParam("home.memberProgramSuspended", "Access paused")
|
|
808
|
+
: copyParam("home.memberProgramPending", "Request pending");
|
|
809
|
+
}
|
|
810
|
+
return [{
|
|
811
|
+
id: program.id,
|
|
812
|
+
name,
|
|
813
|
+
description: "",
|
|
814
|
+
image,
|
|
815
|
+
initial: initials(name),
|
|
816
|
+
hasImage: !!image,
|
|
817
|
+
noImage: !image,
|
|
818
|
+
stateLabel,
|
|
819
|
+
progressFraction,
|
|
820
|
+
hideProgress: !hasProgress || !participant || (participant.enrollmentStatus ?? "").toUpperCase() === "SUSPENDED",
|
|
821
|
+
}];
|
|
822
|
+
});
|
|
823
|
+
} catch (error) {
|
|
824
|
+
// The member rail is optional; never let a member-state refusal blank public Home.
|
|
825
|
+
const status = (error as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(error))?.[1];
|
|
826
|
+
console.warn("[home.member-programs] member state unavailable", status !== undefined ? `HTTP ${String(status)}` : (error as { name?: string } | null)?.name ?? "unknown");
|
|
696
827
|
return [];
|
|
697
828
|
}
|
|
698
829
|
}
|
|
@@ -747,7 +878,7 @@ function groupCard(group: WixGroup): GroupCard {
|
|
|
747
878
|
};
|
|
748
879
|
}
|
|
749
880
|
|
|
750
|
-
async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
|
|
881
|
+
async function fetchExtrasSignal(arg: unknown, generation: number): Promise<ExtrasSignal> {
|
|
751
882
|
const verticals = parseVerticals(arg);
|
|
752
883
|
const extras = emptyExtrasSignal();
|
|
753
884
|
const jobs: Promise<void>[] = [];
|
|
@@ -758,7 +889,12 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
|
|
|
758
889
|
}));
|
|
759
890
|
}
|
|
760
891
|
if (verticals.includes("programs")) {
|
|
761
|
-
jobs.push(fetchHomePrograms().then((cards) => {
|
|
892
|
+
jobs.push(fetchHomePrograms().then(({ cards, programs }) => {
|
|
893
|
+
extras.homePrograms = cards;
|
|
894
|
+
// An older refresh can finish this query after a newer one. Keep its
|
|
895
|
+
// candidates from replacing the current generation's member-read input.
|
|
896
|
+
if (generation === refreshGen) homeProgramCandidates = { generation, programs };
|
|
897
|
+
}));
|
|
762
898
|
}
|
|
763
899
|
if (verticals.includes("videos") && !videoSurfaceRefused) {
|
|
764
900
|
const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
|
|
@@ -883,6 +1019,7 @@ function derive(state: State): State {
|
|
|
883
1019
|
noUpcomingEvents: state.upcomingEvents.length === 0,
|
|
884
1020
|
noNextEvent: state.nextEventCards.length === 0,
|
|
885
1021
|
noHomePrograms: state.homePrograms.length === 0,
|
|
1022
|
+
noMemberPrograms: state.memberPrograms.length === 0,
|
|
886
1023
|
noHomeVideos: state.homeVideos.length === 0,
|
|
887
1024
|
noFeedHighlights: state.feedHighlights.length === 0,
|
|
888
1025
|
noMemberAvatars: state.memberAvatars.length === 0,
|
|
@@ -977,6 +1114,8 @@ function baseState(): State {
|
|
|
977
1114
|
noNextEvent: true,
|
|
978
1115
|
homePrograms: [],
|
|
979
1116
|
noHomePrograms: true,
|
|
1117
|
+
memberPrograms: [],
|
|
1118
|
+
noMemberPrograms: true,
|
|
980
1119
|
homeVideos: [],
|
|
981
1120
|
noHomeVideos: true,
|
|
982
1121
|
feedHighlights: [],
|
|
@@ -1026,7 +1165,7 @@ async function refreshPublic(state: State, arg?: unknown): Promise<State | undef
|
|
|
1026
1165
|
// failure just collapses their blocks), so a store outage cannot blank them
|
|
1027
1166
|
// and vice versa. paramValue() stashes the appear params on first read, so the
|
|
1028
1167
|
// arg-less fallback below still resolves the stashed verticals.
|
|
1029
|
-
const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg), fetchSavedSignal(arg)]);
|
|
1168
|
+
const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg, gen), fetchSavedSignal(arg)]);
|
|
1030
1169
|
if (gen !== refreshGen) return undefined;
|
|
1031
1170
|
// A screen that declares no "store" vertical renders no products rail, so there is
|
|
1032
1171
|
// 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>
|
|
|
1186
1325
|
void refreshPersonal(generation, arg);
|
|
1187
1326
|
const publicState = await refreshPublic(state, arg);
|
|
1188
1327
|
if (!publicState || generation !== personalGeneration) return undefined;
|
|
1328
|
+
// The member-only read runs after public Home has landed. It is deliberately not awaited:
|
|
1329
|
+
// a slow member endpoint must not hold the public catalog or hero behind authentication.
|
|
1330
|
+
const programCandidates = homeProgramCandidates;
|
|
1331
|
+
if (programCandidates.generation === refreshGen && parseVerticals(arg).includes("programs")) {
|
|
1332
|
+
void fetchMemberProgramCards(programCandidates.programs).then((rows) => {
|
|
1333
|
+
void svc.memberProgramsLoaded({ generation: programCandidates.generation, rows });
|
|
1334
|
+
});
|
|
1335
|
+
}
|
|
1189
1336
|
const current = svc.getState();
|
|
1190
|
-
return derive({ ...publicState,
|
|
1337
|
+
return derive({ ...publicState, memberPrograms: current.memberPrograms, noMemberPrograms: current.noMemberPrograms,
|
|
1338
|
+
nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
|
|
1191
1339
|
memberProgressLabel: current.memberProgressLabel, memberProgressFraction: current.memberProgressFraction,
|
|
1192
1340
|
hideMemberProgress: current.hideMemberProgress, personalError: current.personalError, hidePersonalError: current.hidePersonalError,
|
|
1193
1341
|
// The weekly goal is PERSONAL (member bookings); the public refresh resets it, so keep it.
|
|
@@ -1214,6 +1362,7 @@ const svc = defineService<State, {
|
|
|
1214
1362
|
refresh: (state: State, arg?: unknown) => Promise<State | undefined>;
|
|
1215
1363
|
dismissOnboarding: (state: State) => State;
|
|
1216
1364
|
clearPersonal: (state: State) => State;
|
|
1365
|
+
memberProgramsLoaded: (state: State, arg: { generation: number; rows: MemberProgramCard[]; attempt?: number }) => State | undefined;
|
|
1217
1366
|
openShopCategory: (state: State, arg?: unknown) => State;
|
|
1218
1367
|
personalLoaded: (state: State, arg: { generation: number; rows: MemberBookingRow[]; progress: { label: string; fraction: number }; error: boolean; weekly: { count: number; fraction: number; label: string } | null }) => State;
|
|
1219
1368
|
categoriesLoaded: (state: State, arg: { generation: number; categories: StoreCategoryCard[] }) => State | undefined;
|
|
@@ -1221,10 +1370,27 @@ const svc = defineService<State, {
|
|
|
1221
1370
|
state: baseState(),
|
|
1222
1371
|
// The host's site is read fresh at every boot: a snapshot of the last session's site must not
|
|
1223
1372
|
// decide this one's verticals or name (an owner installs or removes one; another site opens).
|
|
1224
|
-
notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories"],
|
|
1373
|
+
notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories", "memberPrograms", "noMemberPrograms"],
|
|
1374
|
+
// A member's standing never reaches the on-device snapshot either: the next boot may be another member's.
|
|
1375
|
+
notPersisted: ["memberPrograms", "noMemberPrograms"],
|
|
1225
1376
|
actions: {
|
|
1226
|
-
clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, personalError: false, hidePersonalError: true,
|
|
1377
|
+
clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, memberPrograms: [], noMemberPrograms: true, personalError: false, hidePersonalError: true,
|
|
1227
1378
|
weeklyClassCount: 0, weeklyClassGoalFraction: 0, weeklyGoalLabel: "" }),
|
|
1379
|
+
// The member read starts inside `refresh` and, for a visitor (identity answers synchronously),
|
|
1380
|
+
// resolves within the same microtask turn — BEFORE the runtime has applied refresh's own result.
|
|
1381
|
+
// The `state` handed here is then refresh's PRE-state (status "loading", every rail empty), and
|
|
1382
|
+
// spreading it wrote a loading home over the ready one; the description-projection test caught
|
|
1383
|
+
// exactly that. So an early arrival re-queues itself (a microtask at a time, bounded) until the
|
|
1384
|
+
// state it would spread is the applied one. A stale generation keeps the current state
|
|
1385
|
+
// (`undefined`), never its own stale snapshot.
|
|
1386
|
+
memberProgramsLoaded: (state, arg) => {
|
|
1387
|
+
if (arg.generation !== refreshGen) return undefined;
|
|
1388
|
+
if (state.status === "loading" && (arg.attempt ?? 0) < MEMBER_PROGRAMS_APPLY_RETRIES) {
|
|
1389
|
+
void Promise.resolve().then(() => svc.memberProgramsLoaded({ ...arg, attempt: (arg.attempt ?? 0) + 1 }));
|
|
1390
|
+
return undefined;
|
|
1391
|
+
}
|
|
1392
|
+
return derive({ ...state, memberPrograms: arg.rows, noMemberPrograms: arg.rows.length === 0 });
|
|
1393
|
+
},
|
|
1228
1394
|
openShopCategory: (state, arg) => {
|
|
1229
1395
|
const category = String((arg as { category?: unknown } | undefined)?.category ?? "");
|
|
1230
1396
|
if (!category) return state;
|
|
@@ -9,7 +9,14 @@ import { withIapPresentation } from "../_shared/iap-presentation.js";
|
|
|
9
9
|
import { queryServices, type WixService } from "@himalaya/wix-bookings";
|
|
10
10
|
import { getPost, queryPosts, type WixPost } from "@himalaya/wix-blog";
|
|
11
11
|
import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
listMyParticipations,
|
|
14
|
+
participationsByProgram,
|
|
15
|
+
queryJoinApplications,
|
|
16
|
+
queryPrograms,
|
|
17
|
+
type WixProgram,
|
|
18
|
+
} from "@himalaya/wix-online-programs";
|
|
19
|
+
import { getMyMember } from "@himalaya/wix-members";
|
|
13
20
|
import { listFeedItems, type WixFeedItem, type WixFeedProfile } from "@himalaya/wix-social-feed";
|
|
14
21
|
import { queryItems as queryMenuItems, querySections as queryMenuSections } from "@himalaya/wix-restaurants";
|
|
15
22
|
import { normalizeEvent, queryEvents } from "../_shared/himi-events.js";
|
|
@@ -166,6 +173,13 @@ interface ProgramCard {
|
|
|
166
173
|
noImage: boolean;
|
|
167
174
|
}
|
|
168
175
|
|
|
176
|
+
/** A member's own program state, kept separate from the visitor catalog cards. */
|
|
177
|
+
interface MemberProgramCard extends ProgramCard {
|
|
178
|
+
stateLabel: string;
|
|
179
|
+
progressFraction: number;
|
|
180
|
+
hideProgress: boolean;
|
|
181
|
+
}
|
|
182
|
+
|
|
169
183
|
/** A communityPulse latest-activity Carousel card (design §4.5). */
|
|
170
184
|
interface FeedHighlight {
|
|
171
185
|
id: string;
|
|
@@ -308,6 +322,8 @@ interface State {
|
|
|
308
322
|
noNextEvent: boolean;
|
|
309
323
|
homePrograms: ProgramCard[];
|
|
310
324
|
noHomePrograms: boolean;
|
|
325
|
+
memberPrograms: MemberProgramCard[];
|
|
326
|
+
noMemberPrograms: boolean;
|
|
311
327
|
/** The videos module's carousel — the newest ready Wix Video videos, the channels
|
|
312
328
|
* taking turns. Guarded on `videos`; same silent-fail contract. */
|
|
313
329
|
homeVideos: (WixVideoCard & CaptionFlags)[];
|
|
@@ -549,6 +565,7 @@ interface ExtrasSignal {
|
|
|
549
565
|
upcomingEvents: EventEntry[];
|
|
550
566
|
nextEventCards: NextEventCard[];
|
|
551
567
|
homePrograms: ProgramCard[];
|
|
568
|
+
memberPrograms: MemberProgramCard[];
|
|
552
569
|
homeVideos: (WixVideoCard & CaptionFlags)[];
|
|
553
570
|
feedHighlights: FeedHighlight[];
|
|
554
571
|
memberAvatars: CoachAvatar[];
|
|
@@ -559,8 +576,17 @@ interface ExtrasSignal {
|
|
|
559
576
|
menuCategories: MenuCategory[];
|
|
560
577
|
}
|
|
561
578
|
|
|
579
|
+
let homeProgramCandidates: { generation: number; programs: WixProgram[] } = { generation: 0, programs: [] };
|
|
580
|
+
/** A finite number from a progress field, or `fallback` when the read left it out or sent junk. */
|
|
581
|
+
function finiteOr(value: unknown, fallback: number): number {
|
|
582
|
+
return typeof value === "number" && Number.isFinite(value) ? value : fallback;
|
|
583
|
+
}
|
|
584
|
+
|
|
585
|
+
/** How many microtask turns `memberProgramsLoaded` waits for refresh's own result to land (see the action). */
|
|
586
|
+
const MEMBER_PROGRAMS_APPLY_RETRIES = 50;
|
|
587
|
+
|
|
562
588
|
function emptyExtrasSignal(): ExtrasSignal {
|
|
563
|
-
return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
|
|
589
|
+
return { upcomingEvents: [], nextEventCards: [], homePrograms: [], memberPrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
|
|
564
590
|
}
|
|
565
591
|
|
|
566
592
|
/** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
|
|
@@ -670,13 +696,13 @@ async function fetchUpcomingEvents(): Promise<{ entries: EventEntry[]; nextEvent
|
|
|
670
696
|
}
|
|
671
697
|
}
|
|
672
698
|
|
|
673
|
-
async function fetchHomePrograms(): Promise<ProgramCard[]> {
|
|
699
|
+
async function fetchHomePrograms(): Promise<{ cards: ProgramCard[]; programs: WixProgram[] }> {
|
|
674
700
|
try {
|
|
675
701
|
const response = await queryPrograms({ cursorPaging: { limit: 12 } });
|
|
676
|
-
|
|
702
|
+
const programs = (response.programs ?? [])
|
|
677
703
|
.filter((p: WixProgram) => ((p.state ?? p.status ?? "").toUpperCase()) !== "DRAFT")
|
|
678
|
-
.slice(0,
|
|
679
|
-
|
|
704
|
+
.slice(0, 12);
|
|
705
|
+
const cards = programs.slice(0, 6).map((p: WixProgram) => {
|
|
680
706
|
const desc = (p as { description?: unknown }).description;
|
|
681
707
|
const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
|
|
682
708
|
const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
|
|
@@ -692,7 +718,112 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
|
|
|
692
718
|
noImage: !image,
|
|
693
719
|
};
|
|
694
720
|
});
|
|
721
|
+
return { cards, programs };
|
|
695
722
|
} catch {
|
|
723
|
+
return { cards: [], programs: [] };
|
|
724
|
+
}
|
|
725
|
+
}
|
|
726
|
+
|
|
727
|
+
/** Member state is best-effort Home enrichment: visitors and unsupported member sessions
|
|
728
|
+
* collapse the rail, while the public Programs section remains available. */
|
|
729
|
+
async function fetchMemberProgramCards(programs: WixProgram[]): Promise<MemberProgramCard[]> {
|
|
730
|
+
try {
|
|
731
|
+
const member = await memberAccess();
|
|
732
|
+
if (!member.email) return [];
|
|
733
|
+
const memberId = (await getMyMember()).member?.id;
|
|
734
|
+
if (!memberId) return [];
|
|
735
|
+
|
|
736
|
+
const [participantResult, applicationResult] = await Promise.allSettled([
|
|
737
|
+
listMyParticipations(memberId, { maxPages: 2 }),
|
|
738
|
+
queryJoinApplications({ memberId, limit: 100 }),
|
|
739
|
+
]);
|
|
740
|
+
// These are independent member reads. An unverified participant-query permission
|
|
741
|
+
// must not also hide applications that the member-scoped endpoint can return.
|
|
742
|
+
const participants = participantResult.status === "fulfilled" ? participantResult.value : [];
|
|
743
|
+
const applications = applicationResult.status === "fulfilled" ? applicationResult.value : { joinApplications: [] };
|
|
744
|
+
const participation = participationsByProgram(participants);
|
|
745
|
+
// An application that already became a participant keeps its status and carries `participantId`
|
|
746
|
+
// (the SDK's PENDING_JOIN_APPLICATION_STATUSES note): the participation is the standing, and a member
|
|
747
|
+
// who later left must not read as "Approved" from the application that once admitted them. Newest
|
|
748
|
+
// first, one per program, and only programs with no participation of their own — so the admitted
|
|
749
|
+
// rows a joined member accumulates never take the lookup slots of a real pending request.
|
|
750
|
+
const applicationByProgram = new Map<string, { status?: string }>();
|
|
751
|
+
for (const application of applications.joinApplications ?? []) {
|
|
752
|
+
if (!application.programId || application.participantId || participation.has(application.programId)) continue;
|
|
753
|
+
if (!applicationByProgram.has(application.programId)) applicationByProgram.set(application.programId, application);
|
|
754
|
+
}
|
|
755
|
+
// The public catalog preview is intentionally capped at 12. Resolve the
|
|
756
|
+
// member's six most recent enrolled programs and six open applications
|
|
757
|
+
// outside that window in one filtered query so both remain visible.
|
|
758
|
+
const knownIds = new Set(programs.map((program) => program.id).filter((id): id is string => !!id));
|
|
759
|
+
const participantProgramIds = [...participation.keys()].slice(0, 6);
|
|
760
|
+
const applicationProgramIds = [...applicationByProgram.keys()].filter((id) => !participantProgramIds.includes(id)).slice(0, 6);
|
|
761
|
+
const candidateIds = [...participantProgramIds, ...applicationProgramIds].slice(0, 12);
|
|
762
|
+
const missingIds = candidateIds.filter((id) => !knownIds.has(id));
|
|
763
|
+
const extraPrograms = missingIds.length
|
|
764
|
+
? await queryPrograms({ filter: { id: { $in: missingIds } }, cursorPaging: { limit: missingIds.length } })
|
|
765
|
+
.then((response) => response.programs ?? []).catch(() => [])
|
|
766
|
+
: [];
|
|
767
|
+
const memberPrograms = [...programs, ...extraPrograms.filter((program) => !!program.id && !knownIds.has(program.id))];
|
|
768
|
+
await assertMemberAccess(member);
|
|
769
|
+
|
|
770
|
+
return memberPrograms.flatMap((program) => {
|
|
771
|
+
if (!program.id) return [];
|
|
772
|
+
const participant = participation.get(program.id);
|
|
773
|
+
const application = applicationByProgram.get(program.id);
|
|
774
|
+
if (!participant && !application) return [];
|
|
775
|
+
const desc = (program as { description?: unknown }).description;
|
|
776
|
+
const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
|
|
777
|
+
const name = cleanTitle(program.settings?.title ?? nestedTitle ?? program.title) || copyParam("home.programFallbackName", "Program");
|
|
778
|
+
const image = programImage(program);
|
|
779
|
+
// Progress may be absent (a `fields` the read did not ask for, or a program with no steps): the
|
|
780
|
+
// bar then sits at 0 and the label comes from `progressStatus`, never from NaN arithmetic.
|
|
781
|
+
const available = finiteOr(participant?.progress?.totalStepsAvailable, 0);
|
|
782
|
+
const completed = finiteOr(participant?.progress?.totalStepsCompleted, 0);
|
|
783
|
+
const percentage = finiteOr(participant?.progress?.completionPercentage, Number.NaN);
|
|
784
|
+
const hasProgress = available > 0 || Number.isFinite(percentage);
|
|
785
|
+
const rawFraction = available > 0 ? completed / available : Number.isFinite(percentage) ? percentage / 100 : 0;
|
|
786
|
+
const progressFraction = Math.max(0, Math.min(1, rawFraction));
|
|
787
|
+
let stateLabel: string;
|
|
788
|
+
if (participant) {
|
|
789
|
+
const enrollmentStatus = (participant.enrollmentStatus ?? "").toUpperCase();
|
|
790
|
+
const progressStatus = (participant.progressStatus ?? "").toUpperCase();
|
|
791
|
+
stateLabel = enrollmentStatus === "SUSPENDED"
|
|
792
|
+
? copyParam("home.memberProgramSuspended", "Access paused")
|
|
793
|
+
: progressStatus === "COMPLETED" || enrollmentStatus === "COMPLETED"
|
|
794
|
+
? copyParam("home.memberProgramCompleted", "Completed")
|
|
795
|
+
: progressStatus === "FAILED"
|
|
796
|
+
? copyParam("home.memberProgramFailed", "Failed")
|
|
797
|
+
: progressStatus === "IN_PROGRESS" || (progressStatus !== "NOT_STARTED" && progressFraction > 0)
|
|
798
|
+
? copyParam("home.memberProgramInProgress", "In progress")
|
|
799
|
+
: copyParam("home.memberProgramNotStarted", "Not started");
|
|
800
|
+
} else {
|
|
801
|
+
const status = (application?.status ?? "").toUpperCase();
|
|
802
|
+
stateLabel = status === "INVITED"
|
|
803
|
+
? copyParam("home.memberProgramInvited", "Invitation")
|
|
804
|
+
: status === "APPROVED"
|
|
805
|
+
? copyParam("home.memberProgramApproved", "Approved")
|
|
806
|
+
: status === "SUSPENDED"
|
|
807
|
+
? copyParam("home.memberProgramSuspended", "Access paused")
|
|
808
|
+
: copyParam("home.memberProgramPending", "Request pending");
|
|
809
|
+
}
|
|
810
|
+
return [{
|
|
811
|
+
id: program.id,
|
|
812
|
+
name,
|
|
813
|
+
description: "",
|
|
814
|
+
image,
|
|
815
|
+
initial: initials(name),
|
|
816
|
+
hasImage: !!image,
|
|
817
|
+
noImage: !image,
|
|
818
|
+
stateLabel,
|
|
819
|
+
progressFraction,
|
|
820
|
+
hideProgress: !hasProgress || !participant || (participant.enrollmentStatus ?? "").toUpperCase() === "SUSPENDED",
|
|
821
|
+
}];
|
|
822
|
+
});
|
|
823
|
+
} catch (error) {
|
|
824
|
+
// The member rail is optional; never let a member-state refusal blank public Home.
|
|
825
|
+
const status = (error as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(error))?.[1];
|
|
826
|
+
console.warn("[home.member-programs] member state unavailable", status !== undefined ? `HTTP ${String(status)}` : (error as { name?: string } | null)?.name ?? "unknown");
|
|
696
827
|
return [];
|
|
697
828
|
}
|
|
698
829
|
}
|
|
@@ -747,7 +878,7 @@ function groupCard(group: WixGroup): GroupCard {
|
|
|
747
878
|
};
|
|
748
879
|
}
|
|
749
880
|
|
|
750
|
-
async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
|
|
881
|
+
async function fetchExtrasSignal(arg: unknown, generation: number): Promise<ExtrasSignal> {
|
|
751
882
|
const verticals = parseVerticals(arg);
|
|
752
883
|
const extras = emptyExtrasSignal();
|
|
753
884
|
const jobs: Promise<void>[] = [];
|
|
@@ -758,7 +889,12 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
|
|
|
758
889
|
}));
|
|
759
890
|
}
|
|
760
891
|
if (verticals.includes("programs")) {
|
|
761
|
-
jobs.push(fetchHomePrograms().then((cards) => {
|
|
892
|
+
jobs.push(fetchHomePrograms().then(({ cards, programs }) => {
|
|
893
|
+
extras.homePrograms = cards;
|
|
894
|
+
// An older refresh can finish this query after a newer one. Keep its
|
|
895
|
+
// candidates from replacing the current generation's member-read input.
|
|
896
|
+
if (generation === refreshGen) homeProgramCandidates = { generation, programs };
|
|
897
|
+
}));
|
|
762
898
|
}
|
|
763
899
|
if (verticals.includes("videos") && !videoSurfaceRefused) {
|
|
764
900
|
const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
|
|
@@ -883,6 +1019,7 @@ function derive(state: State): State {
|
|
|
883
1019
|
noUpcomingEvents: state.upcomingEvents.length === 0,
|
|
884
1020
|
noNextEvent: state.nextEventCards.length === 0,
|
|
885
1021
|
noHomePrograms: state.homePrograms.length === 0,
|
|
1022
|
+
noMemberPrograms: state.memberPrograms.length === 0,
|
|
886
1023
|
noHomeVideos: state.homeVideos.length === 0,
|
|
887
1024
|
noFeedHighlights: state.feedHighlights.length === 0,
|
|
888
1025
|
noMemberAvatars: state.memberAvatars.length === 0,
|
|
@@ -977,6 +1114,8 @@ function baseState(): State {
|
|
|
977
1114
|
noNextEvent: true,
|
|
978
1115
|
homePrograms: [],
|
|
979
1116
|
noHomePrograms: true,
|
|
1117
|
+
memberPrograms: [],
|
|
1118
|
+
noMemberPrograms: true,
|
|
980
1119
|
homeVideos: [],
|
|
981
1120
|
noHomeVideos: true,
|
|
982
1121
|
feedHighlights: [],
|
|
@@ -1026,7 +1165,7 @@ async function refreshPublic(state: State, arg?: unknown): Promise<State | undef
|
|
|
1026
1165
|
// failure just collapses their blocks), so a store outage cannot blank them
|
|
1027
1166
|
// and vice versa. paramValue() stashes the appear params on first read, so the
|
|
1028
1167
|
// arg-less fallback below still resolves the stashed verticals.
|
|
1029
|
-
const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg), fetchSavedSignal(arg)]);
|
|
1168
|
+
const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg, gen), fetchSavedSignal(arg)]);
|
|
1030
1169
|
if (gen !== refreshGen) return undefined;
|
|
1031
1170
|
// A screen that declares no "store" vertical renders no products rail, so there is
|
|
1032
1171
|
// 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>
|
|
|
1186
1325
|
void refreshPersonal(generation, arg);
|
|
1187
1326
|
const publicState = await refreshPublic(state, arg);
|
|
1188
1327
|
if (!publicState || generation !== personalGeneration) return undefined;
|
|
1328
|
+
// The member-only read runs after public Home has landed. It is deliberately not awaited:
|
|
1329
|
+
// a slow member endpoint must not hold the public catalog or hero behind authentication.
|
|
1330
|
+
const programCandidates = homeProgramCandidates;
|
|
1331
|
+
if (programCandidates.generation === refreshGen && parseVerticals(arg).includes("programs")) {
|
|
1332
|
+
void fetchMemberProgramCards(programCandidates.programs).then((rows) => {
|
|
1333
|
+
void svc.memberProgramsLoaded({ generation: programCandidates.generation, rows });
|
|
1334
|
+
});
|
|
1335
|
+
}
|
|
1189
1336
|
const current = svc.getState();
|
|
1190
|
-
return derive({ ...publicState,
|
|
1337
|
+
return derive({ ...publicState, memberPrograms: current.memberPrograms, noMemberPrograms: current.noMemberPrograms,
|
|
1338
|
+
nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
|
|
1191
1339
|
memberProgressLabel: current.memberProgressLabel, memberProgressFraction: current.memberProgressFraction,
|
|
1192
1340
|
hideMemberProgress: current.hideMemberProgress, personalError: current.personalError, hidePersonalError: current.hidePersonalError,
|
|
1193
1341
|
// The weekly goal is PERSONAL (member bookings); the public refresh resets it, so keep it.
|
|
@@ -1214,6 +1362,7 @@ const svc = defineService<State, {
|
|
|
1214
1362
|
refresh: (state: State, arg?: unknown) => Promise<State | undefined>;
|
|
1215
1363
|
dismissOnboarding: (state: State) => State;
|
|
1216
1364
|
clearPersonal: (state: State) => State;
|
|
1365
|
+
memberProgramsLoaded: (state: State, arg: { generation: number; rows: MemberProgramCard[]; attempt?: number }) => State | undefined;
|
|
1217
1366
|
openShopCategory: (state: State, arg?: unknown) => State;
|
|
1218
1367
|
personalLoaded: (state: State, arg: { generation: number; rows: MemberBookingRow[]; progress: { label: string; fraction: number }; error: boolean; weekly: { count: number; fraction: number; label: string } | null }) => State;
|
|
1219
1368
|
categoriesLoaded: (state: State, arg: { generation: number; categories: StoreCategoryCard[] }) => State | undefined;
|
|
@@ -1221,10 +1370,27 @@ const svc = defineService<State, {
|
|
|
1221
1370
|
state: baseState(),
|
|
1222
1371
|
// The host's site is read fresh at every boot: a snapshot of the last session's site must not
|
|
1223
1372
|
// decide this one's verticals or name (an owner installs or removes one; another site opens).
|
|
1224
|
-
notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories"],
|
|
1373
|
+
notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories", "memberPrograms", "noMemberPrograms"],
|
|
1374
|
+
// A member's standing never reaches the on-device snapshot either: the next boot may be another member's.
|
|
1375
|
+
notPersisted: ["memberPrograms", "noMemberPrograms"],
|
|
1225
1376
|
actions: {
|
|
1226
|
-
clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, personalError: false, hidePersonalError: true,
|
|
1377
|
+
clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, memberPrograms: [], noMemberPrograms: true, personalError: false, hidePersonalError: true,
|
|
1227
1378
|
weeklyClassCount: 0, weeklyClassGoalFraction: 0, weeklyGoalLabel: "" }),
|
|
1379
|
+
// The member read starts inside `refresh` and, for a visitor (identity answers synchronously),
|
|
1380
|
+
// resolves within the same microtask turn — BEFORE the runtime has applied refresh's own result.
|
|
1381
|
+
// The `state` handed here is then refresh's PRE-state (status "loading", every rail empty), and
|
|
1382
|
+
// spreading it wrote a loading home over the ready one; the description-projection test caught
|
|
1383
|
+
// exactly that. So an early arrival re-queues itself (a microtask at a time, bounded) until the
|
|
1384
|
+
// state it would spread is the applied one. A stale generation keeps the current state
|
|
1385
|
+
// (`undefined`), never its own stale snapshot.
|
|
1386
|
+
memberProgramsLoaded: (state, arg) => {
|
|
1387
|
+
if (arg.generation !== refreshGen) return undefined;
|
|
1388
|
+
if (state.status === "loading" && (arg.attempt ?? 0) < MEMBER_PROGRAMS_APPLY_RETRIES) {
|
|
1389
|
+
void Promise.resolve().then(() => svc.memberProgramsLoaded({ ...arg, attempt: (arg.attempt ?? 0) + 1 }));
|
|
1390
|
+
return undefined;
|
|
1391
|
+
}
|
|
1392
|
+
return derive({ ...state, memberPrograms: arg.rows, noMemberPrograms: arg.rows.length === 0 });
|
|
1393
|
+
},
|
|
1228
1394
|
openShopCategory: (state, arg) => {
|
|
1229
1395
|
const category = String((arg as { category?: unknown } | undefined)?.category ?? "");
|
|
1230
1396
|
if (!category) return state;
|