@wix/himalaya-cli 0.1537.0 → 0.1539.0

package/templates/events-meetups/tier5-src/_shared/collection-service.ts

@@ -95,7 +95,10 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       if (sort === 'default' || sort === 'az' || sort === 'za') { prefs.sort = sort; changed = true; }
     }
     if (Object.prototype.hasOwnProperty.call(input, 'collectionFilter')) {
-      const filter = String(input.collectionFilter ?? '');
+      const requestedFilter = String(input.collectionFilter ?? '');
+      // Old links to Saved must migrate with the stored preference when this
+      // collection no longer exposes that filter.
+      const filter = config.rowStyle === 'flat' && requestedFilter === 'saved' ? 'all' : requestedFilter;
       const configured = config.filterValues ?? [];
       const rows = Array.isArray(state[config.rows]) ? state[config.rows] as CollectionRow[] : [];
       const derived = config.filter ? rows.map(row => String(row[config.filter!] ?? '')).filter(Boolean) : [];
@@ -139,7 +142,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
         copyParam('collection.itemActionsFor', 'Actions for {title}'), copyParam('collection.itemActions', 'Item actions'));
     });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
-    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ id: 'saved', label: copyParam('collection.saved', 'Saved') }]),
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];
     const loading = s.status === 'loading' || s.isLoading === true;
     // Older domain reducers expose `errored` rather than `isErrored`; backend
@@ -220,7 +223,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
             ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
-      chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};

package/templates/events-meetups/tier5-src/_shared/engine-intl.ts

@@ -410,8 +410,11 @@ export function compareDateDesc(a: string, b: string): number {
 // kind of number. So: one money pattern, one clock, one range.
 
 // Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
-// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
-// "₪70 · ₪69.50".
+// ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
+// SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
+// "₪69.50"), the format the redesigned service screen and services list were approved with. It
+// must read the same on every screen that shows a service (the list, the service screen, the
+// time screen, Home, the agenda); do not put those back on natural decimals one screen at a time.
 
 const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));
 

package/templates/events-meetups/tier5-src/_shared/himi-store-categories.ts

@@ -4,7 +4,7 @@
 // Catalog V3 Categories first, V1 collections only when V3 THROWS (a legacy V1 site):
 // a V3 success with zero rows is an empty catalogue, and V1 on a V3 site answers 428.
 // Same rule as wix-spaces-collections; see the reasoning there.
