@wix/himalaya-cli 0.1026.0 → 0.1027.0

package/templates/community-club-owner/tier5-src/_shared/collection-contract.ts

@@ -8,6 +8,9 @@ export interface CollectionConfig {
   image?: string;
   filter?: string;
   filterValues?: string[];
+  /** A state key holding `{ label }` rows (e.g. a worker's full category list) whose
+   *  labels are filter choices even when no loaded row carries them yet. */
+  filterValuesFrom?: string;
   searchPlaceholder?: string;
   sortLabels?: { default: string; az: string; za: string };
   metadata?: string[];
@@ -20,15 +23,22 @@ export interface CollectionConfig {
   reviewSelectedAction?: string;
   /** Optional comfortable grid media height for immersive visual catalogs. */
   gridImageHeight?: number;
+  /** The card's primary verb, shown as a visible button beside the overflow.
+   * `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 };
 }
+/** At or below this many records, with no query/filter narrowing them and no further
+ * page, the list/grid toggle, Refine, chips, search and count are noise. */
+export const COLLECTION_CHROME_MIN_ITEMS = 4;
 export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiStoreShop: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', view: 'grid', backendQuery: true },
-  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Service name starts with…' },
+  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Service name starts with…', primaryVerb: { label: 'Book', screenId: 'himi_time' } },
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Exact booking ID', filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' } },
-  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', view: 'grid' },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
+  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
   himiOwnerLiteServices: { rows: 'services', title: 'name', subtitle: 'subtitle', view: 'list', backendQuery: true, searchPlaceholder: 'Service name starts with…' },
@@ -45,14 +55,14 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
   himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid' },
   himiBrandedPrograms: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
