Open source alternative to Semrush and Ahrefs
TypeScript backlink-analysisgoogle-search-console-mcpkeyword-researchmcpseoseo-agentseo-auditseo-automationseo-skillsseo-toolssite-audit
One table footer, sort header, score badge and export helper (EVE-284, EVE-282) (#690)
Carter Smith4ecef1a816c4
diff --git a/src/client/features/keywords/components/FloatingTooltip.tsx b/src/client/components/FloatingTooltip.tsxsimilarity index 100%rename from src/client/features/keywords/components/FloatingTooltip.tsxrename to src/client/components/FloatingTooltip.tsxdiff --git a/src/client/components/table/HeaderHelpLabel.tsx b/src/client/components/table/HeaderHelpLabel.tsxnew file mode 100644index 00000000..56b69758--- /dev/null+++ b/src/client/components/table/HeaderHelpLabel.tsx@@ -0,0 +1,42 @@+import { createPortal } from "react-dom";+import {+ FloatingTooltip,+ useFloatingTooltip,+} from "@/client/components/FloatingTooltip";++export function HeaderHelpLabel({+ label,+ helpText,+ delayMs = 150,+}: {+ label: string;+ helpText: string;+ delayMs?: number;+}) {+ const tooltip = useFloatingTooltip<HTMLSpanElement>({ delayMs });++ return (+ <span+ ref={tooltip.triggerRef}+ className="relative inline-flex items-center"+ onMouseEnter={tooltip.scheduleOpen}+ onMouseLeave={tooltip.close}+ onFocus={tooltip.scheduleOpen}+ onBlur={tooltip.close}+ onKeyDown={(e) => {+ if (e.key === "Escape") tooltip.close();+ }}+ aria-describedby={tooltip.isOpen ? tooltip.tooltipId : undefined}+ >+ <span>{label}</span>+ {tooltip.isOpen && typeof document !== "undefined"+ ? createPortal(+ <FloatingTooltip id={tooltip.tooltipId} position={tooltip.position}>+ {helpText}+ </FloatingTooltip>,+ document.body,+ )+ : null}+ </span>+ );+}diff --git a/src/client/components/table/ScoreBadge.tsx b/src/client/components/table/ScoreBadge.tsxnew file mode 100644index 00000000..8c47d60c--- /dev/null+++ b/src/client/components/table/ScoreBadge.tsx@@ -0,0 +1,20 @@+function scoreTierClass(value: number | null): string {+ if (value == null) return "score-tier-na";+ if (value <= 20) return "score-tier-1";+ if (value <= 35) return "score-tier-2";+ if (value <= 50) return "score-tier-3";+ if (value <= 65) return "score-tier-4";+ if (value <= 80) return "score-tier-5";+ return "score-tier-6";+}++/** Keyword difficulty (0-100) as a tier-colored badge. */+export function ScoreBadge({ value }: { value: number | null }) {+ return (+ <span+ className={`score-badge ${scoreTierClass(value)} inline-flex size-6 items-center justify-center rounded-full text-[10px] font-semibold tabular-nums`}+ >+ {value ?? "—"}+ </span>+ );+}diff --git a/src/client/components/table/SortableHeader.tsx b/src/client/components/table/SortableHeader.tsxindex 353dd632..58ac1b99 100644--- a/src/client/components/table/SortableHeader.tsx+++ b/src/client/components/table/SortableHeader.tsx@@ -1,5 +1,5 @@import { ArrowDown, ArrowUp } from "lucide-react";-import { HeaderHelpLabel } from "@/client/features/keywords/components";+import { HeaderHelpLabel } from "./HeaderHelpLabel";type SortableColumn = {getIsSorted: () => false | "asc" | "desc";@@ -10,19 +10,25 @@ export function SortableHeader({column,label,helpText,+ title,align,+ className,}: {column: SortableColumn;label: string;helpText?: string;+ /** Native tooltip, for tables that don't use the floating help label. */+ title?: string;align?: "left" | "right";+ className?: string;}) {const sorted = column.getIsSorted();const content = (<buttontype="button"- className="inline-flex items-center gap-1 font-medium transition-colors hover:text-base-content"+ className={`inline-flex items-center gap-1 font-medium transition-colors hover:text-base-content ${className ?? ""}`}onClick={column.getToggleSortingHandler()}+ title={title}aria-label={`Sort by ${label}`}aria-pressed={!!sorted}>diff --git a/src/client/components/table/TablePagination.tsx b/src/client/components/table/TablePagination.tsxindex 5b6495d6..9ab03426 100644--- a/src/client/components/table/TablePagination.tsx+++ b/src/client/components/table/TablePagination.tsx@@ -1,97 +1,169 @@import { ChevronLeft, ChevronRight } from "lucide-react";+import { useEffect, type ReactNode } from "react";-type Props = {+export type PageButtonProps = {+ page: number;+ disabled: boolean;+ label: string;+ children: ReactNode;+ onPageChange: (nextPage: number) => void;+};++type Props<TSize extends number> = {page: number;pageSize: number;- pageSizes: readonly number[];+ /** Omit for a fixed page size: the footer hides the "Rows per page" select. */+ pageSizes?: readonly TSize[];totalCount: number | null;- hasNextPage: boolean;- isLoading: boolean;+ /** Used only when `totalCount` is unknown. */+ hasNextPage?: boolean;+ isLoading?: boolean;+ /**+ * For pages of different sizes (keyword research keeps a keyword family on+ * one page). Rows are 1-based and inclusive.+ */+ pageRange?: { start: number; end: number; pageCount: number };+ /** Keep "Next" enabled on the last page and label it, to load more rows. */+ loadMoreLabel?: string;onPageChange: (nextPage: number) => void;- onPageSizeChange: (nextPageSize: number) => void;+ onPageSizeChange?: (nextPageSize: TSize) => void;+ /** Render prev/next as links, for pages whose number lives in the URL. */+ renderPageButton?: (props: PageButtonProps) => ReactNode;};-function formatRange(- page: number,- pageSize: number,- totalCount: number | null,-) {- const start = (page - 1) * pageSize + 1;- if (totalCount == null) {- return `${start.toLocaleString()}–${(start + pageSize - 1).toLocaleString()}`;- }- if (totalCount === 0) return "0";- const end = Math.min(totalCount, start + pageSize - 1);- return `${start.toLocaleString()}–${end.toLocaleString()} of ${totalCount.toLocaleString()}`;-}--export function TablePagination({+export function TablePagination<TSize extends number>({page,pageSize,pageSizes,totalCount,- hasNextPage,- isLoading,+ hasNextPage = false,+ isLoading = false,+ pageRange,+ loadMoreLabel,onPageChange,onPageSizeChange,-}: Props) {+ renderPageButton = PageButton,+}: Props<TSize>) {const totalPages =- totalCount != null ? Math.max(1, Math.ceil(totalCount / pageSize)) : null;- const canGoPrev = page > 1;- const canGoNext = totalPages != null ? page < totalPages : hasNextPage;+ pageRange?.pageCount ??+ (totalCount != null ? Math.max(1, Math.ceil(totalCount / pageSize)) : null);+ const isOutOfRange = totalPages != null && page > totalPages;+ const currentPage = isOutOfRange ? totalPages : page;+ const isLastPage = totalPages != null && currentPage >= totalPages;+ const canGoPrev = currentPage > 1;+ const canGoNext = totalPages != null ? !isLastPage : hasNextPage;++ // A page can fall past the end when rows are removed or a stale URL is+ // opened. Move to the last page instead of showing an empty table.+ useEffect(() => {+ if (isOutOfRange && !isLoading) onPageChange(currentPage);+ }, [currentPage, isLoading, isOutOfRange, onPageChange]);return (<div className="flex flex-col gap-3 border-t border-base-300 px-4 py-3 sm:flex-row sm:items-center sm:justify-between"><div className="flex items-center gap-2 text-sm text-base-content/70 tabular-nums">- <span>{formatRange(page, pageSize, totalCount)}</span>+ <span className="whitespace-nowrap">+ {formatRange(currentPage, pageSize, totalCount, pageRange)}+ </span>{isLoading ? (<span className="loading loading-spinner loading-xs" />) : null}</div>- <div className="flex items-center gap-6">- <label className="flex items-center gap-2 text-sm text-base-content/70">- <span className="whitespace-nowrap">Rows per page</span>- <select- className="select select-bordered select-sm w-20"- value={pageSize}- onChange={(event) => onPageSizeChange(Number(event.target.value))}- >- {pageSizes.map((size) => (- <option key={size} value={size}>- {size}- </option>- ))}- </select>- </label>+ <div className="flex flex-wrap items-center gap-x-6 gap-y-2">+ {pageSizes && onPageSizeChange ? (+ <label className="flex items-center gap-2 text-sm text-base-content/70">+ <span className="whitespace-nowrap">Rows per page</span>+ <select+ className="select select-bordered select-sm w-20"+ value={pageSize}+ onChange={(event) => {+ const size = pageSizes.find(+ (option) => option === Number(event.target.value),+ );+ if (size != null) onPageSizeChange(size);+ }}+ >+ {pageSizes.map((size) => (+ <option key={size} value={size}>+ {size}+ </option>+ ))}+ </select>+ </label>+ ) : null}<div className="flex items-center gap-2"><span className="whitespace-nowrap text-sm tabular-nums text-base-content/70">- Page {page.toLocaleString()}+ Page {currentPage.toLocaleString()}{totalPages != null ? ` of ${totalPages.toLocaleString()}` : ""}</span><div className="flex items-center gap-1">- <button- type="button"- aria-label="Previous page"- className="btn btn-ghost btn-sm btn-square"- disabled={!canGoPrev || isLoading}- onClick={() => onPageChange(page - 1)}- >- <ChevronLeft className="size-4" />- </button>- <button- type="button"- aria-label="Next page"- className="btn btn-ghost btn-sm btn-square"- disabled={!canGoNext || isLoading}- onClick={() => onPageChange(page + 1)}- >- <ChevronRight className="size-4" />- </button>+ {renderPageButton({+ page: currentPage - 1,+ disabled: !canGoPrev || isLoading,+ label: "Previous page",+ children: <ChevronLeft className="size-4" />,+ onPageChange,+ })}+ {isLastPage && loadMoreLabel != null ? (+ <button+ type="button"+ className="btn btn-ghost btn-sm"+ disabled={isLoading}+ onClick={() => onPageChange(currentPage + 1)}+ >+ {loadMoreLabel}+ <ChevronRight className="size-4" />+ </button>+ ) : (+ renderPageButton({+ page: currentPage + 1,+ disabled: !canGoNext || isLoading,+ label: "Next page",+ children: <ChevronRight className="size-4" />,+ onPageChange,+ })+ )}</div></div></div></div>);}++function PageButton({+ page,+ disabled,+ label,+ children,+ onPageChange,+}: PageButtonProps) {+ return (+ <button+ type="button"+ aria-label={label}+ className="btn btn-ghost btn-sm btn-square"+ disabled={disabled}+ onClick={() => onPageChange(page)}+ >+ {children}+ </button>+ );+}++function formatRange(+ page: number,+ pageSize: number,+ totalCount: number | null,+ pageRange: Props<number>["pageRange"],+) {+ if (totalCount === 0) return "0";+ const start = pageRange?.start ?? (page - 1) * pageSize + 1;+ const pageEnd = pageRange?.end ?? start + pageSize - 1;+ if (totalCount == null) {+ return `${start.toLocaleString()}–${pageEnd.toLocaleString()}`;+ }+ const end = Math.min(totalCount, pageEnd);+ return `${start.toLocaleString()}–${end.toLocaleString()} of ${totalCount.toLocaleString()}`;+}diff --git a/src/client/features/ai-search/components/BrandLookupCitationTables.tsx b/src/client/features/ai-search/components/BrandLookupCitationTables.tsxindex e60c593e..32161676 100644--- a/src/client/features/ai-search/components/BrandLookupCitationTables.tsx+++ b/src/client/features/ai-search/components/BrandLookupCitationTables.tsx@@ -4,7 +4,7 @@ import { Link } from "@tanstack/react-router";import { ExternalLink, Sparkles } from "lucide-react";import { AppDataTable } from "@/client/components/table/AppDataTable";import { SortableHeader } from "@/client/components/table/SortableHeader";-import { HeaderHelpLabel } from "@/client/features/keywords/components";+import { HeaderHelpLabel } from "@/client/components/table/HeaderHelpLabel";import { numericNullsLast } from "@/client/components/table/nullSafeSort";import {formatCount,diff --git a/src/client/features/ai-search/components/BrandLookupCitationsCard.tsx b/src/client/features/ai-search/components/BrandLookupCitationsCard.tsxindex 3cb2ac84..849e1bf9 100644--- a/src/client/features/ai-search/components/BrandLookupCitationsCard.tsx+++ b/src/client/features/ai-search/components/BrandLookupCitationsCard.tsx@@ -2,10 +2,10 @@ import { useMemo, useState } from "react";import { type SortingState } from "@tanstack/react-table";import { ChevronDown, Download, Sheet, SlidersHorizontal } from "lucide-react";import { useAppTable } from "@/client/components/table/AppDataTable";-import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { exportRows } from "@/client/lib/exportRows";import {buildBrandLookupExport,- downloadBrandLookupCsv,+ brandLookupExportFilename,} from "@/client/features/ai-search/components/brandLookupExport";import { BrandLookupFilterPanel } from "@/client/features/ai-search/components/BrandLookupFilterPanel";import {@@ -128,16 +128,12 @@ export function CitationTabsCard({queriesTable.getSortedRowModel().rows.map((row) => row.original),);- const handleExportCsv = () => {- downloadBrandLookupCsv(activeTab, result.resolvedTarget, exportTable);- closeExportMenu();- };-- const handleExportSheets = () => {- void exportTableToSheets({- headers: exportTable.headers,- rows: exportTable.rows,+ const handleExport = (format: "csv" | "sheets") => {+ void exportRows({+ format,feature: `brand_lookup_${activeTab}`,+ ...exportTable,+ filename: brandLookupExportFilename(activeTab, result.resolvedTarget),});closeExportMenu();};@@ -195,7 +191,7 @@ export function CitationTabsCard({<li><buttontype="button"- onClick={handleExportSheets}+ onClick={() => handleExport("sheets")}disabled={!canExport}><Sheet className="size-4" />@@ -205,7 +201,7 @@ export function CitationTabsCard({<li><buttontype="button"- onClick={handleExportCsv}+ onClick={() => handleExport("csv")}disabled={!canExport}><Download className="size-4" />diff --git a/src/client/features/ai-search/components/brandLookupExport.ts b/src/client/features/ai-search/components/brandLookupExport.tsindex a5a8ad07..e255950d 100644--- a/src/client/features/ai-search/components/brandLookupExport.ts+++ b/src/client/features/ai-search/components/brandLookupExport.ts@@ -1,4 +1,4 @@-import { buildCsv, type CsvValue, downloadCsv } from "@/client/lib/csv";+import type { CsvValue } from "@/client/lib/csv";import { formatPlatformLabel } from "@/client/features/ai-search/platformLabels";import type { BrandLookupResult } from "@/types/schemas/ai-search";@@ -50,17 +50,14 @@ export function buildBrandLookupExport(};}-export function downloadBrandLookupCsv(+export function brandLookupExportFilename(tab: CitationTab,resolvedTarget: string,- table: { headers: string[]; rows: CsvValue[][] },) {const slug = slugify(resolvedTarget);- const filename =- tab === "pages"- ? `ai-brand-lookup-pages-${slug}.csv`- : `ai-brand-lookup-queries-${slug}.csv`;- downloadCsv(filename, buildCsv(table.headers, table.rows));+ return tab === "pages"+ ? `ai-brand-lookup-pages-${slug}`+ : `ai-brand-lookup-queries-${slug}`;}function slugify(value: string): string {diff --git a/src/client/features/audit/results/export.ts b/src/client/features/audit/results/export.tsindex 9b0695ea..c7e4652b 100644--- a/src/client/features/audit/results/export.ts+++ b/src/client/features/audit/results/export.ts@@ -1,8 +1,9 @@import type { AuditResultsData } from "@/client/features/audit/results/types";import { getIssueDescriptor } from "@/shared/audit-issues";-import { buildCsv, type CsvValue, downloadCsv } from "@/client/lib/csv";-import { downloadFile } from "@/client/lib/download";-import { exportTableToSheets } from "@/client/lib/exportToSheets";+import type { CsvValue } from "@/client/lib/csv";+import { exportRows } from "@/client/lib/exportRows";++type AuditExportFormat = "csv" | "json" | "sheets";const ISSUES_HEADERS = ["Severity", "Issue", "URL", "Details", "How To Fix"];@@ -21,40 +22,31 @@ function issuesRows(issues: AuditResultsData["issues"]): CsvValue[][] {export function exportIssues(issues: AuditResultsData["issues"],- format: "csv" | "json" | "sheets",+ format: AuditExportFormat,) {- if (format === "json") {- const rows = issues.map((issue) => {- const descriptor = getIssueDescriptor(issue.issueType);- return {- severity: issue.severity,- issueType: issue.issueType,- issue: descriptor?.title ?? issue.issueType,- url: issue.pageUrl,- details: issue.detailsJson- ? (JSON.parse(issue.detailsJson) as unknown)- : null,- howToFix: descriptor?.howToFix ?? null,- };- });- downloadFile(- JSON.stringify(rows, null, 2),- "audit-issues.json",- "application/json",- );- return;- }-- if (format === "sheets") {- void exportTableToSheets({- headers: ISSUES_HEADERS,- rows: issuesRows(issues),- feature: "audit_issues",- });- return;- }-- downloadCsv("audit-issues.csv", buildCsv(ISSUES_HEADERS, issuesRows(issues)));+ void exportRows({+ format,+ feature: "audit_issues",+ headers: ISSUES_HEADERS,+ rows: issuesRows(issues),+ filename: "audit-issues",+ records:+ format === "json"+ ? issues.map((issue) => {+ const descriptor = getIssueDescriptor(issue.issueType);+ return {+ severity: issue.severity,+ issueType: issue.issueType,+ issue: descriptor?.title ?? issue.issueType,+ url: issue.pageUrl,+ details: issue.detailsJson+ ? (JSON.parse(issue.detailsJson) as unknown)+ : null,+ howToFix: descriptor?.howToFix ?? null,+ };+ })+ : undefined,+ });}const PAGES_HEADERS = [@@ -115,10 +107,15 @@ function performanceRows(export function exportPages(pages: AuditResultsData["pages"],- format: "csv" | "json" | "sheets",+ format: AuditExportFormat,) {- if (format === "json") {- const rows = pages.map((page) => ({+ void exportRows({+ format,+ feature: "audit_pages",+ headers: PAGES_HEADERS,+ rows: pagesRows(pages),+ filename: "audit-pages",+ records: pages.map((page) => ({url: page.url,statusCode: page.statusCode,title: page.title ?? "",@@ -127,34 +124,22 @@ export function exportPages(imagesTotal: page.imagesTotal,imagesMissingAlt: page.imagesMissingAlt,responseTimeMs: page.responseTimeMs,- }));- downloadFile(- JSON.stringify(rows, null, 2),- "audit-pages.json",- "application/json",- );- return;- }-- if (format === "sheets") {- void exportTableToSheets({- headers: PAGES_HEADERS,- rows: pagesRows(pages),- feature: "audit_pages",- });- return;- }-- downloadCsv("audit-pages.csv", buildCsv(PAGES_HEADERS, pagesRows(pages)));+ })),+ });}export function exportPerformance(lighthouse: AuditResultsData["lighthouse"],pages: AuditResultsData["pages"],- format: "csv" | "json" | "sheets",+ format: AuditExportFormat,) {- if (format === "json") {- const rows = lighthouse.map((result) => {+ void exportRows({+ format,+ feature: "audit_performance",+ headers: PERFORMANCE_HEADERS,+ rows: performanceRows(lighthouse, pages),+ filename: "audit-performance",+ records: lighthouse.map((result) => {const page = pages.find((candidate) => candidate.id === result.pageId);return {url: page?.url ?? "",@@ -167,25 +152,6 @@ export function exportPerformance(inpMs: result.inpMs,ttfbMs: result.ttfbMs,};- });- downloadFile(- JSON.stringify(rows, null, 2),- "audit-performance.json",- "application/json",- );- return;- }-- const rows = performanceRows(lighthouse, pages);-- if (format === "sheets") {- void exportTableToSheets({- headers: PERFORMANCE_HEADERS,- rows,- feature: "audit_performance",- });- return;- }-- downloadCsv("audit-performance.csv", buildCsv(PERFORMANCE_HEADERS, rows));+ }),+ });}diff --git a/src/client/features/backlinks/BacklinksOverviewPanels.tsx b/src/client/features/backlinks/BacklinksOverviewPanels.tsxindex f64feea0..e6f4a031 100644--- a/src/client/features/backlinks/BacklinksOverviewPanels.tsx+++ b/src/client/features/backlinks/BacklinksOverviewPanels.tsx@@ -1,7 +1,7 @@import { Link } from "@tanstack/react-router";import { ArrowLeft } from "lucide-react";import { RESEARCH_SCOPE_LABELS } from "@/shared/researchScope";-import { HeaderHelpLabel } from "@/client/features/keywords/components";+import { HeaderHelpLabel } from "@/client/components/table/HeaderHelpLabel";import {BacklinksNewLostChart,BacklinksTrendChart,diff --git a/src/client/features/backlinks/BacklinksTableColumns.tsx b/src/client/features/backlinks/BacklinksTableColumns.tsxindex 98d61bd4..d7375308 100644--- a/src/client/features/backlinks/BacklinksTableColumns.tsx+++ b/src/client/features/backlinks/BacklinksTableColumns.tsx@@ -1,7 +1,7 @@import type { ColumnDef } from "@tanstack/react-table";import { ChevronRight } from "lucide-react";import { SortableHeader } from "@/client/components/table/SortableHeader";-import { HeaderHelpLabel } from "@/client/features/keywords/components";+import { HeaderHelpLabel } from "@/client/components/table/HeaderHelpLabel";import { SafeExternalLink } from "@/client/components/SafeExternalLink";import type { BacklinksRow } from "./backlinksPageTypes";import type { BacklinksRowsSortField } from "@/types/schemas/backlinks";diff --git a/src/client/features/backlinks/BacklinksToolbarMenus.tsx b/src/client/features/backlinks/BacklinksToolbarMenus.tsxindex 3306a5fc..a6803d75 100644--- a/src/client/features/backlinks/BacklinksToolbarMenus.tsx+++ b/src/client/features/backlinks/BacklinksToolbarMenus.tsx@@ -7,9 +7,9 @@ import {Sheet,} from "lucide-react";import type { CsvValue } from "@/client/lib/csv";-import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { exportRows } from "@/client/lib/exportRows";import type { BacklinksSearchState } from "./backlinksPageTypes";-import { exportBacklinksTabCsv } from "./export";+import { buildBacklinksTabFilename } from "./export";export function BacklinksExportMenu({activeTab,@@ -25,15 +25,20 @@ export function BacklinksExportMenu({const [isExportingSheets, setIsExportingSheets] = useState(false);const canExport = rows.length > 0 && !isExportingSheets;+ const runExport = (format: "csv" | "sheets") =>+ exportRows({+ format,+ feature: `backlinks_${activeTab}`,+ headers,+ rows,+ filename: buildBacklinksTabFilename(activeTab, exportTarget),+ });+const handleExportToSheets = async () => {if (!canExport) return;setIsExportingSheets(true);try {- await exportTableToSheets({- headers,- rows,- feature: `backlinks_${activeTab}`,- });+ await runExport("sheets");} finally {setIsExportingSheets(false);}@@ -74,14 +79,7 @@ export function BacklinksExportMenu({<li><buttontype="button"- onClick={() =>- exportBacklinksTabCsv({- tab: activeTab,- target: exportTarget,- headers,- rows,- })- }+ onClick={() => void runExport("csv")}disabled={rows.length === 0}><Download className="size-4" />diff --git a/src/client/features/backlinks/ReferringDomainsTable.tsx b/src/client/features/backlinks/ReferringDomainsTable.tsxindex fb224971..a75bbad1 100644--- a/src/client/features/backlinks/ReferringDomainsTable.tsx+++ b/src/client/features/backlinks/ReferringDomainsTable.tsx@@ -7,7 +7,7 @@ import {useAppTable,} from "@/client/components/table/AppDataTable";import { SortableHeader } from "@/client/components/table/SortableHeader";-import { HeaderHelpLabel } from "@/client/features/keywords/components";+import { HeaderHelpLabel } from "@/client/components/table/HeaderHelpLabel";import { EmptyTableState } from "./BacklinksPageStates";import type { ReferringDomainRow } from "./backlinksPageTypes";import type { ReferringDomainsSortField } from "@/types/schemas/backlinks";diff --git a/src/client/features/backlinks/TopPagesTable.tsx b/src/client/features/backlinks/TopPagesTable.tsxindex bfb039ed..e4ed9fd5 100644--- a/src/client/features/backlinks/TopPagesTable.tsx+++ b/src/client/features/backlinks/TopPagesTable.tsx@@ -6,7 +6,7 @@ import {useAppTable,} from "@/client/components/table/AppDataTable";import { SortableHeader } from "@/client/components/table/SortableHeader";-import { HeaderHelpLabel } from "@/client/features/keywords/components";+import { HeaderHelpLabel } from "@/client/components/table/HeaderHelpLabel";import { EmptyTableState } from "./BacklinksPageStates";import type { TopPageRow } from "./backlinksPageTypes";import type { TopPagesSortField } from "@/types/schemas/backlinks";diff --git a/src/client/features/backlinks/export.test.ts b/src/client/features/backlinks/export.test.tsindex 592cf867..c5ba8692 100644--- a/src/client/features/backlinks/export.test.ts+++ b/src/client/features/backlinks/export.test.ts@@ -1,10 +1,7 @@import { describe, expect, it } from "vitest";import { buildCsv } from "@/client/lib/csv";import type { BacklinksRow, ReferringDomainRow } from "./backlinksPageTypes";-import {- buildBacklinksTabCsvFilename,- buildBacklinksTabExport,-} from "./export";+import { buildBacklinksTabFilename, buildBacklinksTabExport } from "./export";function makeBacklinkRow(overrides: Partial<BacklinksRow> = {}): BacklinksRow {return {@@ -51,16 +48,16 @@ function buildTabCsv(return buildCsv(headers, rows);}-describe("buildBacklinksTabCsvFilename", () => {+describe("buildBacklinksTabFilename", () => {it("normalizes the target into the filename per tab", () => {expect(- buildBacklinksTabCsvFilename("backlinks", "https://Example.com/path?q=1"),- ).toBe("backlinks-backlinks-example.com-path-q-1.csv");- expect(buildBacklinksTabCsvFilename("domains", "Example.com")).toBe(- "backlinks-referring-domains-example.com.csv",+ buildBacklinksTabFilename("backlinks", "https://Example.com/path?q=1"),+ ).toBe("backlinks-backlinks-example.com-path-q-1");+ expect(buildBacklinksTabFilename("domains", "Example.com")).toBe(+ "backlinks-referring-domains-example.com",);- expect(buildBacklinksTabCsvFilename("pages", "docs.example.com")).toBe(- "backlinks-top-pages-docs.example.com.csv",+ expect(buildBacklinksTabFilename("pages", "docs.example.com")).toBe(+ "backlinks-top-pages-docs.example.com",);});});diff --git a/src/client/features/backlinks/export.ts b/src/client/features/backlinks/export.tsindex 0e989ea4..4bb3d46a 100644--- a/src/client/features/backlinks/export.ts+++ b/src/client/features/backlinks/export.ts@@ -1,4 +1,4 @@-import { buildCsv, type CsvValue, downloadCsv } from "@/client/lib/csv";+import type { CsvValue } from "@/client/lib/csv";import type {BacklinksSearchState,BacklinksTabRows,@@ -109,19 +109,7 @@ export function buildBacklinksTabExport(args: {};}-export function exportBacklinksTabCsv(args: {- tab: BacklinksSearchState["tab"];- target: string;- headers: string[];- rows: CsvValue[][];-}) {- downloadCsv(- buildBacklinksTabCsvFilename(args.tab, args.target),- buildCsv(args.headers, args.rows),- );-}--export function buildBacklinksTabCsvFilename(+export function buildBacklinksTabFilename(tab: BacklinksSearchState["tab"],target: string,) {@@ -139,5 +127,5 @@ export function buildBacklinksTabCsvFilename(.replace(/^-+|-+$/g, "").slice(0, 80);- return `backlinks-${tabPrefix}${normalizedTarget ? `-${normalizedTarget}` : ""}.csv`;+ return `backlinks-${tabPrefix}${normalizedTarget ? `-${normalizedTarget}` : ""}`;}diff --git a/src/client/features/domain/components/DifficultyBadge.tsx b/src/client/features/domain/components/DifficultyBadge.tsxdeleted file mode 100644index 26be5ee4..00000000--- a/src/client/features/domain/components/DifficultyBadge.tsx+++ /dev/null@@ -1,20 +0,0 @@-import { scoreTierClass } from "@/client/features/keywords/utils";--export function DifficultyBadge({ value }: { value: number | null }) {- if (value == null) {- return (- <span- className={`score-badge ${scoreTierClass(null)} inline-flex size-6 items-center justify-center rounded-full text-[10px] font-semibold tabular-nums`}- >- —- </span>- );- }- return (- <span- className={`score-badge ${scoreTierClass(value)} inline-flex size-6 items-center justify-center rounded-full text-[10px] font-semibold tabular-nums`}- >- {value}- </span>- );-}diff --git a/src/client/features/domain/components/DomainKeywordsPagination.tsx b/src/client/features/domain/components/DomainKeywordsPagination.tsxdeleted file mode 100644index 3a72ff2d..00000000--- a/src/client/features/domain/components/DomainKeywordsPagination.tsx+++ /dev/null@@ -1,143 +0,0 @@-import { ChevronLeft, ChevronRight } from "lucide-react";-import { Link } from "@tanstack/react-router";-import type { ReactNode } from "react";-import { DOMAIN_KEYWORDS_PAGE_SIZES } from "@/types/schemas/domain";--type Props = {- page: number;- pageSize: number;- totalCount: number | null;- hasNextPage: boolean;- isLoading: boolean;- onPageChange: (nextPage: number) => void;- onPageSizeChange: (nextPageSize: number) => void;-};--function formatRange(- page: number,- pageSize: number,- totalCount: number | null,-) {- const start = (page - 1) * pageSize + 1;- if (totalCount == null) {- return `${start.toLocaleString()}–${(start + pageSize - 1).toLocaleString()}`;- }- if (totalCount === 0) return "0";- const end = Math.min(totalCount, start + pageSize - 1);- return `${start.toLocaleString()}–${end.toLocaleString()} of ${totalCount.toLocaleString()}`;-}--export function DomainKeywordsPagination({- page,- pageSize,- totalCount,- hasNextPage,- isLoading,- onPageChange,- onPageSizeChange,-}: Props) {- const totalPages =- totalCount != null ? Math.max(1, Math.ceil(totalCount / pageSize)) : null;- const canGoPrev = page > 1;- const canGoNext = totalPages != null ? page < totalPages : hasNextPage;-- return (- <div className="flex flex-col gap-3 border-t border-base-300 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">- <div className="flex items-center gap-2 text-sm text-base-content/70 tabular-nums">- <span>{formatRange(page, pageSize, totalCount)}</span>- {isLoading ? (- <span className="loading loading-spinner loading-xs" />- ) : null}- </div>-- <div className="flex items-center gap-6">- <label className="flex items-center gap-2 text-sm text-base-content/70">- <span className="whitespace-nowrap">Rows per page</span>- <select- className="select select-bordered select-sm w-20"- value={pageSize}- onChange={(event) => onPageSizeChange(Number(event.target.value))}- >- {DOMAIN_KEYWORDS_PAGE_SIZES.map((size) => (- <option key={size} value={size}>- {size}- </option>- ))}- </select>- </label>-- <div className="flex items-center gap-2">- <span className="whitespace-nowrap text-sm tabular-nums text-base-content/70">- Page {page.toLocaleString()}- {totalPages != null ? ` of ${totalPages.toLocaleString()}` : ""}- </span>- <div className="flex items-center gap-1">- <PageLink- page={page - 1}- disabled={!canGoPrev || isLoading}- onPageChange={onPageChange}- label="Previous page"- >- <ChevronLeft className="size-4" />- </PageLink>- <PageLink- page={page + 1}- disabled={!canGoNext || isLoading}- onPageChange={onPageChange}- label="Next page"- >- <ChevronRight className="size-4" />- </PageLink>- </div>- </div>- </div>- </div>- );-}--function PageLink({- page,- disabled,- label,- children,- onPageChange,-}: {- page: number;- disabled: boolean;- label: string;- children: ReactNode;- onPageChange: (nextPage: number) => void;-}) {- return (- <Link- from="/p/$projectId/domain"- to="/p/$projectId/domain"- search={(prev) => ({- ...prev,- page: page === 1 ? undefined : page,- })}- aria-label={label}- aria-disabled={disabled}- className={`btn btn-ghost btn-sm btn-square ${disabled ? "btn-disabled" : ""}`}- onClick={(event) => {- if (disabled) {- event.preventDefault();- return;- }- if (- event.metaKey ||- event.ctrlKey ||- event.shiftKey ||- event.altKey ||- event.button !== 0- ) {- return;- }- event.preventDefault();- onPageChange(page);- }}- >- {children}- </Link>- );-}diff --git a/src/client/features/domain/components/DomainKeywordsTable.tsx b/src/client/features/domain/components/DomainKeywordsTable.tsxindex ec80dbc9..fb827320 100644--- a/src/client/features/domain/components/DomainKeywordsTable.tsx+++ b/src/client/features/domain/components/DomainKeywordsTable.tsx@@ -11,9 +11,13 @@ import {useSelectionAnchor,} from "@/client/components/table/AppDataTable";import { ExternalUrlCell } from "@/client/components/table/url";-import { DifficultyBadge } from "@/client/features/domain/components/DifficultyBadge";-import { SortableHeader } from "@/client/features/domain/components/SortableHeader";-import { formatNumber, formatRounded } from "@/client/features/domain/utils";+import { ScoreBadge } from "@/client/components/table/ScoreBadge";+import { SortableHeader } from "@/client/components/table/SortableHeader";+import {+ domainSortColumn,+ formatNumber,+ formatRounded,+} from "@/client/features/domain/utils";import type {DomainSortMode,KeywordRow,@@ -64,9 +68,11 @@ function DomainKeywordsTableComponent({header: () => (<SortableHeaderlabel="Rank"- isActive={sortMode === "rank"}- order={currentSortOrder}- onClick={() => onSortClick("rank")}+ column={domainSortColumn(+ sortMode === "rank",+ currentSortOrder,+ () => onSortClick("rank"),+ )}/>),cell: ({ getValue }) => getValue() ?? "-",@@ -75,9 +81,11 @@ function DomainKeywordsTableComponent({header: () => (<SortableHeaderlabel="Volume"- isActive={sortMode === "volume"}- order={currentSortOrder}- onClick={() => onSortClick("volume")}+ column={domainSortColumn(+ sortMode === "volume",+ currentSortOrder,+ () => onSortClick("volume"),+ )}/>),cell: ({ getValue }) => formatNumber(getValue()),@@ -86,9 +94,11 @@ function DomainKeywordsTableComponent({header: () => (<SortableHeaderlabel="Traffic"- isActive={sortMode === "traffic"}- order={currentSortOrder}- onClick={() => onSortClick("traffic")}+ column={domainSortColumn(+ sortMode === "traffic",+ currentSortOrder,+ () => onSortClick("traffic"),+ )}/>),cell: ({ getValue }) => formatRounded(getValue()),@@ -98,9 +108,9 @@ function DomainKeywordsTableComponent({<SortableHeaderlabel="CPC"helpText="Cost per click in USD."- isActive={sortMode === "cpc"}- order={currentSortOrder}- onClick={() => onSortClick("cpc")}+ column={domainSortColumn(sortMode === "cpc", currentSortOrder, () =>+ onSortClick("cpc"),+ )}/>),cell: ({ getValue }) => {@@ -127,12 +137,14 @@ function DomainKeywordsTableComponent({<SortableHeaderlabel="Score"helpText="Organic ranking difficulty (0-100): higher means harder to reach Google's top 10."- isActive={sortMode === "score"}- order={currentSortOrder}- onClick={() => onSortClick("score")}+ column={domainSortColumn(+ sortMode === "score",+ currentSortOrder,+ () => onSortClick("score"),+ )}/>),- cell: ({ getValue }) => <DifficultyBadge value={getValue()} />,+ cell: ({ getValue }) => <ScoreBadge value={getValue()} />,}),],[currentSortOrder, domain, onSortClick, selectAnchorRef, sortMode],diff --git a/src/client/features/domain/components/DomainPageLink.tsx b/src/client/features/domain/components/DomainPageLink.tsxnew file mode 100644index 00000000..4334aabc--- /dev/null+++ b/src/client/features/domain/components/DomainPageLink.tsx@@ -0,0 +1,44 @@+import { Link } from "@tanstack/react-router";+import type { PageButtonProps } from "@/client/components/table/TablePagination";++/** Prev/next as real links, so a page can open in a new tab. */+export function DomainPageLink({+ page,+ disabled,+ label,+ children,+ onPageChange,+}: PageButtonProps) {+ return (+ <Link+ from="/p/$projectId/domain"+ to="/p/$projectId/domain"+ search={(prev) => ({+ ...prev,+ page: page === 1 ? undefined : page,+ })}+ aria-label={label}+ aria-disabled={disabled}+ className={`btn btn-ghost btn-sm btn-square ${disabled ? "btn-disabled" : ""}`}+ onClick={(event) => {+ if (disabled) {+ event.preventDefault();+ return;+ }+ if (+ event.metaKey ||+ event.ctrlKey ||+ event.shiftKey ||+ event.altKey ||+ event.button !== 0+ ) {+ return;+ }+ event.preventDefault();+ onPageChange(page);+ }}+ >+ {children}+ </Link>+ );+}diff --git a/src/client/features/domain/components/DomainPagesTable.tsx b/src/client/features/domain/components/DomainPagesTable.tsxindex d0f00a12..a60d77c8 100644--- a/src/client/features/domain/components/DomainPagesTable.tsx+++ b/src/client/features/domain/components/DomainPagesTable.tsx@@ -5,11 +5,12 @@ import {useAppTable,} from "@/client/components/table/AppDataTable";import { ExternalUrlCell } from "@/client/components/table/url";-import { SortableHeader } from "@/client/features/domain/components/SortableHeader";+import { SortableHeader } from "@/client/components/table/SortableHeader";import {formatNumber,formatRounded,toPageSortMode,+ domainSortColumn,} from "@/client/features/domain/utils";import type {DomainSortMode,@@ -55,9 +56,11 @@ function DomainPagesTableComponent({header: () => (<SortableHeaderlabel="Organic Traffic"- isActive={toPageSortMode(sortMode) === "traffic"}- order={currentSortOrder}- onClick={() => onSortClick("traffic")}+ column={domainSortColumn(+ toPageSortMode(sortMode) === "traffic",+ currentSortOrder,+ () => onSortClick("traffic"),+ )}/>),cell: ({ getValue }) => formatRounded(getValue()),@@ -66,9 +69,11 @@ function DomainPagesTableComponent({header: () => (<SortableHeaderlabel="Keywords"- isActive={toPageSortMode(sortMode) === "keywords"}- order={currentSortOrder}- onClick={() => onSortClick("volume")}+ column={domainSortColumn(+ toPageSortMode(sortMode) === "keywords",+ currentSortOrder,+ () => onSortClick("volume"),+ )}/>),cell: ({ getValue }) => formatNumber(getValue()),diff --git a/src/client/features/domain/components/KeywordsTab.tsx b/src/client/features/domain/components/KeywordsTab.tsxindex 7349f233..ce89c59c 100644--- a/src/client/features/domain/components/KeywordsTab.tsx+++ b/src/client/features/domain/components/KeywordsTab.tsx@@ -1,13 +1,13 @@import { useCallback, useEffect, useMemo, useState } from "react";import { useQueryClient } from "@tanstack/react-query";import { Copy, Download, FileSpreadsheet, Save, Sheet } from "lucide-react";-import { toast } from "sonner";import {TableBulkActionBar,TableBulkActionButton,TableBulkExportMenu,} from "@/client/components/table/TableBulkActionBar";-import { DomainKeywordsPagination } from "@/client/features/domain/components/DomainKeywordsPagination";+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";@@ -28,10 +28,9 @@ import {} from "@/client/features/domain/types";import { keywordsToTable } from "@/client/features/domain/utils";import type { DomainOverviewRouteState } from "@/client/features/domain/domainRouteState";-import { buildCsv, downloadCsv } from "@/client/lib/csv";-import { exportTableToSheets } from "@/client/lib/exportToSheets";-import { captureClientEvent } from "@/client/lib/posthog";+import { exportRows, type ExportFormat } from "@/client/lib/exportRows";import {+ DOMAIN_KEYWORDS_PAGE_SIZES,MAX_DATAFORSEO_FILTER_CONDITIONS,type DomainSearchParams,} from "@/types/schemas/domain";@@ -203,47 +202,22 @@ export function KeywordsTab({[rows, selectedKeywords],);- const handleCopy = async () => {- await navigator.clipboard.writeText(JSON.stringify(rows, null, 2));- toast.success("Copied data");- };- const handleExportToSheets = () => {- void exportTableToSheets({- headers: exportTable.headers,- rows: exportTable.rows,+ const exportAll = (format: ExportFormat) =>+ void exportRows({+ format,feature: "domain_overview",+ ...exportTable,+ filename: `${fileNamePrefix}-keywords`,+ records: rows,});- };- const handleDownload = (extension: "csv" | "xls") => {- downloadCsv(- `${fileNamePrefix}-keywords.${extension}`,- buildCsv(exportTable.headers, exportTable.rows),- );- if (extension === "csv") {- captureClientEvent("data:export", {- source_feature: "domain_overview",- result_count: rows.length,- });- }- };- const handleExportSelectionToSheets = () => {- void exportTableToSheets({- headers: selectedExportTable.headers,- rows: selectedExportTable.rows,+ const exportSelection = (format: ExportFormat) =>+ void exportRows({+ format,feature: "domain_overview",- });- };- const handleDownloadSelectionCsv = () => {- downloadCsv(- `${fileNamePrefix}-selected-keywords.csv`,- buildCsv(selectedExportTable.headers, selectedExportTable.rows),- );- captureClientEvent("data:export", {- source_feature: "domain_overview",- result_count: selectedKeywords.size,+ ...selectedExportTable,+ filename: `${fileNamePrefix}-selected-keywords`,scope: "selection",});- };return (<>@@ -264,12 +238,12 @@ export function KeywordsTab({{label: "Export to Sheets",icon: <Sheet className="size-4" />,- onClick: handleExportSelectionToSheets,+ onClick: () => exportSelection("sheets"),},{label: "Download CSV",icon: <Download className="size-4" />,- onClick: handleDownloadSelectionCsv,+ onClick: () => exportSelection("csv"),},]}/>@@ -299,22 +273,22 @@ export function KeywordsTab({{label: "Export to Sheets",icon: <Sheet className="size-4" />,- onClick: handleExportToSheets,+ onClick: () => exportAll("sheets"),},{label: "Copy data (JSON)",icon: <Copy className="size-4" />,- onClick: handleCopy,+ onClick: () => exportAll("copy-json"),},{label: "Download CSV",icon: <Download className="size-4" />,- onClick: () => handleDownload("csv"),+ onClick: () => exportAll("csv"),},{label: "Download Excel",icon: <FileSpreadsheet className="size-4" />,- onClick: () => handleDownload("xls"),+ onClick: () => exportAll("excel"),},]}filterPanel={@@ -333,14 +307,16 @@ export function KeywordsTab({) : null}pagination={- <DomainKeywordsPagination+ <TablePaginationpage={routeState.page}pageSize={routeState.pageSize}+ pageSizes={DOMAIN_KEYWORDS_PAGE_SIZES}totalCount={totalCount}hasNextPage={hasNextPage}isLoading={isLoading}onPageChange={onPageChange}onPageSizeChange={onPageSizeChange}+ renderPageButton={DomainPageLink}/>}>diff --git a/src/client/features/domain/components/PagesTab.tsx b/src/client/features/domain/components/PagesTab.tsxindex e5d77381..005c7427 100644--- a/src/client/features/domain/components/PagesTab.tsx+++ b/src/client/features/domain/components/PagesTab.tsx@@ -1,7 +1,7 @@import { useCallback, useMemo, useState } from "react";import { Copy, Download, FileSpreadsheet, Sheet } from "lucide-react";-import { toast } from "sonner";-import { DomainKeywordsPagination } from "@/client/features/domain/components/DomainKeywordsPagination";+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";@@ -21,10 +21,9 @@ import {} from "@/client/features/domain/types";import { pagesToTable } from "@/client/features/domain/utils";import type { DomainOverviewRouteState } from "@/client/features/domain/domainRouteState";-import { buildCsv, downloadCsv } from "@/client/lib/csv";-import { exportTableToSheets } from "@/client/lib/exportToSheets";-import { captureClientEvent } from "@/client/lib/posthog";+import { exportRows, type ExportFormat } from "@/client/lib/exportRows";import {+ DOMAIN_KEYWORDS_PAGE_SIZES,MAX_DATAFORSEO_FILTER_CONDITIONS,type DomainSearchParams,} from "@/types/schemas/domain";@@ -152,29 +151,14 @@ export function PagesTab({const exportTable = useMemo(() => pagesToTable(rows), [rows]);const fileNamePrefix = target.replaceAll("/", "-");- const handleCopy = async () => {- await navigator.clipboard.writeText(JSON.stringify(rows, null, 2));- toast.success("Copied data");- };- const handleExportToSheets = () => {- void exportTableToSheets({- headers: exportTable.headers,- rows: exportTable.rows,+ const exportAll = (format: ExportFormat) =>+ void exportRows({+ format,feature: "domain_overview",+ ...exportTable,+ filename: `${fileNamePrefix}-pages`,+ records: rows,});- };- const handleDownload = (extension: "csv" | "xls") => {- downloadCsv(- `${fileNamePrefix}-pages.${extension}`,- buildCsv(exportTable.headers, exportTable.rows),- );- if (extension === "csv") {- captureClientEvent("data:export", {- source_feature: "domain_overview",- result_count: rows.length,- });- }- };return (<>@@ -200,22 +184,22 @@ export function PagesTab({{label: "Export to Sheets",icon: <Sheet className="size-4" />,- onClick: handleExportToSheets,+ onClick: () => exportAll("sheets"),},{label: "Copy data (JSON)",icon: <Copy className="size-4" />,- onClick: handleCopy,+ onClick: () => exportAll("copy-json"),},{label: "Download CSV",icon: <Download className="size-4" />,- onClick: () => handleDownload("csv"),+ onClick: () => exportAll("csv"),},{label: "Download Excel",icon: <FileSpreadsheet className="size-4" />,- onClick: () => handleDownload("xls"),+ onClick: () => exportAll("excel"),},]}filterPanel={@@ -234,14 +218,16 @@ export function PagesTab({) : null}pagination={- <DomainKeywordsPagination+ <TablePaginationpage={routeState.page}pageSize={routeState.pageSize}+ pageSizes={DOMAIN_KEYWORDS_PAGE_SIZES}totalCount={totalCount}hasNextPage={hasNextPage}isLoading={isLoading}onPageChange={onPageChange}onPageSizeChange={onPageSizeChange}+ renderPageButton={DomainPageLink}/>}>diff --git a/src/client/features/domain/components/SortableHeader.tsx b/src/client/features/domain/components/SortableHeader.tsxdeleted file mode 100644index 9add4e24..00000000--- a/src/client/features/domain/components/SortableHeader.tsx+++ /dev/null@@ -1,42 +0,0 @@-import { ArrowDown, ArrowUp } from "lucide-react";-import { HeaderHelpLabel } from "@/client/features/keywords/components";-import type { SortOrder } from "@/client/features/domain/types";--type Props = {- label: string;- helpText?: string;- isActive: boolean;- order: SortOrder;- onClick: () => void;-};--export function SortableHeader({- label,- helpText,- isActive,- order,- onClick,-}: Props) {- return (- <button- type="button"- className="inline-flex items-center gap-1 font-medium hover:text-base-content"- onClick={onClick}- aria-label={`Sort by ${label}`}- aria-pressed={isActive}- >- {helpText ? (- <HeaderHelpLabel label={label} helpText={helpText} />- ) : (- <span>{label}</span>- )}- {isActive ? (- order === "asc" ? (- <ArrowUp className="size-3" />- ) : (- <ArrowDown className="size-3" />- )- ) : null}- </button>- );-}diff --git a/src/client/features/domain/utils.ts b/src/client/features/domain/utils.tsindex 2e6c482f..85819bfb 100644--- a/src/client/features/domain/utils.ts+++ b/src/client/features/domain/utils.ts@@ -102,3 +102,15 @@ export function pagesToTable(rows: PageRow[]): ExportTable {rows: rows.map((row) => [row.page, row.organicTraffic, row.keywords]),};}++/** Adapts the URL-driven domain sort to the shared `SortableHeader`. */+export function domainSortColumn(+ isActive: boolean,+ order: SortOrder,+ onClick: () => void,+) {+ return {+ getIsSorted: () => (isActive ? order : false),+ getToggleSortingHandler: () => onClick,+ };+}diff --git a/src/client/features/keywords/components/DisplayPrimitives.tsx b/src/client/features/keywords/components/DisplayPrimitives.tsxindex cd51db48..b06743b6 100644--- a/src/client/features/keywords/components/DisplayPrimitives.tsx+++ b/src/client/features/keywords/components/DisplayPrimitives.tsx@@ -12,7 +12,10 @@ import {} from "recharts";import type { MonthlySearch } from "@/types/keywords";import { formatCompactNumber } from "../utils";-import { FloatingTooltip, useFloatingTooltip } from "./FloatingTooltip";+import {+ FloatingTooltip,+ useFloatingTooltip,+} from "@/client/components/FloatingTooltip";export type SortField =| "keyword"@@ -22,43 +25,6 @@ export type SortField =| "keywordDifficulty";export type SortDir = "asc" | "desc";-export function HeaderHelpLabel({- label,- helpText,- delayMs = 150,-}: {- label: string;- helpText: string;- delayMs?: number;-}) {- const tooltip = useFloatingTooltip<HTMLSpanElement>({ delayMs });-- return (- <span- ref={tooltip.triggerRef}- className="relative inline-flex items-center"- onMouseEnter={tooltip.scheduleOpen}- onMouseLeave={tooltip.close}- onFocus={tooltip.scheduleOpen}- onBlur={tooltip.close}- onKeyDown={(e) => {- if (e.key === "Escape") tooltip.close();- }}- aria-describedby={tooltip.isOpen ? tooltip.tooltipId : undefined}- >- <span>{label}</span>- {tooltip.isOpen && typeof document !== "undefined"- ? createPortal(- <FloatingTooltip id={tooltip.tooltipId} position={tooltip.position}>- {helpText}- </FloatingTooltip>,- document.body,- )- : null}- </span>- );-}-export function AreaTrendChart({ trend }: { trend: MonthlySearch[] }) {const sorted = sortBy(trend, (item) => item.year * 100 + item.month);const last12 = sorted.slice(-12);diff --git a/src/client/features/keywords/components/IntentBadge.tsx b/src/client/features/keywords/components/IntentBadge.tsxindex 3858e557..e345c0b5 100644--- a/src/client/features/keywords/components/IntentBadge.tsx+++ b/src/client/features/keywords/components/IntentBadge.tsx@@ -1,6 +1,9 @@import { createPortal } from "react-dom";import type { KeywordIntent } from "@/types/keywords";-import { FloatingTooltip, useFloatingTooltip } from "./FloatingTooltip";+import {+ FloatingTooltip,+ useFloatingTooltip,+} from "@/client/components/FloatingTooltip";const COLORS: Record<KeywordIntent, string> = {informational: "border-info/30 bg-info/15 text-info",diff --git a/src/client/features/keywords/components/KeywordUi.tsx b/src/client/features/keywords/components/KeywordUi.tsxindex 5e8da358..fac0be39 100644--- a/src/client/features/keywords/components/KeywordUi.tsx+++ b/src/client/features/keywords/components/KeywordUi.tsx@@ -1,14 +1,11 @@import type { KeywordResearchRow } from "@/types/keywords";-import { formatNumber, scoreTierClass } from "../utils";+import { ScoreBadge } from "@/client/components/table/ScoreBadge";+import { formatNumber } from "../utils";import { IntentBadge } from "./IntentBadge";export { SerpAnalysisCard } from "./SerpAnalysisCard";export type { SortDir, SortField } from "./DisplayPrimitives";-export {- AreaTrendChart,- HeaderHelpLabel,- SortHeader,-} from "./DisplayPrimitives";+export { AreaTrendChart, SortHeader } from "./DisplayPrimitives";export function OverviewStats({ keyword }: { keyword: KeywordResearchRow }) {return (@@ -46,17 +43,3 @@ export function OverviewStats({ keyword }: { keyword: KeywordResearchRow }) {</div>);}--function ScoreBadge({ value }: { value: number | null }) {- if (value == null) return null;-- const tierClass = scoreTierClass(value);-- return (- <span- className={`score-badge ${tierClass} inline-flex items-center justify-center rounded-full size-6 text-[10px] font-semibold`}- >- {value}- </span>- );-}diff --git a/src/client/features/keywords/components/SerpAnalysisCard.tsx b/src/client/features/keywords/components/SerpAnalysisCard.tsxindex 66b593cd..ac40bde2 100644--- a/src/client/features/keywords/components/SerpAnalysisCard.tsx+++ b/src/client/features/keywords/components/SerpAnalysisCard.tsx@@ -1,5 +1,6 @@-import { ChevronLeft, ChevronRight, ExternalLink } from "lucide-react";+import { ExternalLink } from "lucide-react";import { ExportToSheetsButton } from "@/client/components/table/ExportToSheetsButton";+import { TablePagination } from "@/client/components/table/TablePagination";import type { SerpResultItem } from "@/types/keywords";export function SerpAnalysisCard({@@ -70,13 +71,18 @@ export function SerpAnalysisCard({) : (<SerpAnalysisTable items={pageItems} />)}- <SerpAnalysisPagination- page={page}- totalPages={totalPages}- loadingMore={loadingMore}- canLoadMore={canLoadMore}- onPageChange={onPageChange}- />+ {totalPages > 1 || canLoadMore ? (+ <TablePagination+ page={page + 1}+ pageSize={pageSize}+ totalCount={items.length}+ isLoading={loadingMore}+ // Past the loaded results, "Next" buys a deeper crawl. The button+ // says so rather than spending silently.+ loadMoreLabel={canLoadMore ? "Load top 100" : undefined}+ onPageChange={(nextPage) => onPageChange(nextPage - 1)}+ />+ ) : null}</div>);}@@ -125,59 +131,6 @@ function SerpAnalysisTable({ items }: { items: SerpResultItem[] }) {);}-function SerpAnalysisPagination({- page,- totalPages,- loadingMore,- canLoadMore,- onPageChange,-}: {- page: number;- totalPages: number;- loadingMore: boolean;- canLoadMore: boolean;- onPageChange: (p: number) => void;-}) {- if (totalPages <= 1 && !canLoadMore) return null;-- // Past the loaded results, "Next" stops being free paging and buys a deeper- // crawl — say so on the button rather than spending silently.- const nextBuysDeeperSnapshot =- canLoadMore && !loadingMore && page >= totalPages - 1;-- return (- <div className="flex items-center justify-between mt-3 pt-3 border-t border-base-200">- <span className="text-xs text-base-content/50">- {loadingMore ? (- "Loading more results…"- ) : (- <>- Page {page + 1} of {totalPages}- </>- )}- </span>- <div className="flex gap-1">- <button- className="btn btn-ghost btn-xs"- disabled={page === 0 || loadingMore}- onClick={() => onPageChange(page - 1)}- >- <ChevronLeft className="size-3.5" />- Prev- </button>- <button- className="btn btn-ghost btn-xs"- disabled={loadingMore || (page >= totalPages - 1 && !canLoadMore)}- onClick={() => onPageChange(page + 1)}- >- {nextBuysDeeperSnapshot ? "Load top 100" : "Next"}- <ChevronRight className="size-3.5" />- </button>- </div>- </div>- );-}-function SerpAnalysisLoadingState() {return (<div className="space-y-2">diff --git a/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx b/src/client/features/keywords/page/KeywordResearchDesktopResults.tsxindex 0232eeeb..e93fd656 100644--- a/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx+++ b/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx@@ -9,13 +9,6 @@ import {SlidersHorizontal,} from "lucide-react";import { sortBy } from "remeda";-import {- downloadKeywordResearchCsv,- keywordResearchExportRow,- keywordResearchHeaders,-} from "@/client/features/keywords/state/keywordControllerActions";-import { exportTableToSheets } from "@/client/lib/exportToSheets";-import { captureClientEvent } from "@/client/lib/posthog";import {AreaTrendChart,OverviewStats,@@ -30,9 +23,10 @@ import {} from "./keywordResearchFilters";import { KeywordResearchDesktopTable } from "./KeywordResearchDesktopTable";import {- KeywordResearchPagination,+ KEYWORD_RESEARCH_PAGE_SIZES,useKeywordResearchPagination,} from "./KeywordResearchPagination";+import { TablePagination } from "@/client/components/table/TablePagination";import {TableBulkActionBar,TableBulkActionButton,@@ -113,57 +107,21 @@ function DesktopTableCard({ controller }: Props) {activeFilterCount,filteredRows,rows,- selectedRows,- sheetsExportRows,+ selectedKeywordRows,showFilters,} = controller;- const {- page,- pageSize,- pageRows,- setPage,- setPageSize,- start,- end,- totalPages,- } = useKeywordResearchPagination(filteredRows);+ const { page, pageSize, pageRange, pageRows, setPage, setPageSize } =+ useKeywordResearchPagination(filteredRows);const keywordCount = filteredRows.length;const keywordCountLabel =- selectedRows.size > 0- ? `${selectedRows.size} selected`+ selectedKeywordRows.length > 0+ ? `${selectedKeywordRows.length} selected`: activeFilterCount > 0? `Showing ${keywordCount} of ${rows.length} keywords`: `Showing ${keywordCount} keywords`;const canExport = filteredRows.length > 0;- const selectedExportRows = rows- .filter((row) => selectedRows.has(row.keyword))- .map(keywordResearchExportRow);- const exportHeaders = keywordResearchHeaders(controller.locationName);- const handleExportToSheets = () => {- void exportTableToSheets({- headers: exportHeaders,- rows: sheetsExportRows,- feature: "keyword_research",- });- };- const handleExportSelectionToSheets = () => {- void exportTableToSheets({- headers: exportHeaders,- rows: selectedExportRows,- feature: "keyword_research",- });- };- const handleExportSelectionCsv = () => {- downloadKeywordResearchCsv(selectedExportRows, exportHeaders);- captureClientEvent("data:export", {- source_feature: "keyword_research",- result_count: selectedExportRows.length,- scope: "selection",- });- };-return (<div className="flex-1 flex flex-col min-w-0 border border-base-300 rounded-xl bg-base-100 overflow-hidden"><div className="shrink-0 flex flex-wrap items-center gap-2 px-4 py-2 border-b border-base-300">@@ -199,13 +157,19 @@ function DesktopTableCard({ controller }: Props) {className="dropdown-content z-10 menu p-2 shadow-lg bg-base-100 border border-base-300 rounded-box w-56"><li>- <button onClick={handleExportToSheets} disabled={!canExport}>+ <button+ onClick={() => controller.exportAll("sheets")}+ disabled={!canExport}+ ><Sheet className="size-4" />Export to Sheets</button></li><li>- <button onClick={controller.exportCsv} disabled={!canExport}>+ <button+ onClick={() => controller.exportAll("csv")}+ disabled={!canExport}+ ><FileDown className="size-4" />Export CSV</button>@@ -215,7 +179,7 @@ function DesktopTableCard({ controller }: Props) {</div><TableBulkActionBar- selectedCount={selectedRows.size}+ selectedCount={selectedKeywordRows.length}onClear={() => controller.setSelectedRows(new Set())}actions={<div className="flex items-center px-1.5">@@ -230,12 +194,12 @@ function DesktopTableCard({ controller }: Props) {{label: "Export to Sheets",icon: <Sheet className="size-4" />,- onClick: handleExportSelectionToSheets,+ onClick: () => controller.exportSelection("sheets"),},{label: "Export CSV",icon: <FileDown className="size-4" />,- onClick: handleExportSelectionCsv,+ onClick: () => controller.exportSelection("csv"),},]}/>@@ -256,12 +220,11 @@ function DesktopTableCard({ controller }: Props) {handleRowClick={controller.handleRowClick}/>{filteredRows.length > 0 ? (- <KeywordResearchPagination- start={start}- end={end}- totalPages={totalPages}+ <TablePaginationpage={page}pageSize={pageSize}+ pageSizes={KEYWORD_RESEARCH_PAGE_SIZES}+ pageRange={pageRange}totalCount={filteredRows.length}onPageChange={setPage}onPageSizeChange={setPageSize}diff --git a/src/client/features/keywords/page/KeywordResearchDesktopTable.tsx b/src/client/features/keywords/page/KeywordResearchDesktopTable.tsxindex 1632c2ea..bd5224b0 100644--- a/src/client/features/keywords/page/KeywordResearchDesktopTable.tsx+++ b/src/client/features/keywords/page/KeywordResearchDesktopTable.tsx@@ -16,7 +16,7 @@ import {type SortDir,type SortField,} from "@/client/features/keywords/components";-import { DifficultyBadge } from "@/client/features/domain/components/DifficultyBadge";+import { ScoreBadge } from "@/client/components/table/ScoreBadge";import { formatNumber } from "@/client/features/keywords/utils";import type { KeywordResearchDisplayRow } from "@/client/features/keywords/groupSharedVolumeRows";import type { KeywordResearchRow } from "@/types/keywords";@@ -167,7 +167,7 @@ export function KeywordResearchDesktopTable({className="justify-end"/>),- cell: ({ getValue }) => <DifficultyBadge value={getValue()} />,+ cell: ({ getValue }) => <ScoreBadge value={getValue()} />,meta: { headerClassName: "text-right", cellClassName: "text-right" },}),keywordColumnHelper.accessor("intent", {diff --git a/src/client/features/keywords/page/KeywordResearchMobileResults.tsx b/src/client/features/keywords/page/KeywordResearchMobileResults.tsxindex 044ec7d3..aa75ff30 100644--- a/src/client/features/keywords/page/KeywordResearchMobileResults.tsx+++ b/src/client/features/keywords/page/KeywordResearchMobileResults.tsx@@ -7,20 +7,14 @@ import {Sheet,SlidersHorizontal,} from "lucide-react";-import {- downloadKeywordResearchCsv,- keywordResearchExportRow,- keywordResearchHeaders,-} from "@/client/features/keywords/state/keywordControllerActions";-import { exportTableToSheets } from "@/client/lib/exportToSheets";-import { captureClientEvent } from "@/client/lib/posthog";import { SerpAnalysisCard } from "@/client/features/keywords/components";import { FilterIntentSelect } from "./keywordResearchFilters";import { KeywordResearchDesktopTable } from "./KeywordResearchDesktopTable";import {- KeywordResearchPagination,+ KEYWORD_RESEARCH_PAGE_SIZES,useKeywordResearchPagination,} from "./KeywordResearchPagination";+import { TablePagination } from "@/client/components/table/TablePagination";import type { KeywordResearchControllerState } from "./types";import {TableBulkActionBar,@@ -88,57 +82,21 @@ function MobileKeywordResults({ controller }: Props) {activeFilterCount,filteredRows,rows,- selectedRows,- sheetsExportRows,+ selectedKeywordRows,showFilters,} = controller;- const {- page,- pageSize,- pageRows,- setPage,- setPageSize,- start,- end,- totalPages,- } = useKeywordResearchPagination(filteredRows);+ const { page, pageSize, pageRange, pageRows, setPage, setPageSize } =+ useKeywordResearchPagination(filteredRows);const keywordCount = filteredRows.length;const keywordCountLabel =- selectedRows.size > 0- ? `${selectedRows.size} selected`+ selectedKeywordRows.length > 0+ ? `${selectedKeywordRows.length} selected`: activeFilterCount > 0? `Showing ${keywordCount} of ${rows.length}`: `Showing ${keywordCount} keywords`;const canExport = filteredRows.length > 0;- const selectedExportRows = rows- .filter((row) => selectedRows.has(row.keyword))- .map(keywordResearchExportRow);- const exportHeaders = keywordResearchHeaders(controller.locationName);- const handleExportToSheets = () => {- void exportTableToSheets({- headers: exportHeaders,- rows: sheetsExportRows,- feature: "keyword_research",- });- };- const handleExportSelectionToSheets = () => {- void exportTableToSheets({- headers: exportHeaders,- rows: selectedExportRows,- feature: "keyword_research",- });- };- const handleExportSelectionCsv = () => {- downloadKeywordResearchCsv(selectedExportRows, exportHeaders);- captureClientEvent("data:export", {- source_feature: "keyword_research",- result_count: selectedExportRows.length,- scope: "selection",- });- };-return (<div className="flex-1 flex flex-col overflow-hidden">{controller.showApproximateMatchNotice ? (@@ -184,13 +142,19 @@ function MobileKeywordResults({ controller }: Props) {className="dropdown-content z-10 menu p-2 shadow-lg bg-base-100 border border-base-300 rounded-box w-56"><li>- <button onClick={handleExportToSheets} disabled={!canExport}>+ <button+ onClick={() => controller.exportAll("sheets")}+ disabled={!canExport}+ ><Sheet className="size-4" />Export to Sheets</button></li><li>- <button onClick={controller.exportCsv} disabled={!canExport}>+ <button+ onClick={() => controller.exportAll("csv")}+ disabled={!canExport}+ ><FileDown className="size-4" />Export CSV</button>@@ -200,7 +164,7 @@ function MobileKeywordResults({ controller }: Props) {</div><TableBulkActionBar- selectedCount={selectedRows.size}+ selectedCount={selectedKeywordRows.length}onClear={() => controller.setSelectedRows(new Set())}actions={<div className="flex items-center px-1.5">@@ -215,12 +179,12 @@ function MobileKeywordResults({ controller }: Props) {{label: "Export to Sheets",icon: <Sheet className="size-4" />,- onClick: handleExportSelectionToSheets,+ onClick: () => controller.exportSelection("sheets"),},{label: "Export CSV",icon: <FileDown className="size-4" />,- onClick: handleExportSelectionCsv,+ onClick: () => controller.exportSelection("csv"),},]}/>@@ -242,12 +206,11 @@ function MobileKeywordResults({ controller }: Props) {handleRowClick={controller.handleRowClick}/>{filteredRows.length > 0 ? (- <KeywordResearchPagination- start={start}- end={end}- totalPages={totalPages}+ <TablePaginationpage={page}pageSize={pageSize}+ pageSizes={KEYWORD_RESEARCH_PAGE_SIZES}+ pageRange={pageRange}totalCount={filteredRows.length}onPageChange={setPage}onPageSizeChange={setPageSize}diff --git a/src/client/features/keywords/page/KeywordResearchPage.tsx b/src/client/features/keywords/page/KeywordResearchPage.tsxindex 15366bcb..51e088ec 100644--- a/src/client/features/keywords/page/KeywordResearchPage.tsx+++ b/src/client/features/keywords/page/KeywordResearchPage.tsx@@ -293,7 +293,7 @@ function KeywordSaveDialog({<div className="modal modal-open"><div className="modal-box"><h3 className="font-bold text-lg">- Save {controller.selectedRows.size} Keywords+ Save {controller.selectedKeywordRows.length} Keywords</h3><div className="py-4"><p className="text-base-content/70 text-sm">diff --git a/src/client/features/keywords/page/KeywordResearchPagination.tsx b/src/client/features/keywords/page/KeywordResearchPagination.tsxindex 827d23ed..89af5e8d 100644--- a/src/client/features/keywords/page/KeywordResearchPagination.tsx+++ b/src/client/features/keywords/page/KeywordResearchPagination.tsx@@ -1,88 +1,13 @@-import { ChevronLeft, ChevronRight } from "lucide-react";import { useEffect, useMemo, useState } from "react";import type { KeywordResearchDisplayRow } from "../groupSharedVolumeRows";-const KEYWORD_RESEARCH_PAGE_SIZES = [50, 100, 300, 500] as const;+export const KEYWORD_RESEARCH_PAGE_SIZES = [50, 100, 300, 500] as const;const DEFAULT_KEYWORD_RESEARCH_PAGE_SIZE = 50;const KEYWORD_RESEARCH_PAGE_SIZE_STORAGE_KEY ="keyword-research-table-page-size";type KeywordResearchPageSize = (typeof KEYWORD_RESEARCH_PAGE_SIZES)[number];-type Props = {- page: number;- pageSize: KeywordResearchPageSize;- totalCount: number;- totalPages: number;- start: number;- end: number;- onPageChange: (page: number) => void;- onPageSizeChange: (pageSize: KeywordResearchPageSize) => void;-};--export function KeywordResearchPagination({- page,- pageSize,- totalCount,- totalPages,- start,- end,- onPageChange,- onPageSizeChange,-}: Props) {- return (- <div className="flex flex-col gap-3 border-t border-base-300 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">- <div className="text-sm tabular-nums text-base-content/70">- {start.toLocaleString()}-{end.toLocaleString()} of{" "}- {totalCount.toLocaleString()}- </div>- <div className="flex items-center gap-6">- <label className="flex items-center gap-2 text-sm text-base-content/70">- <span className="whitespace-nowrap">Rows per page</span>- <select- className="select select-bordered select-sm w-20"- value={pageSize}- onChange={(event) =>- onPageSizeChange(parseKeywordResearchPageSize(event.target.value))- }- >- {KEYWORD_RESEARCH_PAGE_SIZES.map((size) => (- <option key={size} value={size}>- {size}- </option>- ))}- </select>- </label>- <div className="flex items-center gap-2">- <span className="whitespace-nowrap text-sm tabular-nums text-base-content/70">- Page {page.toLocaleString()} of {totalPages.toLocaleString()}- </span>- <div className="flex items-center gap-1">- <button- type="button"- className="btn btn-ghost btn-sm btn-square"- disabled={page <= 1}- onClick={() => onPageChange(page - 1)}- aria-label="Previous page"- >- <ChevronLeft className="size-4" />- </button>- <button- type="button"- className="btn btn-ghost btn-sm btn-square"- disabled={page >= totalPages}- onClick={() => onPageChange(page + 1)}- aria-label="Next page"- >- <ChevronRight className="size-4" />- </button>- </div>- </div>- </div>- </div>- );-}-function parseKeywordResearchPageSize(value: string): KeywordResearchPageSize {const parsed = Number(value);return (@@ -126,16 +51,11 @@ export function useKeywordResearchPagination(setPage(1);}, [rows]);- useEffect(() => {- setPage((current) => Math.min(current, totalPages));- }, [totalPages]);-const pageRows = useMemo(() => rows.slice(start, end), [start, end, rows]);return {page: currentPage,- start: rows.length === 0 ? 0 : start + 1,- end,+ pageRange: { start: start + 1, end, pageCount: totalPages },pageSize,pageRows,setPage,@@ -144,7 +64,6 @@ export function useKeywordResearchPagination(persistKeywordResearchPageSize(nextPageSize);setPage(1);},- totalPages,};}diff --git a/src/client/features/keywords/state/keywordControllerActions.ts b/src/client/features/keywords/state/keywordControllerActions.tsindex 9dd814b6..3ed19b40 100644--- a/src/client/features/keywords/state/keywordControllerActions.ts+++ b/src/client/features/keywords/state/keywordControllerActions.ts@@ -1,6 +1,7 @@import { useMemo } from "react";import { toast } from "sonner";-import { buildCsv, type CsvValue, downloadCsv } from "@/client/lib/csv";+import type { CsvValue } from "@/client/lib/csv";+import { exportRows } from "@/client/lib/exportRows";import { captureClientEvent } from "@/client/lib/posthog";import type { KeywordResearchRow } from "@/types/keywords";import type { SaveKeywordsInput } from "@/types/schemas/keywords";@@ -14,7 +15,7 @@ import type { KeywordResearchDisplayRow } from "@/client/features/keywords/groupimport { formatLocationLabel } from "@/shared/keyword-locations";/** Local exports name the area the volume, CPC, and competition cover. */-export function keywordResearchHeaders(locationName?: string) {+function keywordResearchHeaders(locationName?: string) {const scope = locationName ? ` (${formatLocationLabel(locationName)})` : "";return ["Keyword",@@ -28,7 +29,7 @@ export function keywordResearchHeaders(locationName?: string) {export const KEYWORD_RESEARCH_HEADERS = keywordResearchHeaders();-export function keywordResearchExportRow(row: KeywordResearchRow): CsvValue[] {+function keywordResearchExportRow(row: KeywordResearchRow): CsvValue[] {return [row.keyword,row.searchVolume ?? "",@@ -41,7 +42,6 @@ export function keywordResearchExportRow(row: KeywordResearchRow): CsvValue[] {type SaveExportActionParams = {selectedRows: Set<string>;- rows: KeywordResearchRow[];filteredRows: KeywordResearchDisplayRow[];input: KeywordResearchControllerInput;saveKeywordsMutate: (@@ -101,38 +101,43 @@ export function getNextSortParams(export function useSaveAndExportActions(params: SaveExportActionParams) {const {selectedRows,- rows,filteredRows,input,saveKeywordsMutate,setShowSaveDialog,} = params;+ // Save and export act on the same rows: the selected rows that the current+ // filters show.+ const selectedKeywordRows = useMemo(+ () => filteredRows.filter((row) => selectedRows.has(row.keyword)),+ [filteredRows, selectedRows],+ );+const handleSaveKeywords = () => {setShowSaveDialog(true);};const confirmSave = () => {+ const count = selectedKeywordRows.length;// Saved keyword metrics are stored per country, so local numbers are not// saved. The saved list keeps the national metrics.const metrics = input.locationName? undefined- : rows- .filter((row) => selectedRows.has(row.keyword))- .map((row) => ({- keyword: row.keyword,- searchVolume: row.searchVolume,- cpc: row.cpc,- competition: row.competition,- keywordDifficulty: row.keywordDifficulty,- intent: row.intent,- monthlySearches: row.trend,- }));+ : selectedKeywordRows.map((row) => ({+ keyword: row.keyword,+ searchVolume: row.searchVolume,+ cpc: row.cpc,+ competition: row.competition,+ keywordDifficulty: row.keywordDifficulty,+ intent: row.intent,+ monthlySearches: row.trend,+ }));saveKeywordsMutate({projectId: input.projectId,- keywords: [...selectedRows],+ keywords: selectedKeywordRows.map((row) => row.keyword),locationCode: input.locationCode,metrics,},@@ -140,45 +145,52 @@ export function useSaveAndExportActions(params: SaveExportActionParams) {onSuccess: () => {captureClientEvent("keyword:save", {source_feature: "keyword_research",- keyword_count: selectedRows.size,+ keyword_count: count,});- toast.success(`Saved ${selectedRows.size} keywords`);+ toast.success(`Saved ${count} keywords`);setShowSaveDialog(false);},},);};- const sheetsExportRows: CsvValue[][] = useMemo(- () => filteredRows.map(keywordResearchExportRow),- [filteredRows],- );-- const exportCsv = () => {- downloadKeywordResearchCsv(- sheetsExportRows,- keywordResearchHeaders(input.locationName),- );- captureClientEvent("data:export", {- source_feature: "keyword_research",- result_count: sheetsExportRows.length,+ const exportKeywords = (+ format: "csv" | "sheets",+ exportedRows: KeywordResearchRow[],+ scope?: "selection",+ ) => {+ const tableRows = exportedRows.map(keywordResearchExportRow);+ void exportRows({+ format,+ feature: "keyword_research",+ headers: keywordResearchHeaders(input.locationName),+ rows: format === "csv" ? formatCentsForCsv(tableRows) : tableRows,+ filename: "keyword-research",+ scope,});};- return { handleSaveKeywords, confirmSave, exportCsv, sheetsExportRows };+ return {+ handleSaveKeywords,+ confirmSave,+ selectedKeywordRows,+ exportAll: (format: "csv" | "sheets") =>+ exportKeywords(format, filteredRows),+ exportSelection: (format: "csv" | "sheets") =>+ exportKeywords(format, selectedKeywordRows, "selection"),+ };}-export function downloadKeywordResearchCsv(- rows: CsvValue[][],- headers: string[],-) {- // CSV file keeps cents-formatted CPC/competition for human readability.- const csvRows = rows.map((row) =>+/**+ * CSV downloads show CPC and competition (columns 3 and 4 of the keyword+ * headers) with two decimals. Sheets keeps raw numbers.+ */+export function formatCentsForCsv(rows: CsvValue[][]): CsvValue[][] {+ return rows.map((row) =>row.map((cell, idx) =>(idx === 2 || idx === 3) && typeof cell === "number"? cell.toFixed(2): cell,),);- downloadCsv("keyword-research.csv", buildCsv(headers, csvRows));}diff --git a/src/client/features/keywords/state/useKeywordResearchController.ts b/src/client/features/keywords/state/useKeywordResearchController.tsindex a6fd2df8..4677fa87 100644--- a/src/client/features/keywords/state/useKeywordResearchController.ts+++ b/src/client/features/keywords/state/useKeywordResearchController.ts@@ -234,15 +234,19 @@ export function useKeywordResearchController([input.sortDir, input.sortField, setSearchParams],);- const { handleSaveKeywords, confirmSave, exportCsv, sheetsExportRows } =- useSaveAndExportActions({- selectedRows,- rows,- filteredRows,- input,- saveKeywordsMutate: saveMutation.mutate,- setShowSaveDialog: uiState.setShowSaveDialog,- });+ const {+ handleSaveKeywords,+ confirmSave,+ selectedKeywordRows,+ exportAll,+ exportSelection,+ } = useSaveAndExportActions({+ selectedRows,+ filteredRows,+ input,+ saveKeywordsMutate: saveMutation.mutate,+ setShowSaveDialog: uiState.setShowSaveDialog,+ });const handleRowClick = (row: KeywordResearchRow) => {captureClientEvent("keyword_research:serp_open");@@ -258,8 +262,8 @@ export function useKeywordResearchController(activeSerpKeyword,confirmSave,controlsForm,- exportCsv,- sheetsExportRows,+ exportAll,+ exportSelection,filteredRows,filtersForm,handleRowClick,@@ -283,6 +287,7 @@ export function useKeywordResearchController(rows,searchedKeyword,selectedRows,+ selectedKeywordRows,canLoadMoreSerp,deepFetchFailed,serpError,diff --git a/src/client/features/keywords/utils.ts b/src/client/features/keywords/utils.tsindex 696d14bc..909b86d5 100644--- a/src/client/features/keywords/utils.ts+++ b/src/client/features/keywords/utils.ts@@ -1,15 +1,5 @@export { LOCATIONS } from "./locations";-export function scoreTierClass(value: number | null): string {- if (value == null) return "score-tier-na";- if (value <= 20) return "score-tier-1";- if (value <= 35) return "score-tier-2";- if (value <= 50) return "score-tier-3";- if (value <= 65) return "score-tier-4";- if (value <= 80) return "score-tier-5";- return "score-tier-6";-}-export function parseTerms(value: string): string[] {return value.toLowerCase()diff --git a/src/client/features/lighthouse/issues/LighthouseIssuesScreen.tsx b/src/client/features/lighthouse/issues/LighthouseIssuesScreen.tsxindex bee375ed..6da1dfa6 100644--- a/src/client/features/lighthouse/issues/LighthouseIssuesScreen.tsx+++ b/src/client/features/lighthouse/issues/LighthouseIssuesScreen.tsx@@ -9,9 +9,9 @@ import {import { downloadFile } from "@/client/lib/download";import { QueryError } from "@/client/components/QueryState";import { getErrorCode } from "@/client/lib/error-messages";-import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { exportRows } from "@/client/lib/exportRows";import type { CategoryTab, ExportPayload, LighthouseIssue } from "./types";-import { categoryLabel, issuesToCsv, issuesToTable } from "./utils";+import { categoryLabel, issuesToTable } from "./utils";import {LighthouseIssueList,LighthouseIssuesHeader,@@ -64,8 +64,7 @@ export function LighthouseIssuesScreen({categoryCounts,runCopy,runExport,- runExportCsv,- runExportSheets,+ runExportRows,selectedCategoryLabel,severityCounts,visibleIssues,@@ -146,8 +145,12 @@ export function LighthouseIssuesScreen({onExport={(data) => {void runExport(data);}}- onExportCsv={runExportCsv}- onExportSheets={runExportSheets}+ onExportCsv={(rows, variant) =>+ runExportRows("csv", rows, variant)+ }+ onExportSheets={(rows, variant) =>+ runExportRows("sheets", rows, variant)+ }/><LighthouseIssueListissues={visibleIssues}@@ -194,24 +197,16 @@ function useLighthouseIssuesActions({}};- const runExportCsv = (- rows: LighthouseIssue[],- variant: "all" | "current",- ) => {- const filename = `lighthouse-${variant}-${category}-issues.csv`;- downloadFile(issuesToCsv(rows), filename, "text/csv");- toast.success("CSV download started");- };-- const runExportSheets = (+ const runExportRows = (+ format: "csv" | "sheets",rows: LighthouseIssue[],variant: "all" | "current",) => {- const table = issuesToTable(rows);- void exportTableToSheets({- headers: table.headers,- rows: table.rows,+ void exportRows({+ format,feature: `lighthouse_issues_${variant}`,+ ...issuesToTable(rows),+ filename: `lighthouse-${variant}-${category}-issues`,});};@@ -232,8 +227,7 @@ function useLighthouseIssuesActions({categoryCounts,runCopy,runExport,- runExportCsv,- runExportSheets,+ runExportRows,selectedCategoryLabel,severityCounts,visibleIssues,diff --git a/src/client/features/lighthouse/issues/utils.tsx b/src/client/features/lighthouse/issues/utils.tsxindex 41bc2361..a561c129 100644--- a/src/client/features/lighthouse/issues/utils.tsx+++ b/src/client/features/lighthouse/issues/utils.tsx@@ -1,4 +1,4 @@-import { buildCsv, type CsvValue } from "@/client/lib/csv";+import type { CsvValue } from "@/client/lib/csv";import type { CategoryTab, LighthouseIssue } from "./types";const ISSUE_HEADERS = [@@ -36,7 +36,3 @@ export function categoryLabel(category: CategoryTab) {if (category === "all") return "All";return `${category.charAt(0).toUpperCase()}${category.slice(1)}`;}--export function issuesToCsv(issues: LighthouseIssue[]) {- return buildCsv(ISSUE_HEADERS, issuesToRows(issues));-}diff --git a/src/client/features/rank-tracking/KeywordSuggestionStep.tsx b/src/client/features/rank-tracking/KeywordSuggestionStep.tsxindex a6af07c4..d1a8796a 100644--- a/src/client/features/rank-tracking/KeywordSuggestionStep.tsx+++ b/src/client/features/rank-tracking/KeywordSuggestionStep.tsx@@ -15,7 +15,8 @@ import {makeSelectionColumn,useAppTable,} from "@/client/components/table/AppDataTable";-import { SortableHeader } from "./RankTrackingColumns";+import { SortableHeader } from "@/client/components/table/SortableHeader";+import { RANK_TRACKING_HEADER_CLASS } from "./RankTrackingColumns";import {applyShiftRangeSelection,type SelectionAnchor,@@ -38,8 +39,8 @@ const baseColumns: ColumnDef<SuggestedKeyword>[] = [<SortableHeadercolumn={column}label="Keyword"- id="keyword"- tooltip="The search term this domain ranks for"+ title="The search term this domain ranks for"+ className={RANK_TRACKING_HEADER_CLASS}/>),cell: ({ getValue }) => (@@ -54,8 +55,8 @@ const baseColumns: ColumnDef<SuggestedKeyword>[] = [<SortableHeadercolumn={column}label="Position"- id="position"- tooltip="Current Google ranking position"+ title="Current Google ranking position"+ className={RANK_TRACKING_HEADER_CLASS}/>),cell: ({ getValue }) => {@@ -79,8 +80,8 @@ const baseColumns: ColumnDef<SuggestedKeyword>[] = [<SortableHeadercolumn={column}label="Volume"- id="searchVolume"- tooltip="Monthly search volume"+ title="Monthly search volume"+ className={RANK_TRACKING_HEADER_CLASS}/>),cell: ({ getValue }) => {@@ -104,8 +105,8 @@ const baseColumns: ColumnDef<SuggestedKeyword>[] = [<SortableHeadercolumn={column}label="Traffic"- id="traffic"- tooltip="Estimated monthly organic traffic"+ title="Estimated monthly organic traffic"+ className={RANK_TRACKING_HEADER_CLASS}/>),cell: ({ getValue }) => {diff --git a/src/client/features/rank-tracking/KeywordTrendModal.tsx b/src/client/features/rank-tracking/KeywordTrendModal.tsxindex df2111f2..79b6da52 100644--- a/src/client/features/rank-tracking/KeywordTrendModal.tsx+++ b/src/client/features/rank-tracking/KeywordTrendModal.tsx@@ -4,7 +4,8 @@ import { reverse, sortBy } from "remeda";import { toast } from "sonner";import { useQuery } from "@tanstack/react-query";import { Modal } from "@/client/components/Modal";-import { buildCsv, downloadCsv } from "@/client/lib/csv";+import { buildCsv, type CsvValue } from "@/client/lib/csv";+import { exportRows } from "@/client/lib/exportRows";import { captureClientEvent } from "@/client/lib/posthog";import { getRankKeywordHistory } from "@/serverFunctions/rank-tracking";import type { RankKeywordHistoryPoint } from "@/serverFunctions/rank-tracking";@@ -113,27 +114,22 @@ export function KeywordTrendModal({const historyRows = useMemo(() => buildHistoryRows(points), [points]);- const exportRows = () =>- historyRows.map((r) => [- new Date(r.checkedAt).toISOString(),- DEVICE_STYLE[r.device].label,- r.position ?? "",- csvChange(r.position, r.previousPosition),- ]);-const handleCopy = () => {- const headers = ["Date", "Device", "Position", "Change vs previous"];- void navigator.clipboard.writeText(buildCsv(headers, exportRows()));+ void navigator.clipboard.writeText(+ buildCsv(HISTORY_HEADERS, historyRows.map(historyExportRow)),+ );toast.success("Copied to clipboard");captureClientEvent("rank_tracking:keyword_trend_copy");};const handleExport = () => {- const headers = ["Date", "Device", "Position", "Change vs previous"];- downloadCsv(- `rank-history-${slugify(target.keyword)}.csv`,- buildCsv(headers, exportRows()),- );+ void exportRows({+ format: "csv",+ feature: "rank_tracking_keyword_trend",+ headers: HISTORY_HEADERS,+ rows: historyRows.map(historyExportRow),+ filename: `rank-history-${slugify(target.keyword)}`,+ });captureClientEvent("rank_tracking:keyword_trend_export");};@@ -403,3 +399,14 @@ function slugify(value: string): string {.replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");}++const HISTORY_HEADERS = ["Date", "Device", "Position", "Change vs previous"];++function historyExportRow(row: HistoryRow): CsvValue[] {+ return [+ new Date(row.checkedAt).toISOString(),+ DEVICE_STYLE[row.device].label,+ row.position ?? "",+ csvChange(row.position, row.previousPosition),+ ];+}diff --git a/src/client/features/rank-tracking/RankTrackingColumns.tsx b/src/client/features/rank-tracking/RankTrackingColumns.tsxindex f64a93de..c737184c 100644--- a/src/client/features/rank-tracking/RankTrackingColumns.tsx+++ b/src/client/features/rank-tracking/RankTrackingColumns.tsx@@ -1,19 +1,22 @@import { useMemo, type MutableRefObject } from "react";-import { ArrowUp, ArrowDown } from "lucide-react";import type { ColumnDef } from "@tanstack/react-table";import { makeSelectionColumn } from "@/client/components/table/AppDataTable";+import { ScoreBadge } from "@/client/components/table/ScoreBadge";+import { SortableHeader } from "@/client/components/table/SortableHeader";import type { RankTrackingRow } from "@/types/schemas/rank-tracking";import { formatLocationLabel } from "@/shared/keyword-locations";import {CpcCell,DeviceRankCell,DeviceUrlCell,- DifficultyCell,SerpFeatureTags,VolumeCell,} from "./RankTrackingTableParts";import type { SelectionAnchor } from "@/client/components/table/tableSelection";+export const RANK_TRACKING_HEADER_CLASS =+ "text-xs uppercase tracking-wide text-base-content/60";+const HEADER_TOOLTIPS: Record<string, string> = {keyword: "The search term being tracked in Google",volume: "Estimated monthly search volume from Google",@@ -27,40 +30,6 @@ const HEADER_TOOLTIPS: Record<string, string> = {serp: "Special result features appearing on the search results page (e.g. AI Overview, People Also Ask)",};-export function SortableHeader({- column,- label,- id,- tooltip,-}: {- column: {- getIsSorted: () => false | "asc" | "desc";- getToggleSortingHandler: () => ((event: unknown) => void) | undefined;- };- label: string;- id: string;- tooltip?: string;-}) {- const sorted = column.getIsSorted();- return (- <button- type="button"- className="inline-flex items-center gap-1 text-xs uppercase tracking-wide font-medium text-base-content/60 transition-colors hover:text-base-content"- onClick={column.getToggleSortingHandler()}- title={tooltip ?? HEADER_TOOLTIPS[id]}- aria-label={`Sort by ${label}`}- aria-pressed={!!sorted}- >- {label}- {sorted === "asc" ? (- <ArrowUp className="size-3 shrink-0" />- ) : sorted === "desc" ? (- <ArrowDown className="size-3 shrink-0" />- ) : null}- </button>- );-}-// Local configs fetch volume scoped to the tracked city, so the header must// say which number the user is looking at — national volume can overstate// local demand by orders of magnitude.@@ -72,12 +41,12 @@ function makeVolumeColumn(locationLabel?: string): ColumnDef<RankTrackingRow> {<SortableHeadercolumn={column}label={locationLabel ? "Local volume" : "Volume"}- id="volume"- tooltip={+ title={locationLabel? `Estimated monthly searches in ${locationLabel} from Google Ads`- : undefined+ : HEADER_TOOLTIPS.volume}+ className={RANK_TRACKING_HEADER_CLASS}/>),size: 90,@@ -91,10 +60,17 @@ function makeVolumeColumn(locationLabel?: string): ColumnDef<RankTrackingRow> {const kdColumn: ColumnDef<RankTrackingRow> = {id: "kd",accessorFn: (row) => row.keywordDifficulty ?? undefined,- header: ({ column }) => <SortableHeader column={column} label="KD" id="kd" />,+ header: ({ column }) => (+ <SortableHeader+ column={column}+ label="KD"+ title={HEADER_TOOLTIPS.kd}+ className={RANK_TRACKING_HEADER_CLASS}+ />+ ),size: 70,cell: ({ getValue }) => (- <DifficultyCell value={getValue<number | undefined>() ?? null} />+ <ScoreBadge value={getValue<number | undefined>() ?? null} />),sortUndefined: "last",};@@ -103,7 +79,12 @@ const cpcColumn: ColumnDef<RankTrackingRow> = {id: "cpc",accessorFn: (row) => row.cpc ?? undefined,header: ({ column }) => (- <SortableHeader column={column} label="CPC" id="cpc" />+ <SortableHeader+ column={column}+ label="CPC"+ title={HEADER_TOOLTIPS.cpc}+ className={RANK_TRACKING_HEADER_CLASS}+ />),size: 80,cell: ({ getValue }) => (@@ -119,7 +100,12 @@ function makeKeywordColumn(id: "keyword",accessorKey: "keyword",header: ({ column }) => (- <SortableHeader column={column} label="Keyword" id="keyword" />+ <SortableHeader+ column={column}+ label="Keyword"+ title={HEADER_TOOLTIPS.keyword}+ className={RANK_TRACKING_HEADER_CLASS}+ />),cell: ({ row }) => (<div className="flex items-center gap-1.5">@@ -153,7 +139,12 @@ function makeDeviceColumn(id,accessorFn: (row) => row[device].position ?? undefined,header: ({ column }) => (- <SortableHeader column={column} label="Position" id={id} />+ <SortableHeader+ column={column}+ label="Position"+ title={HEADER_TOOLTIPS[id]}+ className={RANK_TRACKING_HEADER_CLASS}+ />),size: 120,maxSize: 140,diff --git a/src/client/features/rank-tracking/RankTrackingDomainDetail.tsx b/src/client/features/rank-tracking/RankTrackingDomainDetail.tsxindex ad957c60..139861b0 100644--- a/src/client/features/rank-tracking/RankTrackingDomainDetail.tsx+++ b/src/client/features/rank-tracking/RankTrackingDomainDetail.tsx@@ -20,10 +20,7 @@ import {RankTrackingHistoryMatrix,} from "./RankTrackingHistoryMatrix";import { RankTrackingTableToolbar } from "./RankTrackingTableToolbar";-import {- exportRankTrackingCsv,- exportRankTrackingToSheets,-} from "./RankTrackingTableParts";+import { exportRankTracking } from "./RankTrackingTableParts";import type {RankTrackingConfig,ComparePeriod,@@ -278,21 +275,24 @@ export function RankTrackingDomainDetail({onViewModeChange={setViewMode}historyAvailable={historyAvailable}onExport={() =>- exportRankTrackingCsv(- filtered,+ exportRankTracking({+ format: "csv",+ rows: filtered,showDesktop,showMobile,- config.domain,- config.locationName,- )+ domain: config.domain,+ locationName: config.locationName,+ })}onExportToSheets={() =>- exportRankTrackingToSheets(- filtered,+ exportRankTracking({+ format: "sheets",+ rows: filtered,showDesktop,showMobile,- config.locationName,- )+ domain: config.domain,+ locationName: config.locationName,+ })}onCopyKeywords={() => {void navigator.clipboard.writeText(diff --git a/src/client/features/rank-tracking/RankTrackingTable.tsx b/src/client/features/rank-tracking/RankTrackingTable.tsxindex b7c5bb8a..1a1cdf8d 100644--- a/src/client/features/rank-tracking/RankTrackingTable.tsx+++ b/src/client/features/rank-tracking/RankTrackingTable.tsx@@ -11,15 +11,11 @@ import {TableBulkActionButton,TableBulkExportMenu,} from "@/client/components/table/TableBulkActionBar";-import { buildCsv } from "@/client/lib/csv";-import { downloadCsv } from "@/client/lib/csv";-import { exportTableToSheets } from "@/client/lib/exportToSheets";-import { captureClientEvent } from "@/client/lib/posthog";import { useMutation, useQueryClient } from "@tanstack/react-query";import { removeTrackingKeywords } from "@/serverFunctions/rank-tracking";import type { RankTrackingRow } from "@/types/schemas/rank-tracking";import { useRankTrackingColumns } from "./RankTrackingColumns";-import { buildRankTrackingExport } from "./RankTrackingTableParts";+import { exportRankTracking } from "./RankTrackingTableParts";import {KeywordTrendModal,type KeywordTrendTarget,@@ -94,36 +90,16 @@ export function RankTrackingTable({const selectedCount = selectedRows.length;const selectedRankRows = selectedRows.map((row) => row.original);- const exportSelectionToSheets = () => {- const { headers, rows: exportRows } = buildRankTrackingExport(- selectedRankRows,+ const exportSelection = (format: "csv" | "sheets") =>+ exportRankTracking({+ format,+ rows: selectedRankRows,showDesktop,showMobile,- );- void exportTableToSheets({- headers,- rows: exportRows,- feature: "rank_tracking",+ domain,+ locationName,+ scope: "selection",});- };-- const exportSelectionCsv = () => {- const { headers, rows: exportRows } = buildRankTrackingExport(- selectedRankRows,- showDesktop,- showMobile,- );- const csvRows = exportRows.map((row) =>- row.map((cell, idx) =>- idx === 3 && typeof cell === "number" ? cell.toFixed(2) : cell,- ),- );- downloadCsv(- `rank-tracking-${domain}-selected.csv`,- buildCsv(headers, csvRows),- );- captureClientEvent("rank_tracking:export_csv", { scope: "selection" });- };const removeMutation = useMutation({mutationFn: (keywordIds: string[]) =>@@ -180,12 +156,12 @@ export function RankTrackingTable({{label: "Export to Sheets",icon: <Sheet className="size-4" />,- onClick: exportSelectionToSheets,+ onClick: () => exportSelection("sheets"),},{label: "Export CSV",icon: <FileDown className="size-4" />,- onClick: exportSelectionCsv,+ onClick: () => exportSelection("csv"),},]}/>diff --git a/src/client/features/rank-tracking/RankTrackingTableParts.tsx b/src/client/features/rank-tracking/RankTrackingTableParts.tsxindex f122d643..2be379f9 100644--- a/src/client/features/rank-tracking/RankTrackingTableParts.tsx+++ b/src/client/features/rank-tracking/RankTrackingTableParts.tsx@@ -1,6 +1,5 @@import { Sparkles } from "lucide-react";-import { buildCsv, downloadCsv } from "@/client/lib/csv";-import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { exportRows } from "@/client/lib/exportRows";import { captureClientEvent } from "@/client/lib/posthog";import { formatLocationLabel } from "@/shared/keyword-locations";import type {@@ -140,20 +139,6 @@ export function VolumeCell({ value }: { value: number | null }) {);}-export function DifficultyCell({ value }: { value: number | null }) {- if (value == null) return <span className="text-base-content/40">-</span>;- let badgeClass = "bg-success/20 text-success";- if (value > 60) badgeClass = "bg-error/20 text-error";- else if (value > 30) badgeClass = "bg-warning/20 text-warning";- return (- <span- className={`font-mono rounded px-1.5 py-0.5 text-xs font-semibold ${badgeClass}`}- >- {value}- </span>- );-}-export function CpcCell({ value }: { value: number | null }) {if (value == null) return <span className="text-base-content/40">-</span>;return <span className="font-mono text-sm">${value.toFixed(2)}</span>;@@ -169,7 +154,7 @@ export function csvChange(return previous - current;}-export function buildRankTrackingExport(+function buildRankTrackingExport(sorted: RankTrackingRow[],showDesktop: boolean,showMobile: boolean,@@ -227,43 +212,43 @@ export function buildRankTrackingExport(return { headers, rows };}-export function exportRankTrackingToSheets(- sorted: RankTrackingRow[],- showDesktop: boolean,- showMobile: boolean,- locationName?: string | null,-) {- const { headers, rows } = buildRankTrackingExport(- sorted,- showDesktop,- showMobile,- locationName,- );- void exportTableToSheets({ headers, rows, feature: "rank_tracking" });-}--export function exportRankTrackingCsv(- sorted: RankTrackingRow[],- showDesktop: boolean,- showMobile: boolean,- domain: string,- locationName?: string | null,-) {+export function exportRankTracking(args: {+ format: "csv" | "sheets";+ rows: RankTrackingRow[];+ showDesktop: boolean;+ showMobile: boolean;+ domain: string;+ locationName?: string | null;+ scope?: "selection";+}) {+ const { format, scope } = args;const { headers, rows } = buildRankTrackingExport(- sorted,- showDesktop,- showMobile,- locationName,+ args.rows,+ args.showDesktop,+ args.showMobile,+ args.locationName,);// CSV file download keeps cents-formatted CPC for human readability;// clipboard/Sheets export uses raw numbers (see buildRankTrackingExport).- const csvRows = rows.map((row) =>- row.map((cell, idx) =>- idx === 3 && typeof cell === "number" ? cell.toFixed(2) : cell,- ),- );- downloadCsv(`rank-tracking-${domain}.csv`, buildCsv(headers, csvRows));- captureClientEvent("rank_tracking:export_csv");+ const exportedRows =+ format === "csv"+ ? rows.map((row) =>+ row.map((cell, idx) =>+ idx === 3 && typeof cell === "number" ? cell.toFixed(2) : cell,+ ),+ )+ : rows;+ void exportRows({+ format,+ feature: "rank_tracking",+ headers,+ rows: exportedRows,+ filename: `rank-tracking-${args.domain}${scope ? "-selected" : ""}`,+ scope,+ });+ if (format === "csv" && rows.length > 0) {+ captureClientEvent("rank_tracking:export_csv", scope ? { scope } : {});+ }}function toPath(url: string): string {diff --git a/src/client/features/saved-keywords/SavedKeywordsPagination.tsx b/src/client/features/saved-keywords/SavedKeywordsPagination.tsxdeleted file mode 100644index ecc31f44..00000000--- a/src/client/features/saved-keywords/SavedKeywordsPagination.tsx+++ /dev/null@@ -1,86 +0,0 @@-import { ChevronLeft, ChevronRight, Loader2 } from "lucide-react";-import { SAVED_KEYWORD_PAGE_SIZES } from "./savedKeywordsUtils";--export function SavedKeywordsPagination({- page,- pageSize,- totalCount,- isLoading,- onPageChange,- onPageSizeChange,-}: {- page: number;- pageSize: (typeof SAVED_KEYWORD_PAGE_SIZES)[number];- totalCount: number;- isLoading: boolean;- onPageChange: (page: number) => void;- onPageSizeChange: (- pageSize: (typeof SAVED_KEYWORD_PAGE_SIZES)[number],- ) => void;-}) {- const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));- const start = totalCount === 0 ? 0 : (page - 1) * pageSize + 1;- const end = Math.min(totalCount, page * pageSize);-- return (- <div className="flex flex-col gap-3 border-t border-base-300 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">- <div className="flex items-center gap-2 text-sm tabular-nums text-base-content/70">- <span>- {start.toLocaleString()}-{end.toLocaleString()} of{" "}- {totalCount.toLocaleString()}- </span>- {isLoading ? <Loader2 className="size-3.5 animate-spin" /> : null}- </div>- <div className="flex items-center gap-6">- <label className="flex items-center gap-2 text-sm text-base-content/70">- <span className="whitespace-nowrap">Rows per page</span>- <select- className="select select-bordered select-sm w-20"- value={pageSize}- onChange={(event) =>- onPageSizeChange(parsePageSize(event.target.value))- }- >- {SAVED_KEYWORD_PAGE_SIZES.map((size) => (- <option key={size} value={size}>- {size}- </option>- ))}- </select>- </label>- <div className="flex items-center gap-2">- <span className="whitespace-nowrap text-sm tabular-nums text-base-content/70">- Page {page.toLocaleString()} of {totalPages.toLocaleString()}- </span>- <div className="flex items-center gap-1">- <button- type="button"- className="btn btn-ghost btn-sm btn-square"- disabled={page <= 1 || isLoading}- onClick={() => onPageChange(page - 1)}- aria-label="Previous page"- >- <ChevronLeft className="size-4" />- </button>- <button- type="button"- className="btn btn-ghost btn-sm btn-square"- disabled={page >= totalPages || isLoading}- onClick={() => onPageChange(page + 1)}- aria-label="Next page"- >- <ChevronRight className="size-4" />- </button>- </div>- </div>- </div>- </div>- );-}--function parsePageSize(- value: string,-): (typeof SAVED_KEYWORD_PAGE_SIZES)[number] {- const parsed = Number(value);- return SAVED_KEYWORD_PAGE_SIZES.find((size) => size === parsed) ?? 50;-}diff --git a/src/client/features/saved-keywords/SavedKeywordsStatus.tsx b/src/client/features/saved-keywords/SavedKeywordsStatus.tsxdeleted file mode 100644index 4865c24e..00000000--- a/src/client/features/saved-keywords/SavedKeywordsStatus.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { Loader2 } from "lucide-react";--export function SavedKeywordsStatus({- totalCount,- isFetching,-}: {- totalCount: number;- isFetching: boolean;-}) {- return (- <div className="flex items-center gap-2 px-1 text-xs text-base-content/60">- <span>- {totalCount.toLocaleString()} saved keyword- {totalCount === 1 ? "" : "s"}- </span>- {isFetching ? <Loader2 className="size-3 animate-spin" /> : null}- </div>- );-}diff --git a/src/client/features/saved-keywords/SavedKeywordsTable.tsx b/src/client/features/saved-keywords/SavedKeywordsTable.tsxindex 4146390e..a670fdbc 100644--- a/src/client/features/saved-keywords/SavedKeywordsTable.tsx+++ b/src/client/features/saved-keywords/SavedKeywordsTable.tsx@@ -14,7 +14,7 @@ import {useSelectionAnchor,} from "@/client/components/table/AppDataTable";import { SortableHeader } from "@/client/components/table/SortableHeader";-import { DifficultyBadge } from "@/client/features/domain/components/DifficultyBadge";+import { ScoreBadge } from "@/client/components/table/ScoreBadge";import { IntentBadge } from "@/client/features/keywords/components";import type { KeywordIntent, SavedKeywordRow } from "@/types/keywords";import { TagChip } from "./TagChip";@@ -89,7 +89,7 @@ export function SavedKeywordsTable({helpText="Organic ranking difficulty (0-100): higher means harder to reach Google's top 10."/>),- cell: ({ getValue }) => <DifficultyBadge value={getValue()} />,+ cell: ({ getValue }) => <ScoreBadge value={getValue()} />,}),columnHelper.accessor("intent", {header: () => "Intent",diff --git a/src/client/features/saved-keywords/useSavedKeywordsExport.ts b/src/client/features/saved-keywords/useSavedKeywordsExport.tsindex 0ffc26e3..d221cd31 100644--- a/src/client/features/saved-keywords/useSavedKeywordsExport.ts+++ b/src/client/features/saved-keywords/useSavedKeywordsExport.ts@@ -1,9 +1,8 @@import { useMemo, useState } from "react";import { toast } from "sonner";-import { buildCsv, downloadCsv } from "@/client/lib/csv";+import { formatCentsForCsv } from "@/client/features/keywords/state/keywordControllerActions";import { getStandardErrorMessage } from "@/client/lib/error-messages";-import { exportTableToSheets } from "@/client/lib/exportToSheets";-import { captureClientEvent } from "@/client/lib/posthog";+import { exportRows } from "@/client/lib/exportRows";import { exportSavedKeywords } from "@/serverFunctions/keywords";import type { SavedKeywordRow } from "@/types/keywords";import type { ExportSavedKeywordsInput } from "@/types/schemas/keywords";@@ -21,7 +20,6 @@ export function useSavedKeywordsExport(params: {order: ExportSavedKeywordsInput["order"];}) {const [exporting, setExporting] = useState<"csv" | "sheets" | null>(null);- // Only the Sheets selection export is async; the CSV download is synchronous.const [exportingSelection, setExportingSelection] = useState(false);const exportInput = useMemo<ExportSavedKeywordsInput>(@@ -42,67 +40,41 @@ export function useSavedKeywordsExport(params: {],);- const loadFilteredRows = async () => {- const result = await exportSavedKeywords({ data: exportInput });- return result.rows;- };-- const exportFilteredCsv = async () => {- setExporting("csv");- try {- const rows = await loadFilteredRows();- if (rows.length === 0) {- toast.error("No keywords to export");- return;- }- downloadKeywordCsv(rows);- captureClientEvent("data:export", {- source_feature: "saved_keywords",- result_count: rows.length,- });- } catch (error) {- toast.error(getStandardErrorMessage(error, "Could not export CSV"));- } finally {- setExporting(null);- }+ const runExport = async (+ format: "csv" | "sheets",+ rows: SavedKeywordRow[],+ scope?: "selection",+ ) => {+ const tableRows = rows.map(savedKeywordExportRow);+ await exportRows({+ format,+ feature: "saved_keywords",+ headers: SAVED_KEYWORD_EXPORT_HEADERS,+ rows: format === "csv" ? formatCentsForCsv(tableRows) : tableRows,+ filename: "saved-keywords",+ scope,+ });};- const exportFilteredSheets = async () => {- setExporting("sheets");+ const exportFiltered = async (format: "csv" | "sheets") => {+ setExporting(format);try {- const rows = await loadFilteredRows();- await exportTableToSheets({- headers: SAVED_KEYWORD_EXPORT_HEADERS,- rows: rows.map(savedKeywordExportRow),- feature: "saved_keywords",- });+ const result = await exportSavedKeywords({ data: exportInput });+ await runExport(format, result.rows);} catch (error) {- toast.error(getStandardErrorMessage(error, "Could not export to Sheets"));+ toast.error(getStandardErrorMessage(error, "Could not export"));} finally {setExporting(null);}};- // The selection bar only renders with at least one row selected.- const exportSelectionCsv = (selectedRows: SavedKeywordRow[]) => {- downloadKeywordCsv(selectedRows);- captureClientEvent("data:export", {- source_feature: "saved_keywords",- result_count: selectedRows.length,- scope: "selection",- });- };-- const exportSelectionSheets = async (selectedRows: SavedKeywordRow[]) => {+ const exportSelection = async (+ format: "csv" | "sheets",+ selectedRows: SavedKeywordRow[],+ ) => {setExportingSelection(true);try {- await exportTableToSheets({- headers: SAVED_KEYWORD_EXPORT_HEADERS,- rows: selectedRows.map(savedKeywordExportRow),- feature: "saved_keywords",- });- } catch (error) {- toast.error(getStandardErrorMessage(error, "Could not export to Sheets"));+ await runExport(format, selectedRows, "selection");} finally {setExportingSelection(false);}@@ -111,25 +83,7 @@ export function useSavedKeywordsExport(params: {return {exporting,exportingSelection,- exportFilteredCsv,- exportFilteredSheets,- exportSelectionCsv,- exportSelectionSheets,+ exportFiltered,+ exportSelection,};}--function downloadKeywordCsv(rows: SavedKeywordRow[]) {- const csvRows = rows- .map(savedKeywordExportRow)- .map((row) =>- row.map((cell, index) =>- (index === 2 || index === 3) && typeof cell === "number"- ? cell.toFixed(2)- : cell,- ),- );- downloadCsv(- "saved-keywords.csv",- buildCsv(SAVED_KEYWORD_EXPORT_HEADERS, csvRows),- );-}diff --git a/src/client/features/search-performance/SearchPerformanceParts.tsx b/src/client/features/search-performance/SearchPerformanceParts.tsxindex 397209de..f779be2f 100644--- a/src/client/features/search-performance/SearchPerformanceParts.tsx+++ b/src/client/features/search-performance/SearchPerformanceParts.tsx@@ -21,13 +21,8 @@ import {type Report,type SearchPerformanceTableRow,} from "@/client/features/search-performance/SearchPerformanceColumns";-import {- buildCsv,- downloadCsv,- normalizeExportValue,- type CsvValue,-} from "@/client/lib/csv";-import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { normalizeExportValue, type CsvValue } from "@/client/lib/csv";+import { exportRows } from "@/client/lib/exportRows";import { captureClientEvent } from "@/client/lib/posthog";import {SEARCH_PERFORMANCE_PAGE_SIZES,@@ -43,7 +38,7 @@ type ExportTable = { filename: string; headers: string[]; rows: CsvValue[][] };function strikingExportTable(report: Report): ExportTable {const stamp = `${report.range.startDate}-to-${report.range.endDate}`;return {- filename: `search-performance-striking-distance-${stamp}.csv`,+ filename: `search-performance-striking-distance-${stamp}`,headers: ["Query", "Page", "Impressions", "Clicks", "Position"],rows: report.strikingDistance.map((row) => [row.query,@@ -62,7 +57,7 @@ function dimensionExportTable(): ExportTable {const isPage = dimension === "page";return {- filename: `search-performance-${isPage ? "pages" : "queries"}-${stamp}.csv`,+ filename: `search-performance-${isPage ? "pages" : "queries"}-${stamp}`,headers: [isPage ? "Page" : "Query","Clicks",@@ -81,18 +76,10 @@ function dimensionExportTable(}function runExport(table: ExportTable, target: ExportTarget): void {- if (target === "csv") {- downloadCsv(table.filename, buildCsv(table.headers, table.rows));- captureClientEvent("data:export", {- source_feature: "search_performance",- result_count: table.rows.length,- });- return;- }- void exportTableToSheets({- headers: table.headers,- rows: table.rows,+ void exportRows({+ format: target,feature: "search_performance",+ ...table,});}diff --git a/src/client/lib/csv.ts b/src/client/lib/csv.tsindex 7e1320cb..e53c6505 100644--- a/src/client/lib/csv.ts+++ b/src/client/lib/csv.ts@@ -48,13 +48,3 @@ function sanitizeCsvValue(return value;}--export function downloadCsv(filename: string, content: string): void {- const blob = new Blob([content], { type: "text/csv;charset=utf-8;" });- const url = URL.createObjectURL(blob);- const link = document.createElement("a");- link.href = url;- link.download = filename;- link.click();- URL.revokeObjectURL(url);-}diff --git a/src/client/lib/exportRows.test.ts b/src/client/lib/exportRows.test.tsnew file mode 100644index 00000000..5cdb6a81--- /dev/null+++ b/src/client/lib/exportRows.test.ts@@ -0,0 +1,61 @@+import { beforeEach, describe, expect, it, vi } from "vitest";+import { toast } from "sonner";+import { downloadFile } from "@/client/lib/download";+import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { captureClientEvent } from "@/client/lib/posthog";+import { exportRows, type ExportFormat } from "./exportRows";++vi.mock("sonner", () => ({ toast: { error: vi.fn(), success: vi.fn() } }));+vi.mock("@/client/lib/download", () => ({ downloadFile: vi.fn() }));+vi.mock("@/client/lib/exportToSheets", () => ({+ exportTableToSheets: vi.fn(),+}));+vi.mock("@/client/lib/posthog", () => ({ captureClientEvent: vi.fn() }));++const writeText = vi.fn();++describe("exportRows", () => {+ beforeEach(() => {+ vi.stubGlobal("navigator", { clipboard: { writeText } });+ });++ it.each<ExportFormat>(["csv", "excel", "json", "copy-json", "sheets"])(+ "refuses to export zero rows as %s",+ async (format) => {+ await exportRows({+ format,+ feature: "test",+ headers: ["Keyword"],+ rows: [],+ filename: "empty",+ });++ expect(toast.error).toHaveBeenCalledWith("No data to export");+ expect(downloadFile).not.toHaveBeenCalled();+ expect(exportTableToSheets).not.toHaveBeenCalled();+ expect(writeText).not.toHaveBeenCalled();+ expect(captureClientEvent).not.toHaveBeenCalled();+ },+ );++ it("downloads Excel as CSV with an .xls name and tracks the export", async () => {+ await exportRows({+ format: "excel",+ feature: "domain_overview",+ headers: ["Keyword"],+ rows: [["seo audit"]],+ filename: "openseo.so-keywords",+ });++ expect(downloadFile).toHaveBeenCalledWith(+ '"Keyword"\n"seo audit"',+ "openseo.so-keywords.xls",+ "text/csv",+ );+ expect(captureClientEvent).toHaveBeenCalledWith("data:export", {+ source_feature: "domain_overview",+ format: "excel",+ result_count: 1,+ });+ });+});diff --git a/src/client/lib/exportRows.ts b/src/client/lib/exportRows.tsnew file mode 100644index 00000000..b232f90a--- /dev/null+++ b/src/client/lib/exportRows.ts@@ -0,0 +1,73 @@+import { toast } from "sonner";+import { buildCsv, type CsvValue } from "@/client/lib/csv";+import { downloadFile } from "@/client/lib/download";+import { exportTableToSheets } from "@/client/lib/exportToSheets";+import { captureClientEvent } from "@/client/lib/posthog";++export type ExportFormat = "csv" | "excel" | "json" | "copy-json" | "sheets";++/**+ * One entry point for every table export, so each format shares the empty+ * check and the analytics event.+ */+export async function exportRows(args: {+ format: ExportFormat;+ /** PostHog `source_feature`. */+ feature: string;+ headers: string[];+ rows: CsvValue[][];+ /** File name without the extension. */+ filename: string;+ /** Records for the JSON formats. Defaults to `rows` keyed by `headers`. */+ records?: unknown[];+ /** Set when the export is the user's row selection. */+ scope?: "selection";+}): Promise<void> {+ const { format, feature, headers, rows, filename, scope } = args;+ if (rows.length === 0) {+ toast.error("No data to export");+ return;+ }++ // Sheets fires its own `data:export_sheets` event.+ if (format === "sheets") {+ await exportTableToSheets({ headers, rows, feature });+ return;+ }++ const records =+ args.records ??+ rows.map((row) =>+ Object.fromEntries(headers.map((header, i) => [header, row[i]])),+ );++ if (format === "copy-json") {+ try {+ await navigator.clipboard.writeText(JSON.stringify(records, null, 2));+ toast.success("Copied data");+ } catch {+ toast.error("Could not copy to clipboard");+ return;+ }+ } else if (format === "json") {+ downloadFile(+ JSON.stringify(records, null, 2),+ `${filename}.json`,+ "application/json",+ );+ } else {+ // "Excel" is the same CSV with an .xls extension, which Excel opens.+ downloadFile(+ buildCsv(headers, rows),+ `${filename}.${format === "excel" ? "xls" : "csv"}`,+ "text/csv",+ );+ }++ captureClientEvent("data:export", {+ source_feature: feature,+ format,+ result_count: rows.length,+ scope,+ });+}diff --git a/src/routes/_project/p/$projectId/saved.tsx b/src/routes/_project/p/$projectId/saved.tsxindex 3ae621d5..d98c74d6 100644--- a/src/routes/_project/p/$projectId/saved.tsx+++ b/src/routes/_project/p/$projectId/saved.tsx@@ -15,6 +15,7 @@ import type {} from "@tanstack/react-table";import { useEffect, useMemo, useState } from "react";import { toast } from "sonner";+import { TablePagination } from "@/client/components/table/TablePagination";import { SavedKeywordsBulkActionBar } from "@/client/features/saved-keywords/SavedKeywordsBulkActionBar";import { SavedKeywordsBulkTagsModal } from "@/client/features/saved-keywords/SavedKeywordsBulkTagsModal";import { SavedKeywordsFilters } from "@/client/features/saved-keywords/SavedKeywordsFilters";@@ -23,13 +24,11 @@ import {DeleteSavedKeywordsModal,RemoveSavedKeywordsError,} from "@/client/features/saved-keywords/SavedKeywordsModals";-import { SavedKeywordsPagination } from "@/client/features/saved-keywords/SavedKeywordsPagination";-import { SavedKeywordsStatus } from "@/client/features/saved-keywords/SavedKeywordsStatus";import { SavedKeywordsTable } from "@/client/features/saved-keywords/SavedKeywordsTable";import { compileSavedKeywordsFilters } from "@/client/features/saved-keywords/savedKeywordsFilterTypes";import {+ SAVED_KEYWORD_PAGE_SIZES,toSavedKeywordSort,- type SAVED_KEYWORD_PAGE_SIZES,} from "@/client/features/saved-keywords/savedKeywordsUtils";import { useSavedKeywordsExport } from "@/client/features/saved-keywords/useSavedKeywordsExport";import { useSavedKeywordsFilters } from "@/client/features/saved-keywords/useSavedKeywordsFilters";@@ -83,10 +82,6 @@ function SavedKeywordsPage() {() => compileSavedKeywordsFilters(committedFilterValues),[committedFilterValues],);- const exportFilters = useMemo(- () => compileSavedKeywordsFilters(filters.values),- [filters.values],- );const sortState = sorting[0];const sort = toSavedKeywordSort(sortState?.id);@@ -121,7 +116,6 @@ function SavedKeywordsPage() {const savedKeywords = data?.rows ?? [];const availableTags = data?.tags ?? [];const totalCount = data?.totalCount ?? 0;- const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));const selectedRows = savedKeywords.filter((row) => rowSelection[row.id]);const selectedIds = selectedRows.map((row) => row.id);const selectedCount = selectedIds.length;@@ -142,10 +136,6 @@ function SavedKeywordsPage() {setRowSelection({});}, [page, pageSize, appliedFilters, tagFilterKey, sort, order]);- useEffect(() => {- if (page > totalPages) setPage(totalPages);- }, [page, totalPages]);-const invalidateSavedKeywords = () =>queryClient.invalidateQueries({ queryKey: ["savedKeywords", projectId] });@@ -206,7 +196,7 @@ function SavedKeywordsPage() {const tagManage = useTagManage(projectId);const exporter = useSavedKeywordsExport({projectId,- appliedFilters: exportFilters,+ appliedFilters,selectedTagIds,sort,order,@@ -239,8 +229,8 @@ function SavedKeywordsPage() {totalCount={totalCount}exporting={exporter.exporting}metricsRefreshing={refreshMetricsMutation.isPending}- onExportCsv={() => void exporter.exportFilteredCsv()}- onExportSheets={() => void exporter.exportFilteredSheets()}+ onExportCsv={() => void exporter.exportFiltered("csv")}+ onExportSheets={() => void exporter.exportFiltered("sheets")}onRefreshMetrics={() => refreshMetricsMutation.mutate()}/>@@ -274,10 +264,6 @@ function SavedKeywordsPage() {{removeError ? (<RemoveSavedKeywordsError message={removeError} />) : null}- <SavedKeywordsStatus- totalCount={totalCount}- isFetching={isFetching && !isLoading}- /><SavedKeywordsTablerows={savedKeywords}rowSelection={rowSelection}@@ -289,9 +275,10 @@ function SavedKeywordsPage() {/></div>- <SavedKeywordsPagination+ <TablePaginationpage={page}pageSize={pageSize}+ pageSizes={SAVED_KEYWORD_PAGE_SIZES}totalCount={totalCount}isLoading={isFetching}onPageChange={setPage}@@ -317,9 +304,9 @@ function SavedKeywordsPage() {);}}onOpenTags={() => setShowTagModal(true)}- onExportCsv={() => exporter.exportSelectionCsv(selectedRows)}+ onExportCsv={() => void exporter.exportSelection("csv", selectedRows)}onExportSheets={() =>- void exporter.exportSelectionSheets(selectedRows)+ void exporter.exportSelection("sheets", selectedRows)}onDelete={() => setShowConfirm(true)}onClear={() => setRowSelection({})}