@tribe-nest/forge 3.36.0 → 3.38.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/package.json +1 -1
- package/src/i18n/de.json +4 -1
- package/src/i18n/en.json +4 -1
- package/src/ui/format/membershipPriceLabel.ts +29 -0
- package/src/ui/headless/membership/_tests/membershipCheckoutRefetch.spec.tsx +136 -0
- package/src/ui/headless/membership/useMembershipCheckout.ts +18 -4
- package/src/ui/headless/work/index.ts +4 -0
- package/src/ui/headless/work/useWorkPortal.ts +125 -10
- package/src/ui/index.ts +1 -0
- package/src/ui/styled/AccountDashboard.tsx +16 -17
- package/src/ui/styled/LoginForm.tsx +15 -1
- package/src/ui/styled/MembershipTierCallout.tsx +91 -0
- package/src/ui/styled/MembershipTiers.tsx +5 -15
- package/src/ui/styled/SignupForm.tsx +10 -0
- package/src/ui/styled/_tests/AccountDashboardCommunity.spec.tsx +49 -34
- package/src/ui/styled/_tests/membershipTierCallout.spec.tsx +126 -0
- package/src/ui/styled/work/WorkProjectDocuments.tsx +224 -0
- package/src/ui/styled/work/WorkProjectReport.tsx +5 -3
- package/src/ui/styled/work/index.ts +1 -0
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import type { CSSProperties } from "react";
|
|
2
|
+
import { useGetMembershipTiers } from "../../data/queries/useMembership";
|
|
3
|
+
import { useForgeT } from "../../i18n";
|
|
4
|
+
import { useThemeTokens } from "../theme/ForgeThemeProvider";
|
|
5
|
+
import { useAmountFormatter } from "../format/useFormatCurrency";
|
|
6
|
+
import { membershipPriceLabel } from "../format/membershipPriceLabel";
|
|
7
|
+
|
|
8
|
+
export interface MembershipTierCalloutProps {
|
|
9
|
+
/** The tier the visitor is on their way to join. Nothing is drawn without it. */
|
|
10
|
+
membershipTierId?: string;
|
|
11
|
+
/** How many benefits to list before summarising the rest. Default 3. */
|
|
12
|
+
maxBenefits?: number;
|
|
13
|
+
className?: string;
|
|
14
|
+
style?: CSSProperties;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* "Join {tier}", with its price and a few of its benefits.
|
|
19
|
+
*
|
|
20
|
+
* Drawn above the login and signup forms when a visitor was sent there from a
|
|
21
|
+
* membership checkout. Without it the fan clicks Join, gets an unexplained
|
|
22
|
+
* sign-in wall, and has to remember which tier they picked and trust that the
|
|
23
|
+
* site remembers too. The client app has always shown this; code websites did
|
|
24
|
+
* not, so this is the same reassurance in a Forge component.
|
|
25
|
+
*
|
|
26
|
+
* Renders NOTHING when there is no tier id, when the tiers have not loaded, or
|
|
27
|
+
* when the id matches nothing the artist sells. A form that pushes itself down
|
|
28
|
+
* the page a beat after it appeared is worse than one that never moved, and an
|
|
29
|
+
* id from a stale link must not print an empty box.
|
|
30
|
+
*/
|
|
31
|
+
export function MembershipTierCallout({
|
|
32
|
+
membershipTierId,
|
|
33
|
+
maxBenefits = 3,
|
|
34
|
+
className,
|
|
35
|
+
style,
|
|
36
|
+
}: MembershipTierCalloutProps) {
|
|
37
|
+
const t = useForgeT();
|
|
38
|
+
const tokens = useThemeTokens();
|
|
39
|
+
const fmt = useAmountFormatter();
|
|
40
|
+
// The tier list is one cached query per profile, so this shares the fetch the
|
|
41
|
+
// membership page and the checkout already make rather than adding a request.
|
|
42
|
+
const { data: tiers } = useGetMembershipTiers();
|
|
43
|
+
const tier = membershipTierId ? tiers?.find((candidate) => candidate.id === membershipTierId) : undefined;
|
|
44
|
+
|
|
45
|
+
if (!tier) return null;
|
|
46
|
+
|
|
47
|
+
const benefits = tier.benefits ?? [];
|
|
48
|
+
const shown = benefits.slice(0, maxBenefits);
|
|
49
|
+
const remaining = benefits.length - shown.length;
|
|
50
|
+
|
|
51
|
+
return (
|
|
52
|
+
<div
|
|
53
|
+
className={className}
|
|
54
|
+
style={{
|
|
55
|
+
// No width and no outer margin: this is placed INSIDE the host's card
|
|
56
|
+
// (the login and signup forms put it above their heading), so it must
|
|
57
|
+
// not carry a column of its own that fights the one around it.
|
|
58
|
+
marginBottom: 24,
|
|
59
|
+
padding: 16,
|
|
60
|
+
borderRadius: tokens.cornerRadius,
|
|
61
|
+
background: `${tokens.primary}1a`,
|
|
62
|
+
color: tokens.text,
|
|
63
|
+
fontFamily: tokens.fontFamily,
|
|
64
|
+
...style,
|
|
65
|
+
}}
|
|
66
|
+
>
|
|
67
|
+
<h2 style={{ fontSize: 18, fontWeight: 700, marginBottom: 8, fontFamily: tokens.headingFontFamily }}>
|
|
68
|
+
{t("forge.membership_tier_callout.join_title", { tier_name: tier.name })}
|
|
69
|
+
</h2>
|
|
70
|
+
<p style={{ fontSize: 14, marginBottom: shown.length ? 12 : 0 }}>{membershipPriceLabel(tier, t, fmt)}</p>
|
|
71
|
+
{!!shown.length && (
|
|
72
|
+
<div style={{ fontSize: 14 }}>
|
|
73
|
+
<p style={{ fontWeight: 500, marginBottom: 4 }}>{t("forge.membership_tier_callout.benefits_label")}</p>
|
|
74
|
+
<ul style={{ listStyle: "none", padding: 0, margin: 0, display: "flex", flexDirection: "column", gap: 4 }}>
|
|
75
|
+
{shown.map((benefit) => (
|
|
76
|
+
<li key={benefit.id} style={{ display: "flex", gap: 8 }}>
|
|
77
|
+
<span style={{ color: tokens.primary }}>✓</span>
|
|
78
|
+
{benefit.title}
|
|
79
|
+
</li>
|
|
80
|
+
))}
|
|
81
|
+
{remaining > 0 && (
|
|
82
|
+
<li style={{ fontSize: 12, opacity: 0.75 }}>
|
|
83
|
+
{t("forge.membership_tier_callout.more_benefits", { count: remaining })}
|
|
84
|
+
</li>
|
|
85
|
+
)}
|
|
86
|
+
</ul>
|
|
87
|
+
</div>
|
|
88
|
+
)}
|
|
89
|
+
</div>
|
|
90
|
+
);
|
|
91
|
+
}
|
|
@@ -5,7 +5,7 @@ import { useAmountFormatter } from "../format/useFormatCurrency";
|
|
|
5
5
|
import { priceTaxCaption } from "../format/PriceDisplay";
|
|
6
6
|
import { usePricesIncludeTax } from "../../data/queries/useWebsite";
|
|
7
7
|
import { useForgeT } from "../../i18n";
|
|
8
|
-
import {
|
|
8
|
+
import { membershipPriceLabel } from "../format/membershipPriceLabel";
|
|
9
9
|
import { Button } from "./Button";
|
|
10
10
|
import { Loading } from "./Loading";
|
|
11
11
|
|
|
@@ -53,20 +53,10 @@ export function MembershipTiers({
|
|
|
53
53
|
if (isLoading) return <Loading fullPage />;
|
|
54
54
|
if (!tiers?.length) return <p style={{ color: tokens.text }}>{t("forge.membership_tiers.empty_title")}</p>;
|
|
55
55
|
|
|
56
|
-
// A tier priced on ONE cycle must be advertised on that cycle.
|
|
57
|
-
//
|
|
58
|
-
//
|
|
59
|
-
const priceLabel = (tier: MembershipTier) =>
|
|
60
|
-
const cycles = offeredCycles(tier);
|
|
61
|
-
if (tier.payWhatYouWant) {
|
|
62
|
-
return cycles.month
|
|
63
|
-
? t("forge.membership_tiers.price_pwyw", { amount: fmt(cycleFloor(tier, "month")) })
|
|
64
|
-
: t("forge.membership_tiers.price_pwyw_yearly", { amount: fmt(cycleFloor(tier, "year")) });
|
|
65
|
-
}
|
|
66
|
-
if (cycles.month) return t("forge.membership_tiers.price_monthly", { amount: fmt(cycleFloor(tier, "month")) });
|
|
67
|
-
if (cycles.year) return t("forge.membership_tiers.price_yearly", { amount: fmt(cycleFloor(tier, "year")) });
|
|
68
|
-
return freeLabel;
|
|
69
|
-
};
|
|
56
|
+
// A tier priced on ONE cycle must be advertised on that cycle. The rule lives
|
|
57
|
+
// in `membershipPriceLabel` so the login and signup callout prices a tier with
|
|
58
|
+
// the same sentence this page does.
|
|
59
|
+
const priceLabel = (tier: MembershipTier) => membershipPriceLabel(tier, t, fmt);
|
|
70
60
|
|
|
71
61
|
const select = (tier: MembershipTier) => {
|
|
72
62
|
if (onSelect) return onSelect(tier);
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
import { useSignupForm } from "../headless/auth/useSignupForm";
|
|
2
2
|
import { useForgeT } from "../../i18n";
|
|
3
3
|
import { useForgeTheme } from "../theme/ForgeThemeProvider";
|
|
4
|
+
import { MembershipTierCallout } from "./MembershipTierCallout";
|
|
4
5
|
|
|
5
6
|
export interface SignupFormProps {
|
|
6
7
|
/** Called after a successful signup. The shell typically redirects here. */
|
|
7
8
|
onSuccess?: (smartLinkPath?: string) => void;
|
|
8
9
|
/** Href for the "Login" link. */
|
|
9
10
|
loginHref: string;
|
|
11
|
+
/**
|
|
12
|
+
* The tier this visitor is on their way to join. Shown above the form, so a
|
|
13
|
+
* fan who pressed Join and landed on a signup wall can see which tier they
|
|
14
|
+
* picked and that the wall is part of joining it. It also rides along on the
|
|
15
|
+
* create-account request, where a coupon can turn it into a membership.
|
|
16
|
+
*/
|
|
10
17
|
membershipTierId?: string;
|
|
11
18
|
couponCode?: string;
|
|
12
19
|
}
|
|
@@ -64,6 +71,9 @@ export function SignupForm({ onSuccess, loginHref, membershipTierId, couponCode
|
|
|
64
71
|
|
|
65
72
|
return (
|
|
66
73
|
<div style={card}>
|
|
74
|
+
{/* What the fan was doing when they hit this wall, kept in view through
|
|
75
|
+
the emailed-code step as well. Nothing is drawn without a tier. */}
|
|
76
|
+
<MembershipTierCallout membershipTierId={membershipTierId} />
|
|
67
77
|
<h1 style={{ fontSize: 24, fontWeight: 700, marginBottom: 24 }}>
|
|
68
78
|
{form.awaitingCode ? t("forge.signup_form.verify_title") : t("forge.signup_form.title")}
|
|
69
79
|
</h1>
|
|
@@ -8,21 +8,20 @@ import { communityKeys, type CommunitySpace } from "../../../data/queries/useCom
|
|
|
8
8
|
import { AccountDashboard } from "../AccountDashboard";
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
* The account page's way into the
|
|
11
|
+
* The account page's way into the member area.
|
|
12
12
|
*
|
|
13
13
|
* Before this, a signed-in member landed on the membership card and the only
|
|
14
14
|
* doors on it led back to billing: change the plan, cancel it, fix the card.
|
|
15
|
-
* The
|
|
15
|
+
* The member area they were paying for was reachable only by typing the URL.
|
|
16
16
|
*
|
|
17
|
-
* The
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
* asserted as hard as the happy one.
|
|
17
|
+
* The first version gated the link on `/public/community/spaces` returning a
|
|
18
|
+
* space the caller could open, which hid it from precisely the fans who had not
|
|
19
|
+
* joined yet. Being signed in is now the whole gate: the member home shows the
|
|
20
|
+
* locked posts and the way to buy access, so it is never a dead end.
|
|
22
21
|
*
|
|
23
22
|
* Rendered through `react-dom/server`: no DOM, no effects, so the spaces query
|
|
24
|
-
* is SEEDED into the react-query cache rather than mocked
|
|
25
|
-
*
|
|
23
|
+
* is SEEDED into the react-query cache rather than mocked, which keeps the real
|
|
24
|
+
* data path in place for the rest of the card.
|
|
26
25
|
*/
|
|
27
26
|
|
|
28
27
|
const PROFILE_ID = "profile-1";
|
|
@@ -65,21 +64,29 @@ const member = {
|
|
|
65
64
|
},
|
|
66
65
|
};
|
|
67
66
|
|
|
67
|
+
/** The same signed-in fan, with no membership of any kind. */
|
|
68
|
+
const nonMember = { ...member, membership: undefined };
|
|
69
|
+
|
|
68
70
|
/**
|
|
69
71
|
* The membership tab as a Forge code website draws it.
|
|
70
72
|
*
|
|
71
|
-
* `spaces === null` stands for the query never having answered
|
|
72
|
-
*
|
|
73
|
+
* `spaces === null` stands for the query never having answered, which is the
|
|
74
|
+
* state every first paint sits in.
|
|
73
75
|
*/
|
|
74
|
-
function render(opts: {
|
|
76
|
+
function render(opts: {
|
|
77
|
+
spaces: CommunitySpace[] | null;
|
|
78
|
+
user?: typeof member | typeof nonMember | null;
|
|
79
|
+
onNavigateCommunity?: () => void;
|
|
80
|
+
}): string {
|
|
75
81
|
const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
|
|
76
82
|
if (opts.spaces) queryClient.setQueryData(communityKeys.spaces(PROFILE_ID), opts.spaces);
|
|
83
|
+
const user = opts.user === undefined ? member : opts.user;
|
|
77
84
|
|
|
78
85
|
return renderToStaticMarkup(
|
|
79
86
|
<QueryClientProvider client={queryClient}>
|
|
80
87
|
<ForgeClientProvider apiUrl="http://api.test" profileId={PROFILE_ID}>
|
|
81
88
|
<PublicAuthContext.Provider
|
|
82
|
-
value={{ user
|
|
89
|
+
value={{ user, currencies: null, userSelectedCurrency: "USD", logout: () => {} } as never}
|
|
83
90
|
>
|
|
84
91
|
<ForgeThemeProvider
|
|
85
92
|
theme={{ colors: { text: "#111111", background: "#ffffff", primary: "#6d28d9" }, cornerRadius: 8 }}
|
|
@@ -96,39 +103,47 @@ function render(opts: { spaces: CommunitySpace[] | null; onNavigateCommunity?: (
|
|
|
96
103
|
);
|
|
97
104
|
}
|
|
98
105
|
|
|
99
|
-
describe("AccountDashboard: the way into the
|
|
100
|
-
it("REGRESSION: offers the
|
|
101
|
-
// The gap this closes. Without it the membership card's only exits
|
|
102
|
-
// Change and Cancel, and the
|
|
106
|
+
describe("AccountDashboard: the way into the member area", () => {
|
|
107
|
+
it("REGRESSION: offers the member area to a member who has a space to open", () => {
|
|
108
|
+
// The original gap this closes. Without it the membership card's only exits
|
|
109
|
+
// are Change and Cancel, and the member area is unreachable from here.
|
|
103
110
|
const html = render({ spaces: [space()], onNavigateCommunity: () => {} });
|
|
104
111
|
|
|
105
|
-
expect(html).toContain("
|
|
112
|
+
expect(html).toContain("Member Area");
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
it("REGRESSION: offers the member area to a signed-in fan with NO membership", () => {
|
|
116
|
+
// The second gap. The link used to require an openable space, so a fan who
|
|
117
|
+
// had not joined saw no way in, which is the fan the member home is most
|
|
118
|
+
// useful to: that page shows the locked posts and the offer to join.
|
|
119
|
+
const html = render({ spaces: [], user: nonMember, onNavigateCommunity: () => {} });
|
|
120
|
+
|
|
121
|
+
expect(html).toContain("Member Area");
|
|
122
|
+
// Still the non-member card and not some other state.
|
|
123
|
+
expect(html).toContain("You don't have an active membership.");
|
|
106
124
|
});
|
|
107
125
|
|
|
108
|
-
it("REGRESSION:
|
|
109
|
-
//
|
|
110
|
-
//
|
|
111
|
-
const html = render({ spaces:
|
|
126
|
+
it("REGRESSION: offers it before the spaces query has answered", () => {
|
|
127
|
+
// First paint has no cached answer. The link no longer waits on that read,
|
|
128
|
+
// so it does not appear a beat late.
|
|
129
|
+
const html = render({ spaces: null, onNavigateCommunity: () => {} });
|
|
112
130
|
|
|
113
|
-
expect(html).
|
|
114
|
-
// The billing actions are untouched, so this is the entry point missing and
|
|
115
|
-
// not the whole card failing to draw.
|
|
116
|
-
expect(html).toContain("Change");
|
|
131
|
+
expect(html).toContain("Member Area");
|
|
117
132
|
});
|
|
118
133
|
|
|
119
|
-
it("draws nothing when the host site has no
|
|
134
|
+
it("draws nothing when the host site has no member-area route to send anyone to", () => {
|
|
120
135
|
// `onNavigateCommunity` is optional. A site that leaves it out gets no
|
|
121
|
-
// button
|
|
136
|
+
// button rather than a dead one.
|
|
122
137
|
const html = render({ spaces: [space()] });
|
|
123
138
|
|
|
124
|
-
expect(html).not.toContain("
|
|
139
|
+
expect(html).not.toContain("Member Area");
|
|
125
140
|
});
|
|
126
141
|
|
|
127
|
-
it("
|
|
128
|
-
//
|
|
129
|
-
//
|
|
130
|
-
const html = render({ spaces: null, onNavigateCommunity: () => {} });
|
|
142
|
+
it("draws nothing for a visitor who is not signed in", () => {
|
|
143
|
+
// The member area is behind a login. Offering it to a signed-out visitor
|
|
144
|
+
// sends them at a guard, not at the content.
|
|
145
|
+
const html = render({ spaces: [space()], user: null, onNavigateCommunity: () => {} });
|
|
131
146
|
|
|
132
|
-
expect(html).not.toContain("
|
|
147
|
+
expect(html).not.toContain("Member Area");
|
|
133
148
|
});
|
|
134
149
|
});
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { renderToStaticMarkup } from "react-dom/server";
|
|
3
|
+
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|
4
|
+
import { ForgeClientProvider } from "../../../provider/ForgeProvider";
|
|
5
|
+
import { PublicAuthContext } from "../../../contexts/PublicAuthContext";
|
|
6
|
+
import { ForgeThemeProvider } from "../../theme/ForgeThemeProvider";
|
|
7
|
+
import { LoginForm } from "../LoginForm";
|
|
8
|
+
import { SignupForm } from "../SignupForm";
|
|
9
|
+
import type { MembershipTier } from "../../../types/models";
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* What a fan sees after pressing Join while signed out.
|
|
13
|
+
*
|
|
14
|
+
* The auth guard sends them to `/i/login?redirect=/i/membership/checkout?membershipTierId=…`,
|
|
15
|
+
* which up to now was a bare sign-in card: no mention of the tier they had just
|
|
16
|
+
* chosen, no sign that the wall was part of joining at all. The client app has
|
|
17
|
+
* always shown the tier on this screen, so this is code websites catching up.
|
|
18
|
+
*
|
|
19
|
+
* Rendered through `react-dom/server`, with the tier list SEEDED into the
|
|
20
|
+
* react-query cache rather than mocked, so the real `useGetMembershipTiers` stays
|
|
21
|
+
* in the path and a rename of its query key fails here.
|
|
22
|
+
*/
|
|
23
|
+
|
|
24
|
+
const PROFILE_ID = "profile-1";
|
|
25
|
+
|
|
26
|
+
const tier: MembershipTier = {
|
|
27
|
+
id: "tier-1",
|
|
28
|
+
profileId: PROFILE_ID,
|
|
29
|
+
name: "Inner Circle",
|
|
30
|
+
description: "The good stuff",
|
|
31
|
+
priceMonthly: 10,
|
|
32
|
+
priceYearly: null,
|
|
33
|
+
payWhatYouWant: false,
|
|
34
|
+
payWhatYouWantMinimum: null,
|
|
35
|
+
payWhatYouWantMaximum: null,
|
|
36
|
+
isDefault: false,
|
|
37
|
+
archived: false,
|
|
38
|
+
order: 0,
|
|
39
|
+
benefits: [
|
|
40
|
+
{ id: "b1", title: "Early demos" },
|
|
41
|
+
{ id: "b2", title: "Monthly livestream" },
|
|
42
|
+
{ id: "b3", title: "Discord access" },
|
|
43
|
+
{ id: "b4", title: "Name in the credits" },
|
|
44
|
+
],
|
|
45
|
+
} as unknown as MembershipTier;
|
|
46
|
+
|
|
47
|
+
function render(node: React.ReactNode, opts: { tiers?: MembershipTier[] } = {}): string {
|
|
48
|
+
const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
|
|
49
|
+
if (opts.tiers) queryClient.setQueryData(["membership-tiers", PROFILE_ID], opts.tiers);
|
|
50
|
+
// Settlement currency, or every price formats as "N/A".
|
|
51
|
+
queryClient.setQueryData(["site-config", PROFILE_ID], { currency: "USD" });
|
|
52
|
+
|
|
53
|
+
return renderToStaticMarkup(
|
|
54
|
+
<QueryClientProvider client={queryClient}>
|
|
55
|
+
<ForgeClientProvider apiUrl="http://api.test" profileId={PROFILE_ID}>
|
|
56
|
+
<PublicAuthContext.Provider
|
|
57
|
+
value={{ user: null, currencies: null, userSelectedCurrency: "USD", logout: () => {} } as never}
|
|
58
|
+
>
|
|
59
|
+
<ForgeThemeProvider
|
|
60
|
+
theme={{ colors: { text: "#111111", background: "#ffffff", primary: "#6d28d9" }, cornerRadius: 8 }}
|
|
61
|
+
>
|
|
62
|
+
{node}
|
|
63
|
+
</ForgeThemeProvider>
|
|
64
|
+
</PublicAuthContext.Provider>
|
|
65
|
+
</ForgeClientProvider>
|
|
66
|
+
</QueryClientProvider>,
|
|
67
|
+
);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
describe("the tier a signed-out fan was on their way to join", () => {
|
|
71
|
+
it("REGRESSION: names the tier, its price and its benefits above the login form", () => {
|
|
72
|
+
const html = render(<LoginForm signupHref="/i/signup" forgotHref="/i/forgot-password" membershipTierId="tier-1" />, {
|
|
73
|
+
tiers: [tier],
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
expect(html).toContain("Join Inner Circle");
|
|
77
|
+
expect(html).toContain("$10/mo");
|
|
78
|
+
expect(html).toContain("Early demos");
|
|
79
|
+
// The login form itself is untouched underneath.
|
|
80
|
+
expect(html).toContain("Password");
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("lists three benefits and counts the rest", () => {
|
|
84
|
+
// The whole list would push the form itself below the fold on a phone.
|
|
85
|
+
const html = render(<LoginForm signupHref="/i/signup" forgotHref="/i/forgot-password" membershipTierId="tier-1" />, {
|
|
86
|
+
tiers: [tier],
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
expect(html).toContain("Discord access");
|
|
90
|
+
expect(html).not.toContain("Name in the credits");
|
|
91
|
+
expect(html).toContain("+1 more benefits");
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it("REGRESSION: shows the same tier on the signup form", () => {
|
|
95
|
+
// A fan with no account gets sent on from login to signup, and the tier has
|
|
96
|
+
// to survive that hop or the reassurance disappears halfway through.
|
|
97
|
+
const html = render(<SignupForm loginHref="/i/login" membershipTierId="tier-1" />, { tiers: [tier] });
|
|
98
|
+
|
|
99
|
+
expect(html).toContain("Join Inner Circle");
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
it("says nothing when the visitor came to log in on their own", () => {
|
|
103
|
+
const html = render(<LoginForm signupHref="/i/signup" forgotHref="/i/forgot-password" />, { tiers: [tier] });
|
|
104
|
+
|
|
105
|
+
expect(html).not.toContain("Join Inner Circle");
|
|
106
|
+
expect(html).toContain("Password");
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
it("says nothing when the id matches no tier the artist sells", () => {
|
|
110
|
+
// A stale link, or a tier that has since been archived. An empty box with a
|
|
111
|
+
// heading and no tier in it would be worse than no box.
|
|
112
|
+
const html = render(<LoginForm signupHref="/i/signup" forgotHref="/i/forgot-password" membershipTierId="gone" />, {
|
|
113
|
+
tiers: [tier],
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
expect(html).not.toContain("Join");
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it("says nothing before the tier list has arrived", () => {
|
|
120
|
+
// First paint has no cached answer. Drawing a heading now and the tier a
|
|
121
|
+
// beat later would move the form under the visitor's cursor.
|
|
122
|
+
const html = render(<LoginForm signupHref="/i/signup" forgotHref="/i/forgot-password" membershipTierId="tier-1" />);
|
|
123
|
+
|
|
124
|
+
expect(html).not.toContain("Join Inner Circle");
|
|
125
|
+
});
|
|
126
|
+
});
|
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
import { useRef, useState } from "react";
|
|
2
|
+
import { FileText, Paperclip, Upload } from "lucide-react";
|
|
3
|
+
import { useThemeTokens } from "../../theme/ForgeThemeProvider";
|
|
4
|
+
import {
|
|
5
|
+
formatWorkDate,
|
|
6
|
+
useUploadWorkDocument,
|
|
7
|
+
useWorkOpenSharedDocument,
|
|
8
|
+
useWorkSharedDocuments,
|
|
9
|
+
type WorkSharedDocument,
|
|
10
|
+
} from "../../headless/work/useWorkPortal";
|
|
11
|
+
|
|
12
|
+
export interface WorkProjectDocumentsProps {
|
|
13
|
+
/** The client project id. */
|
|
14
|
+
projectId: string;
|
|
15
|
+
/** Hide the upload control. The list still renders. Defaults to `true`. */
|
|
16
|
+
allowUpload?: boolean;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const humanSize = (size: number | null | undefined): string => {
|
|
20
|
+
if (!size || size <= 0) return "";
|
|
21
|
+
const units = ["B", "KB", "MB", "GB"];
|
|
22
|
+
let n = size;
|
|
23
|
+
let i = 0;
|
|
24
|
+
while (n >= 1024 && i < units.length - 1) {
|
|
25
|
+
n /= 1024;
|
|
26
|
+
i += 1;
|
|
27
|
+
}
|
|
28
|
+
return `${n.toFixed(n >= 10 || i === 0 ? 0 : 1)} ${units[i]}`;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
const errorMessage = (error: unknown): string =>
|
|
32
|
+
(error as { response?: { data?: { message?: string } } })?.response?.data?.message ||
|
|
33
|
+
"The upload didn't go through. Please try again.";
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* The documents on a client's project: what the firm shared with them, and
|
|
37
|
+
* what they sent in themselves, with an upload control for the latter.
|
|
38
|
+
*
|
|
39
|
+
* A file opens through a short-lived signed read fetched on the click, never
|
|
40
|
+
* from an address held in the page. Built on `useWorkSharedDocuments`,
|
|
41
|
+
* `useWorkOpenSharedDocument` and `useUploadWorkDocument`; theme tokens only.
|
|
42
|
+
*
|
|
43
|
+
* Unlike the invoices block this renders even when the list is empty, because
|
|
44
|
+
* the empty state is where the upload control lives.
|
|
45
|
+
*/
|
|
46
|
+
export function WorkProjectDocuments({ projectId, allowUpload = true }: WorkProjectDocumentsProps) {
|
|
47
|
+
const t = useThemeTokens();
|
|
48
|
+
const { data: documents, isLoading } = useWorkSharedDocuments(projectId);
|
|
49
|
+
const open = useWorkOpenSharedDocument(projectId);
|
|
50
|
+
const upload = useUploadWorkDocument(projectId);
|
|
51
|
+
const fileInputRef = useRef<HTMLInputElement>(null);
|
|
52
|
+
const [error, setError] = useState<string | null>(null);
|
|
53
|
+
const [opening, setOpening] = useState<string | null>(null);
|
|
54
|
+
|
|
55
|
+
if (isLoading) return null;
|
|
56
|
+
|
|
57
|
+
const onFiles = async (files: FileList | null) => {
|
|
58
|
+
if (!files || files.length === 0) return;
|
|
59
|
+
setError(null);
|
|
60
|
+
// One at a time, in order: each is its own signed PUT and its own row, and
|
|
61
|
+
// a failure names the file that failed rather than the whole batch.
|
|
62
|
+
for (const file of Array.from(files)) {
|
|
63
|
+
try {
|
|
64
|
+
await upload.mutateAsync({ file });
|
|
65
|
+
} catch (err) {
|
|
66
|
+
setError(`${file.name}: ${errorMessage(err)}`);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
const openDocument = async (doc: WorkSharedDocument) => {
|
|
73
|
+
if (!doc.file) return;
|
|
74
|
+
setOpening(doc.id);
|
|
75
|
+
try {
|
|
76
|
+
const { url } = await open.mutateAsync(doc.id);
|
|
77
|
+
window.open(url, "_blank", "noopener");
|
|
78
|
+
} catch (err) {
|
|
79
|
+
setError(errorMessage(err));
|
|
80
|
+
} finally {
|
|
81
|
+
setOpening(null);
|
|
82
|
+
}
|
|
83
|
+
};
|
|
84
|
+
|
|
85
|
+
const list = documents ?? [];
|
|
86
|
+
|
|
87
|
+
return (
|
|
88
|
+
<div
|
|
89
|
+
data-testid="work-project-documents"
|
|
90
|
+
style={{
|
|
91
|
+
border: `1px solid ${t.border}`,
|
|
92
|
+
borderRadius: t.cornerRadius,
|
|
93
|
+
background: t.surface,
|
|
94
|
+
padding: 20,
|
|
95
|
+
color: t.text,
|
|
96
|
+
fontFamily: t.fontFamily,
|
|
97
|
+
}}
|
|
98
|
+
>
|
|
99
|
+
<div
|
|
100
|
+
style={{
|
|
101
|
+
display: "flex",
|
|
102
|
+
alignItems: "center",
|
|
103
|
+
justifyContent: "space-between",
|
|
104
|
+
gap: 12,
|
|
105
|
+
flexWrap: "wrap",
|
|
106
|
+
marginBottom: 14,
|
|
107
|
+
}}
|
|
108
|
+
>
|
|
109
|
+
<h2 style={{ fontSize: 16, fontWeight: 800, margin: 0 }}>Documents</h2>
|
|
110
|
+
{allowUpload && (
|
|
111
|
+
<>
|
|
112
|
+
<input
|
|
113
|
+
ref={fileInputRef}
|
|
114
|
+
type="file"
|
|
115
|
+
multiple
|
|
116
|
+
hidden
|
|
117
|
+
data-testid="work-document-file-input"
|
|
118
|
+
onChange={(e) => {
|
|
119
|
+
void onFiles(e.target.files);
|
|
120
|
+
e.target.value = "";
|
|
121
|
+
}}
|
|
122
|
+
/>
|
|
123
|
+
<button
|
|
124
|
+
type="button"
|
|
125
|
+
data-testid="work-document-upload"
|
|
126
|
+
onClick={() => fileInputRef.current?.click()}
|
|
127
|
+
disabled={upload.isPending}
|
|
128
|
+
style={{
|
|
129
|
+
display: "inline-flex",
|
|
130
|
+
alignItems: "center",
|
|
131
|
+
gap: 8,
|
|
132
|
+
padding: "8px 16px",
|
|
133
|
+
borderRadius: t.cornerRadius,
|
|
134
|
+
border: "none",
|
|
135
|
+
background: t.primary,
|
|
136
|
+
color: t.textPrimary,
|
|
137
|
+
fontWeight: 700,
|
|
138
|
+
fontSize: 13,
|
|
139
|
+
cursor: upload.isPending ? "wait" : "pointer",
|
|
140
|
+
opacity: upload.isPending ? 0.7 : 1,
|
|
141
|
+
}}
|
|
142
|
+
>
|
|
143
|
+
<Upload size={14} />
|
|
144
|
+
{upload.isPending ? "Uploading…" : "Upload a document"}
|
|
145
|
+
</button>
|
|
146
|
+
</>
|
|
147
|
+
)}
|
|
148
|
+
</div>
|
|
149
|
+
|
|
150
|
+
{error && (
|
|
151
|
+
<p
|
|
152
|
+
data-testid="work-document-error"
|
|
153
|
+
role="alert"
|
|
154
|
+
style={{ margin: "0 0 12px", fontSize: 13, color: "#ef4444" }}
|
|
155
|
+
>
|
|
156
|
+
{error}
|
|
157
|
+
</p>
|
|
158
|
+
)}
|
|
159
|
+
|
|
160
|
+
{list.length === 0 ? (
|
|
161
|
+
<p data-testid="work-project-documents-empty" style={{ margin: 0, fontSize: 13, color: t.muted }}>
|
|
162
|
+
{allowUpload
|
|
163
|
+
? "Nothing here yet. Upload a document to add it to this project."
|
|
164
|
+
: "Nothing has been shared with you yet."}
|
|
165
|
+
</p>
|
|
166
|
+
) : (
|
|
167
|
+
<ul style={{ listStyle: "none", margin: 0, padding: 0, display: "flex", flexDirection: "column", gap: 8 }}>
|
|
168
|
+
{list.map((doc) => (
|
|
169
|
+
<li
|
|
170
|
+
key={doc.id}
|
|
171
|
+
data-testid={`work-document-${doc.id}`}
|
|
172
|
+
style={{
|
|
173
|
+
display: "flex",
|
|
174
|
+
alignItems: "center",
|
|
175
|
+
justifyContent: "space-between",
|
|
176
|
+
gap: 12,
|
|
177
|
+
flexWrap: "wrap",
|
|
178
|
+
padding: "10px 14px",
|
|
179
|
+
border: `1px solid ${t.border}`,
|
|
180
|
+
borderRadius: t.cornerRadius,
|
|
181
|
+
}}
|
|
182
|
+
>
|
|
183
|
+
<div style={{ display: "flex", alignItems: "center", gap: 10, minWidth: 0 }}>
|
|
184
|
+
{doc.file ? (
|
|
185
|
+
<Paperclip size={14} style={{ color: t.muted, flexShrink: 0 }} />
|
|
186
|
+
) : (
|
|
187
|
+
<FileText size={14} style={{ color: t.muted, flexShrink: 0 }} />
|
|
188
|
+
)}
|
|
189
|
+
<div style={{ display: "flex", flexDirection: "column", gap: 2, minWidth: 0 }}>
|
|
190
|
+
<span style={{ fontWeight: 700, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
|
|
191
|
+
{doc.title}
|
|
192
|
+
</span>
|
|
193
|
+
<span style={{ fontSize: 12, color: t.muted }}>
|
|
194
|
+
{formatWorkDate(doc.sharedAt)}
|
|
195
|
+
{doc.file?.size ? ` · ${humanSize(doc.file.size)}` : ""}
|
|
196
|
+
</span>
|
|
197
|
+
</div>
|
|
198
|
+
</div>
|
|
199
|
+
{doc.file && (
|
|
200
|
+
<button
|
|
201
|
+
type="button"
|
|
202
|
+
data-testid={`work-document-open-${doc.id}`}
|
|
203
|
+
onClick={() => void openDocument(doc)}
|
|
204
|
+
disabled={opening === doc.id}
|
|
205
|
+
style={{
|
|
206
|
+
background: "transparent",
|
|
207
|
+
border: "none",
|
|
208
|
+
padding: 0,
|
|
209
|
+
color: t.primary,
|
|
210
|
+
fontSize: 13,
|
|
211
|
+
textDecoration: "underline",
|
|
212
|
+
cursor: opening === doc.id ? "wait" : "pointer",
|
|
213
|
+
}}
|
|
214
|
+
>
|
|
215
|
+
{opening === doc.id ? "Opening…" : "Open"}
|
|
216
|
+
</button>
|
|
217
|
+
)}
|
|
218
|
+
</li>
|
|
219
|
+
))}
|
|
220
|
+
</ul>
|
|
221
|
+
)}
|
|
222
|
+
</div>
|
|
223
|
+
);
|
|
224
|
+
}
|