Skip to content

Scheduling infrastructure for absolutely everyone.

fix: form issues in QA for onboarding (#25581)

sean-brydon98b862c04877
diff --git a/apps/web/modules/onboarding/teams/details/team-details-view.tsx b/apps/web/modules/onboarding/teams/details/team-details-view.tsx
index 60984243024..bbc55295f5b 100644
--- a/apps/web/modules/onboarding/teams/details/team-details-view.tsx
+++ b/apps/web/modules/onboarding/teams/details/team-details-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { useRouter } from "next/navigation";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState, type FormEvent } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import slugify from "@calcom/lib/slugify";
@@ -65,7 +65,9 @@ export const TeamDetailsView = ({ userEmail }: TeamDetailsViewProps) => {
setTeamLogo(newLogo);
};
- const handleContinue = async () => {
+ const handleContinue = async (e?: FormEvent) => {
+ e?.preventDefault();
+
if (!isSlugValid) {
return;
}
@@ -81,7 +83,8 @@ export const TeamDetailsView = ({ userEmail }: TeamDetailsViewProps) => {
});
// Create the team (will handle payment redirect if needed)
- await createTeam(store);
+ // Don't pass store - let createTeam read the latest state from the store
+ await createTeam();
};
return (
@@ -89,82 +92,87 @@ export const TeamDetailsView = ({ userEmail }: TeamDetailsViewProps) => {
<OnboardingLayout userEmail={userEmail} currentStep={1} totalSteps={3}>
{/* Left column - Main content */}
<div className="flex h-full w-full flex-col gap-4">
- <OnboardingCard
- title={t("create_your_team")}
- subtitle={t("team_onboarding_details_subtitle")}
- footer={
- <div className="flex w-full items-center justify-end gap-4">
- <Button
- color="minimal"
- className="rounded-[10px]"
- onClick={() => router.push("/onboarding/getting-started")}>
- {t("back")}
- </Button>
- <Button
- color="primary"
- className="rounded-[10px]"
- onClick={handleContinue}
- disabled={!isSlugValid || !teamName || !teamSlug || isSubmitting}>
- {t("continue")}
- </Button>
- </div>
- }>
- <div className="flex h-full w-full flex-col gap-4">
- {/* Team Profile Picture */}
- <div className="flex w-full flex-col gap-2">
- <Label className="text-emphasis text-sm font-medium leading-4">{t("team_logo")}</Label>
- <div className="flex flex-row items-center justify-start gap-2 rtl:justify-end">
- <div className="relative shrink-0">
- <Avatar
- size="lg"
- imageSrc={teamLogo || undefined}
- alt={teamName || "Team"}
- className="border-2 border-white"
+ <form onSubmit={handleContinue} className="flex h-full w-full flex-col gap-4">
+ <OnboardingCard
+ title={t("create_your_team")}
+ subtitle={t("team_onboarding_details_subtitle")}
+ footer={
+ <div className="flex w-full items-center justify-end gap-4">
+ <Button
+ type="button"
+ color="minimal"
+ className="rounded-[10px]"
+ onClick={() => router.push("/onboarding/getting-started")}>
+ {t("back")}
+ </Button>
+ <Button
+ type="submit"
+ color="primary"
+ className="rounded-[10px]"
+ disabled={!isSlugValid || !teamName || !teamSlug || isSubmitting}>
+ {t("continue")}
+ </Button>
+ </div>
+ }>
+ <div className="flex h-full w-full flex-col gap-4">
+ {/* Team Profile Picture */}
+ <div className="flex w-full flex-col gap-2">
+ <Label className="text-emphasis text-sm font-medium leading-4">{t("team_logo")}</Label>
+ <div className="flex flex-row items-center justify-start gap-2 rtl:justify-end">
+ <div className="relative shrink-0">
+ <Avatar
+ size="lg"
+ imageSrc={teamLogo || undefined}
+ alt={teamName || "Team"}
+ className="border-2 border-white"
+ />
+ </div>
+ <input ref={logoRef} type="hidden" name="logo" id="logo" defaultValue={teamLogo} />
+ <ImageUploader
+ target="avatar"
+ id="team-logo-upload"
+ buttonMsg={t("upload")}
+ handleAvatarChange={handleLogoChange}
+ imageSrc={teamLogo}
/>
</div>
- <input ref={logoRef} type="hidden" name="logo" id="logo" defaultValue={teamLogo} />
- <ImageUploader
- target="avatar"
- id="team-logo-upload"
- buttonMsg={t("upload")}
- handleAvatarChange={handleLogoChange}
- imageSrc={teamLogo}
+ <p className="text-subtle text-xs font-normal leading-3">
+ {t("onboarding_logo_size_hint")}
+ </p>
+ </div>
+
+ {/* Team Name */}
+ <div className="flex w-full flex-col gap-1.5">
+ <Label className="text-emphasis mb-0 text-sm font-medium leading-4">{t("team_name")}</Label>
+ <TextField
+ value={teamName}
+ onChange={(e) => setTeamName(e.target.value)}
+ placeholder="Acme Inc."
+ className="border-default h-7 rounded-[10px] border px-2 py-1.5 text-sm"
/>
</div>
- <p className="text-subtle text-xs font-normal leading-3">{t("onboarding_logo_size_hint")}</p>
- </div>
- {/* Team Name */}
- <div className="flex w-full flex-col gap-1.5">
- <Label className="text-emphasis mb-0 text-sm font-medium leading-4">{t("team_name")}</Label>
- <TextField
- value={teamName}
- onChange={(e) => setTeamName(e.target.value)}
- placeholder="Acme Inc."
- className="border-default h-7 rounded-[10px] border px-2 py-1.5 text-sm"
+ {/* Team Slug */}
+ <ValidatedTeamSlug
+ value={teamSlug}
+ onChange={handleSlugChange}
+ onValidationChange={setIsSlugValid}
/>
- </div>
- {/* Team Slug */}
- <ValidatedTeamSlug
- value={teamSlug}
- onChange={handleSlugChange}
- onValidationChange={setIsSlugValid}
- />
-
- {/* Team Bio */}
- <div className="flex w-full flex-col gap-1.5">
- <Label className="text-emphasis mb-0 text-sm font-medium leading-4">{t("team_bio")}</Label>
- <TextArea
- value={teamBio}
- onChange={(e) => setTeamBio(e.target.value)}
- placeholder={t("team_bio_placeholder")}
- className="border-default max-h-[150px] min-h-[80px] rounded-[10px] border px-2 py-1.5 text-sm"
- rows={3}
- />
+ {/* Team Bio */}
+ <div className="flex w-full flex-col gap-1.5">
+ <Label className="text-emphasis mb-0 text-sm font-medium leading-4">{t("team_bio")}</Label>
+ <TextArea
+ value={teamBio}
+ onChange={(e) => setTeamBio(e.target.value)}
+ placeholder={t("team_bio_placeholder")}
+ className="border-default max-h-[150px] min-h-[80px] rounded-[10px] border px-2 py-1.5 text-sm"
+ rows={3}
+ />
+ </div>
</div>
- </div>
- </OnboardingCard>
+ </OnboardingCard>
+ </form>
</div>
{/* Right column - Browser view */}
diff --git a/apps/web/modules/onboarding/teams/invite/email/team-invite-email-view.tsx b/apps/web/modules/onboarding/teams/invite/email/team-invite-email-view.tsx
index 0962b2a6994..b98b2cd9385 100644
--- a/apps/web/modules/onboarding/teams/invite/email/team-invite-email-view.tsx
+++ b/apps/web/modules/onboarding/teams/invite/email/team-invite-email-view.tsx
@@ -137,33 +137,33 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
<OnboardingLayout userEmail={userEmail} currentStep={3} totalSteps={3}>
{/* Left column - Main content */}
<div className="flex h-full w-full flex-col gap-4">
- <OnboardingCard
- title={t("invite")}
- subtitle={t("team_invite_subtitle")}
- footer={
- <div className="flex w-full items-center justify-end gap-4">
- <div className="flex items-center gap-2">
- <Button
- color="minimal"
- className="rounded-[10px]"
- onClick={handleSkip}
- disabled={isSubmitting}>
- {t("onboarding_skip_for_now")}
- </Button>
- <Button
- type="button"
- color="primary"
- className="rounded-[10px]"
- disabled={!hasValidInvites || isSubmitting}
- loading={isSubmitting}
- onClick={form.handleSubmit(handleContinue)}>
- {t("continue")}
- </Button>
+ <Form form={form} handleSubmit={handleContinue} className="flex h-full w-full flex-col gap-4">
+ <OnboardingCard
+ title={t("invite")}
+ subtitle={t("team_invite_subtitle")}
+ footer={
+ <div className="flex w-full items-center justify-end gap-4">
+ <div className="flex items-center gap-2">
+ <Button
+ type="button"
+ color="minimal"
+ className="rounded-[10px]"
+ onClick={handleSkip}
+ disabled={isSubmitting}>
+ {t("onboarding_skip_for_now")}
+ </Button>
+ <Button
+ type="submit"
+ color="primary"
+ className="rounded-[10px]"
+ disabled={!hasValidInvites || isSubmitting}
+ loading={isSubmitting}>
+ {t("continue")}
+ </Button>
+ </div>
</div>
- </div>
- }>
- <div className="flex w-full flex-col gap-4 px-1">
- <Form form={form} handleSubmit={handleContinue} className="w-full">
+ }>
+ <div className="flex w-full flex-col gap-4 px-1">
<div className="flex w-full flex-col gap-4">
<EmailInviteForm
fields={fields}
@@ -184,9 +184,9 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
showInfoBadge
/>
</div>
- </Form>
- </div>
- </OnboardingCard>
+ </div>
+ </OnboardingCard>
+ </Form>
</div>
{/* Right column - Browser view */}