Open source alternative to Semrush and Ahrefs
TypeScript backlink-analysisgoogle-search-console-mcpkeyword-researchmcpseoseo-agentseo-auditseo-automationseo-skillsseo-toolssite-audit
Port domain overview and backlinks to shadcn, on the DataTable filter panel and ExportMenu (EVE-311) (#756)
Carter Smithb515b7ea79a6
diff --git a/src/client/components/SegmentedToggle.tsx b/src/client/components/SegmentedToggle.tsxindex f30849c2..f319ab1e 100644--- a/src/client/components/SegmentedToggle.tsx+++ b/src/client/components/SegmentedToggle.tsx@@ -32,7 +32,9 @@ export function SegmentedToggle<T extends string>({const picked = items.find((item) => item.value === next[0]);if (picked) onChange(picked.value);}}- className="rounded-lg bg-muted p-0.5 ring-1 ring-border ring-inset"+ // A border (not an inset ring) keeps the padding clear, and the larger outer+ // radius keeps the pressed pill concentric with the track.+ className="rounded-lg border border-border bg-muted p-0.5 data-[size=sm]:rounded-lg">{items.map((item) => (<ToggleGroupItem@@ -40,10 +42,16 @@ export function SegmentedToggle<T extends string>({value={item.value}aria-label={showLabels ? undefined : item.label}title={item.label}- className="h-6 text-muted-foreground aria-pressed:bg-primary/15 aria-pressed:text-primary aria-pressed:shadow-sm"+ className="h-[22px] text-muted-foreground aria-pressed:bg-primary/15 aria-pressed:text-primary">{item.icon}- {showLabels && item.label}+ {showLabels && (+ // Trim the line box to cap height so the text centers optically+ // with the icon instead of riding high on the font's ascender.+ <span className="[text-box:trim-both_cap_alphabetic]">+ {item.label}+ </span>+ )}</ToggleGroupItem>))}</ToggleGroup>diff --git a/src/client/components/table/DataTable.tsx b/src/client/components/table/DataTable.tsxindex 06ea710b..1760a676 100644--- a/src/client/components/table/DataTable.tsx+++ b/src/client/components/table/DataTable.tsx@@ -117,6 +117,22 @@ function SelectionCheckbox<TData>({);}+/** The frame around the rows, for table components that pass it through. */+export type DataTableFrameProps = {+ /** The first load: shows skeleton rows under the real headers. */+ isLoading?: boolean;+ /** True when filters are active. An empty table then offers `onClearFilters`. */+ isFiltered?: boolean;+ onClearFilters?: () => void;+ /**+ * A load failure, for example a `QueryError`. It shows above the rows. With+ * no rows it replaces the table, so a failed load never reads as empty.+ */+ error?: ReactNode;+ toolbar?: ReactNode;+ footer?: ReactNode;+};+/*** The table body of a data table: sortable headers, skeleton rows while the* first page loads, and an empty state that says whether filters hide rows.@@ -131,19 +147,13 @@ export function DataTable<TData>({empty,isFiltered = false,onClearFilters,+ error,toolbar,footer,-}: {+}: DataTableFrameProps & {table: TanStackTable<TData>;- /** The first load: shows skeleton rows under the real headers. */- isLoading?: boolean;/** Shown when there are no rows and no filters. */empty: { title: ReactNode; description?: ReactNode; action?: ReactNode };- /** True when filters are active. An empty table then offers `onClearFilters`. */- isFiltered?: boolean;- onClearFilters?: () => void;- toolbar?: ReactNode;- footer?: ReactNode;}) {const columns = table.getVisibleLeafColumns();const rows = table.getRowModel().rows;@@ -151,92 +161,97 @@ export function DataTable<TData>({return (<div className="overflow-hidden rounded-xl border border-border bg-card">{toolbar}- <Table>- <TableHeader>- {table.getHeaderGroups().map((headerGroup) => (- <TableRow key={headerGroup.id} className="hover:bg-transparent">- {headerGroup.headers.map((header) => (- <TableHead- key={header.id}- className={header.column.columnDef.meta?.headerClassName}- >- {header.isPlaceholder- ? null- : flexRender(- header.column.columnDef.header,- header.getContext(),- )}- </TableHead>- ))}- </TableRow>- ))}- </TableHeader>- <TableBody>- {isLoading ? (- Array.from({ length: 8 }, (_, index) => (- <TableRow key={index} aria-hidden>- {columns.map((column) => (- <TableCell key={column.id}>- <Skeleton- className={- column.id === "select" ? "size-4" : "h-4 w-full"- }- />- </TableCell>+ {error ? <div className="p-4">{error}</div> : null}+ {error && !isLoading && rows.length === 0 ? null : (+ <Table>+ <TableHeader>+ {table.getHeaderGroups().map((headerGroup) => (+ <TableRow key={headerGroup.id} className="hover:bg-transparent">+ {headerGroup.headers.map((header) => (+ <TableHead+ key={header.id}+ className={header.column.columnDef.meta?.headerClassName}+ >+ {header.isPlaceholder+ ? null+ : flexRender(+ header.column.columnDef.header,+ header.getContext(),+ )}+ </TableHead>))}</TableRow>- ))- ) : rows.length === 0 ? (- <TableRow className="hover:bg-transparent">- <TableCell colSpan={columns.length}>- {isFiltered ? (- <EmptyState- kind="filtered"- variant="plain"- title="No rows match these filters"- description="Change or clear the filters to see more rows."- action={- onClearFilters ? (- <Button- variant="outline"- size="sm"- onClick={onClearFilters}- >- Clear filters- </Button>- ) : undefined- }- />- ) : (- <EmptyState variant="plain" {...empty} />- )}- </TableCell>- </TableRow>- ) : (- rows.map((row) => (- <TableRow- key={row.id}- data-state={row.getIsSelected() ? "selected" : undefined}- >- {row.getVisibleCells().map((cell) => {- const meta = cell.column.columnDef.meta?.cellClassName;- return (- <TableCell- key={cell.id}- className={typeof meta === "function" ? meta(row) : meta}- >- {flexRender(- cell.column.columnDef.cell,- cell.getContext(),- )}+ ))}+ </TableHeader>+ <TableBody>+ {isLoading ? (+ Array.from({ length: 8 }, (_, index) => (+ <TableRow key={index} aria-hidden>+ {columns.map((column) => (+ <TableCell key={column.id}>+ <Skeleton+ className={+ column.id === "select" ? "size-4" : "h-4 w-full"+ }+ /></TableCell>- );- })}+ ))}+ </TableRow>+ ))+ ) : rows.length === 0 ? (+ <TableRow className="hover:bg-transparent">+ <TableCell colSpan={columns.length}>+ {isFiltered ? (+ <EmptyState+ kind="filtered"+ variant="plain"+ title="No rows match these filters"+ description="Change or clear the filters to see more rows."+ action={+ onClearFilters ? (+ <Button+ variant="outline"+ size="sm"+ onClick={onClearFilters}+ >+ Clear filters+ </Button>+ ) : undefined+ }+ />+ ) : (+ <EmptyState variant="plain" {...empty} />+ )}+ </TableCell></TableRow>- ))- )}- </TableBody>- </Table>+ ) : (+ rows.map((row) => (+ <TableRow+ key={row.id}+ data-state={row.getIsSelected() ? "selected" : undefined}+ >+ {row.getVisibleCells().map((cell) => {+ const meta = cell.column.columnDef.meta?.cellClassName;+ return (+ <TableCell+ key={cell.id}+ className={+ typeof meta === "function" ? meta(row) : meta+ }+ >+ {flexRender(+ cell.column.columnDef.cell,+ cell.getContext(),+ )}+ </TableCell>+ );+ })}+ </TableRow>+ ))+ )}+ </TableBody>+ </Table>+ )}{footer}</div>);diff --git a/src/client/components/table/url.tsx b/src/client/components/table/url.tsxindex 81c1ee0d..70560493 100644--- a/src/client/components/table/url.tsx+++ b/src/client/components/table/url.tsx@@ -34,20 +34,23 @@ export function ExternalUrlCell({value,label,baseDomain,- className = "link link-primary inline-flex items-center gap-1",}: {value: string | null | undefined;label: string;baseDomain?: string;- className?: string;}) {const href = resolveUrlHref(value, baseDomain);if (!value || !href) {- return <span className="text-base-content/40">-</span>;+ return <span className="text-muted-foreground">-</span>;}return (- <a className={className} href={href} target="_blank" rel="noreferrer">+ <a+ className="inline-flex max-w-full items-center gap-1 text-primary underline-offset-4 hover:underline"+ href={href}+ target="_blank"+ rel="noreferrer"+ ><span className="truncate">{label}</span><ExternalLink className="size-3 shrink-0" /></a>diff --git a/src/client/features/backlinks/BacklinksFilterPanel.tsx b/src/client/features/backlinks/BacklinksFilterPanel.tsxindex eae95a0a..8e17f0e6 100644--- a/src/client/features/backlinks/BacklinksFilterPanel.tsx+++ b/src/client/features/backlinks/BacklinksFilterPanel.tsx@@ -1,3 +1,9 @@+import { useId } from "react";+import { Link, Link2, Unlink } from "lucide-react";+import { SegmentedToggle } from "@/client/components/SegmentedToggle";+import { DataTableFilterGroup } from "@/client/components/table/DataTableToolbar";+import { Checkbox } from "@/client/components/ui/checkbox";+import { Label } from "@/client/components/ui/label";import { DomainFilterPanel } from "@/client/features/domain/components/DomainFilterPanel";import type { BacklinksTab } from "@/types/schemas/backlinks";import {@@ -172,6 +178,12 @@ export function BacklinksFilterPanel({);}+const LINK_TYPE_ITEMS = [+ { value: "all", icon: <Link2 />, label: "All" },+ { value: "dofollow", icon: <Link />, label: "Dofollow" },+ { value: "nofollow", icon: <Unlink />, label: "Nofollow" },+];+function BacklinksToggleControls({draft,setValue,@@ -180,58 +192,56 @@ function BacklinksToggleControls({setValue: (key: keyof BacklinksTabFilterValues, value: string) => void;}) {return (- <div className="flex flex-wrap items-center gap-4">- <div className="space-y-1.5">- <p className="text-[11px] font-semibold uppercase tracking-wide text-base-content/60">- Link Type- </p>- <div className="flex items-center gap-1">- {(["", "dofollow", "nofollow"] as const).map((value) => (- <button- key={value || "all"}- type="button"- className={`btn btn-xs ${draft.linkType === value ? "btn-soft" : "btn-ghost"}`}- onClick={() => setValue("linkType", value)}- >- {value === ""- ? "All"- : value === "dofollow"- ? "Dofollow"- : "Nofollow"}- </button>- ))}- </div>- </div>+ <div className="grid grid-cols-1 gap-2 sm:grid-cols-2">+ <DataTableFilterGroup label="Link Type">+ <SegmentedToggle+ showLabels+ items={LINK_TYPE_ITEMS}+ value={draft.linkType || "all"}+ onChange={(value) =>+ setValue("linkType", value === "all" ? "" : value)+ }+ />+ </DataTableFilterGroup>- <div className="space-y-1.5">- <p className="text-[11px] font-semibold uppercase tracking-wide text-base-content/60">- Visibility- </p>- <div className="flex items-center gap-3">- <label className="flex items-center gap-1.5 cursor-pointer">- <input- type="checkbox"- className="checkbox checkbox-xs"- checked={draft.hideLost === "true"}- onChange={(event) =>- setValue("hideLost", event.target.checked ? "true" : "")- }- />- <span className="text-xs">Hide lost</span>- </label>- <label className="flex items-center gap-1.5 cursor-pointer">- <input- type="checkbox"- className="checkbox checkbox-xs"- checked={draft.hideBroken === "true"}- onChange={(event) =>- setValue("hideBroken", event.target.checked ? "true" : "")- }- />- <span className="text-xs">Hide broken</span>- </label>+ <DataTableFilterGroup label="Visibility">+ <div className="flex h-7 items-center gap-4">+ <VisibilityCheckbox+ label="Hide lost"+ checked={draft.hideLost === "true"}+ onCheckedChange={(checked) =>+ setValue("hideLost", checked ? "true" : "")+ }+ />+ <VisibilityCheckbox+ label="Hide broken"+ checked={draft.hideBroken === "true"}+ onCheckedChange={(checked) =>+ setValue("hideBroken", checked ? "true" : "")+ }+ /></div>- </div>+ </DataTableFilterGroup>+ </div>+ );+}++function VisibilityCheckbox({+ label,+ checked,+ onCheckedChange,+}: {+ label: string;+ checked: boolean;+ onCheckedChange: (checked: boolean) => void;+}) {+ const id = useId();+ return (+ <div className="flex items-center gap-2">+ <Checkbox id={id} checked={checked} onCheckedChange={onCheckedChange} />+ <Label htmlFor={id} className="text-xs font-normal">+ {label}+ </Label></div>);}diff --git a/src/client/features/backlinks/BacklinksOverviewPanels.tsx b/src/client/features/backlinks/BacklinksOverviewPanels.tsxindex 01ff04e9..2940c8bd 100644--- a/src/client/features/backlinks/BacklinksOverviewPanels.tsx+++ b/src/client/features/backlinks/BacklinksOverviewPanels.tsx@@ -1,4 +1,14 @@import { Link } from "@tanstack/react-router";+import { Info } from "lucide-react";+import { Alert, AlertDescription } from "@/client/components/ui/alert";+import { Badge } from "@/client/components/ui/badge";+import {+ Card,+ CardContent,+ CardDescription,+ CardHeader,+ CardTitle,+} from "@/client/components/ui/card";import { RecentSearchesBackLink } from "@/client/components/RecentSearches";import { RESEARCH_SCOPE_LABELS } from "@/shared/researchScope";import { HelpLabel } from "@/client/components/HelpLabel";@@ -41,10 +51,8 @@ export function BacklinksOverviewPanels({/>)}/>- <div className="flex flex-wrap items-center gap-2 text-sm text-base-content/65">- <span className="badge badge-outline">- {RESEARCH_SCOPE_LABELS[data.scope]}- </span>+ <div className="flex flex-wrap items-center gap-2 text-sm text-muted-foreground">+ <Badge variant="outline">{RESEARCH_SCOPE_LABELS[data.scope]}</Badge><span>Target: {data.displayTarget}</span><span>-</span><span>Updated {formatRelativeTimestamp(data.fetchedAt)}</span>@@ -56,21 +64,23 @@ export function BacklinksOverviewPanels({</div><OverviewGrid data={data} summaryStats={summaryStats} />{data.scope === "exact_url" ? (- <div className="alert alert-info">- <span>+ <Alert variant="info">+ <Info />+ <AlertDescription className="text-foreground">Showing backlinks for this exact page. Switch the scope to Domain orSubdomains for site-wide results — trend charts need one of those.- </span>- </div>+ </AlertDescription>+ </Alert>) : null}{data.scope === "subfolder" ? (- <div className="alert alert-info">- <span>+ <Alert variant="info">+ <Info />+ <AlertDescription className="text-foreground">Showing backlinks pointing into this subfolder. Counts come fromfiltered backlink totals; rank, trends, and the referring-domainsbreakdown need Domain or Subdomains scope.- </span>- </div>+ </AlertDescription>+ </Alert>) : null}</>);@@ -104,23 +114,24 @@ function SummaryStatsGrid({summaryStats: SummaryStat[];}) {const hasTrendPanels = data.scope === "domain" || data.scope === "subdomains";- const cardClassName = `card bg-base-100 border border-base-300 ${hasTrendPanels ? "md:col-span-2 xl:col-span-1" : ""}`;return (- <div className={cardClassName}>- <div className="card-body p-4 xl:h-full">+ <Card+ className={hasTrendPanels ? "md:col-span-2 xl:col-span-1" : undefined}+ >+ <CardContent className="xl:h-full"><div className="grid grid-cols-2 gap-x-6 gap-y-5 xl:gap-y-6">{summaryStats.map((item) => (<div key={item.label}>- <div className="text-xs uppercase tracking-wide text-base-content/55">+ <div className="text-xs tracking-wide text-muted-foreground uppercase"><HelpLabel label={item.label} helpText={item.description} /></div><p className="text-2xl font-semibold">{item.value}</p></div>))}</div>- </div>- </div>+ </CardContent>+ </Card>);}@@ -153,14 +164,14 @@ function TrendCard({title: string;}) {return (- <div className="card bg-base-100 border border-base-300">- <div className="card-body gap-2 p-4">- <div>- <h2 className="text-sm font-medium">{title}</h2>- <p className="text-xs text-base-content/55">{description}</p>- </div>- {children}- </div>- </div>+ <Card className="gap-2">+ <CardHeader>+ <CardTitle className="text-sm font-medium">+ <h2>{title}</h2>+ </CardTitle>+ <CardDescription className="text-xs">{description}</CardDescription>+ </CardHeader>+ <CardContent>{children}</CardContent>+ </Card>);}diff --git a/src/client/features/backlinks/BacklinksPage.tsx b/src/client/features/backlinks/BacklinksPage.tsxindex f403f447..6b94d321 100644--- a/src/client/features/backlinks/BacklinksPage.tsx+++ b/src/client/features/backlinks/BacklinksPage.tsx@@ -1,5 +1,6 @@import { useCallback, useMemo } from "react";import type { SortingState, Updater } from "@tanstack/react-table";+import { PageHeader } from "@/client/components/PageHeader";import { BacklinksSearchCard } from "./BacklinksSearchCard";import { BacklinksBody } from "./BacklinksPageContent";import type { BacklinksPageProps } from "./backlinksPageTypes";@@ -104,13 +105,10 @@ export function BacklinksPage({return (<div className="px-4 py-4 pb-24 overflow-auto md:px-6 md:py-6 md:pb-8"><div className="mx-auto max-w-7xl space-y-4">- <div>- <h1 className="text-2xl font-semibold">Backlinks</h1>- <p className="text-sm text-base-content/70">- Understand who links to a site, what changed recently, and which- pages attract links.- </p>- </div>+ <PageHeader+ title="Backlinks"+ description="Understand who links to a site, what changed recently, and which pages attract links."+ /><BacklinksSearchCardinitialValues={data.searchCardInitialValues}diff --git a/src/client/features/backlinks/BacklinksPageCharts.tsx b/src/client/features/backlinks/BacklinksPageCharts.tsxindex 132879f2..58dbb006 100644--- a/src/client/features/backlinks/BacklinksPageCharts.tsx+++ b/src/client/features/backlinks/BacklinksPageCharts.tsx@@ -140,7 +140,7 @@ export function BacklinksNewLostChart({function EmptyChartState() {return (- <div className="flex h-56 items-center justify-center rounded-xl border border-dashed border-base-300 text-sm text-base-content/55">+ <div className="flex h-56 items-center justify-center rounded-xl border border-dashed border-border text-sm text-muted-foreground">Not enough historical data yet.</div>);diff --git a/src/client/features/backlinks/BacklinksPageContent.tsx b/src/client/features/backlinks/BacklinksPageContent.tsxindex 27500c51..36f475b1 100644--- a/src/client/features/backlinks/BacklinksPageContent.tsx+++ b/src/client/features/backlinks/BacklinksPageContent.tsx@@ -149,7 +149,7 @@ export function BacklinksBody({return (<>{tabStrip}- <p className="text-xs text-base-content/60">+ <p className="text-xs text-muted-foreground">Overview metrics cover the full target, before table filters.</p><BacklinksOverviewPanelsdiff --git a/src/client/features/backlinks/BacklinksPageSections.tsx b/src/client/features/backlinks/BacklinksPageSections.tsxindex 8c8bd9e7..9fe61b13 100644--- a/src/client/features/backlinks/BacklinksPageSections.tsx+++ b/src/client/features/backlinks/BacklinksPageSections.tsx@@ -1,5 +1,5 @@import { useEffect, useMemo } from "react";-import { Check, ChevronDown, Link2, SlidersHorizontal } from "lucide-react";+import { List, Rows3 } from "lucide-react";import type { OnChangeFn, SortingState } from "@tanstack/react-table";import { BacklinksFilterPanel } from "./BacklinksFilterPanel";import { backlinksFilterConditionLimit } from "./backlinksFilterTypes";@@ -13,21 +13,25 @@ import type {import { TAB_DESCRIPTIONS } from "./backlinksPageUtils";import {BacklinksActionsMenu,- BacklinksExportMenu,+ BacklinksBestLinksMenu,} from "./BacklinksToolbarMenus";-import { buildBacklinksTabExport } from "./export";+import { buildBacklinksTabExport, buildBacklinksTabFilename } from "./export";import type { BacklinksDomainExpansion } from "./useBacklinksDomainExpansion";import type { BacklinksFiltersState } from "./useBacklinksFilters";import { useAhrefsDomainRatings } from "./useAhrefsDomainRatings";import { TablePagination } from "@/client/components/table/TablePagination";-import {- BACKLINKS_PAGE_SIZES,- DEFAULT_BACKLINKS_SPAM_THRESHOLD,- type BacklinksTab,-} from "@/types/schemas/backlinks";+import { BACKLINKS_PAGE_SIZES } from "@/types/schemas/backlinks";import type { ResearchScope } from "@/shared/researchScope";-import { Skeleton } from "@/client/components/ui/skeleton";+import { ExportMenu } from "@/client/components/ExportMenu";import { QueryError } from "@/client/components/QueryState";+import { SegmentedToggle } from "@/client/components/SegmentedToggle";+import type { DataTableFrameProps } from "@/client/components/table/DataTable";+import {+ DataTableFilterToggle,+ DataTableToolbar,+} from "@/client/components/table/DataTableToolbar";+import { Tabs, TabsList, TabsTrigger } from "@/client/components/ui/tabs";+import { exportRows } from "@/client/lib/exportRows";const BACKLINKS_RESULTS_TABS: Array<{tab: BacklinksSearchState["tab"];@@ -121,193 +125,98 @@ export function BacklinksResultsCard({if (missing.length > 0) void loadRatings(missing);}, [domainRatings, ratableDomains, loadRatings]);- return (- <div className="border border-base-300 rounded-xl bg-base-100">- <div className="flex flex-col lg:flex-row lg:items-center justify-between gap-3 px-4 py-3 border-b border-base-300">- <div className="space-y-2">- <div role="tablist" className="tabs tabs-border w-fit">- {BACKLINKS_RESULTS_TABS.filter(- // Referring domains can't be filtered to a path prefix.- ({ tab }) => !(scope === "subfolder" && tab === "domains"),- ).map(({ label, tab }) => (- <TabLink- key={tab}- activeTab={activeTab}- label={label}- onSelect={onTabChange}- tab={tab}+ const filterState = filters[activeTab];+ const frame: DataTableFrameProps = {+ isLoading: isTabLoading,+ isFiltered: activeFilterCount > 0,+ onClearFilters: () => {+ filterState.reset();+ onPageChange(1);+ },+ error: tabErrorMessage ? (+ <QueryError+ cause={tabError}+ fallback={tabErrorMessage}+ onRetry={onRetryTab}+ isRetrying={isTabRetrying}+ />+ ) : null,+ toolbar: (+ <>+ <DataTableToolbar+ actions={+ <>+ <ExportMenu+ actions={["sheets", "csv"]}+ scopes={[{ id: "page", label: "Current page · selected view" }]}+ disabled={exportTable.rows.length === 0}+ onExport={(format) =>+ void exportRows({+ format,+ feature: `backlinks_${activeTab}`,+ ...exportTable,+ filename: buildBacklinksTabFilename(+ activeTab,+ exportTarget,+ ),+ })+ }/>- ))}- </div>- <p className="max-w-xl text-sm text-base-content/60">- {TAB_DESCRIPTIONS[activeTab]}- </p>- </div>-- <div className="flex flex-wrap items-center gap-2">- <BacklinksExportMenu- activeTab={activeTab}- exportTarget={exportTarget}- headers={exportTable.headers}- rows={exportTable.rows}- />- {activeTab !== "pages" ? (- <BacklinksActionsMenu- isLoadingRatings={isLoadingRatings}- loadRatings={loadRatings}- ratableDomains={ratableDomains}- />- ) : null}- </div>- </div>-- <div className="flex flex-wrap items-center gap-2 px-4 py-2 border-b border-base-300">- <button- className={`btn btn-ghost btn-sm gap-1.5 ${filters.showFilters ? "btn-active" : ""}`}- onClick={() => filters.setShowFilters((current) => !current)}- title="Toggle table filters"+ {activeTab !== "pages" ? (+ <BacklinksActionsMenu+ isLoadingRatings={isLoadingRatings}+ loadRatings={loadRatings}+ ratableDomains={ratableDomains}+ />+ ) : null}+ </>+ }>- <SlidersHorizontal className="size-3.5" />- Filters- {activeFilterCount > 0 ? (- <span className="badge badge-xs badge-primary border-0 text-primary-content">- {activeFilterCount}- </span>- ) : null}- </button>- {activeTab === "backlinks" ? (- <details className="dropdown">- <summary className="btn btn-ghost btn-sm gap-1.5">- <Link2 className="size-3.5" />- Best links: {hideSpam ? "On" : "Off"}- <ChevronDown className="size-3 opacity-60" />- </summary>- <ul- className="dropdown-content menu z-20 w-72 rounded-box border border-base-300 bg-base-100 p-2 shadow-lg"- onClick={(event) => {- const details = event.currentTarget.parentElement;- details?.removeAttribute("open");- details?.querySelector("summary")?.focus();- }}- >- <li>- <button type="button" onClick={() => onHideSpamChange(true)}>- <span className="w-4 shrink-0">- {hideSpam ? <Check className="size-4" /> : null}- </span>- <span>- <span className="block">Best links only</span>- <span className="block text-xs text-base-content/60">- Scores below {DEFAULT_BACKLINKS_SPAM_THRESHOLD} or unknown- </span>- </span>- </button>- </li>- <li>- <button type="button" onClick={() => onHideSpamChange(false)}>- <span className="w-4 shrink-0">- {!hideSpam ? <Check className="size-4" /> : null}- </span>- <span>- <span className="block">All links (spammy included)</span>- <span className="block text-xs text-base-content/60">- Includes scores {DEFAULT_BACKLINKS_SPAM_THRESHOLD} or- higher- </span>- </span>- </button>- </li>- </ul>- </details>- ) : null}- {activeTab === "backlinks" ? (- <div- role="tablist"- aria-label="Backlinks view"- className="ml-auto tabs tabs-border tabs-xs w-fit"- >- <button- type="button"- role="tab"- aria-selected={view !== "all"}- className={`tab ${view !== "all" ? "tab-active" : ""}`}- title="Show each referring domain's strongest link; expand a row for the rest"- onClick={() => onViewChange(undefined)}- >- One per domain- </button>- <button- type="button"- role="tab"- aria-selected={view === "all"}- className={`tab ${view === "all" ? "tab-active" : ""}`}- title="List every individual backlink"- onClick={() => onViewChange("all")}- >- All links- </button>- </div>- ) : null}- </div>-- {filters.showFilters ? (- <BacklinksFilterPanel- activeTab={activeTab}- filters={filters}- onApplied={() => onPageChange(1)}- // Restored filters are also checked before the query can run.- maxConditions={backlinksFilterConditionLimit(- scope,- activeTab === "backlinks" && hideSpam,- )}- />- ) : null}-- <div className="p-4">- {tabErrorMessage ? (- <div className="mb-3">- <QueryError- cause={tabError}- fallback={tabErrorMessage}- onRetry={onRetryTab}- isRetrying={isTabRetrying}- />- </div>- ) : null}- {isTabLoading ? (- <TabLoadingState label={TAB_LOADING_LABELS[activeTab]} />- ) : null}- {!isTabLoading && showTable ? (- <>- {activeTab === "backlinks" ? (- <BacklinksTable- rows={tabRows.backlinks}- domainRatings={domainRatings}- sorting={sorting}- onSortingChange={onSortingChange}- expansion={view === "all" ? null : domainExpansion}- />- ) : null}- {activeTab === "domains" ? (- <ReferringDomainsTable- rows={tabRows.referringDomains}- domainRatings={domainRatings}- sorting={sorting}- onSortingChange={onSortingChange}+ <DataTableFilterToggle+ open={filters.showFilters}+ activeCount={activeFilterCount}+ onToggle={() => filters.setShowFilters((current) => !current)}+ />+ {activeTab === "backlinks" ? (+ <>+ <BacklinksBestLinksMenu+ hideSpam={hideSpam}+ onHideSpamChange={onHideSpamChange}/>- ) : null}- {activeTab === "pages" ? (- <TopPagesTable- rows={tabRows.topPages}- sorting={sorting}- onSortingChange={onSortingChange}+ <SegmentedToggle+ showLabels+ value={view ?? "one"}+ onChange={(next) =>+ onViewChange(next === "all" ? "all" : undefined)+ }+ items={[+ {+ value: "one",+ icon: <Rows3 />,+ label: "One per domain",+ },+ { value: "all", icon: <List />, label: "All links" },+ ]}/>- ) : null}- </>+ </>+ ) : null}+ </DataTableToolbar>+ {filters.showFilters ? (+ <BacklinksFilterPanel+ activeTab={activeTab}+ filters={filters}+ onApplied={() => onPageChange(1)}+ // Restored filters are also checked before the query can run.+ maxConditions={backlinksFilterConditionLimit(+ scope,+ activeTab === "backlinks" && hideSpam,+ )}+ />) : null}- </div>-- {/* Kept visible on tab errors so a failing page still offers a way back. */}+ </>+ ),+ // Kept visible on tab errors so a failing page still offers a way back.+ footer: (<TablePaginationpage={pagination.page}pageSize={pagination.pageSize}@@ -318,16 +227,70 @@ export function BacklinksResultsCard({onPageChange={onPageChange}onPageSizeChange={onPageSizeChange}/>+ ),+ };++ return (+ <div className="space-y-3">+ <div className="space-y-2">+ <Tabs+ value={activeTab}+ onValueChange={(value) => {+ const next = BACKLINKS_RESULTS_TABS.find(+ (item) => item.tab === value,+ );+ if (next) onTabChange(next.tab);+ }}+ >+ <TabsList variant="line">+ {BACKLINKS_RESULTS_TABS.filter(+ // Referring domains can't be filtered to a path prefix.+ ({ tab }) => !(scope === "subfolder" && tab === "domains"),+ ).map(({ label, tab }) => (+ <TabsTrigger key={tab} value={tab}>+ {label}+ </TabsTrigger>+ ))}+ </TabsList>+ </Tabs>+ <p className="max-w-xl text-sm text-muted-foreground">+ {TAB_DESCRIPTIONS[activeTab]}+ </p>+ </div>++ {/* A filter budget error hides the rows: the query never ran for the+ current filters. */}+ {activeTab === "backlinks" ? (+ <BacklinksTable+ rows={showTable ? tabRows.backlinks : []}+ domainRatings={domainRatings}+ sorting={sorting}+ onSortingChange={onSortingChange}+ expansion={view === "all" ? null : domainExpansion}+ {...frame}+ />+ ) : null}+ {activeTab === "domains" ? (+ <ReferringDomainsTable+ rows={showTable ? tabRows.referringDomains : []}+ domainRatings={domainRatings}+ sorting={sorting}+ onSortingChange={onSortingChange}+ {...frame}+ />+ ) : null}+ {activeTab === "pages" ? (+ <TopPagesTable+ rows={showTable ? tabRows.topPages : []}+ sorting={sorting}+ onSortingChange={onSortingChange}+ {...frame}+ />+ ) : null}</div>);}-const TAB_LOADING_LABELS: Record<BacklinksTab, string> = {- backlinks: "Loading backlinks",- domains: "Loading referring domains",- pages: "Loading top pages",-};-/** Unique domains the DR column keys on, from both the backlinks and referring* domains tables, normalized to match how each table renders its domain. */function collectRatableDomains(tabRows: BacklinksTabRows): string[] {@@ -339,40 +302,3 @@ function collectRatableDomains(tabRows: BacklinksTabRows): string[] {...new Set(domains.filter((domain): domain is string => Boolean(domain))),];}--function TabLink({- activeTab,- label,- onSelect,- tab,-}: {- activeTab: BacklinksSearchState["tab"];- label: string;- onSelect: (tab: BacklinksSearchState["tab"]) => void;- tab: BacklinksSearchState["tab"];-}) {- const isActive = activeTab === tab;-- return (- <button- type="button"- role="tab"- aria-selected={isActive}- className={`tab ${isActive ? "tab-active" : ""}`}- onClick={() => onSelect(tab)}- >- {label}- </button>- );-}--function TabLoadingState({ label }: { label: string }) {- return (- <div className="space-y-3 py-2">- <p className="text-sm text-base-content/60">{label}...</p>- <Skeleton className="h-10 w-full" />- <Skeleton className="h-10 w-full" />- <Skeleton className="h-10 w-full" />- </div>- );-}diff --git a/src/client/features/backlinks/BacklinksPageStates.tsx b/src/client/features/backlinks/BacklinksPageStates.tsxindex acdaa154..ad8467d9 100644--- a/src/client/features/backlinks/BacklinksPageStates.tsx+++ b/src/client/features/backlinks/BacklinksPageStates.tsx@@ -1,35 +1,31 @@-import { ShieldAlert } from "lucide-react";+import { ErrorState } from "@/client/components/ErrorState";+import { SkeletonStatGrid } from "@/client/components/SkeletonPresets";+import { Card, CardContent } from "@/client/components/ui/card";import { Skeleton } from "@/client/components/ui/skeleton";export function BacklinksLoadingState() {return (<div className="space-y-3">- <div className="grid grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-4">- {Array.from({ length: 8 }).map((_, index) => (- <div key={index} className="card bg-base-100 border border-base-300">- <div className="card-body gap-3 p-4">- <Skeleton className="h-3 w-24" />- <Skeleton className="h-8 w-28" />- </div>- </div>- ))}- </div>+ <SkeletonStatGrid+ count={8}+ className="grid-cols-1 md:grid-cols-2 xl:grid-cols-4"+ /><div className="grid grid-cols-1 gap-3 xl:grid-cols-2">{Array.from({ length: 2 }).map((_, index) => (- <div key={index} className="card bg-base-100 border border-base-300">- <div className="card-body gap-3">+ <Card key={index}>+ <CardContent className="space-y-3"><Skeleton className="h-4 w-32" /><Skeleton className="h-64 w-full" />- </div>- </div>+ </CardContent>+ </Card>))}</div>- <div className="card bg-base-100 border border-base-300">- <div className="card-body gap-3">+ <Card>+ <CardContent className="space-y-3"><Skeleton className="h-8 w-60" /><Skeleton className="h-80 w-full" />- </div>- </div>+ </CardContent>+ </Card></div>);}@@ -44,29 +40,11 @@ export function BacklinksErrorState({isRetrying: boolean;}) {return (- <section className="rounded-2xl border border-error/30 bg-error/5 p-6 space-y-3">- <div className="flex items-start gap-3">- <div className="rounded-xl bg-error/10 p-2.5 text-error shrink-0">- <ShieldAlert className="size-5" />- </div>- <div className="space-y-1">- <h2 className="text-lg font-semibold">Could not load backlinks</h2>- <p className="text-sm text-base-content/70">- {errorMessage ?? "Please try again in a moment."}- </p>- </div>- </div>- <button className="btn btn-sm" onClick={onRetry} disabled={isRetrying}>- {isRetrying ? "Retrying…" : "Retry"}- </button>- </section>- );-}--export function EmptyTableState({ label }: { label: string }) {- return (- <div className="rounded-xl border border-dashed border-base-300 p-10 text-center text-sm text-base-content/55">- {label}- </div>+ <ErrorState+ title="Could not load backlinks"+ message={errorMessage ?? "Please try again in a moment."}+ onRetry={onRetry}+ isRetrying={isRetrying}+ />);}diff --git a/src/client/features/backlinks/BacklinksTable.tsx b/src/client/features/backlinks/BacklinksTable.tsxindex c0e33dfb..927da415 100644--- a/src/client/features/backlinks/BacklinksTable.tsx+++ b/src/client/features/backlinks/BacklinksTable.tsx@@ -1,8 +1,10 @@import { useMemo } from "react";-import type { OnChangeFn, SortingState } from "@tanstack/react-table";-import { AppDataTable } from "@/client/components/table/AppDataTable";-import { useDataTable } from "@/client/components/table/DataTable";-import { EmptyTableState } from "./BacklinksPageStates";+import type { OnChangeFn, Row, SortingState } from "@tanstack/react-table";+import {+ DataTable,+ useDataTable,+ type DataTableFrameProps,+} from "@/client/components/table/DataTable";import {buildBacklinksColumns,type BacklinksDisplayRow,@@ -72,13 +74,21 @@ function buildDisplayRows(return out;}+function tintExpandedRow(row: Row<BacklinksDisplayRow>) {+ const displayRow = row.original;+ return displayRow.kind !== "link" || displayRow.depth > 0+ ? "bg-muted/50"+ : undefined;+}+export function BacklinksTable({rows,domainRatings,sorting,onSortingChange,expansion,-}: {+ ...frame+}: DataTableFrameProps & {rows: BacklinksRow[];domainRatings: DomainRatings | null;sorting: SortingState;@@ -87,7 +97,14 @@ export function BacklinksTable({expansion: BacklinksDomainExpansion | null;}) {const columns = useMemo(- () => buildBacklinksColumns(domainRatings, expansion?.toggleDomain),+ () =>+ buildBacklinksColumns(domainRatings, expansion?.toggleDomain).map(+ (column) => ({+ ...column,+ // Tints a domain's expanded links and its status row.+ meta: { ...column.meta, cellClassName: tintExpandedRow },+ }),+ ),[domainRatings, expansion?.toggleDomain],);const displayRows = useMemo(@@ -103,19 +120,11 @@ export function BacklinksTable({manualSorting: true,});- if (rows.length === 0) {- return <EmptyTableState label="No backlinks match this filter." />;- }-return (- <AppDataTable+ <DataTabletable={table}- fixedLayout- getRowClassName={(row) =>- row.original.kind !== "link" || row.original.depth > 0- ? "bg-base-200/30"- : undefined- }+ empty={{ title: "No backlinks found for this target." }}+ {...frame}/>);}diff --git a/src/client/features/backlinks/BacklinksTableColumns.tsx b/src/client/features/backlinks/BacklinksTableColumns.tsxindex 96be3362..e7d86001 100644--- a/src/client/features/backlinks/BacklinksTableColumns.tsx+++ b/src/client/features/backlinks/BacklinksTableColumns.tsx@@ -3,6 +3,9 @@ import { ChevronRight } from "lucide-react";import { SortableHeader } from "@/client/components/table/SortableHeader";import { HelpLabel } from "@/client/components/HelpLabel";import { SafeExternalLink } from "@/client/components/SafeExternalLink";+import { Badge } from "@/client/components/ui/badge";+import { Button } from "@/client/components/ui/button";+import { Spinner } from "@/client/components/ui/spinner";import type { BacklinksRow } from "./backlinksPageTypes";import type { BacklinksRowsSortField } from "@/types/schemas/backlinks";import {@@ -42,7 +45,7 @@ function BacklinksSourceLink({<SafeExternalLinkurl={url}label={truncateMiddle(extractUrlPath(url), maxLength)}- className={`link link-hover break-all inline-flex items-center gap-1 ${muted ? "text-xs text-base-content/55" : "text-sm"}`}+ className={`inline-flex items-center gap-1 break-all underline-offset-4 hover:underline ${muted ? "text-xs text-muted-foreground" : "text-sm"}`}/>);}@@ -50,21 +53,13 @@ function BacklinksSourceLink({function BacklinkFlags({ row }: { row: BacklinksRow }) {return (<div className="flex flex-wrap gap-1">- {row.isLost ? (- <span className="badge badge-sm badge-error badge-outline">Lost</span>- ) : null}- {row.isBroken ? (- <span className="badge badge-sm badge-warning badge-outline">- Broken- </span>- ) : null}+ {row.isLost ? <Badge variant="destructive">Lost</Badge> : null}+ {row.isBroken ? <Badge variant="warning">Broken</Badge> : null}{row.isDofollow === false ? (- <span className="badge badge-sm badge-outline">Nofollow</span>+ <Badge variant="outline">Nofollow</Badge>) : null}{row.linksCount != null && row.linksCount > 1 ? (- <span className="badge badge-sm badge-outline min-w-fit whitespace-nowrap">- {row.linksCount} links- </span>+ <Badge variant="outline">{row.linksCount} links</Badge>) : null}</div>);@@ -73,14 +68,14 @@ function BacklinkFlags({ row }: { row: BacklinksRow }) {function StatusCell({ status }: { status: "loading" | "error" | "empty" }) {if (status === "loading") {return (- <span className="flex items-center gap-2 pl-6 text-sm text-base-content/60">- <span className="loading loading-spinner loading-xs" />+ <span className="flex items-center gap-2 pl-6 text-sm text-muted-foreground">+ <Spinner className="size-3.5" />Loading links…</span>);}return (- <span className="pl-6 text-sm text-base-content/60">+ <span className="pl-6 text-sm text-muted-foreground">{status === "error"? "Couldn't load this domain's links.": "No other links from this domain."}@@ -106,7 +101,7 @@ function SourceCell({{row.urlFrom ? (<BacklinksSourceLink url={row.urlFrom} maxLength={48} muted />) : (- <span className="text-base-content/55">-</span>+ <span className="text-muted-foreground">-</span>)}</div>);@@ -116,9 +111,10 @@ function SourceCell({return (<div className="flex items-start gap-1.5 break-all">{expandable && row.domainFrom && onToggleDomain ? (- <button- type="button"- className="btn btn-ghost btn-xs btn-square shrink-0 -ml-1"+ <Button+ variant="ghost"+ size="icon-xs"+ className="-ml-1 shrink-0"aria-label={`${expanded ? "Hide" : "Show"} all links from ${domainLabel}`}aria-expanded={expanded}onClick={() => onToggleDomain(row.domainFrom ?? "")}@@ -126,7 +122,7 @@ function SourceCell({<ChevronRightclassName={`size-4 transition-transform ${expanded ? "rotate-90" : ""}`}/>- </button>+ </Button>) : null}<div><div className="font-semibold">{domainLabel}</div>@@ -157,8 +153,7 @@ function buildBaseColumns(id: "source",enableSorting: false,header: () => <HelpLabel label="Source" helpText="Page linking to you" />,- size: 250,- minSize: 180,+ meta: { headerClassName: "min-w-[200px]" },cell: ({ row }) => (<SourceCell displayRow={row.original} onToggleDomain={onToggleDomain} />),@@ -169,8 +164,7 @@ function buildBaseColumns(header: () => (<HelpLabel label="Target" helpText="Destination on your site" />),- size: 220,- minSize: 150,+ meta: { headerClassName: "min-w-[180px]" },cell: linkCell((row) => (<div className="break-all">{row.urlTo ? (@@ -187,13 +181,12 @@ function buildBaseColumns(header: () => (<HelpLabel label="Anchor" helpText="Text or format of the link" />),- size: 150,- minSize: 100,+ meta: { headerClassName: "min-w-[150px]" },cell: linkCell((row) => (- <div className="space-y-0.5 break-words">+ <div className="space-y-0.5 wrap-anywhere"><span className="text-sm">{row.anchor || "No anchor text"}</span>{row.itemType ? (- <div className="text-xs text-base-content/55">{row.itemType}</div>+ <div className="text-xs text-muted-foreground">{row.itemType}</div>) : null}</div>)),@@ -207,8 +200,7 @@ function buildBaseColumns(helpText="Special backlink attributes, such as lost, broken, nofollow, or multiple links from the same source."/>),- size: 130,- minSize: 80,+ meta: { headerClassName: "min-w-[110px]" },cell: linkCell((row) => <BacklinkFlags row={row} />),},{@@ -223,8 +215,6 @@ function buildBaseColumns(align="right"/>),- size: 70,- minSize: 50,sortDescFirst: true,cell: linkCell((row) => (<div className="text-right tabular-nums text-sm">@@ -244,8 +234,6 @@ function buildBaseColumns(align="right"/>),- size: 70,- minSize: 50,sortDescFirst: true,cell: linkCell((row) => (<div className="text-right tabular-nums text-sm">@@ -265,8 +253,6 @@ function buildBaseColumns(align="right"/>),- size: 70,- minSize: 50,sortDescFirst: true,cell: linkCell((row) => {const value = row.spamScore;@@ -292,14 +278,12 @@ function buildBaseColumns(helpText="When this link was first discovered by the crawler"/>),- size: 110,- minSize: 80,sortDescFirst: true,cell: linkCell((row) => (<div className="whitespace-nowrap text-sm"><div>{formatCompactDate(row.firstSeen)}</div>{row.lastSeen ? (- <div className="text-xs text-base-content/55">+ <div className="text-xs text-muted-foreground">Last {formatCompactDate(row.lastSeen)}</div>) : null}@@ -334,8 +318,6 @@ export function buildBacklinksColumns(/></span>),- size: 90,- minSize: 70,cell: linkCell((row) => {const domain = row.domainFrom?.replace(/^www\./, "");const dr = domain ? (ratings[domain] ?? null) : null;diff --git a/src/client/features/backlinks/BacklinksToolbarMenus.tsx b/src/client/features/backlinks/BacklinksToolbarMenus.tsxindex 03e2658f..cf24dedf 100644--- a/src/client/features/backlinks/BacklinksToolbarMenus.tsx+++ b/src/client/features/backlinks/BacklinksToolbarMenus.tsx@@ -1,47 +1,54 @@-import { useState } from "react";-import { Gauge, MoreHorizontal } from "lucide-react";-import { ExportMenu } from "@/client/components/ExportMenu";-import type { CsvValue } from "@/client/lib/csv";-import { exportRows } from "@/client/lib/exportRows";-import type { BacklinksSearchState } from "./backlinksPageTypes";-import { buildBacklinksTabFilename } from "./export";+import { ChevronDown, Gauge, Link2, MoreHorizontal } from "lucide-react";+import { Button } from "@/client/components/ui/button";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuTrigger,+} from "@/client/components/ui/dropdown-menu";+import { Spinner } from "@/client/components/ui/spinner";+import { DEFAULT_BACKLINKS_SPAM_THRESHOLD } from "@/types/schemas/backlinks";-export function BacklinksExportMenu({- activeTab,- exportTarget,- headers,- rows,+export function BacklinksBestLinksMenu({+ hideSpam,+ onHideSpamChange,}: {- activeTab: BacklinksSearchState["tab"];- exportTarget: string;- headers: string[];- rows: CsvValue[][];+ hideSpam: boolean;+ onHideSpamChange: (hideSpam: boolean) => void;}) {- const [isExportingSheets, setIsExportingSheets] = useState(false);-- const runExport = async (format: "csv" | "sheets") => {- setIsExportingSheets(format === "sheets");- try {- await exportRows({- format,- feature: `backlinks_${activeTab}`,- headers,- rows,- filename: buildBacklinksTabFilename(activeTab, exportTarget),- });- } finally {- setIsExportingSheets(false);- }- };-return (- <ExportMenu- actions={["sheets", "csv"]}- scopes={[{ id: "page", label: "Current page · selected view" }]}- busy={isExportingSheets}- disabled={rows.length === 0}- onExport={(action) => void runExport(action)}- />+ <DropdownMenu>+ <DropdownMenuTrigger render={<Button variant="ghost" size="sm" />}>+ <Link2 data-icon="inline-start" />+ Best links: {hideSpam ? "On" : "Off"}+ <ChevronDown data-icon="inline-end" className="opacity-60" />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start" className="w-72">+ <DropdownMenuRadioGroup+ value={hideSpam ? "best" : "all"}+ onValueChange={(value) => onHideSpamChange(value === "best")}+ >+ <DropdownMenuRadioItem value="best">+ <span>+ <span className="block">Best links only</span>+ <span className="block text-xs text-muted-foreground">+ Scores below {DEFAULT_BACKLINKS_SPAM_THRESHOLD} or unknown+ </span>+ </span>+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem value="all">+ <span>+ <span className="block">All links (spammy included)</span>+ <span className="block text-xs text-muted-foreground">+ Includes scores {DEFAULT_BACKLINKS_SPAM_THRESHOLD} or higher+ </span>+ </span>+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ </DropdownMenuContent>+ </DropdownMenu>);}@@ -55,37 +62,29 @@ export function BacklinksActionsMenu({ratableDomains: string[];}) {return (- <div className="dropdown dropdown-end">- <div- tabIndex={0}- role="button"- className="btn btn-sm btn-ghost btn-square"- aria-label="Backlinks table actions"- title="Backlinks table actions"- >- <MoreHorizontal className="size-4" />- </div>- <ul- tabIndex={0}- role="menu"- className="dropdown-content z-10 menu p-2 shadow-lg bg-base-100 border border-base-300 rounded-box w-52"+ <DropdownMenu>+ <DropdownMenuTrigger+ render={+ <Button+ variant="ghost"+ size="icon-sm"+ aria-label="Backlinks table actions"+ title="Backlinks table actions"+ />+ }>- <li>- <button- type="button"- onClick={() => void loadRatings(ratableDomains)}- disabled={isLoadingRatings}- title="Look up Ahrefs Domain Rating for each domain in the table"- >- {isLoadingRatings ? (- <span className="loading loading-spinner loading-xs" />- ) : (- <Gauge className="size-4" />- )}- Ahrefs DR- </button>- </li>- </ul>- </div>+ <MoreHorizontal />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end" className="w-52">+ <DropdownMenuItem+ onClick={() => void loadRatings(ratableDomains)}+ disabled={isLoadingRatings}+ title="Look up Ahrefs Domain Rating for each domain in the table"+ >+ {isLoadingRatings ? <Spinner /> : <Gauge />}+ Ahrefs DR+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>);}diff --git a/src/client/features/backlinks/ReferringDomainsTable.tsx b/src/client/features/backlinks/ReferringDomainsTable.tsxindex e111acd8..a5971ca9 100644--- a/src/client/features/backlinks/ReferringDomainsTable.tsx+++ b/src/client/features/backlinks/ReferringDomainsTable.tsx@@ -2,11 +2,13 @@ import { createColumnHelper } from "@tanstack/react-table";import type { OnChangeFn, SortingState } from "@tanstack/react-table";import { useMemo } from "react";import { SafeExternalLink } from "@/client/components/SafeExternalLink";-import { AppDataTable } from "@/client/components/table/AppDataTable";-import { useDataTable } from "@/client/components/table/DataTable";+import {+ DataTable,+ useDataTable,+ type DataTableFrameProps,+} from "@/client/components/table/DataTable";import { SortableHeader } from "@/client/components/table/SortableHeader";import { HelpLabel } from "@/client/components/HelpLabel";-import { EmptyTableState } from "./BacklinksPageStates";import type { ReferringDomainRow } from "./backlinksPageTypes";import type { ReferringDomainsSortField } from "@/types/schemas/backlinks";import {@@ -23,6 +25,7 @@ const columnHelper = createColumnHelper<ReferringDomainRow>();const baseColumns = [columnHelper.accessor("domain", {id: "domain" satisfies ReferringDomainsSortField,+ meta: { cellClassName: "font-medium break-all" },header: ({ column }) => (<SortableHeadercolumn={column}@@ -37,7 +40,7 @@ const baseColumns = [<SafeExternalLinkurl={getDomainWebsiteHref(domain)}label={domain}- className="link link-primary link-hover break-all inline-flex items-center gap-1"+ className="inline-flex items-center gap-1 break-all text-primary underline-offset-4 hover:underline"/>);},@@ -114,7 +117,7 @@ const baseColumns = [cell: ({ row }) => (<div className="text-sm"><div>Broken links: {formatNumber(row.original.brokenBacklinks)}</div>- <div className="text-base-content/55">+ <div className="text-muted-foreground">Broken pages: {formatNumber(row.original.brokenPages)}</div></div>@@ -169,7 +172,8 @@ export function ReferringDomainsTable({domainRatings,sorting,onSortingChange,-}: {+ ...frame+}: DataTableFrameProps & {rows: ReferringDomainRow[];domainRatings: DomainRatings | null;sorting: SortingState;@@ -188,16 +192,11 @@ export function ReferringDomainsTable({manualSorting: true,});- if (rows.length === 0) {- return <EmptyTableState label="No referring domains match this filter." />;- }-return (- <AppDataTable+ <DataTabletable={table}- getCellClassName={(_, columnId) =>- columnId === "domain" ? "font-medium break-all" : undefined- }+ empty={{ title: "No referring domains found for this target." }}+ {...frame}/>);}diff --git a/src/client/features/backlinks/TopPagesTable.tsx b/src/client/features/backlinks/TopPagesTable.tsxindex bd549723..ec52bf8e 100644--- a/src/client/features/backlinks/TopPagesTable.tsx+++ b/src/client/features/backlinks/TopPagesTable.tsx@@ -1,11 +1,13 @@import { createColumnHelper } from "@tanstack/react-table";import type { OnChangeFn, SortingState } from "@tanstack/react-table";import { SafeExternalLink } from "@/client/components/SafeExternalLink";-import { AppDataTable } from "@/client/components/table/AppDataTable";-import { useDataTable } from "@/client/components/table/DataTable";+import {+ DataTable,+ useDataTable,+ type DataTableFrameProps,+} from "@/client/components/table/DataTable";import { SortableHeader } from "@/client/components/table/SortableHeader";import { HelpLabel } from "@/client/components/HelpLabel";-import { EmptyTableState } from "./BacklinksPageStates";import type { TopPageRow } from "./backlinksPageTypes";import type { TopPagesSortField } from "@/types/schemas/backlinks";import { formatNumber } from "./backlinksPageUtils";@@ -18,6 +20,7 @@ const columns = [columnHelper.accessor("page", {id: "page",enableSorting: false,+ meta: { cellClassName: "min-w-80" },header: () => (<HelpLabellabel="Page"@@ -30,7 +33,7 @@ const columns = [<SafeExternalLinkurl={page}label={page}- className="link link-hover break-all inline-flex items-center gap-1"+ className="inline-flex items-center gap-1 break-all underline-offset-4 hover:underline"/>) : ("-"@@ -91,7 +94,8 @@ export function TopPagesTable({rows,sorting,onSortingChange,-}: {+ ...frame+}: DataTableFrameProps & {rows: TopPageRow[];sorting: SortingState;onSortingChange: OnChangeFn<SortingState>;@@ -104,16 +108,11 @@ export function TopPagesTable({manualSorting: true,});- if (rows.length === 0) {- return <EmptyTableState label="No top pages match this filter." />;- }-return (- <AppDataTable+ <DataTabletable={table}- getCellClassName={(_, columnId) =>- columnId === "page" ? "min-w-80" : undefined- }+ empty={{ title: "No top pages found for this target." }}+ {...frame}/>);}diff --git a/src/client/features/domain/DomainOverviewPage.tsx b/src/client/features/domain/DomainOverviewPage.tsxindex 970dca79..927ace49 100644--- a/src/client/features/domain/DomainOverviewPage.tsx+++ b/src/client/features/domain/DomainOverviewPage.tsx@@ -1,7 +1,16 @@/* eslint-disable max-lines, max-lines-per-function -- Domain Overview keeps page-only orchestration colocated to avoid fake indirection. */import { useCallback, useEffect, useMemo, useRef, type FormEvent } from "react";import { useForm, useStore } from "@tanstack/react-form";-import { Globe } from "lucide-react";+import { Globe, Info } from "lucide-react";+import { PageHeader } from "@/client/components/PageHeader";+import { Alert, AlertDescription } from "@/client/components/ui/alert";+import { Badge } from "@/client/components/ui/badge";+import {+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+} from "@/client/components/ui/tabs";import {DEFAULT_DOMAIN_KEYWORDS_PAGE_SIZE,type DomainSearchParams,@@ -547,13 +556,10 @@ export function DomainOverviewPage({return (<div className="px-4 py-4 md:px-6 md:py-6 pb-24 md:pb-8 overflow-auto"><div className="mx-auto max-w-7xl space-y-4">- <div>- <h1 className="text-2xl font-semibold">Domain Overview</h1>- <p className="text-sm text-base-content/70">- Analyze any domain's SEO profile: traffic, keywords, and- backlinks.- </p>- </div>+ <PageHeader+ title="Domain Overview"+ description="Analyze any domain's SEO profile: traffic, keywords, and backlinks."+ /><DomainSearchCardcontrolsForm={state.controlsForm}@@ -603,12 +609,10 @@ export function DomainOverviewPage({{tabControls}{overviewError}<div className="flex flex-wrap items-center gap-2">- <span className="badge badge-ghost font-medium">- {state.overview.displayTarget}- </span>- <span className="badge badge-outline">+ <Badge variant="secondary">{state.overview.displayTarget}</Badge>+ <Badge variant="outline">{RESEARCH_SCOPE_LABELS[state.overview.scope]}- </span>+ </Badge></div><div className="grid grid-cols-1 md:grid-cols-2 gap-3"><StatTile@@ -632,41 +636,27 @@ export function DomainOverviewPage({</div>{!state.overview.hasData ? (- <div className="alert alert-info">- <span>+ <Alert variant="info">+ <Info />+ <AlertDescription className="text-foreground">Not enough data for this scope yet. Try another domain or abroader scope.- </span>- </div>+ </AlertDescription>+ </Alert>) : null}- <div className="border border-base-300 rounded-xl bg-base-100 overflow-hidden">- <div className="flex flex-col lg:flex-row lg:items-center justify-between gap-3 px-4 py-3 border-b border-base-300">- <div role="tablist" className="tabs tabs-border w-fit">- <button- type="button"- role="tab"- aria-selected={routeState.tab === "keywords"}- className={`tab ${routeState.tab === "keywords" ? "tab-active" : ""}`}- onClick={() => state.handleTabChange("keywords")}- >- Top Keywords- </button>- <button- type="button"- role="tab"- aria-selected={routeState.tab === "pages"}- className={`tab ${routeState.tab === "pages" ? "tab-active" : ""}`}- onClick={() => state.handleTabChange("pages")}- >- Top Pages- </button>- </div>- </div>-- {routeState.tab === "keywords" ? (+ <Tabs+ value={routeState.tab}+ onValueChange={(value) =>+ state.handleTabChange(value === "pages" ? "pages" : "keywords")+ }+ >+ <TabsList variant="line">+ <TabsTrigger value="keywords">Top Keywords</TabsTrigger>+ <TabsTrigger value="pages">Top Pages</TabsTrigger>+ </TabsList>+ <TabsContent value="keywords"><KeywordsTab- key="keywords"projectId={projectId}target={state.overview.displayTarget}hostname={state.overview.domain}@@ -678,9 +668,9 @@ export function DomainOverviewPage({onPageChange={state.goToPage}onPageSizeChange={state.setPageSize}/>- ) : (+ </TabsContent>+ <TabsContent value="pages"><PagesTab- key="pages"projectId={projectId}target={state.overview.displayTarget}hostname={state.overview.domain}@@ -691,8 +681,8 @@ export function DomainOverviewPage({onPageChange={state.goToPage}onPageSizeChange={state.setPageSize}/>- )}- </div>+ </TabsContent>+ </Tabs></>)}</div>diff --git a/src/client/features/domain/components/DomainFilterFields.tsx b/src/client/features/domain/components/DomainFilterFields.tsxdeleted file mode 100644index 4ed9589f..00000000--- a/src/client/features/domain/components/DomainFilterFields.tsx+++ /dev/null@@ -1,72 +0,0 @@-import type { ReactNode } from "react";--function FilterFieldLabel({ children }: { children: ReactNode }) {- return (- <span className="text-[11px] font-semibold uppercase tracking-wide text-base-content/60">- {children}- </span>- );-}--export function FilterTextInput({- label,- value,- onChange,- placeholder,-}: {- label: string;- value: string;- onChange: (value: string) => void;- placeholder: string;-}) {- return (- <label className="form-control gap-1.5">- <FilterFieldLabel>{label}</FilterFieldLabel>- <input- className="input input-bordered input-sm w-full bg-base-100"- placeholder={placeholder}- value={value}- onChange={(event) => onChange(event.target.value)}- />- </label>- );-}--export function FilterNumberInput({- value,- onChange,- placeholder,- step,-}: {- value: string;- onChange: (value: string) => void;- placeholder: string;- step?: string;-}) {- return (- <input- className="input input-bordered input-xs bg-base-100"- type="text"- inputMode="decimal"- step={step}- value={value}- placeholder={placeholder}- onChange={(event) => onChange(event.target.value)}- />- );-}--export function FilterRangeGroup({- title,- children,-}: {- title: string;- children: ReactNode;-}) {- return (- <div className="rounded-lg border border-base-300 bg-base-100 p-2.5 space-y-2">- <FilterFieldLabel>{title}</FilterFieldLabel>- <div className="grid grid-cols-2 gap-2">{children}</div>- </div>- );-}diff --git a/src/client/features/domain/components/DomainFilterPanel.tsx b/src/client/features/domain/components/DomainFilterPanel.tsxindex 00516728..b67253d3 100644--- a/src/client/features/domain/components/DomainFilterPanel.tsx+++ b/src/client/features/domain/components/DomainFilterPanel.tsx@@ -5,12 +5,16 @@ import {useState,type ReactNode,} from "react";-import { AlertTriangle, RotateCcw } from "lucide-react";+import { AlertTriangle } from "lucide-react";import {- FilterNumberInput,- FilterRangeGroup,- FilterTextInput,-} from "@/client/features/domain/components/DomainFilterFields";+ DataTableFilterGroup,+ DataTableFilterPanel,+ DataTableRangeFilter,+} from "@/client/components/table/DataTableToolbar";+import { Alert, AlertDescription } from "@/client/components/ui/alert";+import { Badge } from "@/client/components/ui/badge";+import { Button } from "@/client/components/ui/button";+import { Input } from "@/client/components/ui/input";import { MAX_DATAFORSEO_FILTER_CONDITIONS } from "@/types/schemas/domain";type FilterValues = Record<string, string>;@@ -110,111 +114,100 @@ export function DomainFilterPanel<TValues extends FilterValues>({}, []);return (- <div- className="border-b border-base-300 bg-gradient-to-b from-base-100 to-base-200/30 px-4 py-3 space-y-3"- onKeyDown={handleKeyDown}+ <DataTableFilterPanel+ activeCount={activeFilterCount}+ onReset={resetFilters}>- <div className="flex flex-wrap items-center justify-between gap-2">- <div className="flex items-center gap-2">- <p className="text-sm font-semibold">Refine table results</p>- {activeFilterCount > 0 ? (- <span className="badge badge-xs badge-primary border-0 text-primary-content">- {activeFilterCount} active- </span>- ) : null}- {meta.dirtyCount > 0 ? (- <span className="badge badge-xs badge-warning border-0">- {meta.dirtyCount} unapplied- </span>- ) : null}+ <div className="space-y-3" onKeyDown={handleKeyDown}>+ <div className="grid grid-cols-1 gap-2 lg:grid-cols-2">+ {textFields.map((field) => (+ <DataTableFilterGroup key={String(field.key)} label={field.label}>+ <Input+ className="h-7"+ aria-label={field.label}+ placeholder={field.placeholder}+ value={draftFilters[field.key]}+ onChange={(event) =>+ handleValueChange(field.key, event.target.value)+ }+ />+ </DataTableFilterGroup>+ ))}</div>- <button- type="button"- className="btn btn-xs btn-ghost gap-1"- onClick={resetFilters}- disabled={activeFilterCount === 0 && !meta.isDirty}- >- <RotateCcw className="size-3" />- Clear all- </button>- </div>-- <div className="grid grid-cols-1 gap-3 lg:grid-cols-2">- {textFields.map((field) => (- <FilterTextInput- key={String(field.key)}- label={field.label}- placeholder={field.placeholder}- value={draftFilters[field.key]}- onChange={(value) => handleValueChange(field.key, value)}- />- ))}- </div>- <div className="grid grid-cols-1 gap-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-5">- {rangeFields.map((field) => (- <FilterRangeGroup key={String(field.minKey)} title={field.title}>- <FilterNumberInput- value={draftFilters[field.minKey]}- onChange={(value) => handleValueChange(field.minKey, value)}- placeholder="Min"- step={field.step}+ <div className="grid grid-cols-1 gap-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-5">+ {rangeFields.map((field) => (+ <DataTableRangeFilter+ key={String(field.minKey)}+ label={field.title}+ min={{+ step: field.step,+ value: draftFilters[field.minKey],+ onChange: (event) =>+ handleValueChange(field.minKey, event.target.value),+ }}+ max={{+ step: field.step,+ value: draftFilters[field.maxKey],+ onChange: (event) =>+ handleValueChange(field.maxKey, event.target.value),+ }}/>- <FilterNumberInput- value={draftFilters[field.maxKey]}- onChange={(value) => handleValueChange(field.maxKey, value)}- placeholder="Max"- step={field.step}- />- </FilterRangeGroup>- ))}- </div>+ ))}+ </div>- {renderExtra ? renderExtra(draftFilters, handleValueChange) : null}+ {renderExtra ? renderExtra(draftFilters, handleValueChange) : null}- {meta.overLimit ? (- <div className="alert alert-warning py-2 text-xs">- <AlertTriangle className="size-4 shrink-0" />- <span>- Too many filter conditions ({meta.conditionCount} of {maxConditions}{" "}- max). Remove some terms or ranges before applying.- </span>- </div>- ) : null}- <div className="flex items-center justify-between gap-2 pt-1">- <span className="text-xs text-base-content/50 tabular-nums">- {meta.conditionCount} / {maxConditions} conditions- </span>- <div className="flex items-center gap-2">- <button- type="button"- className="btn btn-sm btn-ghost"- onClick={cancelFilterEdits}- disabled={!meta.isDirty}- >- Cancel- </button>- <button- type="button"- className="btn btn-sm btn-primary"- onClick={applyFilters}- disabled={!meta.isDirty || meta.overLimit}- title={- meta.overLimit- ? `This scope leaves room for at most ${maxConditions} filter conditions per request`- : undefined- }- >- Apply filters- {meta.isDirty ? (- <span className="badge badge-xs ml-1 border-0 bg-primary-content/20">- {meta.dirtyCount}- </span>+ {meta.overLimit ? (+ <Alert variant="warning">+ <AlertTriangle />+ <AlertDescription className="text-foreground">+ Too many filter conditions ({meta.conditionCount} of{" "}+ {maxConditions} max). Remove some terms or ranges before applying.+ </AlertDescription>+ </Alert>+ ) : null}+ <div className="flex flex-wrap items-center justify-between gap-2">+ <div className="flex items-center gap-2">+ <span className="text-xs text-muted-foreground tabular-nums">+ {meta.conditionCount} / {maxConditions} conditions+ </span>+ {meta.dirtyCount > 0 ? (+ <Badge size="sm" variant="warning">+ {meta.dirtyCount} unapplied+ </Badge>) : null}- </button>+ </div>+ <div className="flex items-center gap-2">+ <Button+ variant="ghost"+ size="sm"+ onClick={cancelFilterEdits}+ disabled={!meta.isDirty}+ >+ Cancel+ </Button>+ <Button+ size="sm"+ onClick={applyFilters}+ disabled={!meta.isDirty || meta.overLimit}+ title={+ meta.overLimit+ ? `This scope leaves room for at most ${maxConditions} filter conditions per request`+ : undefined+ }+ >+ Apply filters+ {meta.isDirty ? (+ <Badge size="sm" variant="secondary">+ {meta.dirtyCount}+ </Badge>+ ) : null}+ </Button>+ </div></div></div>- </div>+ </DataTableFilterPanel>);}diff --git a/src/client/features/domain/components/DomainKeywordsTable.tsx b/src/client/features/domain/components/DomainKeywordsTable.tsxindex aa01a5c4..fefa0408 100644--- a/src/client/features/domain/components/DomainKeywordsTable.tsx+++ b/src/client/features/domain/components/DomainKeywordsTable.tsx@@ -1,12 +1,13 @@-import { memo, useMemo } from "react";+import { useMemo } from "react";import {createColumnHelper,type ColumnDef,type RowSelectionState,} from "@tanstack/react-table";-import { AppDataTable } from "@/client/components/table/AppDataTable";import {+ DataTable,makeSelectionColumn,+ type DataTableFrameProps,useDataTable,useSelectionAnchor,} from "@/client/components/table/DataTable";@@ -24,7 +25,7 @@ import type {SortOrder,} from "@/client/features/domain/types";-type Props = {+type Props = DataTableFrameProps & {domain: string;rows: KeywordRow[];selectedKeywords: Set<string>;@@ -37,7 +38,7 @@ type Props = {const keywordColumnHelper = createColumnHelper<KeywordRow>();-function DomainKeywordsTableComponent({+export function DomainKeywordsTable({domain,rows,selectedKeywords,@@ -46,6 +47,7 @@ function DomainKeywordsTableComponent({currentSortOrder,onSortClick,onToggleKeyword,+ ...frame}: Props) {const selectAnchorRef = useSelectionAnchor();const rowSelection = useMemo<RowSelectionState>(@@ -170,24 +172,10 @@ function DomainKeywordsTableComponent({enableRowSelection: true,});return (- <div className="overflow-x-auto">- <div className="mb-2 text-xs text-base-content/60">- {selectedKeywords.size > 0- ? `${selectedKeywords.size} selected`- : "Select keywords to save"}- </div>- <AppDataTable- table={table}- className="table table-sm"- wrapperClassName=""- empty={- <div className="py-6 text-center text-base-content/60">- No keywords match this search.- </div>- }- />- </div>+ <DataTable+ table={table}+ empty={{ title: "No keywords match this search." }}+ {...frame}+ />);}--export const DomainKeywordsTable = memo(DomainKeywordsTableComponent);diff --git a/src/client/features/domain/components/DomainOverviewLoadingState.tsx b/src/client/features/domain/components/DomainOverviewLoadingState.tsxindex 64243fcf..69734b31 100644--- a/src/client/features/domain/components/DomainOverviewLoadingState.tsx+++ b/src/client/features/domain/components/DomainOverviewLoadingState.tsx@@ -1,43 +1,26 @@+import {+ SkeletonStatGrid,+ SkeletonTableRows,+} from "@/client/components/SkeletonPresets";+import { Card, CardContent } from "@/client/components/ui/card";import { Skeleton } from "@/client/components/ui/skeleton";export function DomainOverviewLoadingState() {return (<div className="space-y-4" aria-busy>- <div className="grid grid-cols-1 md:grid-cols-2 gap-3">- <div className="card bg-base-100 border border-base-300">- <div className="card-body p-4 space-y-2">- <Skeleton className="h-3 w-36" />- <Skeleton className="h-8 w-44" />- </div>- </div>- <div className="card bg-base-100 border border-base-300">- <div className="card-body p-4 space-y-2">- <Skeleton className="h-3 w-32" />- <Skeleton className="h-8 w-40" />- </div>- </div>- </div>-- <div className="card bg-base-100 border border-base-300">- <div className="card-body gap-3">+ <SkeletonStatGrid+ count={2}+ className="grid-cols-1 md:grid-cols-2 lg:grid-cols-2"+ />+ <Card>+ <CardContent className="space-y-4"><div className="flex items-center justify-between"><Skeleton className="h-8 w-48" /><Skeleton className="h-8 w-60" /></div>- <Skeleton className="h-9 w-64" />- <div className="space-y-2">- {Array.from({ length: 8 }).map((_, index) => (- <div key={index} className="grid grid-cols-7 gap-3">- <Skeleton className="h-4 col-span-2" />- <Skeleton className="h-4" />- <Skeleton className="h-4" />- <Skeleton className="h-4" />- <Skeleton className="h-4 col-span-2" />- </div>- ))}- </div>- </div>- </div>+ <SkeletonTableRows />+ </CardContent>+ </Card></div>);}diff --git a/src/client/features/domain/components/DomainPagesTable.tsx b/src/client/features/domain/components/DomainPagesTable.tsxindex 1990ed9d..79d624a9 100644--- a/src/client/features/domain/components/DomainPagesTable.tsx+++ b/src/client/features/domain/components/DomainPagesTable.tsx@@ -1,7 +1,10 @@-import { memo, useMemo } from "react";+import { useMemo } from "react";import { createColumnHelper, type ColumnDef } from "@tanstack/react-table";-import { AppDataTable } from "@/client/components/table/AppDataTable";-import { useDataTable } from "@/client/components/table/DataTable";+import {+ DataTable,+ useDataTable,+ type DataTableFrameProps,+} from "@/client/components/table/DataTable";import { ExternalUrlCell } from "@/client/components/table/url";import { SortableHeader } from "@/client/components/table/SortableHeader";import {@@ -16,7 +19,7 @@ import type {SortOrder,} from "@/client/features/domain/types";-type Props = {+type Props = DataTableFrameProps & {domain: string;rows: PageRow[];sortMode: DomainSortMode;@@ -26,12 +29,13 @@ type Props = {const pageColumnHelper = createColumnHelper<PageRow>();-function DomainPagesTableComponent({+export function DomainPagesTable({domain,rows,sortMode,currentSortOrder,onSortClick,+ ...frame}: Props) {const columns = useMemo<ColumnDef<PageRow>[]>(() => [@@ -43,7 +47,6 @@ function DomainPagesTableComponent({value={row.original.page}label={row.original.relativePath ?? row.original.page}baseDomain={domain}- className="link link-primary inline-flex items-center gap-1"/>),meta: {@@ -88,16 +91,10 @@ function DomainPagesTableComponent({columns,});return (- <AppDataTable+ <DataTabletable={table}- className="table table-sm"- empty={- <div className="py-6 text-center text-base-content/60">- No pages match this search.- </div>- }+ empty={{ title: "No pages match this search." }}+ {...frame}/>);}--export const DomainPagesTable = memo(DomainPagesTableComponent);diff --git a/src/client/features/domain/components/DomainTableTabSurface.tsx b/src/client/features/domain/components/DomainTableTabSurface.tsxdeleted file mode 100644index 52e745c8..00000000--- a/src/client/features/domain/components/DomainTableTabSurface.tsx+++ /dev/null@@ -1,94 +0,0 @@-import type { ReactNode } from "react";-import { SlidersHorizontal } from "lucide-react";-import { TableExportMenu } from "@/client/components/table/TableBulkActionBar";-import { SkeletonTableRows } from "@/client/components/SkeletonPresets";--type DomainTableExportAction = {- label: string;- icon: ReactNode;- onClick: () => void;-};--type Props = {- /** The scope's condition limit when saved filters exceed it, else null. */- overBudgetLimit: number | null;- showFilters: boolean;- onToggleFilters: () => void;- activeFilterCount: number;- countLabel: string;- totalCount: number | null;- fallbackCount: number;- exportActions: DomainTableExportAction[];- filterPanel?: ReactNode;- isLoading: boolean;- showTableLoading: boolean;- children: ReactNode;- pagination: ReactNode;-};--export function DomainTableTabSurface({- overBudgetLimit,- showFilters,- onToggleFilters,- activeFilterCount,- countLabel,- totalCount,- fallbackCount,- exportActions,- filterPanel,- isLoading,- showTableLoading,- children,- pagination,-}: Props) {- return (- <>- {overBudgetLimit != null ? (- <div className="alert alert-warning mb-3">- <span>- Saved filters exceed this scope's {overBudgetLimit}-condition- limit and were not applied. Open Filters to trim them.- </span>- </div>- ) : null}-- <div className="flex items-center gap-2 px-4 py-2 border-b border-base-300">- <button- className={`btn btn-ghost btn-sm gap-1.5 ${showFilters ? "btn-active" : ""}`}- onClick={onToggleFilters}- title="Toggle filters"- type="button"- >- <SlidersHorizontal className="size-3.5" />- Filters- {activeFilterCount > 0 ? (- <span className="badge badge-xs badge-primary border-0 text-primary-content">- {activeFilterCount}- </span>- ) : null}- </button>- <span className="text-sm text-base-content/60">- {(totalCount ?? fallbackCount).toLocaleString()} {countLabel}- </span>- <div className="flex-1" />- <TableExportMenu actions={exportActions} />- </div>-- {filterPanel}-- <div className="p-4">- <div- className={- isLoading && !showTableLoading- ? "opacity-60 transition-opacity"- : "transition-opacity"- }- >- {showTableLoading ? <SkeletonTableRows className="py-4" /> : children}- </div>- </div>-- {pagination}- </>- );-}diff --git a/src/client/features/domain/components/DomainTableToolbar.tsx b/src/client/features/domain/components/DomainTableToolbar.tsxnew file mode 100644index 00000000..8ac926a5--- /dev/null+++ b/src/client/features/domain/components/DomainTableToolbar.tsx@@ -0,0 +1,74 @@+import type { ReactNode } from "react";+import { AlertTriangle } from "lucide-react";+import { ExportMenu } from "@/client/components/ExportMenu";+import {+ DataTableFilterToggle,+ DataTableToolbar,+} from "@/client/components/table/DataTableToolbar";+import { Alert, AlertDescription } from "@/client/components/ui/alert";+import type { ExportFormat } from "@/client/lib/exportRows";++type Props = {+ /** The scope's condition limit when saved filters exceed it, else null. */+ overBudgetLimit: number | null;+ showFilters: boolean;+ onToggleFilters: () => void;+ activeFilterCount: number;+ countLabel: string;+ totalCount: number | null;+ fallbackCount: number;+ onExport: (format: ExportFormat) => void;+ filterPanel: ReactNode;+ children?: ReactNode;+};++/** The toolbar, over-budget warning and filter panel above a domain table. */+export function DomainTableToolbar({+ overBudgetLimit,+ showFilters,+ onToggleFilters,+ activeFilterCount,+ countLabel,+ totalCount,+ fallbackCount,+ onExport,+ filterPanel,+ children,+}: Props) {+ return (+ <>+ <DataTableToolbar+ actions={+ <ExportMenu+ actions={["sheets", "copy-json", "csv", "excel"]}+ onExport={onExport}+ />+ }+ >+ <DataTableFilterToggle+ open={showFilters}+ activeCount={activeFilterCount}+ onToggle={onToggleFilters}+ />+ <span className="text-sm text-muted-foreground">+ {(totalCount ?? fallbackCount).toLocaleString()} {countLabel}+ </span>+ {children}+ </DataTableToolbar>++ {overBudgetLimit != null ? (+ <div className="border-b border-border px-4 py-3">+ <Alert variant="warning">+ <AlertTriangle />+ <AlertDescription className="text-foreground">+ Saved filters exceed this scope's {overBudgetLimit}-condition+ limit and were not applied. Open Filters to trim them.+ </AlertDescription>+ </Alert>+ </div>+ ) : null}++ {showFilters ? filterPanel : null}+ </>+ );+}diff --git a/src/client/features/domain/components/KeywordsTab.tsx b/src/client/features/domain/components/KeywordsTab.tsxindex d30d5da0..1b8d82cf 100644--- a/src/client/features/domain/components/KeywordsTab.tsx+++ b/src/client/features/domain/components/KeywordsTab.tsx@@ -1,6 +1,6 @@import { useCallback, useEffect, useMemo, useState } from "react";import { useQueryClient } from "@tanstack/react-query";-import { Copy, Download, FileSpreadsheet, Save, Sheet } from "lucide-react";+import { Download, Save, Sheet } from "lucide-react";import {TableBulkActionBar,TableBulkActionButton,@@ -11,7 +11,7 @@ import { TablePagination } from "@/client/components/table/TablePagination";import { DomainPageLink } from "@/client/features/domain/components/DomainPageLink";import { DomainKeywordsTable } from "@/client/features/domain/components/DomainKeywordsTable";import { DomainFilterPanel } from "@/client/features/domain/components/DomainFilterPanel";-import { DomainTableTabSurface } from "@/client/features/domain/components/DomainTableTabSurface";+import { DomainTableToolbar } from "@/client/features/domain/components/DomainTableToolbar";import { saveSelectedKeywords } from "@/client/features/domain/domainActions";import {KEYWORD_FILTER_FIELDS,@@ -135,8 +135,7 @@ export function KeywordsTab({const rows = query.data?.keywords ?? EMPTY_KEYWORDS;const totalCount = query.data?.totalCount ?? null;const hasNextPage = query.data?.hasMore ?? false;- const isLoading = query.isFetching;- const showTableLoading = isLoading && (showFilters || rows.length === 0);+ const isFetching = query.isFetching;const visibleKeywords = useMemo(() => rows.map((r) => r.keyword), [rows]);useEffect(() => {@@ -252,90 +251,74 @@ export function KeywordsTab({}/>- <DomainTableTabSurface- overBudgetLimit={filtersOverBudget ? maxConditions : null}- showFilters={showFilters}- onToggleFilters={() => setShowFilters((prev) => !prev)}- activeFilterCount={activeFilterCount}- countLabel="keywords"- totalCount={totalCount}- fallbackCount={rows.length}- isLoading={isLoading}- showTableLoading={showTableLoading}- exportActions={[- {- label: "Export to Sheets",- icon: <Sheet className="size-4" />,- onClick: () => exportAll("sheets"),- },- {- label: "Copy data (JSON)",- icon: <Copy className="size-4" />,- onClick: () => exportAll("copy-json"),- },- {- label: "Download CSV",- icon: <Download className="size-4" />,- onClick: () => exportAll("csv"),- },- {- label: "Download Excel",- icon: <FileSpreadsheet className="size-4" />,- onClick: () => exportAll("excel"),- },- ]}- filterPanel={- showFilters ? (- <DomainFilterPanel- activeFilterCount={activeFilterCount}- appliedFilters={restoredFilters}- fields={KEYWORD_FILTER_FIELDS}- textFields={KEYWORD_TEXT_FILTERS}- rangeFields={KEYWORD_RANGE_FILTERS}- countConditions={countKeywordFilterConditions}- maxConditions={maxConditions}- onApply={applyFilters}- onClear={resetFilters}+ <DomainKeywordsTable+ domain={hostname}+ rows={rows}+ selectedKeywords={selectedKeywords}+ visibleKeywords={visibleKeywords}+ sortMode={routeState.sort}+ currentSortOrder={routeState.order}+ onSortClick={onSortClick}+ onToggleKeyword={toggleKeywordSelection}+ isLoading={isFetching && (showFilters || rows.length === 0)}+ isFiltered={!filtersOverBudget && activeFilterCount > 0}+ onClearFilters={resetFilters}+ error={+ query.isError ? (+ <QueryError+ error={query.error}+ fallback="Failed to load keywords."+ onRetry={() => void query.refetch()}+ isRetrying={isFetching}/>) : null}- pagination={+ toolbar={+ <DomainTableToolbar+ overBudgetLimit={filtersOverBudget ? maxConditions : null}+ showFilters={showFilters}+ onToggleFilters={() => setShowFilters((prev) => !prev)}+ activeFilterCount={activeFilterCount}+ countLabel="keywords"+ totalCount={totalCount}+ fallbackCount={rows.length}+ onExport={exportAll}+ filterPanel={+ <DomainFilterPanel+ activeFilterCount={activeFilterCount}+ appliedFilters={restoredFilters}+ fields={KEYWORD_FILTER_FIELDS}+ textFields={KEYWORD_TEXT_FILTERS}+ rangeFields={KEYWORD_RANGE_FILTERS}+ countConditions={countKeywordFilterConditions}+ maxConditions={maxConditions}+ onApply={applyFilters}+ onClear={resetFilters}+ />+ }+ >+ <span className="text-sm text-muted-foreground">+ ·{" "}+ {selectedKeywords.size > 0+ ? `${selectedKeywords.size} selected`+ : "Select keywords to save"}+ </span>+ </DomainTableToolbar>+ }+ footer={<TablePaginationpage={routeState.page}pageSize={routeState.pageSize}pageSizes={DOMAIN_KEYWORDS_PAGE_SIZES}totalCount={totalCount}hasNextPage={hasNextPage}- isLoading={isLoading}+ isLoading={isFetching}onPageChange={onPageChange}onPageSizeChange={onPageSizeChange}renderPageButton={DomainPageLink}/>}- >- <div className="space-y-3">- {query.isError ? (- <QueryError- error={query.error}- fallback="Failed to load keywords."- onRetry={() => void query.refetch()}- isRetrying={query.isFetching}- />- ) : null}- {query.isError && !query.data ? null : (- <DomainKeywordsTable- domain={hostname}- rows={rows}- selectedKeywords={selectedKeywords}- visibleKeywords={visibleKeywords}- sortMode={routeState.sort}- currentSortOrder={routeState.order}- onSortClick={onSortClick}- onToggleKeyword={toggleKeywordSelection}- />- )}- </div>- </DomainTableTabSurface>+ /></>);}diff --git a/src/client/features/domain/components/PagesTab.tsx b/src/client/features/domain/components/PagesTab.tsxindex 1fde29d2..e1c8d2f6 100644--- a/src/client/features/domain/components/PagesTab.tsx+++ b/src/client/features/domain/components/PagesTab.tsx@@ -1,11 +1,10 @@import { useCallback, useMemo, useState } from "react";-import { Copy, Download, FileSpreadsheet, Sheet } from "lucide-react";import { QueryError } from "@/client/components/QueryState";import { TablePagination } from "@/client/components/table/TablePagination";import { DomainPageLink } from "@/client/features/domain/components/DomainPageLink";import { DomainFilterPanel } from "@/client/features/domain/components/DomainFilterPanel";import { DomainPagesTable } from "@/client/features/domain/components/DomainPagesTable";-import { DomainTableTabSurface } from "@/client/features/domain/components/DomainTableTabSurface";+import { DomainTableToolbar } from "@/client/features/domain/components/DomainTableToolbar";import {PAGE_FILTER_FIELDS,buildPagesClearSearchUpdate,@@ -126,8 +125,7 @@ export function PagesTab({const rows = query.data?.pages ?? EMPTY_PAGES_ROWS;const totalCount = query.data?.totalCount ?? null;const hasNextPage = query.data?.hasMore ?? false;- const isLoading = query.isFetching;- const showTableLoading = isLoading && (showFilters || rows.length === 0);+ const isFetching = query.isFetching;const applyFilters = useCallback((values: PagesFilterValues) => {@@ -162,86 +160,63 @@ export function PagesTab({});return (- <DomainTableTabSurface- overBudgetLimit={filtersOverBudget ? maxConditions : null}- showFilters={showFilters}- onToggleFilters={() => setShowFilters((prev) => !prev)}- activeFilterCount={activeFilterCount}- countLabel="pages"- totalCount={totalCount}- fallbackCount={rows.length}- isLoading={isLoading}- showTableLoading={showTableLoading}- exportActions={[- {- label: "Export to Sheets",- icon: <Sheet className="size-4" />,- onClick: () => exportAll("sheets"),- },- {- label: "Copy data (JSON)",- icon: <Copy className="size-4" />,- onClick: () => exportAll("copy-json"),- },- {- label: "Download CSV",- icon: <Download className="size-4" />,- onClick: () => exportAll("csv"),- },- {- label: "Download Excel",- icon: <FileSpreadsheet className="size-4" />,- onClick: () => exportAll("excel"),- },- ]}- filterPanel={- showFilters ? (- <DomainFilterPanel- activeFilterCount={activeFilterCount}- appliedFilters={restoredFilters}- fields={PAGE_FILTER_FIELDS}- textFields={PAGE_TEXT_FILTERS}- rangeFields={PAGE_RANGE_FILTERS}- countConditions={countPageFilterConditions}- maxConditions={maxConditions}- onApply={applyFilters}- onClear={resetFilters}+ <DomainPagesTable+ domain={hostname}+ rows={rows}+ sortMode={routeState.sort}+ currentSortOrder={routeState.order}+ onSortClick={onSortClick}+ isLoading={isFetching && (showFilters || rows.length === 0)}+ isFiltered={!filtersOverBudget && activeFilterCount > 0}+ onClearFilters={resetFilters}+ error={+ query.isError ? (+ <QueryError+ error={query.error}+ fallback="Failed to load pages."+ onRetry={() => void query.refetch()}+ isRetrying={isFetching}/>) : null}- pagination={+ toolbar={+ <DomainTableToolbar+ overBudgetLimit={filtersOverBudget ? maxConditions : null}+ showFilters={showFilters}+ onToggleFilters={() => setShowFilters((prev) => !prev)}+ activeFilterCount={activeFilterCount}+ countLabel="pages"+ totalCount={totalCount}+ fallbackCount={rows.length}+ onExport={exportAll}+ filterPanel={+ <DomainFilterPanel+ activeFilterCount={activeFilterCount}+ appliedFilters={restoredFilters}+ fields={PAGE_FILTER_FIELDS}+ textFields={PAGE_TEXT_FILTERS}+ rangeFields={PAGE_RANGE_FILTERS}+ countConditions={countPageFilterConditions}+ maxConditions={maxConditions}+ onApply={applyFilters}+ onClear={resetFilters}+ />+ }+ />+ }+ footer={<TablePaginationpage={routeState.page}pageSize={routeState.pageSize}pageSizes={DOMAIN_KEYWORDS_PAGE_SIZES}totalCount={totalCount}hasNextPage={hasNextPage}- isLoading={isLoading}+ isLoading={isFetching}onPageChange={onPageChange}onPageSizeChange={onPageSizeChange}renderPageButton={DomainPageLink}/>}- >- <div className="space-y-3">- {query.isError ? (- <QueryError- error={query.error}- fallback="Failed to load pages."- onRetry={() => void query.refetch()}- isRetrying={query.isFetching}- />- ) : null}- {query.isError && !query.data ? null : (- <DomainPagesTable- domain={hostname}- rows={rows}- sortMode={routeState.sort}- currentSortOrder={routeState.order}- onSortClick={onSortClick}- />- )}- </div>- </DomainTableTabSurface>+ />);}diff --git a/src/client/features/search-tabs/SearchTabStrip.tsx b/src/client/features/search-tabs/SearchTabStrip.tsxindex bc7f8755..57a2aa9a 100644--- a/src/client/features/search-tabs/SearchTabStrip.tsx+++ b/src/client/features/search-tabs/SearchTabStrip.tsx@@ -1,7 +1,8 @@import { useEffect } from "react";import { useQuery } from "@tanstack/react-query";import type { QueryKey } from "@tanstack/react-query";-import { Loader2, X } from "lucide-react";+import { X } from "lucide-react";+import { Spinner } from "@/client/components/ui/spinner";import type { SearchTab } from "./types";import {KEYWORD_RESEARCH_STALE_TIME_MS,@@ -39,7 +40,7 @@ export function SearchTabStrip({if (tabs.length === 0) return null;return (- <div className="rounded-xl border border-base-300 bg-base-100 p-1">+ <div className="rounded-xl border border-border bg-card p-1"><divrole="tablist"aria-label="Search tabs"@@ -53,8 +54,8 @@ export function SearchTabStrip({data-search-tab-id={tab.id}className={`group flex shrink-0 items-stretch overflow-hidden rounded-md text-sm transition ${active- ? "bg-base-300 text-base-content shadow-sm"- : "text-base-content/80 hover:bg-base-200"+ ? "bg-muted text-foreground shadow-sm"+ : "text-muted-foreground hover:bg-foreground/5 hover:text-foreground"}`}><button@@ -81,7 +82,7 @@ export function SearchTabStrip({<buttontype="button"data-search-tab-id={tab.id}- className="flex items-center px-1.5 text-base-content/50 opacity-60 transition hover:bg-base-content/10 hover:text-base-content hover:opacity-100 group-hover:opacity-100"+ className="flex items-center px-1.5 text-muted-foreground opacity-60 transition hover:bg-foreground/10 hover:text-foreground hover:opacity-100 group-hover:opacity-100"onClick={() => onClose(tab.id)}aria-label={`Close ${tab.label} tab`}>@@ -154,9 +155,9 @@ function SearchTabStatusIndicator({aria-hidden>{status === "loading" ? (- <Loader2 className="size-3 animate-spin text-base-content/50" />+ <Spinner className="size-3 text-muted-foreground" />) : status === "error" ? (- <span className="size-2 rounded-full bg-error" />+ <span className="size-2 rounded-full bg-destructive" />) : status === "unviewed" ? (<span className="size-2 rounded-full bg-primary" />) : null}