@wix/himalaya-cli 0.1253.0 → 0.1254.0

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-home/index.ts

@@ -10,6 +10,7 @@ import { countSites } from "@himalaya/wix-site-list";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { queryBookings } from "@himalaya/wix-bookings";
 import { UPCOMING_BOOKING_STATUSES, upcomingBookingCount } from "../_shared/owner-bookings.js";
+import { ownerOrderAttentionFilter } from "../_shared/owner-order-attention.js";
 import { queryMembers } from "@himalaya/wix-members";
 import { queryReviews } from "@himalaya/wix-reviews";
 import { queryReservations } from "@himalaya/wix-table-reservations";
@@ -102,8 +103,6 @@ const UPCOMING_RESERVATION_STATUSES = ["HELD", "RESERVED", "REQUESTED"];
 const UPCOMING_EVENT_STATUSES = ["UPCOMING", "SCHEDULED"];
 const ATTENTION_MEMBER_STATUSES = ["PENDING"];
 const ATTENTION_REVIEW_STATUSES = ["IN_MODERATION", "SUBMITTED"];
-const ATTENTION_PAYMENT_STATUSES = ["NOT_PAID", "PARTIALLY_PAID"];
-const ATTENTION_FULFILLMENT_STATUSES = ["NOT_FULFILLED", "PARTIALLY_FULFILLED"];
 const SOURCE_LABELS: Record<HomeSourceId, string> = {
   products: "Products", posts: "Posts", events: "Events", sites: "Sites",
   orders: "Orders", bookings: "Bookings", members: "Members",
@@ -469,14 +468,7 @@ async function loadSourcePart(source: HomeSourceId, part: SourcePart): Promise<S
     case "sites": return countSites({}) as Promise<SourcePayload>;
     case "orders": {
       if (part === "primary") return searchOrders({ search: {
-          filter: {
-            archived: false,
-            status: { $nin: ["CANCELED", "CANCELLED"] },
-            $or: [
-              { paymentStatus: { $in: ATTENTION_PAYMENT_STATUSES } },
-              { paymentStatus: "PAID", fulfillmentStatus: { $in: ATTENTION_FULFILLMENT_STATUSES } },
-            ],
-          },
+          filter: ownerOrderAttentionFilter(),
           sort: [{ fieldName: "createdDate", order: "DESC" }, { fieldName: "id", order: "ASC" }],
           cursorPaging: { limit: TODAY_PAGE },
         } }) as Promise<SourcePayload>;

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-search/index.ts

@@ -213,7 +213,10 @@ function copyFromParams(): SearchCopy {
     allFailed: copyParam("ownerSearch.allFailed", DEFAULT_COPY.allFailed),
     loadedOnly: copyParam("ownerSearch.loadedOnly", DEFAULT_COPY.loadedOnly),
     loadingSummary: copyParam("ownerSearch.loading", DEFAULT_COPY.loadingSummary),
-    emptySummary: copyParam("ownerSearch.empty", DEFAULT_COPY.emptySummary),
+    // Keep the pre-worker-heading copy key alive for existing copy packs. The
+    // newer `empty` key takes precedence when present; both flow through the
+    // query interpolator so neither can hide what the owner searched.
+    emptySummary: copyParam("ownerSearch.empty", copyParam("ownerSearch.emptyTitle", DEFAULT_COPY.emptySummary)),
     idleSummary: copyParam("ownerSearch.idle", DEFAULT_COPY.idleSummary),
     permission: copyParam("ownerSearch.permission", DEFAULT_COPY.permission),
     setup: copyParam("ownerSearch.setup", DEFAULT_COPY.setup),
@@ -240,6 +243,7 @@ const IDLE: State = {
   anyLoading: false,
   showEmpty: false,
   hideEmpty: true,
+  emptyTitle: "",
 };
 
 /** Rebuilt on `load`, because the allowlist arrives with the descriptor. */

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-search/logic.ts

@@ -106,6 +106,14 @@ export interface SearchItem {
   /** Stable across refreshes, so a re-fetch cannot re-key a row under the
    *  user's finger: `h:<source>`, `r:<source>:<id>`, `f:<source>`. */
   key: string;
+  /** The row's LIST identity — always equal to `key`, never blank.
+   *
+   *  A bound list keys its rows on `id` (the web BoundList does, verbatim). This
+   *  carried the record id, which left every heading and footer at `""` and let
+   *  two domains that reuse a record id collide — so React reconciled headings
+   *  onto each other as groups landed and painted "Contacts" three times.
+   *  What a record OPENS is `recordId`. */
+  id: string;
   /** The source this row belongs to — a retry or a pager addresses it. */
   sourceId: string;
   // Exactly one kind is true. Pre-negated, because a `hiddenWhen` takes one path.
@@ -122,7 +130,9 @@ export interface SearchItem {
   isLoading: boolean;
   notLoading: boolean;
   // Record.
-  id: string;
+  /** The record this row opens — the destination loads it by this id. Blank on
+   *  headings and footers, which open nothing. */
+  recordId: string;
   title: string;
   subtitle: string;
   statusLabel: string;
@@ -163,6 +173,10 @@ export interface SearchState {
    *  nobody has typed into yet, and again over every result still in flight. */
   showEmpty: boolean;
   hideEmpty: boolean;
+  /** The empty state's heading, naming the query ("No records match “mug”").
+   *  Blank unless `showEmpty` — and while it shows, `summary` is blank, because
+   *  the two sat one above the other saying the same sentence. */
+  emptyTitle: string;
 }
 
 export interface SearchCopy {
@@ -192,7 +206,9 @@ export const DEFAULT_COPY: SearchCopy = {
   allFailed: "No area could be searched",
   loadedOnly: "{n} in loaded records",
   loadingSummary: "Searching…",
-  emptySummary: "No records matched",
+  /** The empty state's heading. `{q}` is the query the owner typed, so the
+   *  state says WHAT matched nothing rather than only that something did not. */
+  emptySummary: "No records match “{q}”",
   idleSummary: "Search your business records",
   permission: "You don’t have access to this area",
   setup: "This area isn’t set up on this site",
@@ -231,6 +247,14 @@ function fill(template: string, n: number, token = "{n}"): string {
   return template.includes(token) ? template.split(token).join(String(n)) : `${template} ${n}`;
 }
 
+/** `{q}` → the query. Custom copy stays query-specific even when it omits the
+ *  placeholder, so the empty state always identifies what was searched. */
+function fillQuery(template: string, query: string): string {
+  return template.includes("{q}")
+    ? template.split("{q}").join(query)
+    : `${template}: “${query}”`;
+}
+
 function idleGroup(adapter: SearchAdapter): SearchGroup {
   return decorate({
     id: adapter.id,
@@ -273,9 +297,9 @@ function baseItem(sourceId: string): SearchItem {
     isHeader: false, notHeader: true,
     isRecord: false, notRecord: true,
     isFooter: false, notFooter: true,
-    label: "", countLabel: "",
+    id: "", label: "", countLabel: "",
     isLoading: false, notLoading: true,
-    id: "", title: "", subtitle: "", statusLabel: "", image: "", screenId: "",
+    recordId: "", title: "", subtitle: "", statusLabel: "", image: "", screenId: "",
     error: "", hasError: false, noError: true,
     canLoadMore: false, cannotLoadMore: true, isLoadingMore: false,
   };
@@ -302,7 +326,7 @@ export function projectItems(groups: SearchGroup[]): SearchItem[] {
     if (silent) continue;
     items.push({
       ...baseItem(group.id),
-      key: `h:${group.id}`,
+      key: `h:${group.id}`, id: `h:${group.id}`,
       isHeader: true, notHeader: false,
       label: group.label,
       // A count is only shown once there is something to count: "0" under a
@@ -313,9 +337,9 @@ export function projectItems(groups: SearchGroup[]): SearchItem[] {
     for (const row of group.rows) {
       items.push({
         ...baseItem(group.id),
-        key: `r:${group.id}:${row.id}`,
+        key: `r:${group.id}:${row.id}`, id: `r:${group.id}:${row.id}`,
         isRecord: true, notRecord: false,
-        id: row.id, title: row.title, subtitle: row.subtitle,
+        recordId: row.id, title: row.title, subtitle: row.subtitle,
         statusLabel: row.statusLabel, image: row.image, screenId: row.screenId,
       });
     }
@@ -325,7 +349,7 @@ export function projectItems(groups: SearchGroup[]): SearchItem[] {
     if (group.hasError || group.problem !== "" || group.canLoadMore) {
       items.push({
         ...baseItem(group.id),
-        key: `f:${group.id}`,
+        key: `f:${group.id}`, id: `f:${group.id}`,
         isFooter: true, notFooter: false,
         error: group.error,
         hasError: group.error !== "", noError: group.error === "",
@@ -393,7 +417,9 @@ export function createGroupedSearch(
       : anyLoading && total === 0
         ? copy.loadingSummary
         : total === 0
-          ? (anyAnswered ? copy.emptySummary : copy.allFailed)
+          // Empty and answered: the empty block carries the sentence, so the
+          // summary line above it steps aside rather than repeating it.
+          ? (anyAnswered ? "" : copy.allFailed)
           : total === 1
             ? copy.resultsOne
             : areas === 1
@@ -416,6 +442,7 @@ export function createGroupedSearch(
       anyLoading,
       showEmpty: emptyAndAnswered,
       hideEmpty: !emptyAndAnswered,
+      emptyTitle: emptyAndAnswered ? fillQuery(copy.emptySummary, query) : "",
     };
   };
 

package/templates/owner-lite/dev/index.ts

@@ -52963,7 +52963,7 @@ const SCREENS = runtimeSetting({
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "wix_platform"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -53048,7 +53048,8 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "text": "$service:himiOwnerLiteSearch.summary",
                   "style": "caption",
-                  "color": "textSecondary"
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
                 }
               }
             },
@@ -53163,7 +53164,7 @@ const SCREENS = runtimeSetting({
                                     "actionId": "himi.open",
                                     "params": {
                                       "screenId": "$item.screenId",
-                                      "id": "$item.id"
+                                      "id": "$item.recordId"
                                     }
                                   }
                                 }
@@ -53269,8 +53270,9 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "No records matched",
-                          "style": "bodyEmphasis"
+                          "text": "$service:himiOwnerLiteSearch.emptyTitle",
+                          "style": "bodyEmphasis",
+                          "maxLines": 2
                         }
                       }
                     },

package/templates/owner-lite/tier5-src/_shared/owner-module-data.ts

@@ -49,6 +49,76 @@ function siteZone(): Promise<string | undefined> {
   return zoneLookup;
 }
 
+/** A subscription order stores its buyer as an internal member/contact id. Resolve the
+ *  display name so the owner can search subscriptions by the same person name shown in
+ *  the dedicated subscriptions screen. Fetch member ids directly, and page the member
+ *  directory only for contact ids. This is best-effort: missing member access must not
+ *  hide otherwise readable plan orders. */
+async function subscriptionMemberNames(orders: unknown[]): Promise<Map<string, string>> {
+  const memberIds = [...new Set(orders.map(order => field(order, 'buyer.memberId')).filter(Boolean))];
+  const unresolvedContacts = new Set(orders.map(order => field(order, 'buyer.contactId')).filter(Boolean));
+  const names = new Map<string, string>();
+  const remember = (member: unknown) => {
+    const emails = at(member, 'contact.emails');
+    const email = Array.isArray(emails) ? scalar(emails[0]) : '';
+    const displayName = name(member, 'contact.firstName', 'contact.lastName')
+      || field(member, 'profile.nickname') || email || field(member, 'loginEmail');
+    if (!displayName) return;
+    const id = field(member, 'id'), contactId = field(member, 'contactId');
+    if (id) names.set(id, displayName);
+    if (contactId) {
+      names.set(contactId, displayName);
+      unresolvedContacts.delete(contactId);
+    }
+  };
+
+  // The first directory page is useful for buyers already in view. For a buyer outside
+  // that page, fetch the known member ID directly instead of walking the whole directory.
+  const pageSize = 100;
+  let offset = 0;
+  let canPageDirectory = false;
+  try {
+    const response = await queryMembers({ query: { paging: { limit: pageSize, offset } } });
+    const members = response.members ?? [];
+    for (const member of members) remember(member);
+    offset += members.length;
+    const total = response.metadata?.total;
+    canPageDirectory = members.length > 0
+      && (typeof total === 'number' ? offset < total : members.length === pageSize);
+  } catch {
+    // Member details below can still work when the directory query is unavailable.
+  }
+
+  const unresolvedMembers = memberIds.filter(id => !names.has(id));
+  for (let start = 0; start < unresolvedMembers.length; start += 10) {
+    const members = await Promise.all(unresolvedMembers.slice(start, start + 10).map(async id => {
+      try { return (await getMember(id)).member; } catch { return undefined; }
+    }));
+    for (const member of members) if (member) remember(member);
+  }
+
+  if (!unresolvedContacts.size || !canPageDirectory) return names;
+  try {
+    while (unresolvedContacts.size) {
+      const response = await queryMembers({ query: { paging: { limit: pageSize, offset } } });
+      const members = response.members ?? [];
+      for (const member of members) remember(member);
+      if (!members.length) break;
+      offset += members.length;
+      const total = response.metadata?.total;
+      if (typeof total === 'number' ? offset >= total : members.length < pageSize) break;
+    }
+  } catch {
+    // A later page can fail after earlier pages already resolved some buyers.
+    // Keep those names; this is best-effort context, never a reason to hide an order.
+  }
+  return names;
+}
+
+function subscriptionBuyerName(order: unknown, names: Map<string, string>): string {
+  return names.get(field(order, 'buyer.memberId')) || names.get(field(order, 'buyer.contactId')) || '';
+}
+
 /** A Wix date value as an instant. A calendar date with no time ("2026-11-07") is a DAY, not an
  *  instant: it is built at local midnight and formatted with no zone, so it never shifts across
  *  one — including on engines without Intl, where a zone could not be applied anyway. */
@@ -99,7 +169,8 @@ export async function queryOwnerModule(module: OwnerModuleId, cursor = ''): Prom
   // The zone lookup runs beside the query, not after it: the two are independent, and serial
   // they would double the time to a first paint.
   const [raw, zone] = await Promise.all([queryRawOwnerModule(module, cursor), siteZone()]);
-  return { ...raw, items: raw.items.map(row => ownerRecord(module, row, zone)) };
+  const subscribers = module === 'subscriptions' ? await subscriptionMemberNames(raw.items) : new Map<string, string>();
+  return { ...raw, items: raw.items.map(row => ownerRecord(module, row, zone, subscriptionBuyerName(row, subscribers))) };
 }
 
 async function queryRawOwnerModule(module: OwnerModuleId, cursor: string): Promise<CollectionPage<unknown>> {
@@ -171,7 +242,7 @@ async function queryRawOwnerModule(module: OwnerModuleId, cursor: string): Promi
   }
 }
 
-export function ownerRecord(module: OwnerModuleId, raw: unknown, zone?: string): OwnerRecord {
+export function ownerRecord(module: OwnerModuleId, raw: unknown, zone?: string, subscriberName = ''): OwnerRecord {
   const when = (path: string, style?: DateStyle) => ownerDate(field(raw, path), zone, style);
   const id = field(raw, 'id');
   if (!id) throw new Error('Wix returned a record without an identity. Refresh this view.');
@@ -239,14 +310,13 @@ export function ownerRecord(module: OwnerModuleId, raw: unknown, zone?: string):
       details = [['Price', join(field(raw, 'pricing.price.value'), field(raw, 'pricing.price.currency'))], ['Free trial days', field(raw, 'pricing.freeTrialDays')]];
       break;
     case 'subscriptions':
-      // The buyer is only a member UUID here — not something an owner can read — so the
-      // row says when the plan started instead of echoing an internal id.
       title = field(raw, 'planName'); statusLabel = words(field(raw, 'status'));
       {
         const started = when('startDate', 'short');
-        subtitle = started ? copyTemplate('ownerModules.startedOn', 'Started {date}', { date: started }) : '';
+        const startedLabel = started ? copyTemplate('ownerModules.startedOn', 'Started {date}', { date: started }) : '';
+        subtitle = join(subscriberName, startedLabel);
       }
-      details = [['Started', when('startDate')], ['Ends', when('endDate')], ['Payment', words(field(raw, 'lastPaymentStatus'))]];
+      details = [['Subscriber', subscriberName], ['Started', when('startDate')], ['Ends', when('endDate')], ['Payment', words(field(raw, 'lastPaymentStatus'))]];
       break;
     case 'programs':
       title = field(raw, 'description.title') || field(raw, 'details.title') || field(raw, 'name');
@@ -344,7 +414,8 @@ export async function getOwnerRecord(module: OwnerModuleId, id: string): Promise
     }
     case 'donationCampaigns': raw = (await getDonationCampaign(id)).donationCampaign; break;
   }
-  const record = ownerRecord(module, raw, await zone);
+  const subscribers = module === 'subscriptions' ? await subscriptionMemberNames([raw]) : new Map<string, string>();
+  const record = ownerRecord(module, raw, await zone, subscriptionBuyerName(raw, subscribers));
   if (record.id !== id) throw new Error('The returned record does not match this link. Refresh the collection.');
   return record;
 }

package/templates/owner-lite/tier5-src/_shared/owner-order-attention.ts

@@ -0,0 +1,18 @@
+/** The Home dashboard's canonical Orders attention filter. Keep drawer reminders on
+ * the same definition so the two surfaces never disagree about what needs review. */
+export function ownerOrderAttentionFilter(updatedAfter?: string): Record<string, unknown> {
+  const filter: Record<string, unknown> = {
+    archived: false,
+    status: { $nin: ["CANCELED", "CANCELLED"] },
+    $or: [
+      { paymentStatus: { $in: ["NOT_PAID", "PARTIALLY_PAID"] } },
+      { paymentStatus: "PAID", fulfillmentStatus: { $in: ["NOT_FULFILLED", "PARTIALLY_FULFILLED"] } },
+    ],
+  };
+  return updatedAfter
+    ? { $and: [filter, { $or: [
+        { createdDate: { $gt: updatedAfter } },
+        { updatedDate: { $gt: updatedAfter } },
+      ] }] }
+    : filter;
+}