Skip to content

refactor: update create organization form to include dynamic slug gen… #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carhartlewis merged 2 commits into from
Apr 5, 2025
Merged

refactor: update create organization form to include dynamic slug gen… #302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f74daf
refactor: update create organization form to include dynamic slug gen…
carhartlewis Apr 5, 2025
008f9b7
refactor: improve slug generation in create organization form
carhartlewis Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
357 changes: 180 additions & 177 deletions apps/app/src/components/forms/create-organization-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { Button } from "@comp/ui/button";
import { Checkbox } from "@comp/ui/checkbox";
import { cn } from "@comp/ui/cn";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@comp/ui/form";
import { Icons } from "@comp/ui/icons";
import { Input } from "@comp/ui/input";
Expand All @@ -30,185 +30,188 @@ import type { z } from "zod";
import { LogoSpinner } from "../logo-spinner";

export function OnboardingClient() {
const [isCreatingOrganization, setIsCreatingOrganization] = useState(false);
const router = useRouter();
const t = useI18n();
const [isCreatingOrganization, setIsCreatingOrganization] = useState(false);
const router = useRouter();
const t = useI18n();

const createOrganization = useAction(createOrganizationAction, {
onSuccess: async () => {
toast.success(t("onboarding.success"));
router.push("/");
},
onError: () => {
toast.error(t("common.actions.error"));
},
onExecute: () => {
setIsCreatingOrganization(true);
},
});
const createOrganization = useAction(createOrganizationAction, {
onSuccess: async () => {
toast.success(t("onboarding.success"));
router.push("/");
},
onError: () => {
toast.error(t("common.actions.error"));
},
onExecute: () => {
setIsCreatingOrganization(true);
},
});

const onSubmit = async (data: z.infer<typeof organizationSchema>) => {
await authClient.organization.create({
name: data.name,
slug: data.name,
});
const onSubmit = async (data: z.infer<typeof organizationSchema>) => {
const randomSuffix = Math.floor(100000 + Math.random() * 900000).toString();
const slug = `${data.name.toLowerCase().trim().replace(/[^\w\s-]/g, '').replace(/[\s_-]+/g, '-')}-${randomSuffix}`;

createOrganization.execute({
...data,
});
};
await authClient.organization.create({
name: data.name,
slug,
});

const form = useForm<z.infer<typeof organizationSchema>>({
resolver: zodResolver(organizationSchema),
defaultValues: {
name: "",
frameworks: [],
},
mode: "onChange",
});
createOrganization.execute({
...data,
});
};

if (isCreatingOrganization) {
return (
<div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
<div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
<div className="flex flex-col justify-center space-y-4 animate-in fade-in slide-in-from-bottom-4 duration-300">
<div className="flex flex-col gap-2 justify-center">
<LogoSpinner />
<h2 className="text-xl font-semibold text-center tracking-tight">
{t("onboarding.trigger.title")}
</h2>
<p className="text-center text-sm text-muted-foreground">
{t("onboarding.trigger.creating")}
</p>
</div>
</div>
</div>
</div>
);
}
const form = useForm<z.infer<typeof organizationSchema>>({
resolver: zodResolver(organizationSchema),
defaultValues: {
name: "",
frameworks: [],
},
mode: "onChange",
});

return (
<div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
<div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
<div className="mb-8 flex justify-between">
<Link href="/">
<Icons.Logo />
</Link>
</div>
if (isCreatingOrganization) {
return (
<div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
<div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
<div className="flex flex-col justify-center space-y-4 animate-in fade-in slide-in-from-bottom-4 duration-300">
<div className="flex flex-col gap-2 justify-center">
<LogoSpinner />
<h2 className="text-xl font-semibold text-center tracking-tight">
{t("onboarding.trigger.title")}
</h2>
<p className="text-center text-sm text-muted-foreground">
{t("onboarding.trigger.creating")}
</p>
</div>
</div>
</div>
</div>
);
}

<div className="mb-8 space-y-2">
<h1 className="text-2xl font-semibold tracking-tight">
{t("onboarding.setup")}
</h1>
<p className="text-sm text-muted-foreground">
{t("onboarding.description")}
</p>
</div>
return (
<div className="flex min-h-screen items-center justify-center bg-background p-6 md:p-8">
<div className="relative w-full max-w-[440px] border bg-card p-8 shadow-lg">
<div className="mb-8 flex justify-between">
<Link href="/">
<Icons.Logo />
</Link>
</div>

<Form {...form}>
<form
onSubmit={form.handleSubmit(onSubmit)}
className="space-y-6"
suppressHydrationWarning
>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItem className="space-y-2">
<FormLabel className="text-sm font-medium">
{t("onboarding.fields.name.label")}
</FormLabel>
<FormControl>
<Input
autoCorrect="off"
placeholder={t("onboarding.fields.name.placeholder")}
suppressHydrationWarning
{...field}
/>
</FormControl>
<FormMessage className="text-xs" />
</FormItem>
)}
/>
<div className="mb-8 space-y-2">
<h1 className="text-2xl font-semibold tracking-tight">
{t("onboarding.setup")}
</h1>
<p className="text-sm text-muted-foreground">
{t("onboarding.description")}
</p>
</div>

<FormField
control={form.control}
name="frameworks"
render={({ field }) => (
<FormItem className="space-y-2">
<FormLabel className="text-sm font-medium">
{t("frameworks.overview.grid.title")}
</FormLabel>
<FormControl>
<fieldset className="flex flex-col gap-2 select-none">
<legend className="sr-only">
{t("frameworks.overview.grid.title")}
</legend>
{Object.entries(frameworks).map(([id, framework]) => {
const frameworkId = id as FrameworkId;
return (
<label
key={frameworkId}
htmlFor={`framework-${frameworkId}`}
className={cn(
"relative flex flex-col p-4 border cursor-pointer transition-colors focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 w-full text-left",
field.value.includes(frameworkId) &&
"border-primary bg-primary/5",
)}
>
<div className="flex items-start justify-between">
<div>
<h3 className="font-semibold">
{framework.name}
</h3>
<p className="text-sm text-muted-foreground mt-1">
{framework.description}
</p>
<p className="text-xs text-muted-foreground/75 mt-2">
{`${t("frameworks.overview.grid.version")}: ${framework.version}`}
</p>
</div>
<div>
<Checkbox
id={`framework-${frameworkId}`}
checked={field.value.includes(frameworkId)}
className="mt-1"
onCheckedChange={(checked) => {
const newValue = checked
? [...field.value, frameworkId]
: field.value.filter(
(name) => name !== frameworkId,
);
field.onChange(newValue);
}}
/>
</div>
</div>
</label>
);
})}
</fieldset>
</FormControl>
<FormMessage className="text-xs" />
</FormItem>
)}
/>
<Form {...form}>
<form
onSubmit={form.handleSubmit(onSubmit)}
className="space-y-6"
suppressHydrationWarning
>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItem className="space-y-2">
<FormLabel className="text-sm font-medium">
{t("onboarding.fields.name.label")}
</FormLabel>
<FormControl>
<Input
autoCorrect="off"
placeholder={t("onboarding.fields.name.placeholder")}
suppressHydrationWarning
{...field}
/>
</FormControl>
<FormMessage className="text-xs" />
</FormItem>
)}
/>

