@wix/himalaya-cli 0.1032.0 → 0.1034.0

package/templates/yoga-studio/tier5-src/_shared/collection-service.ts

@@ -122,14 +122,38 @@ export function decorateCollection(name: string, def: { state: State; actions?:
     const errored = s.status === 'error' || s.isErrored === true || s.errored === true || backendState?.status === 'error';
     const domainError = typeof s.error === 'string' ? s.error.trim() : '';
     const queryError = typeof backendState?.error === 'string' ? backendState.error.trim() : '';
-    const errorMessage = queryError || domainError || copyParam('collection.loadError', 'This collection could not load. Try again.');
+    // Some domains carry their failure sentence in `emptyText` (portfolio, podcasts);
+    // the screen folds that node into this block, so keep the domain's own words.
+    const domainEmptyError = errored && typeof s.emptyText === 'string' ? s.emptyText.trim() : '';
+    const errorMessage = queryError || domainError || domainEmptyError || copyParam('collection.loadError', 'This collection could not load. Try again.');
     const canRetry = !!backend || typeof def.actions?.refresh === 'function' || typeof def.actions?.load === 'function' || typeof def.actions?.collectionRetry === 'function';
+    // Wix refused the visitor: retrying cannot help, signing in can.
+    const signInRequired = errored && s.signInRequired === true;
+    // "the source has nothing" and "your filter matched nothing" are
+    // different states. Only the second may offer "Clear filters", and the list chrome
+    // (view, refine, chips, counter, search) means nothing over a source with no rows.
+    // Loaded-row collections hold the whole source in `rows`, so zero rows IS an empty
+    // source. A backend query returns only matches, so zero rows is source-empty only
+    // when nothing narrowed it.
+    // Anything the customer (or the domain) narrowed the result by. While narrowed, zero rows
+    // is "your filter matched nothing" and the controls that got them here must stay.
+    // The DOMAIN's own filter (config.narrowedBy, e.g. blog category) narrowed the rows: the
+    // domain owns that empty state and its clear action. The shared "Clear filters" block
+    // cannot reset a domain filter, so it never shows for one.
+    const domainNarrowed = !!config.narrowedBy && !!s[config.narrowedBy];
     // A default view is what the screen opens on; anything else is the member's own
     // narrowing, which keeps the chrome (and the Clear that undoes it) on screen.
     // "All" and the collection's own default (e.g. Upcoming) are both un-narrowed: Clear
     // resets to "All", so showing it on either would offer a reset that changes nothing.
-    const narrowed = !!prefs.query.trim() || (prefs.filter !== 'all' && prefs.filter !== initialCollection(config).filter);
-    const hideChrome = !narrowed && !s.nextCursor && projected.loaded < COLLECTION_CHROME_MIN_ITEMS;
+    const narrowed = !!prefs.query.trim() || (prefs.filter !== 'all' && prefs.filter !== initialCollection(config).filter) || domainNarrowed;
+    const sourceEmpty = !loading && !errored && rows.length === 0 &&
+      (!(backend && config.backendQuery) || !narrowed) && !domainNarrowed;
+    const emptySourceText = (typeof s.emptyText === 'string' && s.emptyText.trim()) || copyParam('collection.emptySource', 'Nothing here yet');
+    // Chrome is noise over a small un-narrowed list (fewer than COLLECTION_CHROME_MIN_ITEMS
+    // records, no further page), over an empty source, and before the FIRST load or an
+    // un-narrowed failure. A re-query while typing keeps it (and the search field's focus).
+    const hideChrome = (!narrowed && !s.nextCursor && projected.loaded < COLLECTION_CHROME_MIN_ITEMS)
+      || sourceEmpty || ((loading || errored) && rows.length === 0 && !narrowed);
     return { ...s, collection: { ...prefs, ...projected,
       hideChrome, noActiveCriteria: !narrowed,
       viewName, viewMessage, saveMessage, noSavedViews: prefs.savedViews.length === 0,
@@ -138,8 +162,15 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       noPageError: s.pageError !== true,
       noOffline: s.fromCache !== true,
       noError: !errored,
-      noRetry: !canRetry,
+      noRetry: !canRetry || signInRequired,
+      noSignIn: !signInRequired,
+      errorTitle: signInRequired ? copyParam('collection.signInTitle', 'Sign in to see this') : copyParam('collection.loadErrorTitle', 'This collection could not load'),
       errorMessage,
+      noLoading: !loading,
+      // De-dup against a domain that paints its OWN empty block (screen-kit emptyBlock is
+      // gated on the domain's top-level `noEmpty`): only one empty state ever shows.
+      noEmptySource: !sourceEmpty || s.noEmpty === false,
+      emptySourceText,
       hideList: prefs.view !== 'list', hideGrid: prefs.view !== 'grid',
       hideComfortable: prefs.density !== 'comfortable', hideCompact: prefs.density !== 'compact',
       selectingLabel: prefs.selecting ? copyParam('collection.done', 'Done') : copyParam('collection.select', 'Select'),
@@ -147,7 +178,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       cannotSaveSelected: !prefs.selectedIds.length || prefs.selectedIds.some(id => !rows.some(row => collectionId(row) === id)),
       filtersPresented, previewPresented: !!previewId, preview: projected.items.filter(row => row.collectionId === previewId),
       persistenceLabel: persisted.available ? copyParam('collection.onDevice', 'Saved on this device') : copyParam('collection.sessionOnly', 'Choices last for this session'),
-      noEmpty: loading || errored || projected.items.length > 0,
+      noEmpty: loading || errored || sourceEmpty || domainNarrowed || projected.items.length > 0,
       summary: backend && config.backendQuery
         ? (s.fromCache ? copyParam('collection.cached', 'Saved offline · may be outdated')
           : typeof s.total === 'number' ? `${projected.items.length} / ${s.total} ${copyParam('collection.results', 'results')}`

package/templates/yoga-studio/tier5-src/_shared/empty-flags.ts

@@ -0,0 +1,33 @@
+// Empty-collection flags for descriptors.
+//
+// A bound Grid/LazyList with zero rows still renders a zero-height box, and a stack
+// allocates its `spacing` between CHILDREN, not between painted children — so every
+// empty list left a full gap of blank on the screen (the measure pass's `dead-gap`, on
+// iOS and Android as much as on web). `hiddenWhen` hides on a TRUE scalar only, and an
+// empty array is not one, so a descriptor cannot gate a list on its own rows.
+//
+// `withEmptyFlags(def, { rows: "noRows" })` derives `noRows = rows is empty` into the
+// initial state and after EVERY action (sync or async), so a builder can write
+// `hiddenWhen(grid(...), "$service:svc.noRows")` without each reducer remembering to.
+type State = Record<string, unknown>;
+type Action = (s: State, ...args: unknown[]) => unknown;
+
+export function withEmptyFlags<D extends { state: object; actions?: object }>(def: D, flags: Record<string, string>): D {
+  const derive = <T>(s: T): T => {
+    if (!s || typeof s !== "object") return s;
+    const out = { ...(s as State) };
+    for (const [rows, flag] of Object.entries(flags)) {
+      const v = out[rows];
+      out[flag] = !Array.isArray(v) || v.length === 0;
+    }
+    return out as T;
+  };
+  const actions: Record<string, Action> = {};
+  for (const [name, action] of Object.entries((def.actions ?? {}) as Record<string, Action>)) {
+    actions[name] = (s, ...args) => {
+      const r = action(s, ...args);
+      return r && typeof (r as Promise<unknown>).then === "function" ? (r as Promise<unknown>).then(derive) : derive(r);
+    };
+  }
+  return { ...def, state: derive(def.state), actions } as D;
+}

package/templates/yoga-studio/tier5-src/wix-spaces-my-subscriptions/index.ts

@@ -1,5 +1,6 @@
 // Tier-5 bundle: Wix Spaces clone — My Subscriptions / plan orders (site-scoped).
 import { defineService } from "@himalaya/state";
+import { withEmptyFlags } from "../_shared/empty-flags.js";
 import { dispatch } from "@himalaya/dispatch";
 import { listPlanOrders, type WixPlanOrder } from "@himalaya/wix-pricing-plans";
 
@@ -21,6 +22,10 @@ const EMPTY_MEMBER = "No subscriptions yet";
 const EMPTY_GUEST = "Sign in from Account to see subscriptions you’ve joined — we don’t invent sample memberships.";
 const EMPTY_FORBIDDEN = "No subscriptions for this member yet.";
 
+/** The signed-in member's email, or "" for anyone else. A visitor's identity is
+ *  `{ email: "" }` and a failed lookup proves nothing, so both read as "no member": the
+ *  plan-orders endpoint is not member-filtered, and calling it for a visitor would list
+ *  orders that are not theirs. Fail closed. */
 async function sessionEmail(): Promise<string> {
   try {
     const identity = await dispatch("himi.wix.memberIdentity") as unknown;
@@ -38,12 +43,16 @@ function looksForbidden(err: unknown): boolean {
   return /403|FORBIDDEN|permission|denied|UNAUTHORIZED|401/i.test(msg);
 }
 
-const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesMySubscriptions", {
+const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesMySubscriptions", withEmptyFlags({
   state: { status: "loading", orders: [], emptyText: "", hideAccountCta: false },
   actions: {
     load: async () => {
       const email = await sessionEmail();
       const hideAccountCta = Boolean(email);
+      // plan orders are a MEMBER's own. With no signed-in member there is no
+      // "my" to list, whatever the endpoint answers (a dev mock or a cached session can
+      // answer it): a visitor must never see a subscription as theirs.
+      if (!email) return { status: "ready", orders: [], emptyText: EMPTY_GUEST, hideAccountCta: false };
       try {
         const r = await listPlanOrders();
         const orders = (((r as unknown as { orders?: WixPlanOrder[] }).orders) ?? []).map(norm);
@@ -68,6 +77,6 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesMySubscripti
       }
     },
   },
-});
+}, { orders: "noOrders" }));
 svc.load();
 export { svc };

package/templates/yoga-studio/tier5-src/wix-spaces-whats-new/index.ts

@@ -1,5 +1,6 @@
 // Tier-5 bundle: Wix Spaces clone — What's New (ON-DEVICE, account-level).
 import { defineService } from "@himalaya/state";
+import { withEmptyFlags } from "../_shared/empty-flags.js";
 import { listAnnouncements, type WixAnnouncement } from "@himalaya/wix-new-releases";
 
 interface Row { id: string; name: string; subtitle: string }
@@ -10,7 +11,7 @@ function norm(a: WixAnnouncement, i: number): Row {
   return { id: aa.id || `a${i}`, name: aa.title || "Announcement", subtitle: aa.description || aa.bodyText || "" };
 }
 
-const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", {
+const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", withEmptyFlags({
   state: { status: "loading", items: [], emptyText: "" },
   actions: {
     load: async (s) => {
@@ -21,6 +22,6 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", {
       } catch { return { ...s, status: "ready", items: [], emptyText: "Nothing new right now" }; }
     },
   },
-});
+}, { items: "noItems" }));
 svc.load();
 export { svc };