@wix/himalaya-cli 0.1490.0 → 0.1492.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/sdk/iap/src/wix-payments-contract.d.ts +1 -1
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap-checkout.mjs +9 -3
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap.mjs +6 -3
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/screens.mjs +9 -3
- package/dist/cli.mjs +0 -1
- package/package.json +2 -2
- package/templates/beauty-salon-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/beauty-salon-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/community-club-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/community-club-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/events-meetups-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/events-meetups-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/gym-fitness-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/owner-lite/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/owner-lite/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/podcast-creator-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/podcast-creator-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/portfolio-creative-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/portfolio-creative-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/restaurant-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/restaurant-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/retail-store-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/retail-store-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
- package/templates/yoga-studio-owner/tier5-src/_shared/owner-hosted-sites.ts +60 -0
- package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-overview/index.ts +21 -7
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// The businesses an EMBEDDING HOST says the signed-in owner owns — or null when there is no
|
|
2
|
+
// such host.
|
|
3
|
+
//
|
|
4
|
+
// Standalone, an owner screen lists businesses itself (`querySites`, account level) and reads
|
|
5
|
+
// each one with `site.forSite(msid)`, which stamps `wix-site-id` on that call. Embedded, the
|
|
6
|
+
// host owns site selection: its data source signs every call for the business the user picked
|
|
7
|
+
// and drops a worker-sent `wix-site-id`, so a fan-out read ONE business N times. A host that
|
|
8
|
+
// opts in supplies its own list instead (`HimalayaOwnedSitesDataSource` on iOS / Android, the
|
|
9
|
+
// `ownedSites` prop on web) and answers `himi.wix.ownedSites` with it; the embed then routes a
|
|
10
|
+
// `site.forSite(msid)` call to the host's per-site call for any id on that list and refuses
|
|
11
|
+
// every other id. So a worker reads the list here and keeps using `site.forSite` unchanged.
|
|
12
|
+
//
|
|
13
|
+
// A rejection is "not hosted": a standalone shell has no handler for the verb, and an older embed
|
|
14
|
+
// predates it. Callers then do exactly what they did before. A host that opted in but cannot list
|
|
15
|
+
// answers `{ error }` instead, which THROWS here: falling back to `querySites` would read the
|
|
16
|
+
// account through the host's single-site signer and fan out to ids the host then refuses.
|
|
17
|
+
|
|
18
|
+
import { dispatch } from "@himalaya/dispatch";
|
|
19
|
+
|
|
20
|
+
export const OWNED_SITES_ACTION = "himi.wix.ownedSites";
|
|
21
|
+
|
|
22
|
+
export interface HostedSite {
|
|
23
|
+
/** The business's metaSiteId — what `site.forSite` takes. */
|
|
24
|
+
id: string;
|
|
25
|
+
name: string;
|
|
26
|
+
logoUrl?: string;
|
|
27
|
+
color?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function text(v: unknown): string {
|
|
31
|
+
return typeof v === "string" ? v.trim() : "";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The host's list, in the host's order; [] is a real answer (an owner with no businesses).
|
|
35
|
+
* null when the verb is unanswered or the answer is not a list. Throws the host's `{ error }`. */
|
|
36
|
+
export async function hostOwnedSites(): Promise<HostedSite[] | null> {
|
|
37
|
+
let value: unknown;
|
|
38
|
+
try {
|
|
39
|
+
value = await dispatch(OWNED_SITES_ACTION);
|
|
40
|
+
} catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
// Native hosts resolve the payload itself; some web shells wrap it as `{ payload }`.
|
|
44
|
+
const body = value as { sites?: unknown; error?: unknown; payload?: { sites?: unknown; error?: unknown } } | null;
|
|
45
|
+
const error = body?.error ?? body?.payload?.error;
|
|
46
|
+
if (typeof error === "string") throw new Error(error || "The host could not list your businesses");
|
|
47
|
+
const raw = body?.sites ?? body?.payload?.sites;
|
|
48
|
+
if (!Array.isArray(raw)) return null;
|
|
49
|
+
const sites: HostedSite[] = [];
|
|
50
|
+
for (const entry of raw) {
|
|
51
|
+
const e = (entry ?? {}) as Record<string, unknown>;
|
|
52
|
+
const id = text(e.id);
|
|
53
|
+
if (!id) continue;
|
|
54
|
+
const site: HostedSite = { id, name: text(e.name) };
|
|
55
|
+
if (text(e.logoUrl)) site.logoUrl = text(e.logoUrl);
|
|
56
|
+
if (text(e.color)) site.color = text(e.color);
|
|
57
|
+
sites.push(site);
|
|
58
|
+
}
|
|
59
|
+
return sites;
|
|
60
|
+
}
|
|
@@ -22,6 +22,11 @@
|
|
|
22
22
|
// or one whose mint fails, resolves to `null` and renders as "—" beside the others rather
|
|
23
23
|
// than throwing the whole screen into its error state. A rollup that disappears because one
|
|
24
24
|
// of five businesses is unreachable is worse than one that says so in a row.
|
|
25
|
+
//
|
|
26
|
+
// EMBEDDED, THE HOST NAMES THE BUSINESSES. A host that owns site selection (Symphony's Manage
|
|
27
|
+
// Wix) signs each call itself and would drop the per-call `wix-site-id`, so it supplies the
|
|
28
|
+
// owner's sites instead (`hostOwnedSites`) and resolves each `site.forSite(msid)` call against
|
|
29
|
+
// that list. The list replaces rung 1 only; the fan-out below is identical either way.
|
|
25
30
|
|
|
26
31
|
import { defineService } from "@himalaya/state";
|
|
27
32
|
import { querySites, type WixSite } from "@himalaya/wix-site-list";
|
|
@@ -31,6 +36,7 @@ import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_share
|
|
|
31
36
|
import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
|
|
32
37
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
33
38
|
import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
|
|
39
|
+
import { hostOwnedSites } from "../_shared/owner-hosted-sites.js";
|
|
34
40
|
|
|
35
41
|
/** Mirrors the Home dashboard's "needs attention" definition, so a number here means the
|
|
36
42
|
* same thing it means after the owner drills into that business. */
|
|
@@ -176,16 +182,24 @@ async function attentionCount(msid: string): Promise<number | null> {
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
|
|
185
|
+
/** Rung 1: the host's list when embedded, else the account's own (`querySites`). */
|
|
186
|
+
async function listBusinesses(): Promise<Array<{ id: string; name: string }>> {
|
|
187
|
+
const unnamed = () => copyParam("ownerOverview.unnamedBusiness", "Business");
|
|
188
|
+
const hosted = await hostOwnedSites();
|
|
189
|
+
if (hosted) return hosted.map((h) => ({ id: h.id, name: h.name || unnamed() }));
|
|
190
|
+
const res = await querySites({ query: { cursorPaging: { limit: 50 } } });
|
|
191
|
+
return (res.sites ?? [])
|
|
192
|
+
.filter((r: WixSite) => r?.id)
|
|
193
|
+
.map((r: WixSite) => ({
|
|
194
|
+
id: r.id || "",
|
|
195
|
+
name: r.displayName || (r as { name?: string }).name || unnamed(),
|
|
196
|
+
}));
|
|
197
|
+
}
|
|
198
|
+
|
|
179
199
|
async function loadRollup(): Promise<OverviewState> {
|
|
180
200
|
if (isOwnerPreviewDemo()) return demoRollup();
|
|
181
201
|
try {
|
|
182
|
-
const
|
|
183
|
-
const businesses = (res.sites ?? [])
|
|
184
|
-
.filter((r: WixSite) => r?.id)
|
|
185
|
-
.map((r: WixSite) => ({
|
|
186
|
-
id: r.id || "",
|
|
187
|
-
name: r.displayName || (r as { name?: string }).name || copyParam("ownerOverview.unnamedBusiness", "Business"),
|
|
188
|
-
}));
|
|
202
|
+
const businesses = await listBusinesses();
|
|
189
203
|
if (businesses.length === 0) return shape({ status: "ready", rows: [] });
|
|
190
204
|
|
|
191
205
|
// THE FAN-OUT. Concurrent, one business each, active scope untouched.
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// The businesses an EMBEDDING HOST says the signed-in owner owns — or null when there is no
|
|
2
|
+
// such host.
|
|
3
|
+
//
|
|
4
|
+
// Standalone, an owner screen lists businesses itself (`querySites`, account level) and reads
|
|
5
|
+
// each one with `site.forSite(msid)`, which stamps `wix-site-id` on that call. Embedded, the
|
|
6
|
+
// host owns site selection: its data source signs every call for the business the user picked
|
|
7
|
+
// and drops a worker-sent `wix-site-id`, so a fan-out read ONE business N times. A host that
|
|
8
|
+
// opts in supplies its own list instead (`HimalayaOwnedSitesDataSource` on iOS / Android, the
|
|
9
|
+
// `ownedSites` prop on web) and answers `himi.wix.ownedSites` with it; the embed then routes a
|
|
10
|
+
// `site.forSite(msid)` call to the host's per-site call for any id on that list and refuses
|
|
11
|
+
// every other id. So a worker reads the list here and keeps using `site.forSite` unchanged.
|
|
12
|
+
//
|
|
13
|
+
// A rejection is "not hosted": a standalone shell has no handler for the verb, and an older embed
|
|
14
|
+
// predates it. Callers then do exactly what they did before. A host that opted in but cannot list
|
|
15
|
+
// answers `{ error }` instead, which THROWS here: falling back to `querySites` would read the
|
|
16
|
+
// account through the host's single-site signer and fan out to ids the host then refuses.
|
|
17
|
+
|
|
18
|
+
import { dispatch } from "@himalaya/dispatch";
|
|
19
|
+
|
|
20
|
+
export const OWNED_SITES_ACTION = "himi.wix.ownedSites";
|
|
21
|
+
|
|
22
|
+
export interface HostedSite {
|
|
23
|
+
/** The business's metaSiteId — what `site.forSite` takes. */
|
|
24
|
+
id: string;
|
|
25
|
+
name: string;
|
|
26
|
+
logoUrl?: string;
|
|
27
|
+
color?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function text(v: unknown): string {
|
|
31
|
+
return typeof v === "string" ? v.trim() : "";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The host's list, in the host's order; [] is a real answer (an owner with no businesses).
|
|
35
|
+
* null when the verb is unanswered or the answer is not a list. Throws the host's `{ error }`. */
|
|
36
|
+
export async function hostOwnedSites(): Promise<HostedSite[] | null> {
|
|
37
|
+
let value: unknown;
|
|
38
|
+
try {
|
|
39
|
+
value = await dispatch(OWNED_SITES_ACTION);
|
|
40
|
+
} catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
// Native hosts resolve the payload itself; some web shells wrap it as `{ payload }`.
|
|
44
|
+
const body = value as { sites?: unknown; error?: unknown; payload?: { sites?: unknown; error?: unknown } } | null;
|
|
45
|
+
const error = body?.error ?? body?.payload?.error;
|
|
46
|
+
if (typeof error === "string") throw new Error(error || "The host could not list your businesses");
|
|
47
|
+
const raw = body?.sites ?? body?.payload?.sites;
|
|
48
|
+
if (!Array.isArray(raw)) return null;
|
|
49
|
+
const sites: HostedSite[] = [];
|
|
50
|
+
for (const entry of raw) {
|
|
51
|
+
const e = (entry ?? {}) as Record<string, unknown>;
|
|
52
|
+
const id = text(e.id);
|
|
53
|
+
if (!id) continue;
|
|
54
|
+
const site: HostedSite = { id, name: text(e.name) };
|
|
55
|
+
if (text(e.logoUrl)) site.logoUrl = text(e.logoUrl);
|
|
56
|
+
if (text(e.color)) site.color = text(e.color);
|
|
57
|
+
sites.push(site);
|
|
58
|
+
}
|
|
59
|
+
return sites;
|
|
60
|
+
}
|
|
@@ -22,6 +22,11 @@
|
|
|
22
22
|
// or one whose mint fails, resolves to `null` and renders as "—" beside the others rather
|
|
23
23
|
// than throwing the whole screen into its error state. A rollup that disappears because one
|
|
24
24
|
// of five businesses is unreachable is worse than one that says so in a row.
|
|
25
|
+
//
|
|
26
|
+
// EMBEDDED, THE HOST NAMES THE BUSINESSES. A host that owns site selection (Symphony's Manage
|
|
27
|
+
// Wix) signs each call itself and would drop the per-call `wix-site-id`, so it supplies the
|
|
28
|
+
// owner's sites instead (`hostOwnedSites`) and resolves each `site.forSite(msid)` call against
|
|
29
|
+
// that list. The list replaces rung 1 only; the fan-out below is identical either way.
|
|
25
30
|
|
|
26
31
|
import { defineService } from "@himalaya/state";
|
|
27
32
|
import { querySites, type WixSite } from "@himalaya/wix-site-list";
|
|
@@ -31,6 +36,7 @@ import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_share
|
|
|
31
36
|
import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
|
|
32
37
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
33
38
|
import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
|
|
39
|
+
import { hostOwnedSites } from "../_shared/owner-hosted-sites.js";
|
|
34
40
|
|
|
35
41
|
/** Mirrors the Home dashboard's "needs attention" definition, so a number here means the
|
|
36
42
|
* same thing it means after the owner drills into that business. */
|
|
@@ -176,16 +182,24 @@ async function attentionCount(msid: string): Promise<number | null> {
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
|
|
185
|
+
/** Rung 1: the host's list when embedded, else the account's own (`querySites`). */
|
|
186
|
+
async function listBusinesses(): Promise<Array<{ id: string; name: string }>> {
|
|
187
|
+
const unnamed = () => copyParam("ownerOverview.unnamedBusiness", "Business");
|
|
188
|
+
const hosted = await hostOwnedSites();
|
|
189
|
+
if (hosted) return hosted.map((h) => ({ id: h.id, name: h.name || unnamed() }));
|
|
190
|
+
const res = await querySites({ query: { cursorPaging: { limit: 50 } } });
|
|
191
|
+
return (res.sites ?? [])
|
|
192
|
+
.filter((r: WixSite) => r?.id)
|
|
193
|
+
.map((r: WixSite) => ({
|
|
194
|
+
id: r.id || "",
|
|
195
|
+
name: r.displayName || (r as { name?: string }).name || unnamed(),
|
|
196
|
+
}));
|
|
197
|
+
}
|
|
198
|
+
|
|
179
199
|
async function loadRollup(): Promise<OverviewState> {
|
|
180
200
|
if (isOwnerPreviewDemo()) return demoRollup();
|
|
181
201
|
try {
|
|
182
|
-
const
|
|
183
|
-
const businesses = (res.sites ?? [])
|
|
184
|
-
.filter((r: WixSite) => r?.id)
|
|
185
|
-
.map((r: WixSite) => ({
|
|
186
|
-
id: r.id || "",
|
|
187
|
-
name: r.displayName || (r as { name?: string }).name || copyParam("ownerOverview.unnamedBusiness", "Business"),
|
|
188
|
-
}));
|
|
202
|
+
const businesses = await listBusinesses();
|
|
189
203
|
if (businesses.length === 0) return shape({ status: "ready", rows: [] });
|
|
190
204
|
|
|
191
205
|
// THE FAN-OUT. Concurrent, one business each, active scope untouched.
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// The businesses an EMBEDDING HOST says the signed-in owner owns — or null when there is no
|
|
2
|
+
// such host.
|
|
3
|
+
//
|
|
4
|
+
// Standalone, an owner screen lists businesses itself (`querySites`, account level) and reads
|
|
5
|
+
// each one with `site.forSite(msid)`, which stamps `wix-site-id` on that call. Embedded, the
|
|
6
|
+
// host owns site selection: its data source signs every call for the business the user picked
|
|
7
|
+
// and drops a worker-sent `wix-site-id`, so a fan-out read ONE business N times. A host that
|
|
8
|
+
// opts in supplies its own list instead (`HimalayaOwnedSitesDataSource` on iOS / Android, the
|
|
9
|
+
// `ownedSites` prop on web) and answers `himi.wix.ownedSites` with it; the embed then routes a
|
|
10
|
+
// `site.forSite(msid)` call to the host's per-site call for any id on that list and refuses
|
|
11
|
+
// every other id. So a worker reads the list here and keeps using `site.forSite` unchanged.
|
|
12
|
+
//
|
|
13
|
+
// A rejection is "not hosted": a standalone shell has no handler for the verb, and an older embed
|
|
14
|
+
// predates it. Callers then do exactly what they did before. A host that opted in but cannot list
|
|
15
|
+
// answers `{ error }` instead, which THROWS here: falling back to `querySites` would read the
|
|
16
|
+
// account through the host's single-site signer and fan out to ids the host then refuses.
|
|
17
|
+
|
|
18
|
+
import { dispatch } from "@himalaya/dispatch";
|
|
19
|
+
|
|
20
|
+
export const OWNED_SITES_ACTION = "himi.wix.ownedSites";
|
|
21
|
+
|
|
22
|
+
export interface HostedSite {
|
|
23
|
+
/** The business's metaSiteId — what `site.forSite` takes. */
|
|
24
|
+
id: string;
|
|
25
|
+
name: string;
|
|
26
|
+
logoUrl?: string;
|
|
27
|
+
color?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function text(v: unknown): string {
|
|
31
|
+
return typeof v === "string" ? v.trim() : "";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The host's list, in the host's order; [] is a real answer (an owner with no businesses).
|
|
35
|
+
* null when the verb is unanswered or the answer is not a list. Throws the host's `{ error }`. */
|
|
36
|
+
export async function hostOwnedSites(): Promise<HostedSite[] | null> {
|
|
37
|
+
let value: unknown;
|
|
38
|
+
try {
|
|
39
|
+
value = await dispatch(OWNED_SITES_ACTION);
|
|
40
|
+
} catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
// Native hosts resolve the payload itself; some web shells wrap it as `{ payload }`.
|
|
44
|
+
const body = value as { sites?: unknown; error?: unknown; payload?: { sites?: unknown; error?: unknown } } | null;
|
|
45
|
+
const error = body?.error ?? body?.payload?.error;
|
|
46
|
+
if (typeof error === "string") throw new Error(error || "The host could not list your businesses");
|
|
47
|
+
const raw = body?.sites ?? body?.payload?.sites;
|
|
48
|
+
if (!Array.isArray(raw)) return null;
|
|
49
|
+
const sites: HostedSite[] = [];
|
|
50
|
+
for (const entry of raw) {
|
|
51
|
+
const e = (entry ?? {}) as Record<string, unknown>;
|
|
52
|
+
const id = text(e.id);
|
|
53
|
+
if (!id) continue;
|
|
54
|
+
const site: HostedSite = { id, name: text(e.name) };
|
|
55
|
+
if (text(e.logoUrl)) site.logoUrl = text(e.logoUrl);
|
|
56
|
+
if (text(e.color)) site.color = text(e.color);
|
|
57
|
+
sites.push(site);
|
|
58
|
+
}
|
|
59
|
+
return sites;
|
|
60
|
+
}
|
|
@@ -22,6 +22,11 @@
|
|
|
22
22
|
// or one whose mint fails, resolves to `null` and renders as "—" beside the others rather
|
|
23
23
|
// than throwing the whole screen into its error state. A rollup that disappears because one
|
|
24
24
|
// of five businesses is unreachable is worse than one that says so in a row.
|
|
25
|
+
//
|
|
26
|
+
// EMBEDDED, THE HOST NAMES THE BUSINESSES. A host that owns site selection (Symphony's Manage
|
|
27
|
+
// Wix) signs each call itself and would drop the per-call `wix-site-id`, so it supplies the
|
|
28
|
+
// owner's sites instead (`hostOwnedSites`) and resolves each `site.forSite(msid)` call against
|
|
29
|
+
// that list. The list replaces rung 1 only; the fan-out below is identical either way.
|
|
25
30
|
|
|
26
31
|
import { defineService } from "@himalaya/state";
|
|
27
32
|
import { querySites, type WixSite } from "@himalaya/wix-site-list";
|
|
@@ -31,6 +36,7 @@ import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_share
|
|
|
31
36
|
import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
|
|
32
37
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
33
38
|
import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
|
|
39
|
+
import { hostOwnedSites } from "../_shared/owner-hosted-sites.js";
|
|
34
40
|
|
|
35
41
|
/** Mirrors the Home dashboard's "needs attention" definition, so a number here means the
|
|
36
42
|
* same thing it means after the owner drills into that business. */
|
|
@@ -176,16 +182,24 @@ async function attentionCount(msid: string): Promise<number | null> {
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
|
|
185
|
+
/** Rung 1: the host's list when embedded, else the account's own (`querySites`). */
|
|
186
|
+
async function listBusinesses(): Promise<Array<{ id: string; name: string }>> {
|
|
187
|
+
const unnamed = () => copyParam("ownerOverview.unnamedBusiness", "Business");
|
|
188
|
+
const hosted = await hostOwnedSites();
|
|
189
|
+
if (hosted) return hosted.map((h) => ({ id: h.id, name: h.name || unnamed() }));
|
|
190
|
+
const res = await querySites({ query: { cursorPaging: { limit: 50 } } });
|
|
191
|
+
return (res.sites ?? [])
|
|
192
|
+
.filter((r: WixSite) => r?.id)
|
|
193
|
+
.map((r: WixSite) => ({
|
|
194
|
+
id: r.id || "",
|
|
195
|
+
name: r.displayName || (r as { name?: string }).name || unnamed(),
|
|
196
|
+
}));
|
|
197
|
+
}
|
|
198
|
+
|
|
179
199
|
async function loadRollup(): Promise<OverviewState> {
|
|
180
200
|
if (isOwnerPreviewDemo()) return demoRollup();
|
|
181
201
|
try {
|
|
182
|
-
const
|
|
183
|
-
const businesses = (res.sites ?? [])
|
|
184
|
-
.filter((r: WixSite) => r?.id)
|
|
185
|
-
.map((r: WixSite) => ({
|
|
186
|
-
id: r.id || "",
|
|
187
|
-
name: r.displayName || (r as { name?: string }).name || copyParam("ownerOverview.unnamedBusiness", "Business"),
|
|
188
|
-
}));
|
|
202
|
+
const businesses = await listBusinesses();
|
|
189
203
|
if (businesses.length === 0) return shape({ status: "ready", rows: [] });
|
|
190
204
|
|
|
191
205
|
// THE FAN-OUT. Concurrent, one business each, active scope untouched.
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// The businesses an EMBEDDING HOST says the signed-in owner owns — or null when there is no
|
|
2
|
+
// such host.
|
|
3
|
+
//
|
|
4
|
+
// Standalone, an owner screen lists businesses itself (`querySites`, account level) and reads
|
|
5
|
+
// each one with `site.forSite(msid)`, which stamps `wix-site-id` on that call. Embedded, the
|
|
6
|
+
// host owns site selection: its data source signs every call for the business the user picked
|
|
7
|
+
// and drops a worker-sent `wix-site-id`, so a fan-out read ONE business N times. A host that
|
|
8
|
+
// opts in supplies its own list instead (`HimalayaOwnedSitesDataSource` on iOS / Android, the
|
|
9
|
+
// `ownedSites` prop on web) and answers `himi.wix.ownedSites` with it; the embed then routes a
|
|
10
|
+
// `site.forSite(msid)` call to the host's per-site call for any id on that list and refuses
|
|
11
|
+
// every other id. So a worker reads the list here and keeps using `site.forSite` unchanged.
|
|
12
|
+
//
|
|
13
|
+
// A rejection is "not hosted": a standalone shell has no handler for the verb, and an older embed
|
|
14
|
+
// predates it. Callers then do exactly what they did before. A host that opted in but cannot list
|
|
15
|
+
// answers `{ error }` instead, which THROWS here: falling back to `querySites` would read the
|
|
16
|
+
// account through the host's single-site signer and fan out to ids the host then refuses.
|
|
17
|
+
|
|
18
|
+
import { dispatch } from "@himalaya/dispatch";
|
|
19
|
+
|
|
20
|
+
export const OWNED_SITES_ACTION = "himi.wix.ownedSites";
|
|
21
|
+
|
|
22
|
+
export interface HostedSite {
|
|
23
|
+
/** The business's metaSiteId — what `site.forSite` takes. */
|
|
24
|
+
id: string;
|
|
25
|
+
name: string;
|
|
26
|
+
logoUrl?: string;
|
|
27
|
+
color?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function text(v: unknown): string {
|
|
31
|
+
return typeof v === "string" ? v.trim() : "";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The host's list, in the host's order; [] is a real answer (an owner with no businesses).
|
|
35
|
+
* null when the verb is unanswered or the answer is not a list. Throws the host's `{ error }`. */
|
|
36
|
+
export async function hostOwnedSites(): Promise<HostedSite[] | null> {
|
|
37
|
+
let value: unknown;
|
|
38
|
+
try {
|
|
39
|
+
value = await dispatch(OWNED_SITES_ACTION);
|
|
40
|
+
} catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
// Native hosts resolve the payload itself; some web shells wrap it as `{ payload }`.
|
|
44
|
+
const body = value as { sites?: unknown; error?: unknown; payload?: { sites?: unknown; error?: unknown } } | null;
|
|
45
|
+
const error = body?.error ?? body?.payload?.error;
|
|
46
|
+
if (typeof error === "string") throw new Error(error || "The host could not list your businesses");
|
|
47
|
+
const raw = body?.sites ?? body?.payload?.sites;
|
|
48
|
+
if (!Array.isArray(raw)) return null;
|
|
49
|
+
const sites: HostedSite[] = [];
|
|
50
|
+
for (const entry of raw) {
|
|
51
|
+
const e = (entry ?? {}) as Record<string, unknown>;
|
|
52
|
+
const id = text(e.id);
|
|
53
|
+
if (!id) continue;
|
|
54
|
+
const site: HostedSite = { id, name: text(e.name) };
|
|
55
|
+
if (text(e.logoUrl)) site.logoUrl = text(e.logoUrl);
|
|
56
|
+
if (text(e.color)) site.color = text(e.color);
|
|
57
|
+
sites.push(site);
|
|
58
|
+
}
|
|
59
|
+
return sites;
|
|
60
|
+
}
|
|
@@ -22,6 +22,11 @@
|
|
|
22
22
|
// or one whose mint fails, resolves to `null` and renders as "—" beside the others rather
|
|
23
23
|
// than throwing the whole screen into its error state. A rollup that disappears because one
|
|
24
24
|
// of five businesses is unreachable is worse than one that says so in a row.
|
|
25
|
+
//
|
|
26
|
+
// EMBEDDED, THE HOST NAMES THE BUSINESSES. A host that owns site selection (Symphony's Manage
|
|
27
|
+
// Wix) signs each call itself and would drop the per-call `wix-site-id`, so it supplies the
|
|
28
|
+
// owner's sites instead (`hostOwnedSites`) and resolves each `site.forSite(msid)` call against
|
|
29
|
+
// that list. The list replaces rung 1 only; the fan-out below is identical either way.
|
|
25
30
|
|
|
26
31
|
import { defineService } from "@himalaya/state";
|
|
27
32
|
import { querySites, type WixSite } from "@himalaya/wix-site-list";
|
|
@@ -31,6 +36,7 @@ import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_share
|
|
|
31
36
|
import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
|
|
32
37
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
33
38
|
import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
|
|
39
|
+
import { hostOwnedSites } from "../_shared/owner-hosted-sites.js";
|
|
34
40
|
|
|
35
41
|
/** Mirrors the Home dashboard's "needs attention" definition, so a number here means the
|
|
36
42
|
* same thing it means after the owner drills into that business. */
|
|
@@ -176,16 +182,24 @@ async function attentionCount(msid: string): Promise<number | null> {
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
|
|
185
|
+
/** Rung 1: the host's list when embedded, else the account's own (`querySites`). */
|
|
186
|
+
async function listBusinesses(): Promise<Array<{ id: string; name: string }>> {
|
|
187
|
+
const unnamed = () => copyParam("ownerOverview.unnamedBusiness", "Business");
|
|
188
|
+
const hosted = await hostOwnedSites();
|
|
189
|
+
if (hosted) return hosted.map((h) => ({ id: h.id, name: h.name || unnamed() }));
|
|
190
|
+
const res = await querySites({ query: { cursorPaging: { limit: 50 } } });
|
|
191
|
+
return (res.sites ?? [])
|
|
192
|
+
.filter((r: WixSite) => r?.id)
|
|
193
|
+
.map((r: WixSite) => ({
|
|
194
|
+
id: r.id || "",
|
|
195
|
+
name: r.displayName || (r as { name?: string }).name || unnamed(),
|
|
196
|
+
}));
|
|
197
|
+
}
|
|
198
|
+
|
|
179
199
|
async function loadRollup(): Promise<OverviewState> {
|
|
180
200
|
if (isOwnerPreviewDemo()) return demoRollup();
|
|
181
201
|
try {
|
|
182
|
-
const
|
|
183
|
-
const businesses = (res.sites ?? [])
|
|
184
|
-
.filter((r: WixSite) => r?.id)
|
|
185
|
-
.map((r: WixSite) => ({
|
|
186
|
-
id: r.id || "",
|
|
187
|
-
name: r.displayName || (r as { name?: string }).name || copyParam("ownerOverview.unnamedBusiness", "Business"),
|
|
188
|
-
}));
|
|
202
|
+
const businesses = await listBusinesses();
|
|
189
203
|
if (businesses.length === 0) return shape({ status: "ready", rows: [] });
|
|
190
204
|
|
|
191
205
|
// THE FAN-OUT. Concurrent, one business each, active scope untouched.
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// The businesses an EMBEDDING HOST says the signed-in owner owns — or null when there is no
|
|
2
|
+
// such host.
|
|
3
|
+
//
|
|
4
|
+
// Standalone, an owner screen lists businesses itself (`querySites`, account level) and reads
|
|
5
|
+
// each one with `site.forSite(msid)`, which stamps `wix-site-id` on that call. Embedded, the
|
|
6
|
+
// host owns site selection: its data source signs every call for the business the user picked
|
|
7
|
+
// and drops a worker-sent `wix-site-id`, so a fan-out read ONE business N times. A host that
|
|
8
|
+
// opts in supplies its own list instead (`HimalayaOwnedSitesDataSource` on iOS / Android, the
|
|
9
|
+
// `ownedSites` prop on web) and answers `himi.wix.ownedSites` with it; the embed then routes a
|
|
10
|
+
// `site.forSite(msid)` call to the host's per-site call for any id on that list and refuses
|
|
11
|
+
// every other id. So a worker reads the list here and keeps using `site.forSite` unchanged.
|
|
12
|
+
//
|
|
13
|
+
// A rejection is "not hosted": a standalone shell has no handler for the verb, and an older embed
|
|
14
|
+
// predates it. Callers then do exactly what they did before. A host that opted in but cannot list
|
|
15
|
+
// answers `{ error }` instead, which THROWS here: falling back to `querySites` would read the
|
|
16
|
+
// account through the host's single-site signer and fan out to ids the host then refuses.
|
|
17
|
+
|
|
18
|
+
import { dispatch } from "@himalaya/dispatch";
|
|
19
|
+
|
|
20
|
+
export const OWNED_SITES_ACTION = "himi.wix.ownedSites";
|
|
21
|
+
|
|
22
|
+
export interface HostedSite {
|
|
23
|
+
/** The business's metaSiteId — what `site.forSite` takes. */
|
|
24
|
+
id: string;
|
|
25
|
+
name: string;
|
|
26
|
+
logoUrl?: string;
|
|
27
|
+
color?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function text(v: unknown): string {
|
|
31
|
+
return typeof v === "string" ? v.trim() : "";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The host's list, in the host's order; [] is a real answer (an owner with no businesses).
|
|
35
|
+
* null when the verb is unanswered or the answer is not a list. Throws the host's `{ error }`. */
|
|
36
|
+
export async function hostOwnedSites(): Promise<HostedSite[] | null> {
|
|
37
|
+
let value: unknown;
|
|
38
|
+
try {
|
|
39
|
+
value = await dispatch(OWNED_SITES_ACTION);
|
|
40
|
+
} catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
// Native hosts resolve the payload itself; some web shells wrap it as `{ payload }`.
|
|
44
|
+
const body = value as { sites?: unknown; error?: unknown; payload?: { sites?: unknown; error?: unknown } } | null;
|
|
45
|
+
const error = body?.error ?? body?.payload?.error;
|
|
46
|
+
if (typeof error === "string") throw new Error(error || "The host could not list your businesses");
|
|
47
|
+
const raw = body?.sites ?? body?.payload?.sites;
|
|
48
|
+
if (!Array.isArray(raw)) return null;
|
|
49
|
+
const sites: HostedSite[] = [];
|
|
50
|
+
for (const entry of raw) {
|
|
51
|
+
const e = (entry ?? {}) as Record<string, unknown>;
|
|
52
|
+
const id = text(e.id);
|
|
53
|
+
if (!id) continue;
|
|
54
|
+
const site: HostedSite = { id, name: text(e.name) };
|
|
55
|
+
if (text(e.logoUrl)) site.logoUrl = text(e.logoUrl);
|
|
56
|
+
if (text(e.color)) site.color = text(e.color);
|
|
57
|
+
sites.push(site);
|
|
58
|
+
}
|
|
59
|
+
return sites;
|
|
60
|
+
}
|
|
@@ -22,6 +22,11 @@
|
|
|
22
22
|
// or one whose mint fails, resolves to `null` and renders as "—" beside the others rather
|
|
23
23
|
// than throwing the whole screen into its error state. A rollup that disappears because one
|
|
24
24
|
// of five businesses is unreachable is worse than one that says so in a row.
|
|
25
|
+
//
|
|
26
|
+
// EMBEDDED, THE HOST NAMES THE BUSINESSES. A host that owns site selection (Symphony's Manage
|
|
27
|
+
// Wix) signs each call itself and would drop the per-call `wix-site-id`, so it supplies the
|
|
28
|
+
// owner's sites instead (`hostOwnedSites`) and resolves each `site.forSite(msid)` call against
|
|
29
|
+
// that list. The list replaces rung 1 only; the fan-out below is identical either way.
|
|
25
30
|
|
|
26
31
|
import { defineService } from "@himalaya/state";
|
|
27
32
|
import { querySites, type WixSite } from "@himalaya/wix-site-list";
|
|
@@ -31,6 +36,7 @@ import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback } from "../_share
|
|
|
31
36
|
import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
|
|
32
37
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
33
38
|
import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
|
|
39
|
+
import { hostOwnedSites } from "../_shared/owner-hosted-sites.js";
|
|
34
40
|
|
|
35
41
|
/** Mirrors the Home dashboard's "needs attention" definition, so a number here means the
|
|
36
42
|
* same thing it means after the owner drills into that business. */
|
|
@@ -176,16 +182,24 @@ async function attentionCount(msid: string): Promise<number | null> {
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
|
|
185
|
+
/** Rung 1: the host's list when embedded, else the account's own (`querySites`). */
|
|
186
|
+
async function listBusinesses(): Promise<Array<{ id: string; name: string }>> {
|
|
187
|
+
const unnamed = () => copyParam("ownerOverview.unnamedBusiness", "Business");
|
|
188
|
+
const hosted = await hostOwnedSites();
|
|
189
|
+
if (hosted) return hosted.map((h) => ({ id: h.id, name: h.name || unnamed() }));
|
|
190
|
+
const res = await querySites({ query: { cursorPaging: { limit: 50 } } });
|
|
191
|
+
return (res.sites ?? [])
|
|
192
|
+
.filter((r: WixSite) => r?.id)
|
|
193
|
+
.map((r: WixSite) => ({
|
|
194
|
+
id: r.id || "",
|
|
195
|
+
name: r.displayName || (r as { name?: string }).name || unnamed(),
|
|
196
|
+
}));
|
|
197
|
+
}
|
|
198
|
+
|
|
179
199
|
async function loadRollup(): Promise<OverviewState> {
|
|
180
200
|
if (isOwnerPreviewDemo()) return demoRollup();
|
|
181
201
|
try {
|
|
182
|
-
const
|
|
183
|
-
const businesses = (res.sites ?? [])
|
|
184
|
-
.filter((r: WixSite) => r?.id)
|
|
185
|
-
.map((r: WixSite) => ({
|
|
186
|
-
id: r.id || "",
|
|
187
|
-
name: r.displayName || (r as { name?: string }).name || copyParam("ownerOverview.unnamedBusiness", "Business"),
|
|
188
|
-
}));
|
|
202
|
+
const businesses = await listBusinesses();
|
|
189
203
|
if (businesses.length === 0) return shape({ status: "ready", rows: [] });
|
|
190
204
|
|
|
191
205
|
// THE FAN-OUT. Concurrent, one business each, active scope untouched.
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// The businesses an EMBEDDING HOST says the signed-in owner owns — or null when there is no
|
|
2
|
+
// such host.
|
|
3
|
+
//
|
|
4
|
+
// Standalone, an owner screen lists businesses itself (`querySites`, account level) and reads
|
|
5
|
+
// each one with `site.forSite(msid)`, which stamps `wix-site-id` on that call. Embedded, the
|
|
6
|
+
// host owns site selection: its data source signs every call for the business the user picked
|
|
7
|
+
// and drops a worker-sent `wix-site-id`, so a fan-out read ONE business N times. A host that
|
|
8
|
+
// opts in supplies its own list instead (`HimalayaOwnedSitesDataSource` on iOS / Android, the
|
|
9
|
+
// `ownedSites` prop on web) and answers `himi.wix.ownedSites` with it; the embed then routes a
|
|
10
|
+
// `site.forSite(msid)` call to the host's per-site call for any id on that list and refuses
|
|
11
|
+
// every other id. So a worker reads the list here and keeps using `site.forSite` unchanged.
|
|
12
|
+
//
|
|
13
|
+
// A rejection is "not hosted": a standalone shell has no handler for the verb, and an older embed
|
|
14
|
+
// predates it. Callers then do exactly what they did before. A host that opted in but cannot list
|
|
15
|
+
// answers `{ error }` instead, which THROWS here: falling back to `querySites` would read the
|
|
16
|
+
// account through the host's single-site signer and fan out to ids the host then refuses.
|
|
17
|
+
|
|
18
|
+
import { dispatch } from "@himalaya/dispatch";
|
|
19
|
+
|
|
20
|
+
export const OWNED_SITES_ACTION = "himi.wix.ownedSites";
|
|
21
|
+
|
|
22
|
+
export interface HostedSite {
|
|
23
|
+
/** The business's metaSiteId — what `site.forSite` takes. */
|
|
24
|
+
id: string;
|
|
25
|
+
name: string;
|
|
26
|
+
logoUrl?: string;
|
|
27
|
+
color?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function text(v: unknown): string {
|
|
31
|
+
return typeof v === "string" ? v.trim() : "";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** The host's list, in the host's order; [] is a real answer (an owner with no businesses).
|
|
35
|
+
* null when the verb is unanswered or the answer is not a list. Throws the host's `{ error }`. */
|
|
36
|
+
export async function hostOwnedSites(): Promise<HostedSite[] | null> {
|
|
37
|
+
let value: unknown;
|
|
38
|
+
try {
|
|
39
|
+
value = await dispatch(OWNED_SITES_ACTION);
|
|
40
|
+
} catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
// Native hosts resolve the payload itself; some web shells wrap it as `{ payload }`.
|
|
44
|
+
const body = value as { sites?: unknown; error?: unknown; payload?: { sites?: unknown; error?: unknown } } | null;
|
|
45
|
+
const error = body?.error ?? body?.payload?.error;
|
|
46
|
+
if (typeof error === "string") throw new Error(error || "The host could not list your businesses");
|
|
47
|
+
const raw = body?.sites ?? body?.payload?.sites;
|
|
48
|
+
if (!Array.isArray(raw)) return null;
|
|
49
|
+
const sites: HostedSite[] = [];
|
|
50
|
+
for (const entry of raw) {
|
|
51
|
+
const e = (entry ?? {}) as Record<string, unknown>;
|
|
52
|
+
const id = text(e.id);
|
|
53
|
+
if (!id) continue;
|
|
54
|
+
const site: HostedSite = { id, name: text(e.name) };
|
|
55
|
+
if (text(e.logoUrl)) site.logoUrl = text(e.logoUrl);
|
|
56
|
+
if (text(e.color)) site.color = text(e.color);
|
|
57
|
+
sites.push(site);
|
|
58
|
+
}
|
|
59
|
+
return sites;
|
|
60
|
+
}
|