@wix/himalaya-cli 0.1583.0 → 0.1585.0

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

@@ -1,56 +1,122 @@
-// Tier-5 bundle: Wix Spaces clone — Site Members list (ON-DEVICE, site-scoped).
-// Mirrors wix-owner-members. Binds rows via $service:spacesMembers.members.
-// Supports client-side list search (D22) via the filter action.
-//
-// Load states are explicit: `notLoading` gates a skeleton, `notErrored` an
-// error card with Retry, and `hideSearch` keeps the search field off a list that has
-// not loaded, failed, or has no members — a search box over nothing is not a state.
+// 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 { withEmptyFlags } from "../_shared/empty-flags.js";
 import { queryMembers, 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";
 
-interface Row { id: string; name: string; subtitle: string; initial: string; photo: string }
+interface Row { id: string; name: string; subtitle: string; initial: string; photo: string; sectionTitle: string }
 interface S {
   status: "loading" | "ready" | "error";
-  all: Row[]; members: Row[]; emptyText: string;
+  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;
 }
+const PAGE_SIZE = 50;
+const SEARCH_FIELDS = ["contact.firstName", "contact.lastName", "profile.nickname"];
+let directoryAccess: ReadAccess | undefined;
 
 function name(m: WixMember): string {
   const nick = m.profile?.nickname?.trim();
   if (nick) return nick;
   const full = [m.contact?.firstName, m.contact?.lastName].filter(Boolean).join(" ").trim();
-  return full || m.loginEmail?.trim() || "Member";
+  return full || "Member";
 }
-function norm(m: WixMember): Row {
+function row(m: WixMember): Row {
   const n = name(m);
-  return { id: m.id, name: n, subtitle: m.loginEmail || "", initial: (n[0] || "#").toUpperCase(), photo: m.profile?.photo?.url || "" };
+  // 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: "" };
 }
-function filterRows(all: Row[], q: string): Row[] {
-  const t = q.trim().toLowerCase();
-  if (!t) return all;
-  return all.filter((r) => r.name.toLowerCase().includes(t) || (r.subtitle || "").toLowerCase().includes(t));
+function sections(rows: Row[]): Row[] {
+  const groups = new Map<string, Row[]>();
+  for (const item of rows) {
+    const group = groups.get(item.initial) ?? [];
+    group.push(item); groups.set(item.initial, group);
+  }
+  return [...groups.keys()].sort().flatMap(letter => groups.get(letter)!.map((item, index) => ({ ...item, sectionTitle: index ? "" : letter })));
 }
+const directory = createCollectionQuery<Row>({
+  id: item => item.id,
+  clearOnError: readAccessDenied,
+  errorMessage: () => "Members couldn't be loaded.",
+  async fetch(criteria, cursor) {
+    const offset = cursor ? Number(cursor) : 0;
+    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;
+    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 } } : {}) });
+    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
+      ? metadata.total : undefined;
+    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,
+      nextCursor: response.members.length && (total === undefined ? response.members.length === PAGE_SIZE : next < total) ? String(next) : "",
+    };
+  },
+}, () => { void svc.changed(); });
 
