@wix/himalaya-cli 0.1035.0 → 0.1036.0

package/templates/community-club/tier5-src/himi-events-list/index.ts

@@ -35,16 +35,32 @@ const svc = defineBackendCollection<S, EventRow>("himiEvents", {
     id: row => row.id,
     errorMessage: () => copyParam("events.errorText", "Events could not be loaded."),
     async cached(criteria) {
-      if (criteria.query || criteria.filter !== "all" || criteria.sort !== "default") return undefined;
-      return { items: await readCached(), nextCursor: "", metadata: { fromCache: true } };
+      // The list now OPENS on Upcoming, so the default view must keep its offline-first paint:
+      // serve the cache for it too, minus the rows that have finished.
+      const upcoming = criteria.filter === "value:Upcoming";
+      if (criteria.query || (criteria.filter !== "all" && !upcoming) || criteria.sort !== "default") return undefined;
+      const rows = await readCached();
+      return { items: upcoming ? rows.filter((row) => row.statusLabel !== "Past") : rows, nextCursor: "", metadata: { fromCache: true } };
     },
     async fetch(criteria, cursor) {
       if (!cursor) queryNow = new Date().toISOString();
       if (criteria.filter === "saved" && !criteria.savedIds.length) return { items: [], nextCursor: "" };
       const filter: Record<string, unknown> = { status: { $ne: "DRAFT" } };
-      if (criteria.query) filter.title = { $eq: criteria.query };
+      // Prefix, not exact: the placeholder says "Search events", and an exact-title match returned
+      // nothing for "Harvest" when the event is "Harvest Tasting".
+      if (criteria.query) filter.title = { $startsWith: criteria.query };
       if (criteria.filter === "saved") filter.id = { $in: criteria.savedIds };
-      if (criteria.filter === "value:Upcoming") filter["dateAndTimeSettings.startDate"] = { $gte: queryNow };
+      // Upcoming = not started yet OR not finished yet: an event in progress (a festival on its
+      // second day) is still on. The start-date arm is what keeps a START-ONLY event (no endDate
+      // — valid in Wix Events) in the list; a filter on endDate alone dropped it from both views.
+      // Past stays "has started", so an in-progress event may appear under both; its row is only
+      // marked "Past" once it has actually finished (`eventIsPast`).
+      if (criteria.filter === "value:Upcoming") {
+        filter.$or = [
+          { "dateAndTimeSettings.startDate": { $gte: queryNow } },
+          { "dateAndTimeSettings.endDate": { $gte: queryNow } },
+        ];
+      }
       if (criteria.filter === "value:Past") filter["dateAndTimeSettings.startDate"] = { $lt: queryNow };
       const res = await queryEvents({ limit: 50, offset: Number(cursor || 0), query: { filter,
         sort: [{ fieldName: criteria.sort === "default" ? "dateAndTimeSettings.startDate" : "title", order: criteria.sort === "za" ? "DESC" : "ASC" }, { fieldName: "id", order: "ASC" }] } });

package/templates/community-club/tier5-src/himi-events-my-events/index.ts

@@ -63,9 +63,9 @@ async function identityLine(): Promise<string> {
     const identity = await dispatch("himi.wix.memberIdentity") as { email?: string } | null;
     return identity?.email
       ? copyTemplate("myEvents.signedInAs", "Signed in as {email}", { email: identity.email })
-      : copyParam("myEvents.identityGuest", "RSVPs saved on this device — not yet your full Wix Events history.");
+      : copyParam("myEvents.identityGuest", "RSVPs you confirm on this device appear here.");
   } catch {
-    return copyParam("myEvents.identityGuest", "RSVPs saved on this device — not yet your full Wix Events history.");
+    return copyParam("myEvents.identityGuest", "RSVPs you confirm on this device appear here.");
   }
 }
 

package/templates/community-club/tier5-src/wix-spaces-whats-new/index.ts

@@ -4,7 +4,7 @@ import { withEmptyFlags } from "../_shared/empty-flags.js";
 import { listAnnouncements, type WixAnnouncement } from "@himalaya/wix-new-releases";
 
 interface Row { id: string; name: string; subtitle: string }
-interface S { status: "loading" | "ready"; items: Row[]; emptyText: string }
+interface S { status: "loading" | "ready"; items: Row[]; emptyText: string; /** hiddenWhen hides on true: the empty card shows only once loaded AND empty. */ noEmpty: boolean }
 
 function norm(a: WixAnnouncement, i: number): Row {
   const aa = a as unknown as { id?: string; title?: string; bodyText?: string; description?: string };
@@ -12,14 +12,14 @@ function norm(a: WixAnnouncement, i: number): Row {
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", withEmptyFlags({
-  state: { status: "loading", items: [], emptyText: "" },
+  state: { status: "loading", items: [], emptyText: "", noEmpty: true },
   actions: {
     load: async (s) => {
       try {
         const r = await listAnnouncements(20);
         const items = (((r as unknown as { announcements?: WixAnnouncement[] }).announcements) ?? []).map(norm);
-        return { status: "ready", items, emptyText: items.length ? "" : "Nothing new right now" };
-      } catch { return { ...s, status: "ready", items: [], emptyText: "Nothing new right now" }; }
+        return { status: "ready", items, emptyText: items.length ? "" : "Nothing new right now", noEmpty: items.length > 0 };
+      } catch { return { ...s, status: "ready", items: [], emptyText: "Nothing new right now", noEmpty: false }; }
     },
   },
 }, { items: "noItems" }));