Skip to content

Open-source status page, incident response and uptime monitoring

chore: onboarding improvements (#1332)

Maximilian Kaskea95d5e7a5efe
diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
index 5776f3335..bbb449baa 100644
--- a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
@@ -26,6 +26,7 @@ import { CreateMonitorForm } from "@/components/forms/onboarding/create-monitor"
import { CreatePageForm } from "@/components/forms/onboarding/create-page";
import { LearnFromForm } from "@/components/forms/onboarding/learn-from";
import { Button } from "@/components/ui/button";
+import { extractDomain } from "@/lib/domains";
import { useTRPC } from "@/lib/trpc/client";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { ArrowUpRight } from "lucide-react";
@@ -133,11 +134,19 @@ export function Client() {
</Section>
{step === "1" && (
<Section>
- <SectionHeader>
+ <SectionHeader className="h-8 flex-row items-center justify-between">
<SectionDescription className="tabular-nums">
Step <span className="font-medium text-foreground">1</span> of{" "}
<span className="font-medium text-foreground">2</span>
</SectionDescription>
+ <Button
+ variant="ghost"
+ size="sm"
+ className="text-muted-foreground"
+ onClick={() => setSearchParams({ step: "2" })}
+ >
+ Skip
+ </Button>
</SectionHeader>
<FormCard>
<FormCardHeader>
@@ -170,11 +179,19 @@ export function Client() {
)}
{step === "2" && (
<Section>
- <SectionHeader>
+ <SectionHeader className="h-8 flex-row items-center justify-between">
<SectionDescription className="tabular-nums">
Step <span className="font-medium text-foreground">2</span> of{" "}
<span className="font-medium text-foreground">2</span>
</SectionDescription>
+ <Button
+ variant="ghost"
+ size="sm"
+ className="text-muted-foreground"
+ onClick={() => setSearchParams({ step: "next" })}
+ >
+ Skip
+ </Button>
</SectionHeader>
<FormCard>
<FormCardHeader>
@@ -186,6 +203,9 @@ export function Client() {
<FormCardContent>
<CreatePageForm
id="create-page-form"
+ defaultValues={{
+ slug: extractDomain(createMonitorMutation.data?.url ?? ""),
+ }}
onSubmit={async (values) => {
if (!workspace?.id) return;
@@ -210,7 +230,7 @@ export function Client() {
{step === "next" && (
<>
<Section>
- <SectionHeader>
+ <SectionHeader className="h-8 flex-row items-center justify-between">
<SectionDescription>
We&apos;d love to know how you heard about us. This will help us
improve our product and services.
diff --git a/apps/dashboard/src/components/forms/onboarding/create-page.tsx b/apps/dashboard/src/components/forms/onboarding/create-page.tsx
index 4f7ac797e..eb6d4b207 100644
--- a/apps/dashboard/src/components/forms/onboarding/create-page.tsx
+++ b/apps/dashboard/src/components/forms/onboarding/create-page.tsx
@@ -10,13 +10,19 @@ import {
FormLabel,
FormMessage,
} from "@/components/ui/form";
+import { useDebounce } from "@/hooks/use-debounce";
+import { useTRPC } from "@/lib/trpc/client";
import { zodResolver } from "@hookform/resolvers/zod";
+import { useQuery } from "@tanstack/react-query";
import { isTRPCClientError } from "@trpc/client";
-import { useTransition } from "react";
+import { useEffect, useTransition } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
+const SLUG_UNIQUE_ERROR_MESSAGE =
+ "This slug is already taken. Please choose another one.";
+
const schema = z.object({
slug: z.string().min(3),
});
@@ -31,17 +37,40 @@ export function CreatePageForm({
defaultValues?: FormValues;
onSubmit: (values: FormValues) => Promise<void>;
}) {
+ const trpc = useTRPC();
const form = useForm({
resolver: zodResolver(schema),
defaultValues: defaultValues ?? { slug: "" },
});
const [isPending, startTransition] = useTransition();
+ const watchSlug = form.watch("slug");
+ const debouncedSlug = useDebounce(watchSlug, 500);
+ const { data: isUnique } = useQuery(
+ trpc.page.getSlugUniqueness.queryOptions(
+ { slug: debouncedSlug },
+ { enabled: debouncedSlug.length > 0 },
+ ),
+ );
+
+ useEffect(() => {
+ if (isUnique === false) {
+ form.setError("slug", { message: SLUG_UNIQUE_ERROR_MESSAGE });
+ } else {
+ form.clearErrors("slug");
+ }
+ }, [isUnique, form]);
function submitAction(values: FormValues) {
if (isPending) return;
startTransition(async () => {
try {
+ if (isUnique === false) {
+ toast.error(SLUG_UNIQUE_ERROR_MESSAGE);
+ form.setError("slug", { message: SLUG_UNIQUE_ERROR_MESSAGE });
+ return;
+ }
+
const promise = onSubmit(values);
toast.promise(promise, {
loading: "Saving...",
diff --git a/apps/dashboard/src/lib/domains.ts b/apps/dashboard/src/lib/domains.ts
index 7a408dc10..d33e24831 100644
--- a/apps/dashboard/src/lib/domains.ts
+++ b/apps/dashboard/src/lib/domains.ts
@@ -19,3 +19,28 @@ export const getApexDomain = (url: string) => {
// if it's a normal domain (e.g. dub.sh), we return the domain
return domain;
};
+
+export function extractDomain(url: string) {
+ // Use URL constructor to parse
+ try {
+ if (url.trim() === "") return "";
+
+ const hostname = new URL(url).hostname; // e.g. "craft.mxkaske.dev"
+
+ const parts = hostname.split("."); // ["craft", "mxkaske", "dev"]
+
+ if (parts.length === 2) {
+ // no subdomain
+ return parts[0]; // "mxkaske"
+ }
+ if (parts.length > 2) {
+ // has subdomain(s)
+ return `${parts.slice(0, -2).join("-")}-${parts[parts.length - 2]}`;
+ // "craft-mxkaske"
+ }
+ return "";
+ } catch (e) {
+ console.error(e);
+ return "";
+ }
+}