-const svc = defineService<S, { load: (s: S) => Promise<S>; filter: (s: S, arg?: unknown) => S }>("spacesMembers", withEmptyFlags({
-  state: { status: "loading", all: [], members: [], emptyText: "", error: "", notErrored: true, notLoading: false, hideSearch: true },
+// 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;
+
+function project(): S {
+  const page = directory.getState();
+  const loading = page.status === "idle" || page.status === "loading";
+  const total = page.total ?? null;
+  const failed = page.status === "error";
+  return {
+    status: failed ? "error" : loading ? "loading" : "ready",
+    members: sections(page.items), 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,
+    noMore: !page.nextCursor || loading || page.loadingMore || page.pageError,
+    noPageError: !page.pageError,
+    error: page.error, notErrored: !failed,
+    // The skeleton stands in for rows that are not there yet; a typed search keeps the previous rows on screen
+    // while its response is in flight, so it must not paint skeletons above them.
+    notLoading: !(loading && !page.items.length),
+    // 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),
+  };
+}
+const svc = defineService<S, {
+  load: (s: S) => Promise<undefined>;
+  filter: (s: S, arg?: unknown) => Promise<undefined>;
+  loadMore: (s: S) => Promise<undefined>;
+  retry: (s: S) => Promise<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 },
+  // 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"],
   actions: {
-    load: async (s) => {
-      try {
-        const r = await queryMembers({ query: { paging: { limit: 50 } } });
-        const all = (r.members ?? []).map(norm);
-        return { status: "ready", all, members: all, emptyText: all.length ? "" : "No members yet",
-          error: "", notErrored: true, notLoading: true, hideSearch: all.length === 0 };
-      } catch {
-        return { ...s, status: "error", all: [], members: [], emptyText: "",
-          error: "Members couldn't be loaded.", notErrored: false, notLoading: true, hideSearch: true };
-      }
-    },
-    filter: (s, arg) => {
-      const q = (typeof arg === "string" ? arg : (arg as { value?: string })?.value || "").trim().toLowerCase();
-      const filtered = filterRows(s.all, q);
-      return { ...s, members: filtered, emptyText: filtered.length ? "" : "No results" };
+    load: async () => { 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;
+      await directory.query({ query: typeof value === "string" ? value : "" }); return undefined;
     },
+    loadMore: async () => { await directory.loadMore(); return undefined; },
+    retry: async () => { await directory.retry(); return undefined; },
+    changed: () => project(),
   },
 }, { members: "noMembers" }));
 svc.load();

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

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // Tier-5 bundle: Wix Spaces clone — Pricing plan detail (ON-DEVICE, site-scoped).
 // himalaya.input.id carries the plan id.
 //
@@ -53,7 +54,7 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesPlanDetail",
         const p = await readPlan(id);
         if (!p) return { ...s, status: "ready", ...presence("missing") };
         const perks = (p.perks?.values ?? []).map((v) => `• ${v}`).join("\n");
-        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: p.description || "", perks, ...presence("found") };
+        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: descriptionBody(p.description).bodyText, perks, ...presence("found") };
       } catch (e) { return { ...s, status: "ready", ...presenceAfterError(e) }; }
     },
   },

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

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 // 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";
@@ -8,7 +9,7 @@ interface S { status: "loading" | "ready"; items: Row[]; emptyText: string; /**
 
 function norm(a: WixAnnouncement, i: number): Row {
   const aa = a as unknown as { id?: string; title?: string; bodyText?: string; description?: string };
-  return { id: aa.id || `a${i}`, name: aa.title || "Announcement", subtitle: aa.description || aa.bodyText || "" };
+  return { id: aa.id || `a${i}`, name: aa.title || "Announcement", subtitle: descriptionBody(aa.description, descriptionBody(aa.bodyText).bodyText).bodyText };
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", withEmptyFlags({

package/templates/community-club/config.ts

@@ -144,6 +144,13 @@ export default defineApp({
         "parentScreenId": "himi_blog",
         "tabId": "home"
       },
+      {
+        "screenId": "himi_notif_settings",
+        "isPublic": true,
+        "paramKeys": [],
+        "parentScreenId": "himi_account",
+        "tabId": "profile"
+      },
       {
         "screenId": "himi_events",
         "isPublic": true,
@@ -215,6 +222,15 @@ export default defineApp({
         "parentScreenId": "himi_groups",
         "tabId": "groups"
       },
+      {
+        "screenId": "himi_group_about",
+        "isPublic": true,
+        "paramKeys": [
+          "id"
+        ],
+        "parentScreenId": "himi_group",
+        "tabId": "groups"
+      },
       {
         "screenId": "himi_cms",
         "isPublic": true,