-  himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list' },
+  himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },
-  himiBrandedLoyalty: { rows: 'rewards', title: 'name', subtitle: 'description', view: 'grid' },
+  himiBrandedLoyalty: { rows: 'rewards', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Redeem' } },
   himiBrandedReviews: { rows: 'reviews', title: 'title', subtitle: 'body', metadata: ['author', 'stars'], view: 'list' },
   himiBrandedPortfolio: { rows: 'projects', title: 'title', subtitle: 'subtitle', image: 'image', view: 'grid', gridImageHeight: 180 },
   himiBrandedInvoices: { rows: 'invoices', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedBadges: { rows: 'badges', title: 'name', subtitle: 'description', view: 'grid' },
-  himiBrandedDonations: { rows: 'campaigns', title: 'name', subtitle: 'description', view: 'grid' },
+  himiBrandedDonations: { rows: 'campaigns', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Donate' } },
   himiBrandedGiftCards: { rows: 'cards', title: 'name', subtitle: 'description', view: 'grid' },
   himiBrandedVideos: { rows: 'channels', title: 'title', subtitle: 'description', view: 'grid' },
   himiBrandedPodcasts: { rows: 'episodes', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['progressLabel'], view: 'list' },
@@ -114,7 +124,7 @@ export function collectionTitle(row: CollectionRow, config: CollectionConfig): s
   return scalar(row[config.title]) || scalar(row.title) || scalar(row.name) || scalar(row.display) || scalar(row.label);
 }
 /** Does not mutate domain rows, paging, or domain-derived state. */
-export function projectCollection(source: CollectionRow[], config: CollectionConfig, prefs: CollectionPreferences, backendQuery = false) {
+export function projectCollection(source: CollectionRow[], config: CollectionConfig, prefs: CollectionPreferences, backendQuery = false, knownFilters: string[] = []) {
   const query = prefs.query.trim().toLocaleLowerCase();
   const unique = new Set<string>();
   // Menu sections describe their following items; they are not actionable
@@ -130,7 +140,7 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
     if (unique.has(id)) return false;
     unique.add(id); return true;
   });
-  const filters = config.filterValues ?? [...new Set(rows.map(row => config.filter ? scalar(row[config.filter]) : '').filter(Boolean))].sort();
+  const filters = config.filterValues ?? [...new Set([...knownFilters, ...rows.map(row => config.filter ? scalar(row[config.filter]) : '')].filter(Boolean))].sort();
   const visible = rows.filter(row => {
     if (backendQuery) return true;
     if (prefs.filter === 'saved' && !prefs.savedIds.includes(collectionId(row))) return false;

package/templates/community-club-owner/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,

package/templates/events-meetups/dev/index.ts

@@ -4900,11 +4900,10 @@ const SCREENS = runtimeSetting({
               "id": "himi_feed.search",
               "body": {
                 "package": "himalaya",
-                "type": "TextField",
+                "type": "SearchField",
                 "props": {
                   "placeholder": "Search posts",
-                  "autoCapitalization": "none",
-                  "submitLabel": "search",
+                  "debounceMs": 200,
                   "onChange": {
                     "actionId": "tier5.himiBrandedFeed.filter"
                   }
@@ -5840,6 +5839,9 @@ const SCREENS = runtimeSetting({
                   },
                   "value": "$service:himiEvents.collection.query"
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiEvents.collection.hideChrome"
               }
             },
             {
@@ -6096,6 +6098,7 @@ const SCREENS = runtimeSetting({
                                 }
                               },
                               "modifiers": {
+                                "hiddenPath": "$service:himiEvents.collection.hideChrome",
                                 "padding": {
                                   "bottom": 12
                                 }
@@ -6133,37 +6136,55 @@ const SCREENS = runtimeSetting({
                                             "actionId": "tier5.himiEvents.collectionFilter"
                                           }
                                         }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_events.list.collection.clear",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "Button",
                                         "props": {
-                                          "text": "$service:himiEvents.collection.summary",
-                                          "style": "caption",
-                                          "color": "textSecondary"
+                                          "title": "Clear",
+                                          "style": "plain",
+                                          "fullWidth": false,
+                                          "action": {
+                                            "actionId": "tier5.himiEvents.collectionClear"
+                                          }
                                         }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiEvents.collection.noActiveCriteria"
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
+                                "hiddenPath": "$service:himiEvents.collection.hideChrome",
                                 "padding": {
                                   "bottom": 12
                                 }
                               }
                             },
+                            {
+                              "id": "himi_events.list.collection.summary",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiEvents.collection.summary",
+                                  "style": "caption",
+                                  "color": "textSecondary",
+                                  "maxLines": 1
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiEvents.collection.hideChrome"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -6460,6 +6481,25 @@ const SCREENS = runtimeSetting({
                                                                         "hiddenPath": "$service:himiEvents.collection.noSelection"
                                                                       }
                                                                     },
+                                                                    {
+                                                                      "id": "himi_events.list.collection.list.$item.collectionId/primary",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Button",
+                                                                        "props": {
+                                                                          "title": "Register",
+                                                                          "style": "secondary",
+                                                                          "fullWidth": false,
+                                                                          "action": {
+                                                                            "actionId": "himi.open",
+                                                                            "params": {
+                                                                              "screenId": "$item.detailScreenId",
+                                                                              "id": "$item.id"
+                                                                            }
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    },
                                                                     {
                                                                       "id": "himi_events.list.collection.list.$item.collectionId/actions",
                                                                       "body": {
@@ -6789,6 +6829,25 @@ const SCREENS = runtimeSetting({
                                                                         "hiddenPath": "$service:himiEvents.collection.noSelection"
                                                                       }
                                                                     },
+                                                                    {
+                                                                      "id": "himi_events.list.collection.grid.$item.collectionId/primary",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Button",
+                                                                        "props": {
+                                                                          "title": "Register",
+                                                                          "style": "secondary",
+                                                                          "fullWidth": false,
+                                                                          "action": {
+                                                                            "actionId": "himi.open",
+                                                                            "params": {
+                                                                              "screenId": "$item.detailScreenId",
+                                                                              "id": "$item.id"
+                                                                            }
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    },
                                                                     {
                                                                       "id": "",
                                                                       "body": {
@@ -7111,6 +7170,25 @@ const SCREENS = runtimeSetting({
                                                                         "hiddenPath": "$service:himiEvents.collection.noSelection"
                                                                       }
                                                                     },
+                                                                    {
+                                                                      "id": "himi_events.list.collection.compact-list.$item.collectionId/primary",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Button",
+                                                                        "props": {
+                                                                          "title": "Register",
+                                                                          "style": "secondary",
+                                                                          "fullWidth": false,
+                                                                          "action": {
+                                                                            "actionId": "himi.open",
+                                                                            "params": {
+                                                                              "screenId": "$item.detailScreenId",
+                                                                              "id": "$item.id"
+                                                                            }
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    },
                                                                     {
                                                                       "id": "himi_events.list.collection.compact-list.$item.collectionId/actions",
                                                                       "body": {
@@ -7440,6 +7518,25 @@ const SCREENS = runtimeSetting({
                                                                         "hiddenPath": "$service:himiEvents.collection.noSelection"
                                                                       }
                                                                     },
+                                                                    {
+                                                                      "id": "himi_events.list.collection.compact-grid.$item.collectionId/primary",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Button",
+                                                                        "props": {
+                                                                          "title": "Register",
+                                                                          "style": "secondary",
+                                                                          "fullWidth": false,
+                                                                          "action": {
+                                                                            "actionId": "himi.open",
+                                                                            "params": {
+                                                                              "screenId": "$item.detailScreenId",
+                                                                              "id": "$item.id"
+                                                                            }
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    },
                                                                     {
                                                                       "id": "",
                                                                       "body": {
@@ -8126,6 +8223,25 @@ const SCREENS = runtimeSetting({
                                                               "hiddenPath": "$service:himiEvents.collection.noSelection"
                                                             }
                                                           },
+                                                          {
+                                                            "id": "himi_events.list.collection.preview.$item.collectionId/primary",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Button",
+                                                              "props": {
+                                                                "title": "Register",
+                                                                "style": "secondary",
+                                                                "fullWidth": false,
+                                                                "action": {
+                                                                  "actionId": "himi.open",
+                                                                  "params": {
+                                                                    "screenId": "$item.detailScreenId",
+                                                                    "id": "$item.id"
+                                                                  }
+                                                                }
+                                                              }
+                                                            }
+                                                          },
                                                           {
                                                             "id": "",
                                                             "body": {
@@ -9027,59 +9143,9 @@ const SCREENS = runtimeSetting({
                   },
                   "value": "$service:himiBlogFeed.collection.query"
                 }
-              }
-            },
-            {
-              "id": "himi_blog.categories",
-              "body": {
-                "package": "himalaya",
-                "type": "Grid",
-                "props": {
-                  "columns": 2,
-                  "spacing": 8,
-                  "itemsPath": "$service:himiBlogFeed.categories",
-                  "items": [
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$item.label",
-                          "style": "footnote",
-                          "color": "textPrimary",
-                          "maxLines": 1
-                        }
-                      },
-                      "modifiers": {
-                        "background": {
-                          "token": "accentSurface"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 8,
-                        "padding": {
-                          "leading": 12,
-                          "trailing": 12,
-                          "top": 9,
-                          "bottom": 9
-                        },
-                        "onTap": {
-                          "actionId": "tier5.himiBlogFeed.selectCategory",
-                          "params": {
-                            "categoryId": "$item.id"
-                          }
-                        },
-                        "pressFeedback": "scale",
-                        "haptic": "light"
-                      }
-                    }
-                  ]
-                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBlogFeed.collection.hideChrome"
               }
             },
             {
@@ -9274,40 +9340,6 @@ const SCREENS = runtimeSetting({
                   "spacing": 12,
                   "alignment": "leading",
                   "children": [
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "HStack",
-                        "props": {
-                          "spacing": 8,
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Spacer",
-                                "props": {}
-                              }
-                            },
-                            {
-                              "id": "himi_blog.clear",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Clear",
-                                  "style": "secondary",
-                                  "action": {
-                                    "actionId": "tier5.himiBlogFeed.clearFilters"
-                                  }
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    },
                     {
                       "id": "himi_blog.list.collection.toolbar",
                       "body": {
@@ -9370,6 +9402,7 @@ const SCREENS = runtimeSetting({
                                 }
                               },
                               "modifiers": {
+                                "hiddenPath": "$service:himiBlogFeed.collection.hideChrome",
                                 "padding": {
                                   "bottom": 12
                                 }
@@ -9407,37 +9440,55 @@ const SCREENS = runtimeSetting({
                                             "actionId": "tier5.himiBlogFeed.collectionFilter"
                                           }
                                         }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
                                       }
                                     },
                                     {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
-                                      }
-                                    },
-                                    {
-                                      "id": "",
+                                      "id": "himi_blog.list.collection.clear",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "Button",
                                         "props": {
-                                          "text": "$service:himiBlogFeed.collection.summary",
-                                          "style": "caption",
-                                          "color": "textSecondary"
+                                          "title": "Clear",
+                                          "style": "plain",
+                                          "fullWidth": false,
+                                          "action": {
+                                            "actionId": "tier5.himiBlogFeed.collectionClear"
+                                          }
                                         }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBlogFeed.collection.noActiveCriteria"
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
+                                "hiddenPath": "$service:himiBlogFeed.collection.hideChrome",
                                 "padding": {
                                   "bottom": 12
                                 }
                               }
                             },
+                            {
+                              "id": "himi_blog.list.collection.summary",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBlogFeed.collection.summary",
+                                  "style": "caption",
+                                  "color": "textSecondary",
+                                  "maxLines": 1
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBlogFeed.collection.hideChrome"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -12194,6 +12245,9 @@ const SCREENS = runtimeSetting({
                   },
                   "value": "$service:himiBrandedGroups.collection.query"
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedGroups.collection.hideChrome"
               }
             },
             {
@@ -12371,6 +12425,7 @@ const SCREENS = runtimeSetting({
                         }
                       },
                       "modifiers": {
+                        "hiddenPath": "$service:himiBrandedGroups.collection.hideChrome",
                         "padding": {
                           "bottom": 12
                         }
@@ -12408,37 +12463,55 @@ const SCREENS = runtimeSetting({
                                     "actionId": "tier5.himiBrandedGroups.collectionFilter"
                                   }
                                 }
+                              },
+                              "modifiers": {
+                                "weight": 1
                               }
                             },
                             {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Spacer",
-                                "props": {}
-                              }
-                            },
-                            {
-                              "id": "",
+                              "id": "himi_groups.rows.collection.clear",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Text",
+                                "type": "Button",
                                 "props": {
-                                  "text": "$service:himiBrandedGroups.collection.summary",
-                                  "style": "caption",
-                                  "color": "textSecondary"
+                                  "title": "Clear",
+                                  "style": "plain",
+                                  "fullWidth": false,
+                                  "action": {
+                                    "actionId": "tier5.himiBrandedGroups.collectionClear"
+                                  }
                                 }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBrandedGroups.collection.noActiveCriteria"
                               }
                             }
                           ]
                         }
                       },
                       "modifiers": {
+                        "hiddenPath": "$service:himiBrandedGroups.collection.hideChrome",
                         "padding": {
                           "bottom": 12
                         }
                       }
                     },
+                    {
+                      "id": "himi_groups.rows.collection.summary",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedGroups.collection.summary",
+                          "style": "caption",
+                          "color": "textSecondary",
+                          "maxLines": 1
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedGroups.collection.hideChrome"
+                      }
+                    },
                     {
                       "id": "",
                       "body": {