@wix/himalaya-cli 0.1632.0 → 0.1634.0

package/templates/branded-lite/tier5-src/himi-branded-lite-notifications/index.ts

@@ -10,6 +10,10 @@ import { defineService as registerService } from "../_shared/collection-service.
 import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
 import { queryNotifications, markRead, markAllRead, type MfvNotification } from "@himalaya/wix-members-feed-viewer";
 import { assertMemberAccess, memberAccess, type MemberAccess } from "../_shared/member-access.js";
+import { navigate } from "@himalaya/state";
+import { notificationOpen, urlHost, type NotificationOpen } from "../_shared/notification-target.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { copyParam, copyTemplate } from "../_shared/himi-copy.js";
 
 interface Row {
   id: string;
@@ -22,9 +26,13 @@ interface Row {
   photo: string;
   initial: string;
   dest: string;
+  /** What a tap does (a screen, a web link or nothing). Absent on the preview samples, which open nothing. */
+  open?: NotificationOpen;
 }
 interface S extends LoadFlags {
   items: Row[]; emptyText: string; actionMessage: string;
+  /** The web link the last tap named and is waiting for a second tap to open (see `open`). */
+  pendingUrl: string;
   /** Ownership travels with the rows, including a state captured by an async write. */
   inboxMember: MemberAccess | null;
   isMock: boolean; notMock: boolean;
@@ -67,7 +75,17 @@ function photo(n: MfvNotification): string {
   return n.icon?.personAvatarData?.data || n.icon?.webUrlData?.webUrl || "";
 }
 
-function norm(n: MfvNotification): Row {
+/** The screens the Notifications screen says its app serves, or undefined when it did not say. */
+function servedScreens(arg: unknown): ReadonlySet<string> | undefined {
+  const served = (arg as { served?: unknown } | null | undefined)?.served;
+  // A Retry reaches `load` with no params (the collection layer re-dispatches the action bare), so the list the screen
+  // last named is kept: dropping it would let every catalog link be tried again.
+  if (typeof served === "string") lastServed = new Set(served.split(",").filter(Boolean));
+  return lastServed;
+}
+let lastServed: ReadonlySet<string> | undefined;
+
+function norm(n: MfvNotification, served?: ReadonlySet<string>): Row {
   const name = (n.title || n.message || "Notification").trim() || "Notification";
   const rel = relativeTime(n.sentDate);
   const lead = n.title && n.message ? n.message.trim() : "";
@@ -83,6 +101,7 @@ function norm(n: MfvNotification): Row {
     photo: p,
     initial: (name[0] || "#").toUpperCase(),
     dest: dest(n),
+    open: notificationOpen(n.deeplink, served),
   };
 }
 
@@ -128,12 +147,13 @@ function currentInbox(s: S): S | undefined {
 }
 
 const defineService = withOnlineWrites(registerService, ["markOneRead","markAll"], { messageFields: ["actionMessage"] });
-const INITIAL = { ...LOADING, items: [] as Row[], emptyText: "", actionMessage: "", inboxMember: null };
+const INITIAL = { ...LOADING, items: [] as Row[], emptyText: "", actionMessage: "", pendingUrl: "", inboxMember: null };
 const svc = defineService<S, {
   prepare: (s: S) => S;
-  load: (s: S) => Promise<S>;
+  load: (s: S, arg?: unknown) => Promise<S>;
   markOneRead: (s: S, id: string) => Promise<S | undefined>;
   markAll: (s: S) => Promise<S | undefined>;
+  open: (s: S, arg?: unknown) => Promise<S | undefined>;
 }>("himiBrandedNotifications", {
   state: INITIAL,
   actions: {
@@ -141,14 +161,16 @@ const svc = defineService<S, {
     // Native hosts may already cold-paint their account-scoped snapshot; this
     // reducer does not control that earlier host phase.
     prepare: (s) => ({ ...s, ...INITIAL }),
-    load: async (s) => {
+    load: async (s, arg) => {
+      // The screen names which of the link targets this app serves (a comma list); none given means any may be tried.
+      const served = servedScreens(arg);
       try {
         const member = await requireMember();
-        const items = (await queryNotifications(25)).map(norm);
+        const items = (await queryNotifications(25)).map((n) => norm(n, served));
         await assertMemberAccess(member);
-        return { ...s, ...loaded("items", items, COPY), inboxMember: member, actionMessage: "" };
+        return { ...s, ...loaded("items", items, COPY), inboxMember: member, actionMessage: "", pendingUrl: "" };
       } catch (err) {
-        return { ...s, ...loadFailed("items", (await memberAccess()).email ? err : signInRequired(), COPY), inboxMember: null };
+        return { ...s, ...loadFailed("items", (await memberAccess()).email ? err : signInRequired(), COPY), inboxMember: null, actionMessage: "", pendingUrl: "" };
       }
     },
     // Mark one read; optimistically clear its dot. Real write is best-effort and
@@ -174,6 +196,39 @@ const svc = defineService<S, {
       const current = currentInbox(s);
       return current ? { ...current, items: current.items.map((r) => (r.id === id ? { ...r, unread: false, unreadDot: "" } : r)) } : undefined;
     },
+    // A tap on a row opens what the notification points at, like the One App: a Himi screen when its link names
+    // one of ours (see _shared/notification-target.ts), else its https link, else a visible "can't open".
+    // A web link is written by the site, so it needs a SECOND tap on the same row, after the first tap has
+    // shown where it goes. It never replaces the inbox, and an unknown link never guesses a screen.
+    open: async (s, arg): Promise<S | undefined> => {
+      const id = String((arg as { id?: unknown } | null | undefined)?.id ?? "");
+      const row = s.items.find((r) => r.id === id);
+      if (!row || s.busy) return undefined;
+      if (!s.isMock) {
+        try { await requireInboxMember(s); } catch (err) {
+          const current = currentInbox(s);
+          return current ? { ...current, ...loadFailed("items", err, COPY), inboxMember: null } : undefined;
+        }
+      }
+      const current = currentInbox(s);
+      if (!current) return undefined;
+      const action = row.open ?? { kind: "none" as const };
+      if (action.kind === "url") {
+        if (current.pendingUrl !== action.url) {
+          return { ...current, pendingUrl: action.url, actionMessage: copyTemplate("notifications.openLinkText", "Tap again to open {host}.", { host: urlHost(action.url) }) };
+        }
+        const opened = await openRichLink(action.url);
+        const now = currentInbox(s);
+        return now ? { ...now, pendingUrl: "", actionMessage: opened ? "" : copyParam("notifications.cantOpenText", "This notification can't be opened here.") } : undefined;
+      }
+      if (action.kind === "none") {
+        return { ...current, pendingUrl: "", actionMessage: copyParam("notifications.cantOpenText", "This notification can't be opened here.") };
+      }
+      // Read on open: the dot clears at once, the write is best effort and never holds the navigation.
+      if (!id.startsWith("sample-") && row.unread) markRead([id]).catch(() => undefined);
+      const read = { ...current, pendingUrl: "", actionMessage: "", items: current.items.map((r) => (r.id === id ? { ...r, unread: false, unreadDot: "" } : r)) };
+      return navigate(read, { screenId: action.target.screenId, args: action.target.args });
+    },
     // Mark everything read; optimistically clear all dots.
     markAll: async (s): Promise<S | undefined> => {
       if (s.busy) return undefined;

package/templates/branded-lite/tier5-src/himi-store-product/index.ts

@@ -439,7 +439,7 @@ function derive(s: S): S {
 let cartBadgeEpoch = 0;
 
 // A digital product with no options sells through the App Store once the platform sells Wix Stores
-// items there (`storesAppleSalesEnabled`), through StartItemPayment or the app's own eCom order.
+// items there (`storesAppleSalesEnabled`): wix-iap StartItemPayment places and charges its order.
 // Until then, and for any other product, an App Store route only blocks the regular checkout.
 const SELLS_THROUGH_APPLE = storesAppleSalesEnabled();
 const WIX_STORES_APP = "215238eb-22a5-4c36-9e7b-e7c08025e04e";

package/templates/branded-lite/tier5-src/wix-spaces-members/index.ts

@@ -1,23 +1,34 @@
 // Public site-member directory. Search, sorting, totals and offset paging match
 // OneApp's Members v1 query; no owner roster or build-time count is substituted.
 import { defineService } from "@himalaya/state";
-import { queryMembers, type WixMember } from "@himalaya/wix-members";
+import { queryMembers, followMember, unfollowMember, type WixMember } from "@himalaya/wix-members";
 import { createCollectionQuery } from "../_shared/collection-query.js";
 import { readAccess, assertReadAccess, readAccessDenied, type ReadAccess } from "../_shared/member-read.js";
 import { memberAccessChanged } from "../_shared/member-access.js";
 import { withEmptyFlags } from "../_shared/empty-flags.js";
+import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { memberRowExtras, followLabel, type MemberRowExtras } from "../_shared/member-row-extras.js";
 
-interface Row { id: string; name: string; subtitle: string; initial: string; photo: string; sectionTitle: string }
+interface Row extends MemberRowExtras { id: string; name: string; initial: string; photo: string; sectionTitle: string }
 interface S {
   status: "loading" | "ready" | "error";
   members: Row[]; emptyText: string;
   query: string; total: number | null; searchLabel: string;
   nextCursor: string; noMore: boolean; noPageError: boolean;
   error: string; notErrored: boolean; notLoading: boolean; hideSearch: boolean;
+  followHint: string;
 }
 const PAGE_SIZE = 50;
 const SEARCH_FIELDS = ["contact.firstName", "contact.lastName", "profile.nickname"];
 let directoryAccess: ReadAccess | undefined;
+// A Follow the signed-in member just made or undone. Rows keep the state they were read with, so this
+// shows the change at once; the next first-page read replaces it with what the server says.
+const followChanges = new Map<string, boolean>();
+const pendingFollows = new Set<string>();
+
+/** Who a directory read, and a write that follows it, belong to: the site and the signed-in member. A reload
+ *  builds a NEW ReadAccess object for the same reader, so identity says nothing; this key does. */
+const readerKey = (access: ReadAccess | undefined): string => access ? JSON.stringify([access.tenant, access.member.scope, access.member.email]) : "";
 
 function name(m: WixMember): string {
   const nick = m.profile?.nickname?.trim();
@@ -25,10 +36,14 @@ function name(m: WixMember): string {
   const full = [m.contact?.firstName, m.contact?.lastName].filter(Boolean).join(" ").trim();
   return full || "Member";
 }
-function row(m: WixMember): Row {
+function row(m: WixMember, extras: MemberRowExtras): Row {
   const n = name(m);
   // Login emails are not directory subtitles. Only public profile content is presented.
-  return { id: m.id, name: n, subtitle: "", initial: (n[0] || "#").toUpperCase(), photo: m.profile?.photo?.url || "", sectionTitle: "" };
+  return { id: m.id, name: n, initial: (n[0] || "#").toUpperCase(), photo: m.profile?.photo?.url || "", sectionTitle: "", ...extras };
+}
+function withFollowChange(item: Row): Row {
+  const following = followChanges.get(item.id);
+  return following === undefined ? item : { ...item, isFollowing: following, followLabel: followLabel(following) };
 }
 function sections(rows: Row[]): Row[] {
   const groups = new Map<string, Row[]>();
@@ -47,16 +62,17 @@ const directory = createCollectionQuery<Row>({
     if (!Number.isSafeInteger(offset) || offset < 0) throw new Error("Invalid member page offset");
     const access = cursor ? directoryAccess : await readAccess();
     if (!access) throw memberAccessChanged();
-    if (!cursor) directoryAccess = access;
+    if (!cursor) { directoryAccess = access; followChanges.clear(); followHint = ""; }
     await assertReadAccess(access);
     const response = await queryMembers({ query: {
       filter: { status: "APPROVED", privacyStatus: "PUBLIC" },
       sorting: [{ fieldName: "profile.nickname", order: "ASC" }],
       paging: { limit: PAGE_SIZE, offset },
     }, ...(criteria.query ? { search: { expression: criteria.query, fields: SEARCH_FIELDS } } : {}) });
+    if (!Array.isArray(response.members) || response.members.some(member => !member?.id)) throw new Error("Invalid member page");
+    const extras = response.members.length ? await memberRowExtras(response.members.map(member => member.id), access) : undefined;
     await assertReadAccess(access);
     if (access !== directoryAccess) throw memberAccessChanged();
-    if (!Array.isArray(response.members) || response.members.some(member => !member?.id)) throw new Error("Invalid member page");
     const metadata = response.metadata;
     if (metadata?.offset !== undefined && metadata.offset !== offset) throw new Error("Mismatched member page offset");
     const total = !metadata?.tooManyToCount && typeof metadata?.total === "number" && Number.isSafeInteger(metadata.total) && metadata.total >= 0
@@ -64,7 +80,7 @@ const directory = createCollectionQuery<Row>({
     const next = offset + response.members.length;
     if (!response.members.length && total !== undefined && total > next) throw new Error("Incomplete member page");
     return {
-      items: response.members.map(row), total,
+      items: response.members.map(member => row(member, extras!(member.id))), total,
       nextCursor: response.members.length && (total === undefined ? response.members.length === PAGE_SIZE : next < total) ? String(next) : "",
     };
   },
@@ -73,6 +89,7 @@ const directory = createCollectionQuery<Row>({
 // Set once the reader has typed a search: from then on the field stays mounted, even while a cleared search
 // reloads the full directory (no rows, no query yet), so it never unmounts and loses focus mid-edit.
 let searched = false;
+let followHint = "";
 
 function project(): S {
   const page = directory.getState();
@@ -81,7 +98,7 @@ function project(): S {
   const failed = page.status === "error";
   return {
     status: failed ? "error" : loading ? "loading" : "ready",
-    members: sections(page.items), query: page.criteria.query, total,
+    members: sections(page.items.map(withFollowChange)), query: page.criteria.query, total,
     searchLabel: total === null ? "" : `${total} ${total === 1 ? "member" : "members"}`,
     emptyText: page.status === "ready" && !page.items.length ? page.criteria.query ? "No results" : "No members yet" : "",
     nextCursor: loading || page.loadingMore || page.pageError ? "" : page.nextCursor,
@@ -94,21 +111,24 @@ function project(): S {
     // A successful empty SEARCH keeps its field reachable (to clear the query); a directory that is
     // loading or truly empty (no query, no rows) has nothing to search.
     hideSearch: failed || (!page.items.length && !page.criteria.query && !searched),
+    followHint,
   };
 }
 const svc = defineService<S, {
-  load: (s: S) => Promise<undefined>;
+  load: (s: S, arg?: unknown) => Promise<undefined>;
   filter: (s: S, arg?: unknown) => Promise<undefined>;
   loadMore: (s: S) => Promise<undefined>;
   retry: (s: S) => Promise<undefined>;
+  toggleFollow: (s: S, arg?: unknown) => Promise<S | undefined>;
   changed: (s: S) => S;
 }>("spacesMembers", withEmptyFlags({
   state: { status: "loading", members: [], emptyText: "", query: "", total: null, searchLabel: "", nextCursor: "", noMore: true, noPageError: true,
-    error: "", notErrored: true, notLoading: false, hideSearch: true },
+    error: "", notErrored: true, notLoading: false, hideSearch: true, followHint: "" },
   // A restored worker must re-read the current reader/site before showing a roster.
-  notHydrated: ["status", "members", "emptyText", "query", "total", "searchLabel", "nextCursor", "noMore", "noPageError", "error", "notErrored", "notLoading", "hideSearch"],
+  notHydrated: ["status", "members", "emptyText", "query", "total", "searchLabel", "nextCursor", "noMore", "noPageError", "error", "notErrored", "notLoading", "hideSearch", "followHint"],
   actions: {
-    load: async () => { await directory.query(directory.getState().criteria); return undefined; },
+    // The screen's onAppear carries the copy pack (the owner's wording, the stock translations) and the app language.
+    load: async (_s, arg) => { stashCopy(arg); await directory.query(directory.getState().criteria); return undefined; },
     filter: async (_s, arg) => {
       const value = typeof arg === "string" ? arg : (arg as { value?: unknown })?.value;
       if (typeof value === "string" && value.trim()) searched = true;
@@ -116,6 +136,34 @@ const svc = defineService<S, {
     },
     loadMore: async () => { await directory.loadMore(); return undefined; },
     retry: async () => { await directory.retry(); return undefined; },
+    // Only a signed-in member reaches this: a Visitor's Follow opens sign-in from the descriptor instead.
+    toggleFollow: async (_s, arg) => {
+      const id = (arg as { id?: unknown } | undefined)?.id;
+      const access = directoryAccess;
+      if (typeof id !== "string" || !id || !access?.member.email || pendingFollows.has(id)) return undefined;
+      const row = directory.getState().items.find(item => item.id === id);
+      if (!row) return undefined;
+      const following = withFollowChange(row).isFollowing;
+      pendingFollows.add(id);
+      try {
+        await assertReadAccess(access);
+        if (following) await unfollowMember(id); else await followMember(id);
+        await assertReadAccess(access);
+        // A first-page reload (typing in search, Retry) may have replaced directoryAccess while the write was in
+        // flight. The write still stands for the same reader on the same site, so it is recorded; only another
+        // reader's list must not take it.
+        if (readerKey(access) !== readerKey(directoryAccess)) return undefined;
+        followChanges.set(id, !following);
+        followHint = "";
+      } catch {
+        // A failed write belongs to the member who tapped: the control keeps its state and says so.
+        if (readerKey(access) !== readerKey(directoryAccess)) return undefined;
+        followHint = copyParam("members.followError", "Couldn't update Follow — try again.");
+      } finally {
+        pendingFollows.delete(id);
+      }
+      return project();
+    },
     changed: () => project(),
   },
 }, { members: "noMembers" }));

package/templates/community-club/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/events-meetups/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/gym-fitness/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/gym-fitness/tier5-src/himi-store-product/index.ts

@@ -467,7 +467,7 @@ function derive(s: S): S {
 let cartBadgeEpoch = 0;
 
 // A digital product with no options sells through the App Store once the platform sells Wix Stores
-// items there (`storesAppleSalesEnabled`), through StartItemPayment or the app's own eCom order.
+// items there (`storesAppleSalesEnabled`): wix-iap StartItemPayment places and charges its order.
 // Until then, and for any other product, an App Store route only blocks the regular checkout.
 const SELLS_THROUGH_APPLE = storesAppleSalesEnabled();
 const WIX_STORES_APP = "215238eb-22a5-4c36-9e7b-e7c08025e04e";

package/templates/nonprofit-cause/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/podcast-creator/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/portfolio-creative/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/portfolio-creative/tier5-src/himi-store-product/index.ts

@@ -467,7 +467,7 @@ function derive(s: S): S {
 let cartBadgeEpoch = 0;
 
 // A digital product with no options sells through the App Store once the platform sells Wix Stores
-// items there (`storesAppleSalesEnabled`), through StartItemPayment or the app's own eCom order.
+// items there (`storesAppleSalesEnabled`): wix-iap StartItemPayment places and charges its order.
 // Until then, and for any other product, an App Store route only blocks the regular checkout.
 const SELLS_THROUGH_APPLE = storesAppleSalesEnabled();
 const WIX_STORES_APP = "215238eb-22a5-4c36-9e7b-e7c08025e04e";

package/templates/restaurant/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/retail-store/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/retail-store/tier5-src/himi-store-product/index.ts

@@ -439,7 +439,7 @@ function derive(s: S): S {
 let cartBadgeEpoch = 0;
 
 // A digital product with no options sells through the App Store once the platform sells Wix Stores
-// items there (`storesAppleSalesEnabled`), through StartItemPayment or the app's own eCom order.
+// items there (`storesAppleSalesEnabled`): wix-iap StartItemPayment places and charges its order.
 // Until then, and for any other product, an App Store route only blocks the regular checkout.
 const SELLS_THROUGH_APPLE = storesAppleSalesEnabled();
 const WIX_STORES_APP = "215238eb-22a5-4c36-9e7b-e7c08025e04e";