@wix/himalaya-cli 0.1026.0 → 0.1028.0

package/templates/retail-store/tier5-src/_shared/collection-service.ts

@@ -1,5 +1,5 @@
 import { defineService as register, type ServiceDefinition } from '@himalaya/state';
-import { COLLECTIONS, normalizeCollection, projectCollection, collectionId, type CollectionRow } from './collection-contract.js';
+import { COLLECTIONS, COLLECTION_CHROME_MIN_ITEMS, initialCollection, normalizeCollection, projectCollection, collectionId, type CollectionRow } from './collection-contract.js';
 import { localPreferences, type PreferenceRuntime } from './local-preferences.js';
 import { copyParam, stashCopy } from './himi-copy.js';
 import { createCollectionQuery, type CollectionQuerySource, type CollectionQueryState } from './collection-query.js';
@@ -54,6 +54,14 @@ export function decorateCollection(name: string, def: { state: State; actions?:
   /** Navigation can open a collection in a useful, reviewable context. Keep
    * this input additive and constrained to the same criteria the collection UI
    * can select; arbitrary route values must never become backend filters. */
+  /** Labels of the worker-listed filter choices (`filterValuesFrom`), minus the "All" row. */
+  const listedFilters = (state: State): string[] => config.filterValuesFrom && Array.isArray(state[config.filterValuesFrom])
+    ? (state[config.filterValuesFrom] as unknown[]).flatMap(row => {
+      const r = row && typeof row === 'object' ? row as Record<string, unknown> : {};
+      return typeof r.label === 'string' && r.id !== '' ? [r.label] : [];
+    })
+    : [];
+  let pendingFilter = '';
   const applyNavigationCriteria = (arg: unknown, state: State): boolean => {
     const input = object(arg);
     let changed = false;
@@ -70,9 +78,14 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       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) : [];
+      const known = listedFilters(state);
       const allowed = filter === 'all' || filter === 'saved' ||
-        (filter.startsWith('value:') && [...configured, ...derived].includes(filter.slice(6)));
+        (filter.startsWith('value:') && [...configured, ...derived, ...known].includes(filter.slice(6)));
       if (allowed) { prefs.filter = filter; changed = true; }
+      // A worker-listed choice (e.g. a blog category) may not have loaded yet at boot:
+      // hold it and settle it against the list once the list arrives, instead of
+      // discarding a valid deep link before load().
+      else if (filter.startsWith('value:') && config.filterValuesFrom && known.length === 0) pendingFilter = filter;
     }
     if (changed) {
       prefs.selectedIds = [];
@@ -90,7 +103,12 @@ export function decorateCollection(name: string, def: { state: State; actions?:
   const derive = (s: State): State => {
     syncSaved();
     const rows = Array.isArray(s[config.rows]) ? (s[config.rows] as CollectionRow[]).filter(x => x && typeof x === 'object') : [];
-    const projected = projectCollection(rows, config, prefs, !!backend && config.backendQuery === true);
+    const known = listedFilters(s);
+    if (pendingFilter && known.length) {
+      if (known.includes(pendingFilter.slice(6))) { prefs.filter = pendingFilter; persisted.write(prefs); }
+      pendingFilter = '';
+    }
+    const projected = projectCollection(rows, config, prefs, !!backend && config.backendQuery === true, known);
     projected.items.forEach(row => { row.collectionSelectLabel = row.collectionSelected ? copyParam('collection.selected', 'Selected') : copyParam('collection.select', 'Select'); });
     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') },
@@ -106,7 +124,14 @@ export function decorateCollection(name: string, def: { state: State; actions?:
     const queryError = typeof backendState?.error === 'string' ? backendState.error.trim() : '';
     const errorMessage = queryError || domainError || 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';
+    // 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;
     return { ...s, collection: { ...prefs, ...projected,
+      hideChrome, noActiveCriteria: !narrowed,
       viewName, viewMessage, saveMessage, noSavedViews: prefs.savedViews.length === 0,
       cursor: s.pageError === true || s.loadingMore === true ? '' : s.nextCursor,
       noMore: !s.nextCursor || s.pageError === true || s.loadingMore === true,