Email for professionals and teams
improve domain card
Hieu Nguyen (Jack)c1f4c245255c
diff --git a/src/app/(admin)/domains/DomainDnsDetails.tsx b/src/app/(admin)/domains/DomainDnsDetails.tsxindex acc329b..bb1d66f 100644--- a/src/app/(admin)/domains/DomainDnsDetails.tsx+++ b/src/app/(admin)/domains/DomainDnsDetails.tsx@@ -13,6 +13,15 @@ export default function DomainDnsDetails({}: DomainDnsDetailsProps) {const audit = dns.audit;const manual = domain.zoneId === "manual";+ const subdomain = dns.sendingSubdomain;+ const sendingOk = subdomain ? dns.sendingEnabled : manual && domain.sendingEnabled;+ const sendingLabel = subdomain+ ? `Sending for ${subdomain.name} is ${dns.sendingEnabled ? "enabled" : "disabled"}`+ : manual+ ? domain.sendingEnabled+ ? "Email sending is configured"+ : "Email sending is not configured"+ : "Sending has not configured for this domain";return (<div className="border-t border-neutral-100 pt-5">{audit && (@@ -114,27 +123,18 @@ export default function DomainDnsDetails({<section className="space-y-3 mt-8"><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>- )}+ <li+ className={`flex items-center gap-2 rounded-xl px-3 py-2 text-sm ${sendingOk ? "bg-green-50 text-green-800" : "bg-red-50 text-red-800"}`}+ >+ {sendingOk ? (+ <Check className="h-4 w-4 shrink-0 text-green-600" />+ ) : (+ <AlertTriangle className="h-4 w-4 shrink-0 text-red-600" />+ )}+ {sendingLabel}+ </li></ul>- </section>+ </section></div>);}diff --git a/src/app/(admin)/domains/DomainDnsSkeleton.tsx b/src/app/(admin)/domains/DomainDnsSkeleton.tsxnew file mode 100644index 0000000..ec33ccd--- /dev/null+++ b/src/app/(admin)/domains/DomainDnsSkeleton.tsx@@ -0,0 +1,14 @@+import { Skeleton } from "@/components/ui/skeleton";++export default function DomainDnsSkeleton() {+ return (+ <div className="space-y-3 border-t border-neutral-100 pt-5">+ <Skeleton className="h-4 w-28" />+ <div className="space-y-2">+ {Array.from({ length: 4 }, (_, index) => (+ <Skeleton key={index} className="h-9 w-full rounded-xl" />+ ))}+ </div>+ </div>+ );+}diff --git a/src/app/(admin)/domains/DomainItemCard.tsx b/src/app/(admin)/domains/DomainItemCard.tsxindex c87f914..4456aee 100644--- a/src/app/(admin)/domains/DomainItemCard.tsx+++ b/src/app/(admin)/domains/DomainItemCard.tsx@@ -4,6 +4,7 @@ import { Badge } from "@/components/ui/badge";import { ListRow } from "@/components/ui/list";import { cn } from "@/lib/utils";import DomainDnsDetails from "./DomainDnsDetails";+import DomainDnsSkeleton from "./DomainDnsSkeleton";import { dnsAuthRecords, getDnsAuthStatusLabel } from "./utils";import {Check,@@ -24,6 +25,8 @@ export default function DomainItemCard({item,dns,dnsDetails,+ dnsLoading = false,+ dnsError,expanded = false,remove,onToggleDns,@@ -111,15 +114,22 @@ export default function DomainItemCard({</div></div>- {expanded && dnsDetails && (- <DomainDnsDetails- domain={item}- dns={dnsDetails}- onSetup={onSetup}- setupRecord={setupRecord}- setupMessage={setupMessage}- />- )}+ {expanded &&+ (dnsDetails ? (+ <DomainDnsDetails+ domain={item}+ dns={dnsDetails}+ onSetup={onSetup}+ setupRecord={setupRecord}+ setupMessage={setupMessage}+ />+ ) : dnsError ? (+ <div className="border-t border-neutral-100 pt-5 text-sm text-red-600">+ {dnsError}+ </div>+ ) : dnsLoading ? (+ <DomainDnsSkeleton />+ ) : null)}<Buttonvariant="destructive"diff --git a/src/app/(admin)/domains/page.tsx b/src/app/(admin)/domains/page.tsxindex e91cd42..c0206c4 100644--- a/src/app/(admin)/domains/page.tsx+++ b/src/app/(admin)/domains/page.tsx@@ -1,7 +1,7 @@"use client";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";-import { useState } from "react";+import { useRef, useState } from "react";import { Button } from "@/components/ui/button";import {Dialog,@@ -38,6 +38,10 @@ export default function DomainsPage() {const [createOpen, setCreateOpen] = useState(false);const [setupRecord, setSetupRecord] = useState<DnsAuthRecord | null>(null);const [setupMessage, setSetupMessage] = useState<string | null>(null);+ const [expandedDomainId, setExpandedDomainId] = useState<string | null>(null);+ const expandedIdRef = useRef<string | null>(null);+ const [dnsLoading, setDnsLoading] = useState(false);+ const [dnsError, setDnsError] = useState<string | null>(null);const [dnsView, setDnsView] = useState<{domain: Domain;dns: DomainDnsView;@@ -104,20 +108,47 @@ 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: DomainDnsView };- if (res.ok) {- setDnsView(json);- setSetupMessage(null);+ const json = (await res.json()) as {+ domain?: Domain;+ dns?: DomainDnsView;+ error?: string;+ };+ if (!res.ok || !json.domain || !json.dns) {+ throw new Error(json.error ?? "Failed to load DNS");}+ // Ignore a response that arrives after the user expanded another domain.+ if (expandedIdRef.current !== id) return;+ setDnsView({ domain: json.domain, dns: json.dns });+ setSetupMessage(null);};const toggleDns = async (id: string) => {- if (dnsView?.domain.id === id) {+ if (expandedDomainId === id) {+ expandedIdRef.current = null;+ setExpandedDomainId(null);setDnsView(null);setSetupMessage(null);+ setDnsLoading(false);+ setDnsError(null);return;}- await loadDns(id);+ // Expand immediately and show a skeleton while the audit is fetched, rather+ // than leaving the card unchanged until the request resolves.+ expandedIdRef.current = id;+ setExpandedDomainId(id);+ setDnsView(null);+ setSetupMessage(null);+ setDnsError(null);+ setDnsLoading(true);+ try {+ await loadDns(id);+ } catch (error) {+ if (expandedIdRef.current === id) {+ setDnsError(error instanceof Error ? error.message : "Failed to load DNS");+ }+ } finally {+ if (expandedIdRef.current === id) setDnsLoading(false);+ }};const setupDns = async (record: DnsAuthRecord) => {@@ -293,7 +324,9 @@ export default function DomainsPage() {key={d.id}dns={dns}dnsDetails={dnsView?.domain.id === d.id ? dnsView.dns : undefined}- expanded={dnsView?.domain.id === d.id}+ dnsLoading={expandedDomainId === d.id && dnsLoading}+ dnsError={expandedDomainId === d.id ? dnsError : null}+ expanded={expandedDomainId === d.id}onToggleDns={toggleDns}onSetup={setupDns}setupRecord={setupRecord}diff --git a/src/app/(admin)/domains/types.d.ts b/src/app/(admin)/domains/types.d.tsindex 2952b31..8aa8d2e 100644--- a/src/app/(admin)/domains/types.d.ts+++ b/src/app/(admin)/domains/types.d.ts@@ -54,6 +54,8 @@ export type DomainDnsView = {};sending: DnsRecord[];sendingEnabled: boolean;+ dkimSelector?: string;+ sendingSubdomain?: { name: string; tag: string };audit?: DomainDnsAudit;};@@ -69,6 +71,8 @@ export type DomainItemCardProps = {item: Domain;dns?: DnsStatusSummary;dnsDetails?: DomainDnsView;+ dnsLoading?: boolean;+ dnsError?: string | null;expanded?: boolean;remove: { mutate: (id: string) => void; isPending: boolean };onToggleDns: (id: string) => void;diff --git a/src/components/mailbox-selector.tsx b/src/components/mailbox-selector.tsxindex 2927157..74a56e8 100644--- a/src/components/mailbox-selector.tsx+++ b/src/components/mailbox-selector.tsx@@ -228,7 +228,7 @@ export function MailboxSelector() {</button>{open && (- <div className="absolute right-0 top-14 z-50 w-[360px] overflow-hidden rounded-[28px] border border-neutral-200 bg-[#eef3fb] p-3 shadow-2xl shadow-neutral-900/20">+ <div className="absolute right-0 top-14 z-50 w-[360px] overflow-hidden rounded-[28px] border border-neutral-200 bg-[#eef3fb] p-3 shadow-2xl shadow-neutral-900/20 max-h-[82vh] overflow-y-auto"><div className="rounded-[22px] bg-white px-5 py-5"><div className="flex items-center gap-4"><AccountAvatardiff --git a/src/lib/cloudflare-api.types.d.ts b/src/lib/cloudflare-api.types.d.tsindex 63f6b6f..c821408 100644--- a/src/lib/cloudflare-api.types.d.ts+++ b/src/lib/cloudflare-api.types.d.ts@@ -56,4 +56,9 @@ export type CfSendingSubdomain = {tag: string;name: string;enabled: boolean;+ /** The selector Cloudflare signs DKIM with, published at `<selector>._domainkey.<name>`. */+ dkim_selector?: string;+ return_path_domain?: string;+ created?: string;+ modified?: string;};diff --git a/src/lib/domains/dns-audit.ts b/src/lib/domains/dns-audit.tsindex b3fc640..52723cc 100644--- a/src/lib/domains/dns-audit.ts+++ b/src/lib/domains/dns-audit.ts@@ -22,6 +22,7 @@ export type DomainDnsAudit = {type AuditInput = {routing: { records: CfDnsRecord[]; missing: CfDnsRecord[] };sending: CfDnsRecord[];+ dkimSelector?: string;};function isTxt(record: CfDnsRecord) {@@ -56,9 +57,13 @@ export async function auditDomainDns(view: AuditInput,): Promise<DomainDnsAudit> {const expected = [...view.routing.records, ...view.routing.missing, ...view.sending];- const dkimName = expected.find(- (record) => isTxt(record) && /_domainkey/i.test(record.name ?? ""),- )?.name;+ // Cloudflare reports the selector it signs with, which is more reliable than+ // guessing from the subdomain's DNS records (whose names may be relative).+ const dkimName =+ (view.dkimSelector+ ? `${view.dkimSelector}._domainkey.${hostname}`+ : undefined) ??+ expected.find((record) => isTxt(record) && /_domainkey/i.test(record.name ?? ""))?.name;const [mx, spf, dmarc] = await Promise.all([check("mx", "MX", hostname, "MX", (value) => !/^0\s*\.?$/.test(value.trim())),diff --git a/src/lib/domains/dns-setup.ts b/src/lib/domains/dns-setup.tsindex 8a7fd0b..0a745dd 100644--- a/src/lib/domains/dns-setup.ts+++ b/src/lib/domains/dns-setup.ts@@ -5,6 +5,7 @@ import {createSendingSubdomain,enableEmailRouting,getZone,+ listSendingSubdomains,} from "@/lib/cloudflare-api";import { createDnsRecord, listDnsRecords } from "@/lib/cloudflare-dns";import { ensureEmailRoutingCatchAllToWorker } from "@/lib/domains/catch-all-routing";@@ -13,6 +14,7 @@ import {isManualZone,shouldBindEmailCatchAllToWorker,} from "@/lib/domains/provision";+import { findSendingSubdomain } from "@/lib/domains/sending-status";import type { DomainRow } from "@/lib/domains/types";import { isZoneApex } from "@/lib/domains/utils";@@ -51,13 +53,18 @@ export async function setupDomainDnsRecord(return;}case "dkim": {- if (domain.sendingSubdomainTag) return;- const created = await createSendingSubdomain(env, domain.zoneId, domain.hostname);+ // The stored tag can be stale or empty even though the subdomain exists+ // on Cloudflare, so reuse what is there instead of creating a duplicate+ // (which Cloudflare rejects with "Subdomain already exists").+ const subdomains = await listSendingSubdomains(env, domain.zoneId);+ const subdomain =+ findSendingSubdomain(domain.hostname, subdomains) ??+ (await createSendingSubdomain(env, domain.zoneId, domain.hostname));await getDb(env).update(domains).set({- sendingSubdomainTag: created.tag,- sendingEnabled: created.enabled,+ sendingSubdomainTag: subdomain.tag,+ sendingEnabled: subdomain.enabled,sendingRequested: true,}).where(eq(domains.id, domain.id));diff --git a/src/lib/domains/service.ts b/src/lib/domains/service.tsindex 9da955a..97e2d5b 100644--- a/src/lib/domains/service.ts+++ b/src/lib/domains/service.ts@@ -23,6 +23,10 @@ export type DomainDnsView = {routing: { records: CfDnsRecord[]; missing: CfDnsRecord[]; status?: string };sending: CfDnsRecord[];sendingEnabled: boolean;+ /** DKIM selector Cloudflare signs with, when a sending subdomain exists. */+ dkimSelector?: string;+ /** The matching sending subdomain, when the zone has the domain added for sending. */+ sendingSubdomain?: { name: string; tag: string };};export async function listUserDomains(env: CloudflareEnv, userId: string) {@@ -123,16 +127,27 @@ export async function getDomainDns(domain: typeof domains.$inferSelect,): Promise<DomainDnsView> {if (isManualZone(domain.zoneId)) return getManualDomainDns(env, domain.hostname);- const shouldInspectSending = domain.sendingRequested;+ // Read the zone's actual sending state rather than trusting `sendingRequested`,+ // which goes stale when sending is enabled outside Mailflare (or when the row+ // was written before the subdomain existed). A missing Email Sending permission+ // must not take down the routing/DNS view, so a failed list degrades to none.const [routingDns, routingSettings, sendingSubdomains] = await Promise.all([getEmailRoutingDns(env, domain.zoneId),getEmailRoutingSettings(env, domain.zoneId),- shouldInspectSending ? listSendingSubdomains(env, domain.zoneId) : [],+ listSendingSubdomains(env, domain.zoneId).catch((error) => {+ console.warn("getDomainDns: failed to list sending subdomains", error);+ return [];+ }),]);const sendingSubdomain = findSendingSubdomain(domain.hostname, sendingSubdomains);let sending: CfDnsRecord[] = [];if (sendingSubdomain?.tag) {- sending = await getSendingSubdomainDns(env, domain.zoneId, sendingSubdomain.tag);+ sending = await getSendingSubdomainDns(env, domain.zoneId, sendingSubdomain.tag).catch(+ (error) => {+ console.warn("getDomainDns: failed to read sending subdomain DNS", error);+ return [];+ },+ );}return {routing: {@@ -142,6 +157,10 @@ export async function getDomainDns(},sending,sendingEnabled: sendingSubdomain?.enabled ?? false,+ dkimSelector: sendingSubdomain?.dkim_selector,+ sendingSubdomain: sendingSubdomain+ ? { name: sendingSubdomain.name, tag: sendingSubdomain.tag }+ : undefined,};}