Skip to content

Email for professionals and teams

improve domains UI

Hieu Nguyen (Jack)d9388a6705a4
diff --git a/src/app/(admin)/domains/DomainDnsDetails.tsx b/src/app/(admin)/domains/DomainDnsDetails.tsx
new file mode 100644
index 0000000..5eaf389
--- /dev/null
+++ b/src/app/(admin)/domains/DomainDnsDetails.tsx
@@ -0,0 +1,74 @@
+import { AlertTriangle, Check } from "lucide-react";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { getDnsRecordLabel } from "./domain-dns-details-utils";
+import type { DomainDnsDetailsProps } from "./types";
+
+export default function DomainDnsDetails({ domain, dns }: DomainDnsDetailsProps) {
+ return (
+ <Card className="rounded-3xl border-0 bg-white p-6">
+ <CardHeader className="py-0">
+ <CardTitle>DNS — {domain.hostname}</CardTitle>
+ </CardHeader>
+ <CardContent className="grid gap-6 pt-5 md:grid-cols-2">
+ <section className="space-y-3">
+ <h2 className="text-sm font-medium text-neutral-900">Email Routing</h2>
+ <ul className="space-y-2">
+ {dns.routing.records.map((record, index) => (
+ <li
+ key={`routing-${record.type}-${record.name}-${index}`}
+ className="flex items-start gap-2 rounded-xl bg-green-50 px-3 py-2 text-sm text-green-800"
+ >
+ <Check className="mt-0.5 h-4 w-4 shrink-0 text-green-600" />
+ <span className="break-all">{getDnsRecordLabel(record)}</span>
+ </li>
+ ))}
+ {dns.routing.missing.map((record, index) => (
+ <li
+ key={`missing-${record.type}-${record.name}-${index}`}
+ className="flex items-start gap-2 rounded-xl bg-red-50 px-3 py-2 text-sm text-red-800"
+ >
+ <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0 text-red-600" />
+ <span className="break-all">{getDnsRecordLabel(record)}</span>
+ </li>
+ ))}
+ {dns.routing.records.length === 0 && dns.routing.missing.length === 0 && (
+ <li className={`flex items-center gap-2 rounded-xl px-3 py-2 text-sm ${domain.routingEnabled ? "bg-green-50 text-green-800" : "bg-red-50 text-red-800"}`}>
+ {domain.routingEnabled ? (
+ <Check className="h-4 w-4 shrink-0 text-green-600" />
+ ) : (
+ <AlertTriangle className="h-4 w-4 shrink-0 text-red-600" />
+ )}
+ {domain.routingEnabled ? "Email routing is configured" : "No routing DNS records found"}
+ </li>
+ )}
+ </ul>
+ </section>
+
+ <section className="space-y-3">
+ <h2 className="text-sm font-medium text-neutral-900">Email Sending</h2>
+ <ul className="space-y-2">
+ {dns.sending.map((record, index) => (
+ <li
+ key={`sending-${record.type}-${record.name}-${index}`}
+ className="flex items-start gap-2 rounded-xl bg-green-50 px-3 py-2 text-sm text-green-800"
+ >
+ <Check className="mt-0.5 h-4 w-4 shrink-0 text-green-600" />
+ <span className="break-all">{getDnsRecordLabel(record)}</span>
+ </li>
+ ))}
+ {dns.sending.length === 0 && (
+ <li className={`flex items-center gap-2 rounded-xl px-3 py-2 text-sm ${domain.sendingEnabled ? "bg-green-50 text-green-800" : "bg-red-50 text-red-800"}`}>
+ {domain.sendingEnabled ? (
+ <Check className="h-4 w-4 shrink-0 text-green-600" />
+ ) : (
+ <AlertTriangle className="h-4 w-4 shrink-0 text-red-600" />
+ )}
+ {domain.sendingEnabled ? "Email sending is configured" : "No sending DNS records found"}
+ </li>
+ )}
+ </ul>
+ </section>
+ </CardContent>
+ </Card>
+ );
+}
diff --git a/src/app/(admin)/domains/page.tsx b/src/app/(admin)/domains/page.tsx
index ca6b5db..4dcb44f 100644
--- a/src/app/(admin)/domains/page.tsx
+++ b/src/app/(admin)/domains/page.tsx
@@ -3,7 +3,6 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { useState } from "react";
import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import {
Dialog,
DialogContent,
@@ -14,19 +13,11 @@ import {
} from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
-import { Badge } from "@/components/ui/badge";
-import {
- Check,
- X,
- AlertTriangle,
- ArrowRight,
- Globe2,
- Plus,
- Trash2,
-} from "lucide-react";
+import { Plus } from "lucide-react";
import { authFetch } from "@/lib/auth/client";
-import type { DnsRecord, DnsStatusSummary, Domain } from "./types";
+import type { DnsStatusSummary, Domain, DomainDnsView } from "./types";
import DomainItemCard from "./DomainItemCard";
+import DomainDnsDetails from "./DomainDnsDetails";
import { CardGridSkeleton } from "@/components/page-skeletons";
export default function DomainsPage() {
@@ -35,7 +26,7 @@ export default function DomainsPage() {
const [createOpen, setCreateOpen] = useState(false);
const [dnsView, setDnsView] = useState<{
domain: Domain;
- dns: unknown;
+ dns: DomainDnsView;
} | null>(null);
const { data, isLoading } = useQuery({
@@ -81,7 +72,7 @@ export default function DomainsPage() {
const loadDns = async (id: string) => {
const res = await authFetch(`/api/domains/${id}/dns`);
- const json = (await res.json()) as { domain: Domain; dns: unknown };
+ const json = (await res.json()) as { domain: Domain; dns: DomainDnsView };
if (res.ok) setDnsView(json);
};
@@ -121,9 +112,24 @@ export default function DomainsPage() {
/>
</div>
{create.isError && (
- <p className="text-sm text-red-600">
- {(create.error as Error).message}
- </p>
+ <div className="space-y-3 rounded-xl bg-red-50 px-4 py-3 text-sm text-red-700">
+ <p>{(create.error as Error).message}</p>
+ <div className="space-y-2">
+ <p className="font-medium">
+ Check that your Cloudflare API token has these permissions:
+ </p>
+ <ul className="list-disc space-y-1 pl-5">
+ <li>
+ All accounts — Email Sending:Edit, DNS Settings:Edit,
+ Email Routing Addresses:Edit
+ </li>
+ <li>
+ All zones — DNS Settings:Edit, Email Routing Rules:Edit,
+ Zone Settings:Edit, DNS:Edit
+ </li>
+ </ul>
+ </div>
+ </div>
)}
<Button
onClick={() => create.mutate()}
@@ -163,37 +169,7 @@ export default function DomainsPage() {
</div>
</section>
{dnsView && (
- <Card className="rounded-3xl border-0 bg-white p-6">
- <CardHeader className="py-0">
- <CardTitle>DNS — {dnsView.domain.hostname}</CardTitle>
- </CardHeader>
- <CardContent className="space-y-4 pt-5 text-xs no-font-mono">
- <div>
- <p className="font-sans font-medium text-sm mb-2">
- Email Routing
- </p>
- <pre className="overflow-auto bg-neutral-50 dark:bg-neutral-900 p-3 rounded-md">
- {JSON.stringify(
- (dnsView.dns as { routing: unknown }).routing,
- null,
- 2,
- )}
- </pre>
- </div>
- <div>
- <p className="font-sans font-medium text-sm mb-2">
- Email Sending
- </p>
- <pre className="overflow-auto bg-neutral-50 dark:bg-neutral-900 p-3 rounded-md">
- {JSON.stringify(
- (dnsView.dns as { sending: DnsRecord[] }).sending,
- null,
- 2,
- )}
- </pre>
- </div>
- </CardContent>
- </Card>
+ <DomainDnsDetails domain={dnsView.domain} dns={dnsView.dns} />
)}
</div>
);
diff --git a/src/app/(admin)/domains/types.d.ts b/src/app/(admin)/domains/types.d.ts
index 8ba5db2..fd994a2 100644
--- a/src/app/(admin)/domains/types.d.ts
+++ b/src/app/(admin)/domains/types.d.ts
@@ -18,3 +18,17 @@ export type DnsStatusSummary = {
routing: { configured: boolean; missing: string[] };
sending: { configured: boolean; records: string[] };
};
+
+export type DomainDnsView = {
+ routing: {
+ records: DnsRecord[];
+ missing: DnsRecord[];
+ status?: string;
+ };
+ sending: DnsRecord[];
+};
+
+export type DomainDnsDetailsProps = {
+ domain: Domain;
+ dns: DomainDnsView;
+};
diff --git a/src/app/api/domains/route.ts b/src/app/api/domains/route.ts
index 7351278..e8dba86 100644
--- a/src/app/api/domains/route.ts
+++ b/src/app/api/domains/route.ts
@@ -20,7 +20,13 @@ export async function GET(request: NextRequest) {
const view = await getDomainDns(env, domain);
return {
id: domain.id,
- summary: summariseDns(view.routing.records, view.routing.missing, view.sending),
+ summary: summariseDns(
+ view.routing.records,
+ view.routing.missing,
+ view.sending,
+ domain.routingEnabled,
+ domain.sendingEnabled,
+ ),
};
}),
);
diff --git a/src/components/settings/inbox-rules.tsx b/src/components/settings/inbox-rules.tsx
index dd6ee7a..507b923 100644
--- a/src/components/settings/inbox-rules.tsx
+++ b/src/components/settings/inbox-rules.tsx
@@ -205,11 +205,11 @@ export function InboxRules() {
</DialogHeader>
<form onSubmit={onSubmit} className="space-y-4">
<div className="grid gap-3 sm:grid-cols-2">
- <div className="space-y-2">
+ <div className="space-2">
<Label htmlFor="matchField">Field</Label>
<Select
id="matchField"
- className="h-10 w-full rounded-md border border-neutral-200 px-3 text-sm"
+ className="h-10 w-full px-3 text-sm"
value={matchField}
onChange={(event) =>
setMatchField(
@@ -222,11 +222,11 @@ export function InboxRules() {
<option value="title">Title</option>
</Select>
</div>
- <div className="space-y-2">
+ <div className="space-2">
<Label htmlFor="matchOperator">Match</Label>
<Select
id="matchOperator"
- className="h-10 w-full rounded-md border border-neutral-200 px-3 text-sm"
+ className="h-10 w-full px-3 text-sm"
value={matchOperator}
onChange={(event) =>
setMatchOperator(event.target.value as "contains" | "exact")
@@ -252,7 +252,7 @@ export function InboxRules() {
<Label htmlFor="destination">Destination</Label>
<Select
id="destination"
- className="h-10 w-full rounded-md border border-neutral-200 px-3 text-sm"
+ className="h-10 w-full px-3 text-sm"
value={destination}
onChange={(event) => setDestination(event.target.value)}
>
diff --git a/src/lib/dns-status.ts b/src/lib/dns-status.ts
index 205bc65..7316c79 100644
--- a/src/lib/dns-status.ts
+++ b/src/lib/dns-status.ts
@@ -15,6 +15,8 @@ export function summariseDns(
routingRecords: CfDnsRecord[],
routingMissing: CfDnsRecord[],
sendingRecords: CfDnsRecord[],
+ routingEnabled = false,
+ sendingEnabled = false,
): DnsStatusSummary {
const recordTypes = (
type: "routing-records" | "routing-missing" | "sending",
@@ -30,11 +32,11 @@ export function summariseDns(
return {
routing: {
- configured: routingMissing.length === 0 && routingRecords.length > 0,
+ configured: routingMissing.length === 0 && (routingRecords.length > 0 || routingEnabled),
missing: recordTypes("routing-missing"),
},
sending: {
- configured: sendingRecords.length > 0,
+ configured: sendingRecords.length > 0 || sendingEnabled,
records: recordTypes("sending"),
},
};