<Button
type="submit"
className="w-full"
disabled={createOrganization.status === "executing"}
suppressHydrationWarning
>
{createOrganization.status === "executing" && (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
)}
{t("onboarding.submit")}
</Button>
</form>
</Form>
</div>
</div>
);
<FormField
control={form.control}
name="frameworks"
render={({ field }) => (
<FormItem className="space-y-2">
<FormLabel className="text-sm font-medium">
{t("frameworks.overview.grid.title")}
</FormLabel>
<FormControl>
<fieldset className="flex flex-col gap-2 select-none">
<legend className="sr-only">
{t("frameworks.overview.grid.title")}
</legend>
{Object.entries(frameworks).map(([id, framework]) => {
const frameworkId = id as FrameworkId;
return (
<label
key={frameworkId}
htmlFor={`framework-${frameworkId}`}
className={cn(
"relative flex flex-col p-4 border cursor-pointer transition-colors focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 w-full text-left",
field.value.includes(frameworkId) &&
"border-primary bg-primary/5",
)}
>
<div className="flex items-start justify-between">
<div>
<h3 className="font-semibold">
{framework.name}
</h3>
<p className="text-sm text-muted-foreground mt-1">
{framework.description}
</p>
<p className="text-xs text-muted-foreground/75 mt-2">
{`${t("frameworks.overview.grid.version")}: ${framework.version}`}
</p>
</div>
<div>
<Checkbox
id={`framework-${frameworkId}`}
checked={field.value.includes(frameworkId)}
className="mt-1"
onCheckedChange={(checked) => {
const newValue = checked
? [...field.value, frameworkId]
: field.value.filter(
(name) => name !== frameworkId,
);
field.onChange(newValue);
}}
/>
</div>
</div>
</label>
);
})}
</fieldset>
</FormControl>
<FormMessage className="text-xs" />
</FormItem>
)}
/>

<Button
type="submit"
className="w-full"
disabled={createOrganization.status === "executing"}
suppressHydrationWarning
>
{createOrganization.status === "executing" && (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
)}
{t("onboarding.submit")}
</Button>
</form>
</Form>
</div>
</div>
);
}