-import { categoryImage, queryCollections, queryStoreCategories, type StoreCategoriesResponse, type StoreCategory, type WixCollection } from "@himalaya/wix-stores-collections";
+import { categoryCount, categoryImage, queryCollections, queryStoreCategories, type StoreCategoriesResponse, type StoreCategory, type WixCollection } from "@himalaya/wix-stores-collections";
 import { wixMediaUrl } from "@himalaya/wix-media";
 
 export interface StoreCategoryCard {
@@ -13,6 +13,7 @@ export interface StoreCategoryCard {
   image: string;
   hasImage: boolean;
   noImage: boolean;
+  subtitle?: string;
 }
 
 /** "All Products" is a Wix system collection — every product is in it, so it is
@@ -20,12 +21,12 @@ export interface StoreCategoryCard {
 const SYSTEM_NAMES = ["all products"];
 const SYSTEM_COLLECTION_IDS = ["00000000-000000-000000-000000000001"];
 
-function card(id: string, name: string, image: string): StoreCategoryCard {
-  return { id, name, image, hasImage: !!image, noImage: !image };
+function card(id: string, name: string, image: string, subtitle = ""): StoreCategoryCard {
+  return { id, name, image, hasImage: !!image, noImage: !image, subtitle };
 }
 
 function fromCategory(c: StoreCategory): StoreCategoryCard {
-  return card(c.id ?? "", (c.name ?? "").trim(), categoryImage(c));
+  return card(c.id ?? "", (c.name ?? "").trim(), categoryImage(c), categoryCount(c));
 }
 
 function fromCollection(c: WixCollection): StoreCategoryCard {
@@ -34,19 +35,24 @@ function fromCollection(c: WixCollection): StoreCategoryCard {
   return card(raw.id ?? "", (raw.name ?? "").trim(), wixMediaUrl(media?.image?.url ?? media?.thumbnail?.url ?? ""));
 }
 
-function visible(rows: StoreCategoryCard[]): StoreCategoryCard[] {
+function visible(rows: StoreCategoryCard[], includeAllProducts = false): StoreCategoryCard[] {
   const seen = new Set<string>();
   return rows.filter((r) => {
-    if (!r.id || !r.name || SYSTEM_COLLECTION_IDS.includes(r.id) || SYSTEM_NAMES.includes(r.name.toLowerCase()) || seen.has(r.id)) return false;
+    if (!r.id || !r.name || (!includeAllProducts && (SYSTEM_COLLECTION_IDS.includes(r.id) || SYSTEM_NAMES.includes(r.name.toLowerCase()))) || seen.has(r.id)) return false;
     seen.add(r.id);
     return true;
+  }).map(row => {
+    // Counts belong to the directory opt-in; Home rails and Shop chips retain their
+    // established five-field card contract.
+    const { subtitle, ...card } = row;
+    return includeAllProducts ? row : card;
   });
 }
 
 const PAGE_SIZE = 50;
 const MAX_PAGES = 100;
 
-async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
+async function loadLegacyCategories(includeAllProducts: boolean): Promise<StoreCategoryCard[]> {
   const cards: StoreCategoryCard[] = [];
   const seen = new Set<string>();
   let offset = 0;
@@ -58,7 +64,7 @@ async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
     if (reportedTotal != null) total = Math.max(total ?? 0, reportedTotal);
     if (!rows.length) {
       if (total != null && seen.size < total) throw new Error("Category pagination is incomplete");
-      return visible(cards);
+      return visible(cards, includeAllProducts);
     }
     const priorCount = seen.size;
     rows.forEach(row => { if (row.id) seen.add(row.id); });
@@ -67,7 +73,7 @@ async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
     offset += rows.length;
     if (total != null ? offset >= total : rows.length < PAGE_SIZE) {
       if (total != null && seen.size < total) throw new Error("Category pagination is incomplete");
-      return visible(cards);
+      return visible(cards, includeAllProducts);
     }
   }
   throw new Error("Category pagination exceeded the page limit");
@@ -75,11 +81,11 @@ async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
 
 /** The store's browsable categories in site order. Rejects incomplete reads so callers
  *  can retain their last good catalog instead of invalidating a later category. */
-export async function loadStoreCategories(): Promise<StoreCategoryCard[]> {
+export async function loadStoreCategories({ includeAllProducts = false }: { includeAllProducts?: boolean } = {}): Promise<StoreCategoryCard[]> {
   let r: StoreCategoriesResponse;
   try {
     r = await queryStoreCategories(PAGE_SIZE);
-  } catch { return loadLegacyCategories(); /* Only the initial failure can identify a legacy V1 site. */ }
+  } catch { return loadLegacyCategories(includeAllProducts); /* Only the initial failure can identify a legacy V1 site. */ }
   const cards: StoreCategoryCard[] = [];
   const cursors = new Set<string>();
   const seen = new Set<string>();
@@ -92,7 +98,7 @@ export async function loadStoreCategories(): Promise<StoreCategoryCard[]> {
     const next = r.pagingMetadata?.cursors?.next;
     if (!next) {
       if (seen.size < total) throw new Error("Category pagination is incomplete");
-      return visible(cards);
+      return visible(cards, includeAllProducts);
     }
     if (cursors.has(next)) throw new Error("Category pagination repeated a cursor");
     cursors.add(next);

package/templates/events-meetups/tier5-src/_shared/wix-service-price.ts

@@ -118,7 +118,7 @@ export function formatServiceMoney(money: unknown, fallbackCurrency = "USD"): st
 }
 
 /**
- * Format a Wix Bookings service's price for display, e.g. "₪111" / "$20".
+ * Format a Wix Bookings service's price for display, e.g. "₪111" / "$20" / "$19.50".
  *
  * Reads, in order of preference:
  *   1. Bookings v2 fixed price — `payment.fixed.price.{value,currency}` (the
@@ -137,7 +137,9 @@ export function formatServicePrice(service: unknown): string {
   if (amount == null) return "";
   const currency = serviceCurrency(service);
   try {
-    return formatCurrency(amount, currency, "en");
+    // A whole amount drops its cents ("₪70", not "₪70.00"), as formatServiceMoney and the service
+    // screen show it, so the same service reads the same price on every screen.
+    return formatCurrency(amount, currency, "en", Number.isInteger(amount) ? 0 : undefined);
   } catch {
     return `${amount}`;
   }

package/templates/events-meetups-owner/tier5-src/_shared/collection-contract.ts

@@ -2,6 +2,8 @@ import { compareText, compareIso } from "./engine-intl.js";
 /** Shared OTA collection contract. No host APIs: used by workers and builders. */
 export interface CollectionConfig {
   rows: string;
+  /** Flat customer history rows, divided rather than boxed. */
+  rowStyle?: "flat";
   instanceInput?: string;
   title: string;
   subtitle?: string;
@@ -84,7 +86,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
-  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
+  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['status', 'meta'], rowStyle: 'flat', view: 'list', backendQuery: true,
     searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
   himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3', 'joinNote'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
@@ -139,7 +141,10 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
     density: s.density === 'compact' ? 'compact' : 'comfortable',
     sort: s.sort === 'az' || s.sort === 'za' ? s.sort : 'default',
     query: typeof s.query === 'string' ? s.query.slice(0, 256) : '',
-    filter: typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
+    // Flat collections no longer offer Saved. Migrate its persisted value before
+    // the first backend request so an invisible old filter cannot empty the list.
+    filter: config.rowStyle === 'flat' && s.filter === 'saved' ? 'all'
+      : typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
     savedIds: Array.isArray(s.savedIds) ? [...new Set(s.savedIds.filter((id): id is string => typeof id === 'string' && id.length > 0 && id.length <= 256))].slice(0, 500) : [],
     savedViews: Array.isArray(s.savedViews) ? s.savedViews.filter((v): v is SavedCollectionView => !!v && typeof v === 'object' && typeof v.name === 'string' && !!v.name.trim()).slice(0, 8).map((v, i) => ({
       id: `view-${i}`, name: v.name.trim().slice(0, 40),
@@ -147,7 +152,8 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
       density: v.density === 'compact' ? 'compact' : 'comfortable',
       sort: v.sort === 'az' || v.sort === 'za' ? v.sort : 'default',
       query: typeof v.query === 'string' ? v.query.slice(0, 256) : '',
-      filter: typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
+      filter: config.rowStyle === 'flat' && v.filter === 'saved' ? 'all'
+        : typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
     })) : [],
   };
 }

package/templates/events-meetups-owner/tier5-src/_shared/collection-service.ts

@@ -95,7 +95,10 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       if (sort === 'default' || sort === 'az' || sort === 'za') { prefs.sort = sort; changed = true; }
     }
     if (Object.prototype.hasOwnProperty.call(input, 'collectionFilter')) {
-      const filter = String(input.collectionFilter ?? '');
+      const requestedFilter = String(input.collectionFilter ?? '');
+      // Old links to Saved must migrate with the stored preference when this
+      // collection no longer exposes that filter.
+      const filter = config.rowStyle === 'flat' && requestedFilter === 'saved' ? 'all' : requestedFilter;
       const configured = config.filterValues ?? [];
       const rows = Array.isArray(state[config.rows]) ? state[config.rows] as CollectionRow[] : [];
       const derived = config.filter ? rows.map(row => String(row[config.filter!] ?? '')).filter(Boolean) : [];
@@ -139,7 +142,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
         copyParam('collection.itemActionsFor', 'Actions for {title}'), copyParam('collection.itemActions', 'Item actions'));
     });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
-    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ id: 'saved', label: copyParam('collection.saved', 'Saved') }]),
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];
     const loading = s.status === 'loading' || s.isLoading === true;
     // Older domain reducers expose `errored` rather than `isErrored`; backend
@@ -220,7 +223,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
             ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
-      chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};

package/templates/events-meetups-owner/tier5-src/_shared/engine-intl.ts

@@ -410,8 +410,11 @@ export function compareDateDesc(a: string, b: string): number {
 // kind of number. So: one money pattern, one clock, one range.
 
 // Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
-// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
-// "₪70 · ₪69.50".
+// ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
+// SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
+// "₪69.50"), the format the redesigned service screen and services list were approved with. It
+// must read the same on every screen that shows a service (the list, the service screen, the
+// time screen, Home, the agenda); do not put those back on natural decimals one screen at a time.
 
 const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));