@wix/himalaya-cli 0.1222.0 → 0.1224.0

package/templates/gym-fitness/tier5-src/_shared/collection-contract.ts

@@ -37,6 +37,13 @@ export interface CollectionConfig {
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
   primaryVerb?: { label: string; screenId?: string };
+  /** A TIME-BOUND entity (an event, a booking, a reservation): the boolean row field the
+   *  DOMAIN sets once the record has finished — computed by the same rule as the row's own
+   *  "Past" label, in the same place, so the two cannot disagree. A finished
+   *  record's `primaryVerb` (Register, Book…) is transactional and would act on something
+   *  that is over, so it is swapped for a non-transactional "View details" that opens the
+   *  row's own detail. Without a row tap action the verb is simply hidden. */
+  endedWhen?: string;
   /** A catalog card whose one expected per-item action is "favorite".
    *  The ellipsis overflow is replaced by an always-visible heart toggle wired to
    *  the same `collectionSave` reducer. A dropdown `Menu` anchored inside a
@@ -57,7 +64,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search by booking ID', countNoun: ['booking', 'bookings'], filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' }, endedWhen: 'isPast' },
   himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
@@ -180,7 +187,13 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
       collectionSubtitle: scalar(row[config.subtitle ?? '']) || scalar(row.subtitle) || scalar(row.description) || scalar(row.meta),
       collectionImage: scalar(row[config.image ?? '']), collectionNoImage: !scalar(row[config.image ?? '']), collectionHasImage: !!scalar(row[config.image ?? '']),
       collectionSaved: prefs.savedIds.includes(collectionId(row)), collectionNotSaved: !prefs.savedIds.includes(collectionId(row)), collectionSelected: prefs.selectedIds.includes(collectionId(row)),
-      collectionNoIdentity: !collectionId(row) })),
+      collectionNoIdentity: !collectionId(row),
+      // Older cached EventRows predate `isPast` but already stored `statusLabel: "Past"`.
+      // Keep their ended state through an offline render until the row is refreshed.
+      ...(config.endedWhen ? (() => {
+        const ended = row[config.endedWhen] === true || (config.endedWhen === 'isPast' && row.statusLabel === 'Past');
+        return { collectionEnded: ended, collectionNotEnded: !ended };
+      })() : {}) })),
     filters, loaded: rows.length,
   };
 }

package/templates/gym-fitness/tier5-src/wix-spaces-create-post/index.ts

@@ -2,7 +2,7 @@
 // Holds the typed title + body; submit creates AND publishes a real blog post via
 // the Wix Blog API, then the new post shows up in ws_blog. (Forum has no member
 // create endpoint in the SDK; blog is the available authored-content write.)
-import { defineService } from "@himalaya/state";
+import { defineService, navigate } from "@himalaya/state";
 import { createDraftPost, publishDraftPost } from "@himalaya/wix-blog";
 import { memberAccess } from "../_shared/member-access.js";
 
@@ -38,7 +38,7 @@ function val(arg?: unknown): string {
   return typeof arg === "string" ? arg : ((arg as { value?: string; text?: string })?.value ?? (arg as { text?: string })?.text ?? "");
 }
 
-const svc = defineService<S, { load: (s: S) => Promise<S>; setTitle: (s: S, a?: unknown) => S; setBody: (s: S, a?: unknown) => S; focusBody: (s: S) => S; submit: (s: S) => Promise<S> }>("spacesCreatePost", {
+const svc = defineService<S, { load: (s: S) => Promise<S>; setTitle: (s: S, a?: unknown) => S; setBody: (s: S, a?: unknown) => S; focusBody: (s: S) => S; submit: (s: S, a?: unknown) => Promise<S> }>("spacesCreatePost", {
   state: { status: "ready", title: "", body: "", hint: "Share something with the community.", bodyFocus: "", needsSignIn: false, noSignIn: true, hideForm: true },
   actions: {
     load: async (s) => {
@@ -50,7 +50,11 @@ const svc = defineService<S, { load: (s: S) => Promise<S>; setTitle: (s: S, a?:
     // Title's Next key lands here. The keyboard stays up (that is the "next"
     // contract) and the body field takes focus.
     focusBody: (s) => ({ ...s, bodyFocus: bumpToken(s.bodyFocus) }),
-    submit: async (s) => {
+    // `postScreenId` (a submit param) names the screen that shows ONE post, so a host
+    // with one lands the author on what they just posted. Several apps share this
+    // worker and each owns its own post screen, so the descriptor names it; without
+    // it the composer clears and confirms in place.
+    submit: async (s, a) => {
       if (s.needsSignIn) return { ...s, hint: "Sign in to post." };
       const title = s.title.trim();
       if (!title) return { ...s, hint: "Please enter a title." };
@@ -73,7 +77,13 @@ const svc = defineService<S, { load: (s: S) => Promise<S>; setTitle: (s: S, a?:
         // steals focus, so those transitions must clear it (see himi-store-account's
         // NO_FOCUS on its mode switches). Same token, opposite fix; the deciding
         // question is always whether the field stays mounted.
-        return { ...s, status: "ready", title: "", body: "", bodyFocus: s.bodyFocus, hint: `Posted “${title}” ✓ — it now appears in Blog.` };
+        const posted: S = { ...s, status: "ready", title: "", body: "", bodyFocus: s.bodyFocus, hint: `Posted “${title}” ✓ — it now appears in Blog.` };
+        // Only after the worker has the post's id — a failure takes the catch below and
+        // keeps every character the user typed.
+        const postScreenId = (a as { postScreenId?: unknown } | undefined)?.postScreenId;
+        return id && typeof postScreenId === "string" && postScreenId
+          ? navigate(posted, { screenId: postScreenId, args: { id } })
+          : posted;
       } catch {
         return { ...s, status: "ready", hint: "Couldn't post — check your connection and try again." };
       } finally {

package/templates/gym-fitness-owner/tier5-src/_shared/collection-contract.ts

@@ -37,6 +37,13 @@ export interface CollectionConfig {
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
   primaryVerb?: { label: string; screenId?: string };
+  /** A TIME-BOUND entity (an event, a booking, a reservation): the boolean row field the
+   *  DOMAIN sets once the record has finished — computed by the same rule as the row's own
+   *  "Past" label, in the same place, so the two cannot disagree. A finished
+   *  record's `primaryVerb` (Register, Book…) is transactional and would act on something
+   *  that is over, so it is swapped for a non-transactional "View details" that opens the
+   *  row's own detail. Without a row tap action the verb is simply hidden. */
+  endedWhen?: string;
   /** A catalog card whose one expected per-item action is "favorite".
    *  The ellipsis overflow is replaced by an always-visible heart toggle wired to
    *  the same `collectionSave` reducer. A dropdown `Menu` anchored inside a
@@ -57,7 +64,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search by booking ID', countNoun: ['booking', 'bookings'], filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' }, endedWhen: 'isPast' },
   himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
@@ -180,7 +187,13 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
       collectionSubtitle: scalar(row[config.subtitle ?? '']) || scalar(row.subtitle) || scalar(row.description) || scalar(row.meta),
       collectionImage: scalar(row[config.image ?? '']), collectionNoImage: !scalar(row[config.image ?? '']), collectionHasImage: !!scalar(row[config.image ?? '']),
       collectionSaved: prefs.savedIds.includes(collectionId(row)), collectionNotSaved: !prefs.savedIds.includes(collectionId(row)), collectionSelected: prefs.selectedIds.includes(collectionId(row)),
-      collectionNoIdentity: !collectionId(row) })),
+      collectionNoIdentity: !collectionId(row),
+      // Older cached EventRows predate `isPast` but already stored `statusLabel: "Past"`.
+      // Keep their ended state through an offline render until the row is refreshed.
+      ...(config.endedWhen ? (() => {
+        const ended = row[config.endedWhen] === true || (config.endedWhen === 'isPast' && row.statusLabel === 'Past');
+        return { collectionEnded: ended, collectionNotEnded: !ended };
+      })() : {}) })),
     filters, loaded: rows.length,
   };
 }

package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-events/index.ts

@@ -96,6 +96,7 @@ function demoList(s: EventsState, upcoming = false): EventsState {
     location: d.location,
     status: d.statusLabel,
     statusLabel: "",
+    isPast: false,
     image: "",
     hasImage: false,
     noImage: true,