setToastDismissed(true)}
@@ -163,12 +194,12 @@ export function CompletedScreen() {
return (
<>
-
+
setAskOrganizerOpen(false)}
+ />
);
}
diff --git a/app/(app)/create/screens/review/FinalReviewScreen.tsx b/app/(app)/create/screens/review/FinalReviewScreen.tsx
index 7f2bcc1..c1d57b3 100644
--- a/app/(app)/create/screens/review/FinalReviewScreen.tsx
+++ b/app/(app)/create/screens/review/FinalReviewScreen.tsx
@@ -14,8 +14,11 @@ import {
} from "../../components/CreateFlowLockupCardStepShell";
import {
buildFinalReviewCategoryRowsDetailed,
+ type FinalReviewCategoryNames,
type FinalReviewCategoryRowDetailed,
} from "../../../../../lib/create/buildFinalReviewCategories";
+import { communityInitialsFromTitle } from "../../../../../lib/create/communityInitials";
+import { finalReviewChipHasWarning } from "../../../../../lib/create/finalReviewChipWarnings";
import { applyFinalReviewChipEditPatch } from "../../../../../lib/create/applyFinalReviewChipEditPatch";
import type {
TemplateChipDetail,
@@ -32,10 +35,6 @@ import { useCommunityAvatarDisplayUrl } from "../../hooks/useCommunityAvatarDisp
import { usePreviewSurfaceColor } from "../../hooks/usePreviewSurfaceColor";
import { useCreateFlowNavigation } from "../../hooks/useCreateFlowNavigation";
import { createFlowStepForFacetGroup } from "../../utils/facetGroupToCreateFlowStep";
-import {
- getAssetPath,
- vectorMarkPath,
-} from "../../../../../lib/assetUtils";
import { isPreviewSurfaceColor } from "../../../../../lib/create/previewSurfaceColor";
import {
persistDraftPreviewSurfaceColor,
@@ -51,53 +50,17 @@ function bindingArbitrationNeedsSeparateYes(state: CreateFlowState): boolean {
return joinsWithoutAYes && conflict.includes("binding-arbitration");
}
-const FACET_FALLBACK_ORDER: readonly TemplateFacetGroupKey[] = [
- "coreValues",
- "communication",
- "membership",
- "decisionApproaches",
- "conflictManagement",
-] as const;
-
-/**
- * `finalReview.json.categories` ships a demo ordering + localized names
- * (Values / Communication / Membership / Decision-making / Conflict
- * management). We reuse that ordering for the state-derived rows so the
- * Rule layout stays stable across customize / use-without-changes /
- * plain-custom flows, and fall back to the demo chips when state resolves
- * to nothing selected.
- */
-function readFallbackCategoryRows(
- categories: readonly { name: string; chips: readonly string[] }[],
-): {
- names: {
- values: string;
- communication: string;
- membership: string;
- decisions: string;
- conflict: string;
- };
- rows: FinalReviewCategoryRowDetailed[];
-} {
+function categoryNamesFromMessages(
+ categories: readonly { name: string }[],
+): FinalReviewCategoryNames {
const get = (i: number): string =>
typeof categories[i]?.name === "string" ? categories[i].name : "";
return {
- names: {
- values: get(0),
- communication: get(1),
- membership: get(2),
- decisions: get(3),
- conflict: get(4),
- },
- rows: categories.map((c) => ({
- name: c.name,
- groupKey: null,
- entries: [...c.chips].map((label) => ({
- label,
- groupKey: null,
- overrideKey: null,
- })),
- })),
+ values: get(0),
+ communication: get(1),
+ membership: get(2),
+ decisions: get(3),
+ conflict: get(4),
};
}
@@ -145,28 +108,32 @@ export function FinalReviewScreen({
);
const { categories: finalReviewCategories } = useMemo(() => {
- const { names, rows: fallbackRows } = readFallbackCategoryRows(
- m.create.reviewAndComplete.finalReview.categories,
- );
- const derived = buildFinalReviewCategoryRowsDetailed(state, names);
+ const copy = m.create.reviewAndComplete.finalReview;
+ const names = categoryNamesFromMessages(copy.categories);
const rowsToRender: readonly FinalReviewCategoryRowDetailed[] =
- derived.length > 0 ? derived : fallbackRows;
- const usingFallbackRows = derived.length === 0;
+ buildFinalReviewCategoryRowsDetailed(state, names);
const lookup = new Map<
string,
{ target: FinalReviewChipEditTarget | null; readOnly: TemplateChipDetail }
>();
- const cats: Category[] = rowsToRender.map((row, rowIndex) => {
- const effectiveGroupKey: TemplateFacetGroupKey | null =
- row.groupKey ??
- (usingFallbackRows && rowIndex < FACET_FALLBACK_ORDER.length
- ? FACET_FALLBACK_ORDER[rowIndex]
- : null);
-
+ const cats: Category[] = rowsToRender.map((row) => {
+ const effectiveGroupKey: TemplateFacetGroupKey | null = row.groupKey;
const reviewReturn =
variant === "editPublished" ? ("edit-rule" as const) : ("final-review" as const);
+ const isEmpty = row.entries.length === 0;
+ const flag =
+ isEmpty && effectiveGroupKey === "coreValues"
+ ? copy.flags.noValues
+ : isEmpty && effectiveGroupKey != null
+ ? copy.flags.noCard
+ : undefined;
+ const addButtonText = isEmpty
+ ? effectiveGroupKey === "coreValues"
+ ? copy.addValue
+ : copy.addCard
+ : "";
const chipOptions = row.entries.map((entry, idx) => {
const chipId = `${row.name}-${idx}`;
@@ -190,12 +157,19 @@ export function FinalReviewScreen({
id: chipId,
label: entry.label,
state: "unselected" as const,
+ hasWarning: finalReviewChipHasWarning(
+ state,
+ entry.groupKey,
+ entry.overrideKey,
+ ),
};
});
return {
name: row.name,
chipOptions,
addButton: effectiveGroupKey != null,
+ addButtonText,
+ flag,
onChipClick: (_categoryName: string, chipId: string) => {
const hit = lookup.get(chipId);
if (!hit) return;
@@ -219,7 +193,7 @@ export function FinalReviewScreen({
});
return { categories: cats };
}, [
- m.create.reviewAndComplete.finalReview.categories,
+ m.create.reviewAndComplete.finalReview,
state,
markCreateFlowInteraction,
goToStep,
@@ -249,8 +223,7 @@ export function FinalReviewScreen({
const rawTitleForModal =
typeof state.title === "string" ? state.title : "";
- const descriptionEmptyHint =
- variant === "editPublished" ? t("communityContextEditModal.emptyHint") : undefined;
+ const descriptionEmptyHint = t("communityContextEditModal.emptyHint");
const avatarUrl = useCommunityAvatarDisplayUrl(state.communityAvatarUrl);
const storedFallback =
@@ -305,34 +278,21 @@ export function FinalReviewScreen({
setTitleModalOpen(true)
- : undefined
- }
- titleEditAriaLabel={
- variant === "editPublished"
- ? t("titleEditModal.ariaEditTitle")
- : undefined
- }
- onDescriptionClick={
- variant === "editPublished"
- ? () => setCommunityContextModalOpen(true)
- : undefined
- }
+ onTitleClick={() => setTitleModalOpen(true)}
+ titleEditAriaLabel={t("titleEditModal.ariaEditTitle")}
+ onDescriptionClick={() => setCommunityContextModalOpen(true)}
descriptionEmptyHint={descriptionEmptyHint}
- descriptionEditAriaLabel={
- variant === "editPublished"
- ? t("communityContextEditModal.ariaEditDescription")
- : undefined
- }
+ descriptionEditAriaLabel={t("communityContextEditModal.ariaEditDescription")}
size={mdUp ? "L" : "M"}
expanded={true}
descriptionAtBottom
backgroundColor="bg-transparent"
surfaceColor={surfaceColor}
- logoUrl={avatarUrl ?? getAssetPath(vectorMarkPath("mutual-aid"))}
+ logoUrl={avatarUrl}
logoAlt={ruleCardTitle}
+ communityInitials={
+ avatarUrl ? undefined : communityInitialsFromTitle(ruleCardTitle)
+ }
categories={finalReviewCategories}
className={`${CREATE_FLOW_REVIEW_RULE_LAYOUT_CLASS}${surfaceColor ? "" : " invisible"}`}
onClick={() => {}}
@@ -352,28 +312,24 @@ export function FinalReviewScreen({
onClose={() => setActiveReadOnlyDetail(null)}
detail={activeReadOnlyDetail}
/>
- {variant === "editPublished" ? (
- <>
- setTitleModalOpen(false)}
- initialValue={rawTitleForModal}
- onSave={(value) => {
- markCreateFlowInteraction();
- updateState({ title: value });
- }}
- />
- setCommunityContextModalOpen(false)}
- initialValue={rawCommunityContextForModal}
- onSave={(value) => {
- markCreateFlowInteraction();
- updateState({ communityContext: value, summary: value });
- }}
- />
-
- ) : null}
+ setTitleModalOpen(false)}
+ initialValue={rawTitleForModal}
+ onSave={(value) => {
+ markCreateFlowInteraction();
+ updateState({ title: value });
+ }}
+ />
+ setCommunityContextModalOpen(false)}
+ initialValue={rawCommunityContextForModal}
+ onSave={(value) => {
+ markCreateFlowInteraction();
+ updateState({ communityContext: value, summary: value });
+ }}
+ />
);
}
diff --git a/app/(app)/create/screens/select/ConfirmStakeholdersScreen.tsx b/app/(app)/create/screens/select/ConfirmStakeholdersScreen.tsx
index 054702f..d52e684 100644
--- a/app/(app)/create/screens/select/ConfirmStakeholdersScreen.tsx
+++ b/app/(app)/create/screens/select/ConfirmStakeholdersScreen.tsx
@@ -1,34 +1,84 @@
"use client";
-import { useEffect, useState } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import MultiSelect from "../../../../components/controls/MultiSelect";
-import Alert from "../../../../components/modals/Alert";
-import type { ChipOption } from "../../../../components/controls/MultiSelect/MultiSelect.types";
+import {
+ useCallback,
+ useEffect,
+ useMemo,
+ useState,
+ type ClipboardEvent,
+} from "react";
+import { useSearchParams } from "next/navigation";
+import Button from "../../../../components/buttons/Button";
+import InlineTextButton from "../../../../components/buttons/InlineTextButton";
+import TextInput from "../../../../components/controls/TextInput";
+import Icon from "../../../../components/asset/icon";
+import { ASSETS, getAssetPath } from "../../../../../lib/assetUtils";
import { useTranslation } from "../../../../contexts/MessagesContext";
+import { fetchAuthSession } from "../../../../../lib/create/api";
+import { membershipInvitePreview } from "../../../../../lib/create/membershipInvitePreview";
+import {
+ INVITE_EMAIL_PATTERN,
+ formatInviteCountWord,
+ parseInvitePaste,
+} from "../../../../../lib/create/parseInviteEmails";
import { MAX_STAKEHOLDER_EMAILS } from "../../../../../lib/create/stakeholderLimits";
import { useCreateFlow } from "../../context/CreateFlowContext";
+import { MembershipInvitePreviewCard } from "../../components/MembershipInvitePreviewCard";
import { CreateFlowHeaderLockup } from "../../components/CreateFlowHeaderLockup";
import { CreateFlowTwoColumnSelectShell } from "../../components/CreateFlowTwoColumnSelectShell";
import {
CREATE_FLOW_MANAGE_STAKEHOLDERS_QUERY,
CREATE_FLOW_MANAGE_STAKEHOLDERS_VALUE,
} from "../../utils/flowSteps";
-import { createFlowStepPath } from "../../utils/createFlowPaths";
import { PublishedStakeholdersManagePanel } from "./PublishedStakeholdersManagePanel";
-const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const VISIBLE_WHEN_COLLAPSED = 6;
-function emailsToChipOptions(emails: string[]): ChipOption[] {
- return emails.map((email) => ({
- id: email,
- label: email,
- state: "selected" as const,
- }));
+function InvitePersonRow({
+ email,
+ youLabel,
+ removeAria,
+ onRemove,
+}: {
+ email: string;
+ youLabel?: string;
+ removeAria: string;
+ onRemove?: () => void;
+}) {
+ return (
+ (null);
+ const [draftEmail, setDraftEmail] = useState("");
+ const [fieldError, setFieldError] = useState(null);
+ const [pasteResult, setPasteResult] = useState(null);
+ const [expanded, setExpanded] = useState(false);
useEffect(() => {
- if (!manageStakeholdersIntent) return;
- if (editingPublishedRuleId.length > 0) return;
- router.replace(createFlowStepPath("edit-rule"));
- }, [
- manageStakeholdersIntent,
- editingPublishedRuleId.length,
- router,
- ]);
+ let cancelled = false;
+ void fetchAuthSession().then(({ user }) => {
+ if (cancelled) return;
+ const email = user?.email?.trim().toLowerCase() ?? "";
+ setOwnerEmail(email.length > 0 ? email : null);
+ });
+ return () => {
+ cancelled = true;
+ };
+ }, []);
- const persistedKey = (state.stakeholderEmails ?? []).join("\0");
- const [toastDismissed, setToastDismissed] = useState(false);
- const [chipError, setChipError] = useState(null);
- const [stakeholderOptions, setStakeholderOptions] = useState(
- () => emailsToChipOptions(state.stakeholderEmails ?? []),
+ const invitees = useMemo(() => {
+ const raw = state.stakeholderEmails ?? [];
+ const owner = ownerEmail;
+ return raw
+ .map((email) => email.trim().toLowerCase())
+ .filter((email) => email.length > 0 && email !== owner);
+ }, [state.stakeholderEmails, ownerEmail]);
+
+ const rows = useMemo(() => {
+ const list: Array<{ email: string; isYou: boolean }> = [];
+ if (ownerEmail) {
+ list.push({ email: ownerEmail, isYou: true });
+ }
+ for (const email of invitees) {
+ list.push({ email, isYou: false });
+ }
+ return list;
+ }, [ownerEmail, invitees]);
+
+ const visibleRows = expanded
+ ? rows
+ : rows.slice(0, VISIBLE_WHEN_COLLAPSED);
+ const hiddenCount = Math.max(0, rows.length - visibleRows.length);
+
+ const preview = membershipInvitePreview(state);
+
+ const countLine =
+ rows.length === 1
+ ? t("countOne")
+ : t("countMany").replace("{count}", String(rows.length));
+
+ const persistInvitees = useCallback(
+ (next: string[]) => {
+ updateState({ stakeholderEmails: next });
+ },
+ [updateState],
);
- useEffect(() => {
- setStakeholderOptions((prev) => {
- const inFlight = prev.filter((c) => c.state === "custom");
- const nextPersisted = emailsToChipOptions(state.stakeholderEmails ?? []);
- return [...nextPersisted, ...inFlight];
- });
- }, [persistedKey]);
+ const addOne = useCallback(
+ (raw: string): boolean => {
+ const trimmed = raw.trim().toLowerCase();
+ if (!INVITE_EMAIL_PATTERN.test(trimmed)) {
+ setFieldError(t("invalidEmail"));
+ return false;
+ }
+ if (ownerEmail && trimmed === ownerEmail) {
+ setFieldError(t("duplicateEmail"));
+ return false;
+ }
+ if (invitees.includes(trimmed)) {
+ setFieldError(t("duplicateEmail"));
+ return false;
+ }
+ if (invitees.length >= MAX_STAKEHOLDER_EMAILS) {
+ setFieldError(t("maxStakeholders"));
+ return false;
+ }
+ persistInvitees([...invitees, trimmed]);
+ return true;
+ },
+ [invitees, ownerEmail, persistInvitees, t],
+ );
- const handleAddStakeholder = () => {
+ const handleAdd = () => {
markCreateFlowInteraction();
- setChipError(null);
- const confirmed = state.stakeholderEmails ?? [];
- const customCount = stakeholderOptions.filter(
- (o) => o.state === "custom",
- ).length;
- if (confirmed.length + customCount >= MAX_STAKEHOLDER_EMAILS) {
- setChipError(t("maxStakeholders"));
- return;
+ setPasteResult(null);
+ if (addOne(draftEmail)) {
+ setDraftEmail("");
+ setFieldError(null);
}
- setStakeholderOptions((prev) => [
- ...prev,
- { id: crypto.randomUUID(), label: "", state: "custom" },
- ]);
};
- const handleCustomChipConfirm = (chipId: string, value: string) => {
+ const handlePaste = (event: ClipboardEvent) => {
+ const text = event.clipboardData.getData("text");
+ const tokens = text
+ .split(/[\s,;]+/)
+ .map((token) => token.trim())
+ .filter((token) => token.length > 0);
+ if (tokens.length <= 1) return;
+
+ event.preventDefault();
markCreateFlowInteraction();
- setChipError(null);
- const trimmed = value.trim().toLowerCase();
- if (!EMAIL_PATTERN.test(trimmed)) {
- setChipError(t("invalidEmail"));
- return;
+ setFieldError(null);
+
+ const existing = ownerEmail ? [ownerEmail, ...invitees] : [...invitees];
+ const parsed = parseInvitePaste(text, existing, MAX_STAKEHOLDER_EMAILS);
+ if (parsed.added.length > 0) {
+ persistInvitees([...invitees, ...parsed.added]);
}
- const current = state.stakeholderEmails ?? [];
- if (current.includes(trimmed)) {
- setChipError(t("duplicateEmail"));
- setStakeholderOptions((prev) => prev.filter((opt) => opt.id !== chipId));
- return;
+ setDraftEmail(parsed.invalidRemainder);
+ if (parsed.invalidRemainder.length > 0) {
+ setFieldError(t("invalidEmail"));
}
- if (current.length >= MAX_STAKEHOLDER_EMAILS) {
- setChipError(t("maxStakeholders"));
- setStakeholderOptions((prev) => prev.filter((opt) => opt.id !== chipId));
- return;
+
+ const parts: string[] = [];
+ if (parsed.added.length > 0) {
+ const people =
+ parsed.added.length === 1 ? t("peopleNounOne") : t("peopleNounMany");
+ parts.push(
+ t("pasteAdded")
+ .replace("{count}", formatInviteCountWord(parsed.added.length))
+ .replace("{people}", people),
+ );
}
- setStakeholderOptions((prev) =>
- prev.map((opt) =>
- opt.id === chipId
- ? { id: trimmed, label: trimmed, state: "selected" as const }
- : opt,
- ),
- );
- updateState({ stakeholderEmails: [...current, trimmed] });
+ const invalidCount = parsed.invalidRemainder
+ .split(",")
+ .map((item) => item.trim())
+ .filter((item) => item.length > 0).length;
+ if (invalidCount === 1) {
+ parts.push(t("pasteInvalidOne"));
+ } else if (invalidCount > 1) {
+ parts.push(
+ t("pasteInvalidMany").replace(
+ "{count}",
+ formatInviteCountWord(invalidCount),
+ ),
+ );
+ }
+ setPasteResult(parts.length > 0 ? parts.join(" ") : null);
};
- const handleCustomChipClose = (chipId: string) => {
+ const handleRemove = (email: string) => {
markCreateFlowInteraction();
- setChipError(null);
- setStakeholderOptions((prev) => prev.filter((opt) => opt.id !== chipId));
+ setPasteResult(null);
+ persistInvitees(invitees.filter((item) => item !== email));
};
- const handleChipClick = (chipId: string) => {
- markCreateFlowInteraction();
- setChipError(null);
- setStakeholderOptions((prev) => prev.filter((opt) => opt.id !== chipId));
- updateState({
- stakeholderEmails: (state.stakeholderEmails ?? []).filter(
- (e) => e !== chipId,
- ),
- });
- };
+ const header = (
+
+ {editingPublishedRuleId.length > 0 ? (
+
);
}
return (
- <>
-
+ {completed.askOrganizerLead}{" "}
+
+ {copiedNameHit && copiedFromTitle ? (
+
{toast}
+
+
+ ) : null}
+
+ );
}
export function ConfirmStakeholdersScreen() {
- const router = useRouter();
const searchParams = useSearchParams();
const { state, updateState, markCreateFlowInteraction } = useCreateFlow();
const t = useTranslation("create.reviewAndComplete.confirmStakeholders");
@@ -37,163 +87,271 @@ export function ConfirmStakeholdersScreen() {
searchParams?.get(CREATE_FLOW_MANAGE_STAKEHOLDERS_QUERY) ===
CREATE_FLOW_MANAGE_STAKEHOLDERS_VALUE;
const editingPublishedRuleId = state.editingPublishedRuleId?.trim() ?? "";
- const managePublishedMode =
- manageStakeholdersIntent && editingPublishedRuleId.length > 0;
+
+ const [ownerEmail, setOwnerEmail] = useState
+
+ {onRemove ? (
+
+ ) : null}
+ + {email} +
+ {youLabel ? ( ++ {youLabel} +
+ ) : null} +
+
+ );
- if (managePublishedMode) {
+ if (manageStakeholdersIntent) {
return (
-
- {chipError}
+
+ {pasteResult}
+
+ {countLine}
+ {t("privacy")}
+
+
+
+
+
+ {pasteResult ? (
+
+
+
+
+
+
+
+ ) : null}
+
+ {rows.length > 0 ? (
+
+ {visibleRows.map((row) => (
+
+ ) : null}
+
+ {rows.length > 0 ? (
+
+
+ ) : null}
+
-
- )}
-
+
-
+
-
- - ++ {row.email} - + {row.status === "pending" ? t("managePublished.pending") : t("managePublished.accepted")}-+{row.status === "pending" ? ({belowCard ? ( -e.stopPropagation()}> +diff --git a/app/contexts/AuthModalContext.tsx b/app/contexts/AuthModalContext.tsx index bc715a2..55d4364 100644 --- a/app/contexts/AuthModalContext.tsx +++ b/app/contexts/AuthModalContext.tsx @@ -8,10 +8,15 @@ import { useState, type ReactNode, } from "react"; +import { useTranslation } from "./MessagesContext"; import Login from "../components/modals/Login"; import LoginForm from "../components/modals/Login/LoginForm"; -export type AuthModalLoginVariant = "default" | "saveProgress" | "keepRule"; +export type AuthModalLoginVariant = + | "default" + | "saveProgress" + | "keepRule" + | "invite"; export type AuthModalBackdropVariant = "solid" | "blurredYellow"; @@ -35,6 +40,7 @@ type AuthModalContextValue = { const AuthModalContext = createContexte.stopPropagation()} + > {belowCard}) : null} diff --git a/app/components/modals/Login/LoginForm.tsx b/app/components/modals/Login/LoginForm.tsx index 2699de3..827358b 100644 --- a/app/components/modals/Login/LoginForm.tsx +++ b/app/components/modals/Login/LoginForm.tsx @@ -44,7 +44,11 @@ function MailIconInline() { const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; -export type LoginFormVariant = "default" | "saveProgress" | "keepRule"; +export type LoginFormVariant = + | "default" + | "saveProgress" + | "keepRule" + | "invite"; function loginFormHeading( variant: LoginFormVariant, @@ -66,6 +70,12 @@ function loginFormHeading( description: t("keepRuleSubtitle"), }; } + if (variant === "invite") { + return { + title: t("inviteTitle"), + description: t("inviteSubtitle"), + }; + } return { title: t("title"), description: t("subtitle") }; } @@ -74,7 +84,11 @@ function shouldAttachCreateFlowDraft( nextPath: string, ): boolean { if (variant === "keepRule") return false; - return variant === "saveProgress" || nextPath.includes("syncDraft=1"); + return ( + variant === "saveProgress" || + variant === "invite" || + nextPath.includes("syncDraft=1") + ); } export type LoginFormProps = { @@ -266,46 +280,48 @@ export default function LoginForm({ {emailError} ) : null} - - {onDismiss ? ( +- ) : null} -) : null}
- {t("legalPrefix")} - - {tFooter("legal.termsOfService")} - - {t("legalAnd")} - - {tFooter("legal.privacyPolicy")} - - {t("legalSuffix")} -
+ {onDismiss ? ( + + ) : null} ++ {t("legalPrefix")} + + {tFooter("legal.termsOfService")} + + {t("legalAnd")} + + {tFooter("legal.privacyPolicy")} + + {t("legalSuffix")} +
+(null); export function AuthModalProvider({ children }: { children: ReactNode }) { + const tLogin = useTranslation("pages.login"); const [open, setOpen] = useState(false); const [opts, setOpts] = useState ({}); @@ -72,6 +78,17 @@ export function AuthModalProvider({ children }: { children: ReactNode }) { backdropVariant={backdropVariant} usePortal ariaLabelledBy="login-modal-heading" + belowCard={ + opts.variant === "invite" ? ( + + ) : undefined + } > ; + copiedFromTitle: string; + copiedNameHit: { + categoryName: string; + entryTitle: string; + } | null; + } + | { ok: false; error: string; status: number }; + +export async function makeCopyPublishedRule( + id: string, + title: string, +): Promise { + try { + const res = await fetch( + `/api/rules/${encodeURIComponent(id)}/make-copy`, + { + method: "POST", + credentials: "include", + headers: jsonHeaders, + body: JSON.stringify({ title }), + }, + ); + const data = (await safeParseJsonResponse(res)) as { + rule?: { + id: string; + title: string; + summary?: string | null; + document?: Record { diff --git a/lib/create/buildFinalReviewCategories.ts b/lib/create/buildFinalReviewCategories.ts index d4f4be8..939f9bb 100644 --- a/lib/create/buildFinalReviewCategories.ts +++ b/lib/create/buildFinalReviewCategories.ts @@ -50,6 +50,56 @@ export type FinalReviewCategoryNames = { conflict: string; }; +const CANONICAL_FACET_ORDER: readonly TemplateFacetGroupKey[] = [ + "coreValues", + "communication", + "membership", + "decisionApproaches", + "conflictManagement", +] as const; + +function nameForGroup( + groupKey: TemplateFacetGroupKey, + names: FinalReviewCategoryNames, +): string { + switch (groupKey) { + case "coreValues": + return names.values; + case "communication": + return names.communication; + case "membership": + return names.membership; + case "decisionApproaches": + return names.decisions; + case "conflictManagement": + return names.conflict; + } +} + +/** Always five section rows, in values-first order, including empty ones. */ +export function ensureCanonicalFinalReviewRows( + rows: readonly FinalReviewCategoryRowDetailed[], + names: FinalReviewCategoryNames, +): FinalReviewCategoryRowDetailed[] { + const byGroup = new Map { const { text, html } = buildVerifyLinkParts( verifyUrl, - "Open this link to sign in (it expires in 60 minutes):", + "Open this link to log in (it expires in 60 minutes):", "If you did not request this, you can ignore this email.\n\nSent because you saved a draft at communityrule.info", - "Sign in", + "Log in", ); await sendHtmlMail({ to, - subject: "Sign in to Community Rule", + subject: "Log in to Community Rule", text, html, devLog: `[dev] Magic link for ${to}: ${verifyUrl}`, }); } -/** Stakeholder invite after rule publish (one-time link, same dev/Mailhog pattern as magic link). */ +/** Stakeholder invite after finishing a Rule (one-time link, same Mailhog pattern as magic link). */ export async function sendRuleStakeholderInviteEmail( - to: string, - verifyUrl: string, - ruleTitle: string, + input: RuleStakeholderInviteMailInput, ): Promise { - const { text, html } = buildVerifyLinkParts( - verifyUrl, - `You've been invited to view "${ruleTitle}" on Community Rule.\n\nOpen this link to create your account (or sign in) and open the rule. The link expires in 60 minutes and works once:`, - "If you did not expect this, you can ignore this email.", - "Open the rule", - ); + const { subject, text, html } = buildRuleStakeholderInviteMail(input); + const replyTo = stakeholderInviteReplyTo(input.inviterEmail); await sendHtmlMail({ - to, - subject: `You're invited to view a Community Rule: ${ruleTitle}`, + to: input.to, + subject, text, html, - devLog: `[dev] Rule stakeholder invite (${ruleTitle}) for ${to}: ${verifyUrl}`, + ...(replyTo ? { replyTo } : {}), + devLog: `[dev] Rule stakeholder invite (${input.communityName}) for ${input.to}: ${input.verifyUrl}`, }); } diff --git a/lib/server/publishedRules.ts b/lib/server/publishedRules.ts index f6d67ea..a3ae502 100644 --- a/lib/server/publishedRules.ts +++ b/lib/server/publishedRules.ts @@ -224,3 +224,60 @@ export async function listProfileRulesForUser( }); return combined.slice(0, cap); } + +export type StakeholderInviteView = { + ruleId: string; + title: string; + summary: string | null; + document: Record { + if (!isDatabaseConfigured()) return null; + const userId = opts.userId.trim(); + const ruleId = opts.ruleId.trim(); + if (userId.length === 0 || ruleId.length === 0) return null; + try { + const row = await prisma.ruleStakeholder.findFirst({ + where: { ruleId, userId }, + select: { + invitedBy: { select: { email: true } }, + rule: { + select: { + id: true, + title: true, + summary: true, + document: true, + updatedAt: true, + }, + }, + }, + }); + if (!row) return null; + const document = + row.rule.document !== null && + typeof row.rule.document === "object" && + !Array.isArray(row.rule.document) + ? (row.rule.document as Record ${description}
` + : ""; + + return ` + + + + +${heading} + + + ++
+ +`; +} + +function privacyHtmlWithLead(privacy: string): string { + const lead = "Every Rule starts private."; + if (privacy.startsWith(lead)) { + return `${escapeHtml(lead)}${escapeHtml( + privacy.slice(lead.length), + )}`; + } + return escapeHtml(privacy); +} + +function leadInHtml(lead: string, full: string): string { + if (full.startsWith(lead)) { + return `${escapeHtml(lead)}${escapeHtml( + full.slice(lead.length), + )}`; + } + return escapeHtml(full); +} diff --git a/lib/server/ruleStakeholderInviteOps.ts b/lib/server/ruleStakeholderInviteOps.ts index 91516da..946ca50 100644 --- a/lib/server/ruleStakeholderInviteOps.ts +++ b/lib/server/ruleStakeholderInviteOps.ts @@ -18,8 +18,11 @@ export async function createRuleStakeholderInviteAndSendMail(opts: { origin: string; ruleId: string; ruleTitle: string; + summary?: string | null; + document?: unknown; email: string; invitedByUserId: string; + inviterEmail: string; pepper: string; }): Promise<{ ok: true } | { ok: false }> { const token = newSessionToken(); @@ -38,7 +41,15 @@ export async function createRuleStakeholderInviteAndSendMail(opts: { const verifyUrl = stakeholderInviteVerifyUrl(opts.origin, token); try { - await sendRuleStakeholderInviteEmail(opts.email, verifyUrl, opts.ruleTitle); + await sendRuleStakeholderInviteEmail({ + to: opts.email, + verifyUrl, + origin: opts.origin, + communityName: opts.ruleTitle, + inviterEmail: opts.inviterEmail, + summary: opts.summary, + document: opts.document, + }); return { ok: true }; } catch (err) { logRouteError(opts.scope, opts.requestId, err, { diff --git a/lib/server/validation/createFlowSchemas.ts b/lib/server/validation/createFlowSchemas.ts index 56e027b..52b8c40 100644 --- a/lib/server/validation/createFlowSchemas.ts +++ b/lib/server/validation/createFlowSchemas.ts @@ -223,6 +223,25 @@ export const postRuleStakeholderBodySchema = z.object({ email: stakeholderEmailSchema, }); +export const makeCopyRuleBodySchema = z.object({ + title: z + .string() + .max(48) + .transform((s) => s.trim()) + .refine((s) => s.length > 0, { message: "title required" }), +}); + +export type MakeCopyRuleBody = z.infer+ ++ ++
++ ++ ++
++ +CommunityRule ++ ++
+ ++ +${heading}
+${intro}
++ Read the Rule +
+Or paste this link into a browser
++ ${verifyHref} +
++
+ ++ ++ ++
+ ${cardBody} ++ ++ +${initials}+${name} ++ ${counts} +
+${privacyHtml}
+${ownLinkHtml}
+${copyHtml}
+ +; + +export const resendExpiredStakeholderInviteBodySchema = z.object({ + token: z.string().min(10).max(200), + email: stakeholderEmailSchema, +}); + +export type ResendExpiredStakeholderInviteBody = z.infer< + typeof resendExpiredStakeholderInviteBodySchema +>; + export type PostRuleStakeholderBody = z.infer< typeof postRuleStakeholderBodySchema >; diff --git a/messages/en/components/controlsChrome.json b/messages/en/components/controlsChrome.json index d60b4a9..cd14c12 100644 --- a/messages/en/components/controlsChrome.json +++ b/messages/en/components/controlsChrome.json @@ -7,6 +7,7 @@ "chipClose": "Close", "chipSelect": "Select {label}", "chipDeselect": "Deselect {label}", + "chipMissingWords": "{label}, missing words", "selectPlaceholder": "Choose an option", "selectAriaLabel": "Select an option", "multiSelectAddDefault": "Add organization type", diff --git a/messages/en/create/footer.json b/messages/en/create/footer.json index eb0c060..644239c 100644 --- a/messages/en/create/footer.json +++ b/messages/en/create/footer.json @@ -12,7 +12,7 @@ "confirmDetails": "Confirm details", "confirmDescription": "Confirm description", "confirmSize": "Confirm size", - "publishCommunityRule": "Publish CommunityRule", + "publishCommunityRule": "Finish", "confirmStakeholders": "Confirm Stakeholders", "confirmCoreValues": "Confirm values", "confirmCommunication": "Confirm", diff --git a/messages/en/create/reviewAndComplete/completed.json b/messages/en/create/reviewAndComplete/completed.json index 51c7274..43872d3 100644 --- a/messages/en/create/reviewAndComplete/completed.json +++ b/messages/en/create/reviewAndComplete/completed.json @@ -1,8 +1,14 @@ { - "toastTitle": "This is what folks see when you share your CommunityRule", - "toastDescription": "Your group can use this document as an operating manual.", + "toastTitle": "Your Rule is finished", + "toastDescription": "This is what the people you invite will see.", + "copyReadyToastTitle": "Your copy is ready", + "copyReadyToastDescription": "It started from {possessive} Rule. Read it through and change what does not fit before you invite your members.", + "copyNameHitTitle": "One line names {name}", + "copyNameHitDescription": "It is in {entry} under {category}.", + "askOrganizerLead": "Has your Rule changed how your community works?", + "askOrganizerLink": "Tell an organizer what changed.", "shareNoRuleTitle": "Nothing to share yet", - "shareNoRuleDescription": "Open this page from your profile after publishing, or publish a rule first.", + "shareNoRuleDescription": "Open this page from your profile after you finish, or finish a rule first.", "shareLinkCopiedTitle": "Link copied", "shareLinkCopiedDescription": "Paste the link anywhere to share your public CommunityRule.", "shareCopyFailedTitle": "Could not copy link", @@ -16,7 +22,7 @@ "exportEmptyDocumentTitle": "Could not export", "exportEmptyDocumentDescription": "Your rule document is not available to export yet.", "guestInvitesSkippedTitle": "Stakeholder invites were not sent", - "guestInvitesSkippedDescription": "Sign in to invite people by email. Until then, share the public link to this CommunityRule.", - "guestClaimHintTitle": "Sign in to keep this rule on your profile", - "guestClaimHintDescription": "Sign in on this same browser to attach the rule to your account so you can edit it later." + "guestInvitesSkippedDescription": "Log in to invite people by email. Until then, share the public link to this CommunityRule.", + "guestClaimHintTitle": "Log in to keep this rule on your profile", + "guestClaimHintDescription": "Log in on this same browser to attach the rule to your account so you can edit it later." } diff --git a/messages/en/create/reviewAndComplete/confirmStakeholders.json b/messages/en/create/reviewAndComplete/confirmStakeholders.json index 27324bb..6bd8c93 100644 --- a/messages/en/create/reviewAndComplete/confirmStakeholders.json +++ b/messages/en/create/reviewAndComplete/confirmStakeholders.json @@ -1,25 +1,44 @@ { - "title": "Do other stakeholders need to be involved in creating your community?", - "description": "Add their email addresses. When you publish, we'll send each person a one-time link to join Community Rule and view this rule in their profile (they won't be able to manage it unless they created it).", - "addStakeholder": "Add stakeholder", - "draftToastTitle": "Congratulations! You've drafted your CommunityRule!", - "invalidEmail": "Enter a valid email address.", + "title": "Invite people to read your Rule", + "description": "Everyone you add gets a private link to read the Rule.", + "fromYourRule": "Who belongs, in your Rule’s words", + "whoBelongsLabel": "Who belongs.", + "joiningLabel": "Joining.", + "emailLabel": "Add someone by email", + "emailPlaceholder": "name@example.org", + "add": "Add", + "you": "You", + "removeAria": "Remove {email}", + "showMore": "Show {count} more", + "countOne": "1 person gets a private link to read the Rule.", + "countMany": "{count} people get a private link to read the Rule.", + "privacy": "Every Rule starts private. Only the people you invite can read it until the person who holds the pen turns on a link.", + "finishWithoutInviting": "Finish without inviting", + "sendInvitations": "Send invitations", + "invalidEmail": "Not an email address. Fix it and select Add, or clear it.", "duplicateEmail": "That email is already on the list.", - "maxStakeholders": "You can add up to 30 stakeholder emails.", + "maxStakeholders": "You can add up to 30 emails.", + "pasteAdded": "Added {count} {people} from your list.", + "pasteInvalidOne": "One is not an email address.", + "pasteInvalidMany": "{count} are not email addresses.", + "peopleNounOne": "person", + "peopleNounMany": "people", + "sendFailedTitle": "Some invitations didn’t send", + "sendFailedDescription": "Check the addresses and try again", "managePublished": { - "lockupTitle": "Stakeholders", - "lockupDescription": "Invite people by email. They get a one-time link to view this rule in their profile.", - "emailLabel": "Email address", - "emailPlaceholder": "colleague@example.com", - "addInvite": "Send invite", + "lockupTitle": "Invite people to read your Rule", + "lockupDescription": "Everyone you add gets a private link to read the Rule.", + "emailLabel": "Add someone by email", + "emailPlaceholder": "name@example.org", + "addInvite": "Add", "loading": "Loading…", - "loadFailed": "Could not load stakeholders. Refresh and try again.", + "loadFailed": "Could not load the list. Refresh and try again.", "pending": "Pending", "accepted": "Accepted", "remove": "Remove", "resend": "Resend invite", - "empty": "No stakeholders yet.", - "invalidEmail": "Enter a valid email address.", + "empty": "No one invited yet.", + "invalidEmail": "Not an email address. Fix it and select Add, or clear it.", "actionFailed": "Something went wrong. Try again.", "rateLimited": "Too many requests. Try again in {seconds} seconds.", "removeAria": "Remove {email}", diff --git a/messages/en/create/reviewAndComplete/finalReview.json b/messages/en/create/reviewAndComplete/finalReview.json index ee0cde5..59a6508 100644 --- a/messages/en/create/reviewAndComplete/finalReview.json +++ b/messages/en/create/reviewAndComplete/finalReview.json @@ -1,9 +1,15 @@ { - "title": "Review your CommunityRule", - "description": "Here's what other people will see. Make sure everything looks good before you publish. Once the rule is published, you must use one of your decision-making mechanisms to edit it again.", + "title": "Review your Rule", + "description": "Here's what other people will see.", "editPublishedTitle": "Edit your CommunityRule", - "editPublishedDescription": "Update what others see on your public rule. Save & Exit or Publish applies changes to your published CommunityRule.", + "editPublishedDescription": "Update what others see on your Rule. Save & Exit or Finish applies the changes.", "ruleCardTitleFallback": "Your community", + "addValue": "Add value", + "addCard": "Add card", + "flags": { + "noValues": "No values yet. You can add them any time.", + "noCard": "No card yet. Add one before you finish." + }, "chipEditModal": { "saveButton": "Save", "readOnlyCloseButton": "Close", @@ -35,7 +41,7 @@ }, { "name": "Membership", - "chips": ["Open Admission"] + "chips": ["Open admission"] }, { "name": "Decision-making", diff --git a/messages/en/create/reviewAndComplete/publish.json b/messages/en/create/reviewAndComplete/publish.json index 34362e9..94ff407 100644 --- a/messages/en/create/reviewAndComplete/publish.json +++ b/messages/en/create/reviewAndComplete/publish.json @@ -1,6 +1,6 @@ { - "publishBannerTitle": "Couldn't publish", - "missingCommunityName": "Add a community name before publishing.", - "publishButtonPublishing": "Publishing…", + "publishBannerTitle": "Couldn't finish", + "missingCommunityName": "Add a community name before you finish.", + "publishButtonPublishing": "Finishing…", "genericPublishFailed": "Something went wrong. Try again." } diff --git a/messages/en/create/upload.json b/messages/en/create/upload.json index 2e46eb0..244c14e 100644 --- a/messages/en/create/upload.json +++ b/messages/en/create/upload.json @@ -2,7 +2,7 @@ "errors": { "generic": "Something went wrong while uploading. Try again.", "tooLarge": "That file is too large. Community photos can be up to 5 MB; attachments up to 10 MB.", - "unauthorized": "Sign in to upload files. Use Save progress if you started without an account.", + "unauthorized": "Log in to upload files. Use Save progress if you started without an account.", "misconfigured": "Uploads are not available on this server yet.", "empty": "That file is empty. Choose a file that has content.", "svg": "SVG files aren't supported. Export a JPEG, PNG, WebP, or GIF instead.", diff --git a/messages/en/index.ts b/messages/en/index.ts index 42e82ec..04f350b 100644 --- a/messages/en/index.ts +++ b/messages/en/index.ts @@ -34,6 +34,7 @@ import login from "./pages/login.json"; import profile from "./pages/profile.json"; import notFoundPage from "./pages/notFoundPage.json"; import ruleDetail from "./pages/ruleDetail.json"; +import invite from "./pages/invite.json"; import navigation from "./navigation.json"; import metadata from "./metadata.json"; import modalsShare from "./modals/share.json"; @@ -114,6 +115,7 @@ export default { profile, notFoundPage, ruleDetail, + invite, }, create: { community: { diff --git a/messages/en/metadata.json b/messages/en/metadata.json index 21d2de0..4a9a967 100644 --- a/messages/en/metadata.json +++ b/messages/en/metadata.json @@ -50,6 +50,14 @@ "title": "Log in", "description": "Enter your email and we'll send you a magic link to sign in. No password needed!" }, + "invite": { + "title": "Invitation", + "description": "Read a CommunityRule you were invited to see." + }, + "inviteExpired": { + "title": "This link has expired", + "description": "Ask for a new invitation link to read the Rule." + }, "profile": { "title": "Profile", "description": "Manage your CommunityRules, saved progress, and account." @@ -157,8 +165,8 @@ "keywords": ["terms of service", "license", "communityrule"] }, "cookies": { - "title": "Cookies Settings", - "description": "CommunityRule uses cookies to keep you signed in and to let you claim a rule you published without an account.", + "title": "Cookies", + "description": "CommunityRule uses cookies to keep you logged in and to let you claim a rule you finished without logging in.", "keywords": ["cookies", "session", "privacy", "communityrule"] } } diff --git a/messages/en/pages/cookies.json b/messages/en/pages/cookies.json index 7416759..f26d42d 100644 --- a/messages/en/pages/cookies.json +++ b/messages/en/pages/cookies.json @@ -1,21 +1,21 @@ { - "_comment": "Cookies Settings. Figma Content page Template (19003:23305): banner + labeled body stacks. There are no optional cookies to toggle.", + "_comment": "Cookies. Figma Content page Template (19003:23305): banner + labeled body stacks. There are no optional cookies to toggle. The footer does not link here.", "banner": { - "title": "Cookies Settings", - "description": "CommunityRule uses cookies to keep you signed in and to let you claim a rule you published without an account.", + "title": "Cookies", + "description": "CommunityRule uses cookies to keep you logged in and to let you claim a rule you finished without logging in.", "author": "Media Economies Design Lab", "date": "2026-08-15" }, "updated": "Last updated August 15, 2026.", "intro": [ - "CommunityRule sets a cookie named cr_session after you sign in with a magic link. It keeps you signed in for up to 30 days. If you publish a CommunityRule without signing in, we also set cr_rule_claim so that signing in later on this browser can attach that rule to your account. There are no advertising or analytics cookies to turn off." + "CommunityRule sets a cookie named cr_session after you log in with a magic link. It keeps you logged in for up to 30 days. Set when you finish a Rule without logging in: we also set cr_rule_claim so that logging in later on this browser can attach that rule to your account. There are no advertising or analytics cookies to turn off." ], "sections": [ { "heading": "The session cookie", "paragraphs": [ - "Sign out to clear the session cookie on this browser. Blocking it will sign you out and keep you from staying signed in. Browsing templates does not set this cookie.", - "The claim cookie is set only when you publish without an account. It is httpOnly, lasts up to 30 days, and is cleared after a successful sign-in claim. Clearing this site’s cookies means you cannot attach that guest-published rule to an account from this browser." + "Log out to clear the session cookie on this browser. Blocking it will log you out and keep you from staying logged in. Browsing templates does not set this cookie.", + "Set when you finish a Rule without logging in. It is httpOnly, lasts up to 30 days, and is cleared after a successful login claim. Clearing this site’s cookies means you cannot attach that guest-finished rule to an account from this browser." ] }, { diff --git a/messages/en/pages/invite.json b/messages/en/pages/invite.json new file mode 100644 index 0000000..c7afd8c --- /dev/null +++ b/messages/en/pages/invite.json @@ -0,0 +1,50 @@ +{ + "_comment": "Invited Rule reader, Make a copy, and expired invitation link.", + "makeACopy": "Make a copy", + "makeACopyAria": "Make a copy of this Rule", + "navAria": "Invitation", + "bannerTitle": "{email} invited you to read this Rule", + "bannerTitleNoEmail": "You were invited to read this Rule", + "bannerDescription": "Their Rule sets out how they talk, who belongs, how they decide and what happens when they disagree.", + "downloadPdf": "Download PDF", + "print": "Print", + "factsHeading": "About this Rule", + "whoCanEdit": "Who can edit", + "whoCanEditUnknown": "The person who invited you", + "whoCanSee": "Who can see it", + "whoCanSeeValue": "Only people the community invites", + "lastChanged": "Last changed", + "copyCardTitle": "Start a Rule from this one", + "copyCardBody": "You get its {counts} word for word. The name, description, photo, invited people and history stay with the original.", + "privacy": "Every Rule starts private. Only the people the community invites can read it until the person who holds the pen turns on a link.", + "exportFailedTitle": "Could not export", + "exportFailedDescription": "Something went wrong. Refresh the page and try again.", + "dialogTitle": "Make a copy for your community", + "dialogDescription": "Your copy starts with {possessive} {counts} word for word.", + "communityNameLabel": "Community name", + "communityNamePlaceholder": "Enter community name", + "characterCountTemplate": "{current}/{max}", + "comesWithTitle": "Comes with the copy", + "comesWithBody": "The cards and the text on them.", + "staysWithTitle": "Stays with the original", + "staysWithBody": "The name, description, photo, invited people and history.", + "saveTo": "The copy saves to {email}.", + "cancel": "Cancel", + "confirm": "Make a copy", + "copyFailed": "Could not make a copy. Try again.", + "nameRequired": "Add your community’s name to continue.", + "expiredTitle": "This link has expired", + "expiredDescription": "Enter the email the invitation was sent to. We’ll send a new link that works for 60 minutes.", + "emailLabel": "Email address", + "emailPlaceholder": "you@example.com", + "sendNewLink": "Send a new link", + "notInvitedAddress": "Not the address you were invited at?", + "backToHome": "← Back to home", + "sentTitle": "Check your email", + "sentBody": "If that address still has an invitation, we sent a new link. Open it within 60 minutes.", + "emailInvalid": "Enter a valid email address.", + "genericError": "Something went wrong. Try again.", + "rateLimited": "Too many requests. Try again in {seconds} seconds.", + "missingToken": "This page needs the original invitation link. Ask the person who invited you to send it again.", + "loadingFallback": "Loading…" +} diff --git a/messages/en/pages/login.json b/messages/en/pages/login.json index 9fb560d..eff0895 100644 --- a/messages/en/pages/login.json +++ b/messages/en/pages/login.json @@ -1,16 +1,19 @@ { "title": "Log in to CommunityRule", - "subtitle": "Enter your email and we'll send you a magic link to sign in. No password needed!", + "subtitle": "Enter your email and we'll send you a magic link to log in. No password needed!", "saveProgressTitle": "Save your progress?", - "saveProgressSubtitle": "We need your email to save, and we'll send you a magic link to sign in. If you don't save now you could lose your progress.", - "keepRuleTitle": "Sign in to keep this rule on your profile", + "saveProgressSubtitle": "We need your email to save, and we'll send you a magic link to log in. If you don't save now you could lose your progress.", + "keepRuleTitle": "Log in to keep this rule on your profile", "keepRuleSubtitle": "Enter your email and we'll send a magic link. Open it on this same browser to attach the rule to your account. You can also continue without saving.", + "inviteTitle": "Log in to invite your members", + "inviteSubtitle": "Only a logged-in person can invite. Enter your email and we’ll send you a magic link to log in.", + "backToYourRule": "← Back to your Rule", "continueWithoutSaving": "Continue without saving", "emailLabel": "Email address", "emailPlaceholder": "you@example.com", "sendMagicLink": "Send me a magic link", "successTitle": "Check your email", - "successBody": "We sent a sign-in link. Open it on this device to continue. If you don't see it, check spam or promotions.", + "successBody": "We sent a login link. Open it on this device to continue. If you don't see it, check spam or promotions.", "legalPrefix": "By continuing, you agree to our ", "legalAnd": " and ", "legalSuffix": ".", @@ -21,9 +24,9 @@ "emailInvalid": "Enter a valid email address.", "rateLimited": "Too many requests. Try again in {seconds} seconds.", "generic": "Something went wrong. Try again.", - "invalidLink": "That sign-in link is not valid. Request a new one from the login page.", - "expiredLink": "That sign-in link has expired. Request a new one from the login page.", + "invalidLink": "That login link is not valid. Request a new one from the login page.", + "expiredLink": "That login link has expired. Request a new one from the login page.", "serverError": "Something went wrong on our end. Try again later.", - "stakeholderWrongAccount": "Sign out and open the stakeholder invite link again, or use the same email you were invited with." + "stakeholderWrongAccount": "Log out and open the invite link again, or use the same email you were invited with." } } diff --git a/messages/en/pages/privacy.json b/messages/en/pages/privacy.json index 5d58890..6dd10c6 100644 --- a/messages/en/pages/privacy.json +++ b/messages/en/pages/privacy.json @@ -14,14 +14,14 @@ { "heading": "What we collect", "paragraphs": [ - "Your email, to sign you in, change your email, or invite a stakeholder. In-progress drafts in your browser and, after you save, on our servers. Files you attach to a Rule. Messages you send through the organizer form, which go to MEDLab by email. Page performance metrics (URL, timing, and browser), which are written to our server logs and are not tied to your account. If you publish without signing in, a claim cookie on this browser so a later sign-in can attach that Rule to your account.", + "Your email, to log you in, change your email, or invite a stakeholder. In-progress drafts in your browser and, after you save, on our servers. Files you attach to a Rule. Messages you send through the organizer form, which go to MEDLab by email. Page performance metrics (URL, timing, and browser), which are written to our server logs and are not tied to your account. If you finish a Rule without logging in, a claim cookie on this browser so a later login can attach that Rule to your account.", "We do not sell this information or use it for advertising. As a public university project, some records may be subject to the Colorado Open Records Act." ] }, { "heading": "Where it is stored", "paragraphs": [ - "Accounts, drafts, published Rules, uploads, and the recommendation table live on servers MEDLab operates. The app is not hosted on a third-party cloud app platform.", + "Accounts, drafts, finished Rules, uploads, and the recommendation table live on servers MEDLab operates. The app is not hosted on a third-party cloud app platform.", "Sign-in and invite emails are sent through MEDLab’s mail system, which relays through Amazon SES to deliver them. Ordinary server logs may include the request URL and IP address." ] }, @@ -35,7 +35,7 @@ { "heading": "Your account", "paragraphs": [ - "You can sign out, delete a Rule you published, or delete your account from your profile. Deleting your account removes your login and draft. Published Rules are public and stay public unless you delete them first.", + "You can log out, delete a Rule you finished, or delete your account from your profile. Logging out clears the session cookie on this browser. Deleting your account deletes every Rule you made. The people you invited lose access to them.", "Questions: [medlab@colorado.edu](mailto:medlab@colorado.edu)." ] } diff --git a/messages/en/pages/profile.json b/messages/en/pages/profile.json index 5dd5377..81ba486 100644 --- a/messages/en/pages/profile.json +++ b/messages/en/pages/profile.json @@ -1,21 +1,23 @@ { "pageTitle": "Your profile", "welcomeTitle": "Congrats {{name}}!", - "welcomeBodyFirstRule": "You’ve made your first CommunityRule. Make sure to link it in your community resources and evolve it as your group grows and changes.", + "welcomeBodyFirstRule": "Invite the people in your community to read it.", "welcomeBodyNoRules": "Create your first CommunityRule to capture how your group makes decisions—then link it from your community resources as you grow.", - "yourOptionsHeading": "Your Options", + "yourOptionsHeading": "Your options", "optionCreateCustom": "Create new custom Rule", "optionCreateTemplate": "Create new Rule from template", "optionLogout": "Log out of CommunityRule", "optionChangeEmail": "Change your account email", "intro": "Manage your CommunityRules, saved progress, and account.", - "signInPrompt": "Sign in to view your profile and saved rules.", + "signInPrompt": "Log in to view your profile and saved rules.", "signInCta": "Log in", "loading": "Loading…", - "yourRulesHeading": "Your CommunityRules", - "yourRulesEmpty": "You have not published a rule yet. Create one to see it here.", + "yourRulesHeading": "Your Rules", + "yourRulesEmpty": "You have not finished a rule yet. Create one to see it here.", "draftHeading": "Saved in progress", - "draftInProgressBadge": "In progress", + "draftInProgressBadge": "Draft", + "finishedBadge": "Finished", + "inviteMembers": "Invite your members", "continueDraft": "Continue", "createHeading": "Create", "createCustomDescription": "Start a new custom rule from the beginning.", @@ -26,7 +28,7 @@ "manageRule": "Manage", "duplicate": "Duplicate", "deleteRule": "Delete", - "deleteRuleConfirm": "Delete this published rule? This cannot be undone.", + "deleteRuleConfirm": "Delete this finished rule? This cannot be undone.", "deleteRuleModalTitle": "Delete this rule?", "deleteRuleModalBody": "This cannot be undone.", "deleteRuleCancel": "Cancel", @@ -50,13 +52,13 @@ "emailChangeVerifyInvalid": "That confirmation link is not valid.", "emailChangeVerifyTaken": "That address was claimed by another account while you were confirming. Try a different email.", "emailChangeRateLimited": "Too many requests. Try again in about {{seconds}} seconds.", - "signOut": "Sign out", + "signOut": "Log out", "deleteAccount": "Delete account", - "deleteAccountIntro": "Permanently delete your account and sign-in data. Your published rules will remain visible without an owner name.", + "deleteAccountIntro": "This deletes your account and every Rule you made. The people you invited lose access to them. Export any Rule you want to keep first.", "deleteAccountCancel": "Cancel", "deleteAccountConfirm": "Delete my account", "deleteAccountModalTitle": "Delete your account?", - "deleteAccountModalBody": "This will remove your account and sign you out. Published rules you created stay public as anonymous community rules.", + "deleteAccountModalBody": "This deletes your account and every Rule you made. The people you invited lose access to them. Export any Rule you want to keep first.", "actionError": "Something went wrong. Try again.", "rulesLoadBannerTitle": "Could not load your CommunityRules", "rulesLoadBannerDescription": "Check your connection and refresh the page.", diff --git a/public/assets/logos/community-rule-mark.png b/public/assets/logos/community-rule-mark.png new file mode 100644 index 0000000..cbaed36 Binary files /dev/null and b/public/assets/logos/community-rule-mark.png differ diff --git a/stories/pages/ConfirmStakeholdersPage.stories.js b/stories/pages/ConfirmStakeholdersPage.stories.js index 85c2d0c..31ca160 100644 --- a/stories/pages/ConfirmStakeholdersPage.stories.js +++ b/stories/pages/ConfirmStakeholdersPage.stories.js @@ -1,14 +1,14 @@ import { ConfirmStakeholdersScreen } from "../../app/(app)/create/screens/select/ConfirmStakeholdersScreen"; export default { - title: "Pages/Create Flow/Confirm stakeholders", + title: "Pages/Create Flow/Invite your members", component: ConfirmStakeholdersScreen, parameters: { layout: "fullscreen", docs: { description: { component: - "Stacked lockup + MultiSelect; draft congratulations banner; before final review.", + "Invite people to read the Rule after final review. Membership card beside the email list; Finish without inviting and Send invitations in the footer.", }, }, }, diff --git a/tests/components/Chip.test.tsx b/tests/components/Chip.test.tsx index 5bfb662..787b63b 100644 --- a/tests/components/Chip.test.tsx +++ b/tests/components/Chip.test.tsx @@ -64,4 +64,14 @@ describe("Chip", () => { expect(chip).toHaveAttribute("aria-pressed", "true"); expect(chip.querySelector("svg[aria-hidden]")).not.toBeNull(); }); + + it("shows a warning icon and names the missing words", () => { + render( + , + ); + const chip = screen.getByRole("button", { + name: "Signal, missing words", + }); + expect(chip.querySelector("svg")).not.toBeNull(); + }); }); diff --git a/tests/components/CompletedPage.test.tsx b/tests/components/CompletedPage.test.tsx index 6e0dc01..ee91968 100644 --- a/tests/components/CompletedPage.test.tsx +++ b/tests/components/CompletedPage.test.tsx @@ -67,7 +67,7 @@ describe("CompletedScreen", () => { expect(screen.queryByText("Values")).not.toBeInTheDocument(); }); - it("does not pin the title on small screens", () => { + it("keeps the heading in place while the Rule column scrolls", () => { sessionStorage.setItem( CREATE_FLOW_LAST_PUBLISHED_KEY, JSON.stringify(storedRuleFixture), @@ -78,11 +78,25 @@ describe("CompletedScreen", () => { }); const column = heading.closest("div[class*='md:justify-center']"); expect(column).toBeTruthy(); - expect(column.className).not.toMatch(/\bsticky\b/); + expect(column.className).toMatch(/\bshrink-0\b/); const ruleColumn = screen .getByText("Fixture value title") - .closest("div[class*='md:overflow-y-auto']"); - expect(ruleColumn?.className).toMatch(/max-md:shrink-0/); + .closest("div[class*='overflow-y-auto']"); + expect(ruleColumn?.className).toMatch(/overflow-y-auto/); + }); + + it("offers Ask an organizer under the finished Rule heading", () => { + sessionStorage.setItem( + CREATE_FLOW_LAST_PUBLISHED_KEY, + JSON.stringify(storedRuleFixture), + ); + render( ); + expect( + screen.getByText("Has your Rule changed how your community works?"), + ).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: "Tell an organizer what changed." }), + ).toBeInTheDocument(); }); it("renders header and document from sessionStorage", () => { @@ -106,16 +120,34 @@ describe("CompletedScreen", () => { render( ); expect( screen.queryByText( - "This is what folks see when you share your CommunityRule", + "Your Rule is finished", ), ).not.toBeInTheDocument(); expect( screen.queryByText( - "Your group can use this document as an operating manual.", + "This is what the people you invite will see.", ), ).not.toBeInTheDocument(); }); + it("shows copy-ready toast when copied query is set", () => { + sessionStorage.setItem( + CREATE_FLOW_LAST_PUBLISHED_KEY, + JSON.stringify({ + ...storedRuleFixture, + copiedFromTitle: "Juniper Street Food Share", + }), + ); + mockSearchParams({ copied: "1" }); + render( ); + expect(screen.getByText("Your copy is ready")).toBeInTheDocument(); + expect( + screen.getByText( + "It started from Juniper Street Food Share’s Rule. Read it through and change what does not fit before you invite your members.", + ), + ).toBeInTheDocument(); + }); + it("shows post-publish toast in status region when celebrate query is set", () => { mockSearchParams({ [CREATE_FLOW_COMPLETED_CELEBRATE_QUERY]: @@ -123,20 +155,16 @@ describe("CompletedScreen", () => { }); render( ); expect( - screen.getByText( - "This is what folks see when you share your CommunityRule", - ), + screen.getByText("Your Rule is finished"), ).toBeInTheDocument(); expect( - screen.getByText( - "Your group can use this document as an operating manual.", - ), + screen.getByText("This is what the people you invite will see."), ).toBeInTheDocument(); const statusRegions = screen.getAllByRole("status"); expect(statusRegions.length).toBeGreaterThanOrEqual(1); expect( statusRegions.some((el) => - el.textContent?.includes("This is what folks see when you share"), + el.textContent?.includes("Your Rule is finished"), ), ).toBe(true); }); diff --git a/tests/components/ConfirmStakeholdersPage.test.tsx b/tests/components/ConfirmStakeholdersPage.test.tsx index a878344..8428235 100644 --- a/tests/components/ConfirmStakeholdersPage.test.tsx +++ b/tests/components/ConfirmStakeholdersPage.test.tsx @@ -1,42 +1,128 @@ -import { describe, it, expect } from "vitest"; +import { describe, it, expect, vi, beforeEach } from "vitest"; +import { useEffect } from "react"; import userEvent from "@testing-library/user-event"; import { renderWithProviders as render, screen } from "../utils/test-utils"; import "@testing-library/jest-dom/vitest"; import { ConfirmStakeholdersScreen } from "../../app/(app)/create/screens/select/ConfirmStakeholdersScreen"; +import { useCreateFlow } from "../../app/(app)/create/context/CreateFlowContext"; +import type { CreateFlowState } from "../../app/(app)/create/types"; + +vi.mock("../../lib/create/api", async (importOriginal) => { + const actual = await importOriginal (); + return { + ...actual, + fetchAuthSession: vi.fn(async () => ({ + user: { id: "u1", email: "maya@example.org" }, + })), + }; +}); + +function SeedCreateFlow({ patch }: { patch: Partial }) { + const { updateState } = useCreateFlow(); + useEffect(() => { + updateState(patch); + }, [patch, updateState]); + return null; +} describe("ConfirmStakeholdersScreen", () => { - it("renders title and description", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it("renders the invite heading and email field", () => { render( ); expect( screen.getByRole("heading", { - name: /Do other stakeholders need to be involved/i, + name: "Invite people to read your Rule", }), ).toBeInTheDocument(); + expect( + screen.getByText("Everyone you add gets a private link to read the Rule."), + ).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: "Add" }), + ).toBeInTheDocument(); expect( screen.getByText( - /Add their email addresses\. When you publish, we'll send each person a one-time link/i, + /Every Rule starts private\. Only the people you invite can read it/, ), ).toBeInTheDocument(); }); - it("renders Add stakeholder control", () => { + it("does not show the old draft toast", () => { render( ); expect( - screen.getByRole("button", { name: "Add stakeholder" }), - ).toBeInTheDocument(); - }); - - it("shows draft toast and can dismiss it", async () => { - const user = userEvent.setup(); - render( ); - expect( - screen.getByText(/Congratulations! You've drafted your CommunityRule!/i), - ).toBeInTheDocument(); - await user.click(screen.getByRole("button", { name: "Close" })); - expect( - screen.queryByText( - /Congratulations! You've drafted your CommunityRule!/i, - ), + screen.queryByText(/Congratulations! You've drafted your CommunityRule!/i), ).not.toBeInTheDocument(); }); + + it("adds an email and shows the owner as You", async () => { + const user = userEvent.setup(); + render( ); + expect(await screen.findByText("maya@example.org")).toBeInTheDocument(); + expect(screen.getByText("You")).toBeInTheDocument(); + + await user.type( + screen.getByRole("textbox", { name: /Add someone by email/i }), + "rosa@example.org", + ); + await user.click(screen.getByRole("button", { name: "Add" })); + expect(screen.getByText("rosa@example.org")).toBeInTheDocument(); + expect( + screen.getByText("2 people get a private link to read the Rule."), + ).toBeInTheDocument(); + expect( + screen.queryByRole("button", { name: /Remove maya@example.org/i }), + ).not.toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /Remove rosa@example.org/i }), + ).toBeInTheDocument(); + }); + + it("keeps a pasted invalid address in the field and reports what was added", async () => { + const user = userEvent.setup(); + render( ); + const field = await screen.findByRole("textbox", { + name: /Add someone by email/i, + }); + field.focus(); + await user.paste("rosa@example.org, jo@example, sam@example.org"); + expect(await screen.findByText("rosa@example.org")).toBeInTheDocument(); + expect(screen.getByText("sam@example.org")).toBeInTheDocument(); + expect(field).toHaveValue("jo@example"); + expect( + screen.getByText( + /Added two people from your list\. One is not an email address\./, + ), + ).toBeInTheDocument(); + expect( + screen.getByText("Not an email address. Fix it and select Add, or clear it."), + ).toBeInTheDocument(); + }); + + it("shows the membership card from the selected method", async () => { + render( + <> + + + , + ); + expect(await screen.findByText("Open admission")).toBeInTheDocument(); + expect(screen.getByText("Who belongs, in your Rule’s words")).toBeInTheDocument(); + expect( + screen.getByText(/Anyone who shares the work belongs/), + ).toBeInTheDocument(); + }); }); diff --git a/tests/components/ExpiredInviteScreen.test.tsx b/tests/components/ExpiredInviteScreen.test.tsx new file mode 100644 index 0000000..74afa48 --- /dev/null +++ b/tests/components/ExpiredInviteScreen.test.tsx @@ -0,0 +1,63 @@ +import { describe, expect, it, vi, beforeEach } from "vitest"; +import { renderWithProviders as render, screen } from "../utils/test-utils"; +import userEvent from "@testing-library/user-event"; +import "@testing-library/jest-dom/vitest"; +import { ExpiredInviteScreen } from "../../app/(app)/invite/_components/ExpiredInviteScreen"; + +const { navMock, resendMock } = vi.hoisted(() => ({ + navMock: { + searchParams: new URLSearchParams("token=abcdefghijkl"), + push: vi.fn(), + }, + resendMock: vi.fn(), +})); + +vi.mock("next/navigation", () => ({ + useRouter: () => ({ + push: navMock.push, + replace: vi.fn(), + prefetch: vi.fn(), + refresh: vi.fn(), + back: vi.fn(), + forward: vi.fn(), + }), + useSearchParams: () => navMock.searchParams, + usePathname: () => "/invite/expired", +})); + +vi.mock("../../lib/create/api", () => ({ + resendExpiredStakeholderInvite: (...args: unknown[]) => resendMock(...args), +})); + +describe("ExpiredInviteScreen", () => { + beforeEach(() => { + navMock.searchParams = new URLSearchParams("token=abcdefghijkl"); + navMock.push.mockReset(); + resendMock.mockReset(); + resendMock.mockResolvedValue({ ok: true }); + }); + + it("asks for the invited email and sends a new link", async () => { + const user = userEvent.setup(); + render( ); + + expect( + screen.getByRole("heading", { name: "This link has expired" }), + ).toBeInTheDocument(); + await user.type( + screen.getByLabelText("Email address"), + "inv@example.com", + ); + await user.click( + screen.getByRole("button", { name: "Send a new link" }), + ); + + expect(resendMock).toHaveBeenCalledWith( + "abcdefghijkl", + "inv@example.com", + ); + expect( + await screen.findByRole("heading", { name: "Check your email" }), + ).toBeInTheDocument(); + }); +}); diff --git a/tests/components/FinalReviewPage.test.tsx b/tests/components/FinalReviewPage.test.tsx index 25b9237..6bf107d 100644 --- a/tests/components/FinalReviewPage.test.tsx +++ b/tests/components/FinalReviewPage.test.tsx @@ -14,7 +14,9 @@ import { clearCoreValueDetailsLocalStorage } from "../../app/(app)/create/utils/ import type { CreateFlowState } from "../../app/(app)/create/types"; function catalogChipName(label: string) { - return new RegExp(`^(Select|Deselect) ${label}$`); + return new RegExp( + `^((Select|Deselect) ${label}|${label}, missing words)$`, + ); } async function confirmDiscardCustomizeEdits() { @@ -75,7 +77,7 @@ describe("FinalReviewScreen", () => { render( ); expect( screen.getByRole("heading", { - name: "Review your CommunityRule", + name: "Review your Rule", }), ).toBeInTheDocument(); }); @@ -83,9 +85,7 @@ describe("FinalReviewScreen", () => { it("renders lockup description", () => { render( ); expect( - screen.getByText( - /Here's what other people will see. Make sure everything looks good before you publish. Once the rule is published, you must use one of your decision-making mechanisms to edit it again./i, - ), + screen.getByText("Here's what other people will see."), ).toBeInTheDocument(); }); @@ -182,11 +182,19 @@ describe("FinalReviewScreen", () => { expect(screen.getByText("Conflict management")).toBeInTheDocument(); }); - it("renders category chips", () => { + it("shows add chips and flags when no cards or values are picked", () => { render( ); - expect(screen.getByText("Consciousness")).toBeInTheDocument(); - expect(screen.getByText("Signal")).toBeInTheDocument(); - expect(screen.getByText("Open Admission")).toBeInTheDocument(); + expect( + screen.getByText("No values yet. You can add them any time."), + ).toBeInTheDocument(); + expect( + screen.getAllByText("No card yet. Add one before you finish.").length, + ).toBe(4); + expect( + screen.getByRole("button", { name: "Add value" }), + ).toBeInTheDocument(); + expect(screen.getAllByRole("button", { name: "Add card" })).toHaveLength(4); + expect(screen.queryByText("Consciousness")).not.toBeInTheDocument(); }); }); @@ -225,10 +233,10 @@ describe("FinalReviewScreen — prefilled selections", () => { expect(screen.getByText("Lazy consensus")).toBeInTheDocument(); expect(screen.getByText("Conflict ladder")).toBeInTheDocument(); - // Demo chips from `finalReview.json` must not leak through once the - // user has real selections. The fallback still says "Open Admission". - expect(screen.queryByText("Open Admission")).not.toBeInTheDocument(); expect(screen.queryByText("Consciousness")).not.toBeInTheDocument(); + expect( + screen.getByRole("button", { name: "Signal, missing words" }), + ).toBeInTheDocument(); }); it("warns when binding arbitration sits next to a join that records no yes", async () => { @@ -1288,20 +1296,20 @@ describe("FinalReviewScreen — edit published title and description", () => { ).toBeInTheDocument(); expect( screen.getByText( - /Update what others see on your public rule. Save & Exit or Publish applies changes to your published CommunityRule./i, + /Update what others see on your Rule. Save & Exit or Finish applies the changes./i, ), ).toBeInTheDocument(); }); - it("does not expose click-to-edit title or description on default final review", () => { + it("exposes click-to-edit title and description on default final review", () => { render( , ); - expect(screen.queryByTestId("rule-title-edit")).not.toBeInTheDocument(); - expect(screen.queryByTestId("rule-description-edit")).not.toBeInTheDocument(); + expect(screen.getByTestId("rule-title-edit")).toBeInTheDocument(); + expect(screen.getByTestId("rule-description-edit")).toBeInTheDocument(); }); it("opens Save modal from title click and updates title", async () => { diff --git a/tests/components/InvitedRuleView.test.tsx b/tests/components/InvitedRuleView.test.tsx new file mode 100644 index 0000000..bd497d4 --- /dev/null +++ b/tests/components/InvitedRuleView.test.tsx @@ -0,0 +1,68 @@ +import { describe, expect, it, vi } from "vitest"; +import { renderWithProviders as render, screen } from "../utils/test-utils"; +import "@testing-library/jest-dom/vitest"; +import { InvitedRuleView } from "../../app/(app)/invite/_components/InvitedRuleView"; + +vi.mock("next/navigation", () => ({ + useRouter: () => ({ + replace: vi.fn(), + push: vi.fn(), + prefetch: vi.fn(), + refresh: vi.fn(), + back: vi.fn(), + forward: vi.fn(), + }), +})); + +const document = { + sections: [ + { + categoryName: "Values", + entries: [ + { + title: "Care", + body: "We care for each other.", + }, + ], + }, + ], +}; + +describe("InvitedRuleView", () => { + it("names the inviter by email and offers Make a copy", () => { + render( + , + ); + + expect( + screen.getByText("maya@example.com invited you to read this Rule"), + ).toBeInTheDocument(); + expect( + screen.getByText( + "Their Rule sets out how they talk, who belongs, how they decide and what happens when they disagree.", + ), + ).toBeInTheDocument(); + expect( + screen.getAllByRole("button", { name: "Make a copy of this Rule" }) + .length, + ).toBeGreaterThan(0); + expect( + screen.getByText("Only people the community invites"), + ).toBeInTheDocument(); + expect( + screen.getByText( + "Every Rule starts private. Only the people the community invites can read it until the person who holds the pen turns on a link.", + ), + ).toBeInTheDocument(); + expect(screen.getByText("Care")).toBeInTheDocument(); + }); +}); diff --git a/tests/components/LoginForm.test.tsx b/tests/components/LoginForm.test.tsx index f94d757..2c368d7 100644 --- a/tests/components/LoginForm.test.tsx +++ b/tests/components/LoginForm.test.tsx @@ -124,7 +124,7 @@ describe("LoginForm", () => { expect( await screen.findByRole("heading", { name: /check your email/i }), ).toBeInTheDocument(); - expect(screen.getByText(/we sent a sign-in link/i)).toBeInTheDocument(); + expect(screen.getByText(/we sent a login link/i)).toBeInTheDocument(); expect(screen.getByText(/check spam or promotions/i)).toBeInTheDocument(); }); @@ -191,7 +191,7 @@ describe("LoginForm", () => { ); expect( screen.getByRole("heading", { - name: /sign in to keep this rule on your profile/i, + name: /log in to keep this rule on your profile/i, }), ).toBeInTheDocument(); await user.type( @@ -212,6 +212,44 @@ describe("LoginForm", () => { window.localStorage.removeItem("create-flow-anonymous"); }); + it("invite variant attaches a create-flow draft", async () => { + const user = userEvent.setup(); + window.localStorage.setItem( + "create-flow-anonymous", + JSON.stringify({ title: "Guest draft" }), + ); + vi.mocked(requestMagicLink).mockResolvedValue({ ok: true }); + renderWithProviders( + + , + ); + expect( + screen.getByRole("heading", { + name: /log in to invite your members/i, + }), + ).toBeInTheDocument(); + await user.type( + screen.getByRole("textbox", { name: /email address/i }), + "guest@example.com", + ); + await user.click( + screen.getByRole("button", { name: /send me a magic link/i }), + ); + await waitFor(() => { + expect(requestMagicLink).toHaveBeenCalledWith( + "guest@example.com", + "/create/confirm-stakeholders?syncDraft=1", + expect.objectContaining({ title: "Guest draft" }), + ); + }); + expect(setTransferPendingFlag).toHaveBeenCalled(); + window.localStorage.removeItem("create-flow-anonymous"); + }); + it("keepRule continue without saving calls onDismiss", async () => { const user = userEvent.setup(); const onDismiss = vi.fn(); @@ -300,7 +338,7 @@ describe("LoginForm", () => { navMock.searchParams = new URLSearchParams("error=expired_link"); renderLoginForm(); expect( - screen.getByText(/that sign-in link has expired/i), + screen.getByText(/that login link has expired/i), ).toBeInTheDocument(); }); @@ -308,7 +346,7 @@ describe("LoginForm", () => { navMock.searchParams = new URLSearchParams("error=invalid_link"); renderLoginForm(); expect( - screen.getByText(/that sign-in link is not valid/i), + screen.getByText(/that login link is not valid/i), ).toBeInTheDocument(); }); diff --git a/tests/components/MultiSelect.test.tsx b/tests/components/MultiSelect.test.tsx index ac8ca39..b86abd2 100644 --- a/tests/components/MultiSelect.test.tsx +++ b/tests/components/MultiSelect.test.tsx @@ -287,4 +287,18 @@ describe("MultiSelect – behaviour specifics", () => { ); expect(screen.getByText("Pick one")).toBeInTheDocument(); }); + + it("shows a flag after the add chip in the same row", () => { + render( ++ , + ); + expect( + screen.getByText("No card yet. Add one before you finish."), + ).toBeInTheDocument(); + }); }); diff --git a/tests/components/TextPage.test.tsx b/tests/components/TextPage.test.tsx index 65f7f58..4b0cdbe 100644 --- a/tests/components/TextPage.test.tsx +++ b/tests/components/TextPage.test.tsx @@ -46,7 +46,7 @@ describe("CreateFlowTextFieldScreen (community description)", () => { , diff --git a/tests/contexts/AuthModalContext.test.tsx b/tests/contexts/AuthModalContext.test.tsx index fe67d4f..84fbc22 100644 --- a/tests/contexts/AuthModalContext.test.tsx +++ b/tests/contexts/AuthModalContext.test.tsx @@ -87,6 +87,17 @@ function LoginTrigger() { > Open keep rule then leave + @@ -192,7 +203,7 @@ describe("AuthModalProvider (header overlay)", () => { }); expect( screen.getByRole("heading", { - name: /sign in to keep this rule on your profile/i, + name: /log in to keep this rule on your profile/i, }), ).toBeInTheDocument(); await user.type( @@ -253,4 +264,44 @@ describe("AuthModalProvider (header overlay)", () => { }); expect(screen.getByText("Left completed")).toBeInTheDocument(); }); + + it("invite openLogin shows back-to-rule and attaches a draft", async () => { + const user = userEvent.setup(); + window.localStorage.setItem( + "create-flow-anonymous", + JSON.stringify({ title: "Guest draft" }), + ); + vi.mocked(requestMagicLink).mockResolvedValue({ ok: true }); + renderWithProviders( + + , + ); + await user.click(screen.getByRole("button", { name: /open invite login/i })); + await waitFor(() => { + expect(screen.getByRole("dialog")).toBeInTheDocument(); + }); + expect( + screen.getByRole("heading", { name: /log in to invite your members/i }), + ).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /back to your rule/i }), + ).toBeInTheDocument(); + await user.type( + screen.getByRole("textbox", { name: /email address/i }), + "guest@example.com", + ); + await user.click( + screen.getByRole("button", { name: /send me a magic link/i }), + ); + await waitFor(() => { + expect(requestMagicLink).toHaveBeenCalledWith( + "guest@example.com", + "/create/confirm-stakeholders?syncDraft=1", + expect.objectContaining({ title: "Guest draft" }), + ); + }); + expect(setTransferPendingFlag).toHaveBeenCalled(); + window.localStorage.removeItem("create-flow-anonymous"); + }); }); diff --git a/tests/pages/profile.test.tsx b/tests/pages/profile.test.tsx index ac62914..88ffb34 100644 --- a/tests/pages/profile.test.tsx +++ b/tests/pages/profile.test.tsx @@ -53,6 +53,7 @@ function viewProps( onCloseDeleteRule: vi.fn(), onConfirmDeleteRule: vi.fn(), onDuplicateRule: vi.fn(), + onInviteMembers: vi.fn(), onContinueDraft: vi.fn(), onDeleteDraft: vi.fn(), onCloseDeleteDraft: vi.fn(), @@ -142,4 +143,45 @@ describe("ProfilePageView", () => { await user.click(confirm); expect(onConfirmDeleteAccount).toHaveBeenCalledTimes(1); }); + + test("finished owner cards offer Invite your members beside Duplicate and Delete", async () => { + const user = userEvent.setup(); + const onInviteMembers = vi.fn(); + render( ++ , + ); + + expect( + screen.getByText(copy.welcomeBodyFirstRule), + ).toBeInTheDocument(); + expect(screen.getByText(copy.finishedBadge)).toBeInTheDocument(); + expect( + screen.getByRole("heading", { name: copy.yourRulesHeading }), + ).toBeInTheDocument(); + + await user.click( + screen.getByRole("button", { name: copy.inviteMembers }), + ); + expect(onInviteMembers).toHaveBeenCalledWith("rule-1"); + expect( + screen.getByRole("button", { name: copy.duplicate }), + ).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: copy.deleteRule }), + ).toBeInTheDocument(); + }); }); diff --git a/tests/unit/buildFinalReviewCategories.test.ts b/tests/unit/buildFinalReviewCategories.test.ts index f9f893d..3ae1ad5 100644 --- a/tests/unit/buildFinalReviewCategories.test.ts +++ b/tests/unit/buildFinalReviewCategories.test.ts @@ -10,9 +10,21 @@ const NAMES = { conflict: "Conflict management", }; +function rowsWith( + chipsByName: Partial , + ) => { + const tx = { + publishedRule: { + create: vi.fn().mockResolvedValue(created), + }, + ruleStakeholder: { + create: vi.fn().mockResolvedValue({}), + }, + }; + return fn(tx); + }, + ); + sendInviteMock + .mockResolvedValueOnce(undefined) + .mockRejectedValueOnce(new Error("smtp down")); + + const res = await POST( + new NextRequest("https://x.test/api/rules", { + method: "POST", + body: JSON.stringify({ + title: "Published title", + summary: null, + document: {}, + stakeholderEmails: ["first@example.com", "second@example.com"], + }), + }), + undefined, + ); + + expect(res.status).toBe(200); + expect(sendInviteMock).toHaveBeenCalledTimes(2); + expect(publishedRuleDeleteMock).not.toHaveBeenCalled(); + const body = (await res.json()) as { rule: { id: string } }; + expect(body.rule.id).toBe("rule-partial"); + }); + it("creates an unlisted rule when there is no session", async () => { getSessionUserMock.mockResolvedValueOnce(null); publishedRuleCreateMock.mockResolvedValueOnce({ diff --git a/tests/unit/rulesStakeholderMutationsRoute.test.ts b/tests/unit/rulesStakeholderMutationsRoute.test.ts index 9498b12..309b024 100644 --- a/tests/unit/rulesStakeholderMutationsRoute.test.ts +++ b/tests/unit/rulesStakeholderMutationsRoute.test.ts @@ -130,7 +130,13 @@ describe("POST /api/rules/[id]/stakeholders", () => { routeCtx, ); expect(res.status).toBe(201); - expect(createInviteMock).toHaveBeenCalled(); + expect(createInviteMock).toHaveBeenCalledWith( + expect.objectContaining({ + email: "inv@example.com", + ruleTitle: "My rule", + inviterEmail: owner.email, + }), + ); const body = (await res.json()) as { stakeholder: { email: string; status: string }; }; @@ -214,9 +220,14 @@ describe("POST /api/rules/[id]/stakeholders/[stakeholderId]/resend", () => { expect(await res.json()).toEqual({ ok: true }); expect(updateMock).toHaveBeenCalled(); expect(sendInviteEmailMock).toHaveBeenCalledWith( - "inv@example.com", - expect.stringContaining("/api/invites/rule-stakeholder/verify?token="), - "My rule", + expect.objectContaining({ + to: "inv@example.com", + communityName: "My rule", + inviterEmail: owner.email, + verifyUrl: expect.stringContaining( + "/api/invites/rule-stakeholder/verify?token=", + ), + }), ); }); });
-
{items.map((row) => (