Keep a failed Profile rules load from looking like an empty account.

This commit is contained in:
adilallo committed 2026-11-11 11:39:57 -07:00
1 parent c332b26683
commit da6388eef3
3 files changed
+39 -2

No files matched your search

+5 -1
View File
@@ -60,6 +60,7 @@ export default function ProfilePageClient() {
const [sessionLoaded, setSessionLoaded] = useState(false); const [sessionLoaded, setSessionLoaded] = useState(false);
const [user, setUser] = useState<{ id: string; email: string } | null>(null); const [user, setUser] = useState<{ id: string; email: string } | null>(null);
const [rules, setRules] = useState<MyPublishedRule[]>([]); const [rules, setRules] = useState<MyPublishedRule[]>([]);
const [rulesLoaded, setRulesLoaded] = useState(false);
const [rulesError, setRulesError] = useState(false); const [rulesError, setRulesError] = useState(false);
const [draft, setDraft] = useState< const [draft, setDraft] = useState<
Awaited<ReturnType<typeof fetchServerDraftForProfile>> Awaited<ReturnType<typeof fetchServerDraftForProfile>>
@@ -92,6 +93,7 @@ export default function ProfilePageClient() {
setSessionLoaded(true); setSessionLoaded(true);
if (!u) { if (!u) {
setRules([]); setRules([]);
setRulesLoaded(false);
setRulesError(false); setRulesError(false);
setDraft(null); setDraft(null);
return; return;
@@ -101,10 +103,11 @@ export default function ProfilePageClient() {
fetchServerDraftForProfile(), fetchServerDraftForProfile(),
]); ]);
if (r === null) { if (r === null) {
setRules([]); setRulesLoaded(false);
setRulesError(true); setRulesError(true);
} else { } else {
setRules(r); setRules(r);
setRulesLoaded(true);
setRulesError(false); setRulesError(false);
} }
setDraft(d); setDraft(d);
@@ -435,6 +438,7 @@ export default function ProfilePageClient() {
profileLgUp={isProfileLgUp} profileLgUp={isProfileLgUp}
profileListSize={isProfileXlUp ? "l" : "m"} profileListSize={isProfileXlUp ? "l" : "m"}
rules={rules} rules={rules}
rulesLoaded={rulesLoaded}
rulesError={rulesError} rulesError={rulesError}
draft={draft} draft={draft}
showDraftCard={showDraftCard} showDraftCard={showDraftCard}
@@ -46,6 +46,8 @@ export type ProfilePageViewProps = {
/** `m` = {@link List} M; `l` = List L at `xl` per Figma `22143:900256`. */ /** `m` = {@link List} M; `l` = List L at `xl` per Figma `22143:900256`. */
profileListSize: Extract<ListSize, "m" | "l">; profileListSize: Extract<ListSize, "m" | "l">;
rules: MyPublishedRule[]; rules: MyPublishedRule[];
/** True only after `fetchMyPublishedRules` succeeds. Dismissing the warning does not set this. */
rulesLoaded: boolean;
rulesError: boolean; rulesError: boolean;
draft: ServerDraftForProfile | null; draft: ServerDraftForProfile | null;
showDraftCard: boolean; showDraftCard: boolean;
@@ -171,6 +173,7 @@ export function ProfilePageView({
profileLgUp, profileLgUp,
profileListSize, profileListSize,
rules, rules,
rulesLoaded,
rulesError, rulesError,
draft, draft,
showDraftCard, showDraftCard,
@@ -235,7 +238,10 @@ export function ProfilePageView({
? t("welcomeBodyFirstRule") ? t("welcomeBodyFirstRule")
: undefined; : undefined;
const showEmptyYourRules = const showEmptyYourRules =
ownedRules.length === 0 && !showDraftCard && !rulesError; rulesLoaded &&
ownedRules.length === 0 &&
!showDraftCard &&
!rulesError;
const profileOptionsItems = useMemo((): ListItem[] => { const profileOptionsItems = useMemo((): ListItem[] => {
return [ return [
+27
View File
@@ -27,6 +27,7 @@ function viewProps(
profileLgUp: true, profileLgUp: true,
profileListSize: "l", profileListSize: "l",
rules: [], rules: [],
rulesLoaded: true,
rulesError: false, rulesError: false,
draft: null, draft: null,
showDraftCard: false, showDraftCard: false,
@@ -128,6 +129,32 @@ describe("ProfilePageView", () => {
expect(onStartNewCustomRule).toHaveBeenCalledTimes(1); expect(onStartNewCustomRule).toHaveBeenCalledTimes(1);
}); });
test("keeps the No Rules card hidden when a failed load warning is dismissed", () => {
const { rerender } = render(
<ProfilePageView
{...viewProps({ rulesLoaded: false, rulesError: true })}
/>,
);
expect(screen.getByText(copy.rulesLoadBannerTitle)).toBeInTheDocument();
expect(
screen.queryByRole("heading", { name: copy.emptyCardTitle }),
).not.toBeInTheDocument();
rerender(
<ProfilePageView
{...viewProps({ rulesLoaded: false, rulesError: false })}
/>,
);
expect(
screen.queryByText(copy.rulesLoadBannerTitle),
).not.toBeInTheDocument();
expect(
screen.queryByRole("heading", { name: copy.emptyCardTitle }),
).not.toBeInTheDocument();
});
test("asks for confirmation before deleting the account", async () => { test("asks for confirmation before deleting the account", async () => {
const user = userEvent.setup(); const user = userEvent.setup();
const onOpenDeleteAccount = vi.fn(); const onOpenDeleteAccount = vi.fn();