stabilize hydrated login actions

This commit is contained in:
ajnart committed 2026-08-13 19:56:38 +02:00
1 parent de682abadc
commit d825cb7051
2 files changed
+9 -7

No files matched your search

@@ -4,7 +4,7 @@ import type { PropsWithChildren } from "react";
import { useCallback, useEffect, useRef, useState } from "react"; import { useCallback, useEffect, useRef, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import { Anchor, Button, Card, Code, Collapse, Divider, PasswordInput, Stack, Text, TextInput } from "@mantine/core"; import { Anchor, Button, Card, Code, Collapse, Divider, PasswordInput, Stack, Text, TextInput } from "@mantine/core";
import { useDisclosure } from "@mantine/hooks"; import { useDisclosure, useMounted } from "@mantine/hooks";
import { z } from "zod/v4"; import { z } from "zod/v4";
import { signIn } from "@homarr/auth/client"; import { signIn } from "@homarr/auth/client";
@@ -32,6 +32,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const isError = searchParams.has("error"); const isError = searchParams.has("error");
const router = useRouter(); const router = useRouter();
const isMounted = useMounted();
const [isPending, setIsPending] = useState(false); const [isPending, setIsPending] = useState(false);
const form = useZodForm(extendedValidation, { const form = useZodForm(extendedValidation, {
initialValues: { initialValues: {
@@ -132,7 +133,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
{providers.includes("credentials") && ( {providers.includes("credentials") && (
<Stack gap="sm"> <Stack gap="sm">
<SubmitButton isPending={isPending} form={form} provider="credentials"> <SubmitButton isMounted={isMounted} isPending={isPending} form={form} provider="credentials">
{t("action.login.label")} {t("action.login.label")}
</SubmitButton> </SubmitButton>
<PasswordForgottenCollapse username={form.values.name} /> <PasswordForgottenCollapse username={form.values.name} />
@@ -140,7 +141,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
)} )}
{providers.includes("ldap") && ( {providers.includes("ldap") && (
<SubmitButton isPending={isPending} form={form} provider="ldap"> <SubmitButton isMounted={isMounted} isPending={isPending} form={form} provider="ldap">
{t("action.login.labelWith", { provider: "LDAP" })} {t("action.login.labelWith", { provider: "LDAP" })}
</SubmitButton> </SubmitButton>
)} )}
@@ -151,7 +152,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
)} )}
{providers.includes("oidc") && ( {providers.includes("oidc") && (
<Button fullWidth variant="light" onClick={async () => await signInAsync("oidc")}> <Button fullWidth variant="light" disabled={!isMounted} onClick={async () => await signInAsync("oidc")}>
{t("action.login.labelWith", { provider: oidcClientName })} {t("action.login.labelWith", { provider: oidcClientName })}
</Button> </Button>
)} )}
@@ -161,12 +162,13 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
}; };
interface SubmitButtonProps { interface SubmitButtonProps {
isMounted: boolean;
isPending: boolean; isPending: boolean;
form: UseFormReturnType<FormType>; form: UseFormReturnType<FormType>;
provider: "credentials" | "ldap"; provider: "credentials" | "ldap";
} }
const SubmitButton = ({ isPending, form, provider, children }: PropsWithChildren<SubmitButtonProps>) => { const SubmitButton = ({ isMounted, isPending, form, provider, children }: PropsWithChildren<SubmitButtonProps>) => {
const isCurrentProviderActive = form.getValues().provider === provider; const isCurrentProviderActive = form.getValues().provider === provider;
return ( return (
@@ -176,7 +178,7 @@ const SubmitButton = ({ isPending, form, provider, children }: PropsWithChildren
fullWidth fullWidth
onClick={() => form.setFieldValue("provider", provider)} onClick={() => form.setFieldValue("provider", provider)}
loading={isPending && isCurrentProviderActive} loading={isPending && isCurrentProviderActive}
disabled={isPending && !isCurrentProviderActive} disabled={!isMounted || (isPending && !isCurrentProviderActive)}
> >
{children} {children}
</Button> </Button>
+1 -1
View File
@@ -44,7 +44,7 @@ describe("Assistant management", () => {
await page.getByLabel("Username").fill(adminCredentials.username); await page.getByLabel("Username").fill(adminCredentials.username);
await page.locator("#password").fill(adminCredentials.password); await page.locator("#password").fill(adminCredentials.password);
await page.getByRole("button", { name: "Login" }).click(); await page.getByRole("button", { name: "Login" }).click();
await page.waitForURL(baseUrl, { timeout: 15_000 }); await expect(page).not.toHaveURL(/\/auth\/login/, { timeout: 30_000 });
await page.goto(`${baseUrl}/manage/assistant`); await page.goto(`${baseUrl}/manage/assistant`);
await expect(page.getByRole("heading", { name: "Assistant" })).toBeVisible(); await expect(page.getByRole("heading", { name: "Assistant" })).toBeVisible();