The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Improve link sort efficiency (#3981)
Steven Teyedbc8b8a1636
diff --git a/apps/web/app/api/links/export/route.ts b/apps/web/app/api/links/export/route.tsindex 0c774f6893..d755447e81 100644--- a/apps/web/app/api/links/export/route.ts+++ b/apps/web/app/api/links/export/route.ts@@ -6,7 +6,10 @@ import { getLinksForWorkspace } from "@/lib/api/links/get-links-for-workspace";import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";import { validateLinksQueryFilters } from "@/lib/api/links/validate-links-query-filters";import { withWorkspace } from "@/lib/auth";-import { MEGA_WORKSPACE_LINKS_LIMIT } from "@/lib/constants/misc";+import {+ MEGA_WORKSPACE_LINKS_LIMIT,+ SORTABLE_LINKS_LIMIT,+} from "@/lib/constants/misc";import { qstash } from "@/lib/cron";import { linksExportQuerySchema } from "@/lib/zod/schemas/links";import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";@@ -62,6 +65,10 @@ export const GET = withWorkspace(startDate,endDate,}),+ sortBy:+ workspace.totalLinks > SORTABLE_LINKS_LIMIT+ ? "createdAt"+ : filters.sortBy,searchMode:workspace.totalLinks > MEGA_WORKSPACE_LINKS_LIMIT ? "exact" : "fuzzy",includeDashboard: false,diff --git a/apps/web/app/api/links/route.ts b/apps/web/app/api/links/route.tsindex c67509e985..779d3c305b 100644--- a/apps/web/app/api/links/route.ts+++ b/apps/web/app/api/links/route.ts@@ -4,7 +4,10 @@ import { throwIfLinksUsageExceeded } from "@/lib/api/links/usage-checks";import { validateLinksQueryFilters } from "@/lib/api/links/validate-links-query-filters";import { parseRequestBody } from "@/lib/api/utils";import { withWorkspace } from "@/lib/auth";-import { MEGA_WORKSPACE_LINKS_LIMIT } from "@/lib/constants/misc";+import {+ MEGA_WORKSPACE_LINKS_LIMIT,+ SORTABLE_LINKS_LIMIT,+} from "@/lib/constants/misc";import { ratelimit } from "@/lib/upstash";import { sendWorkspaceWebhook } from "@/lib/webhook/publish";import {@@ -31,6 +34,10 @@ export const GET = withWorkspace(...filters,workspaceId: workspace.id,folderIds,+ sortBy:+ workspace.totalLinks > SORTABLE_LINKS_LIMIT+ ? "createdAt"+ : filters.sortBy,searchMode:workspace.totalLinks > MEGA_WORKSPACE_LINKS_LIMIT ? "exact" : "fuzzy",});diff --git a/apps/web/lib/api/links/get-links-for-workspace.ts b/apps/web/lib/api/links/get-links-for-workspace.tsindex e0a25ae9dc..8d54c50ef8 100644--- a/apps/web/lib/api/links/get-links-for-workspace.ts+++ b/apps/web/lib/api/links/get-links-for-workspace.ts@@ -24,7 +24,6 @@ export async function getLinksForWorkspace(filters: GetLinksForWorkspaceProps) {tagNames,search,searchMode,- sort,userId,showArchived,withTags,@@ -40,12 +39,10 @@ export async function getLinksForWorkspace(filters: GetLinksForWorkspaceProps) {endDate,} = filters;- // Support legacy sort param- if (sort && sort !== "createdAt") {- filters = { ...filters, sortBy: sort };- }-- const paginationQuery = buildPaginationQuery(filters);+ const paginationQuery = buildPaginationQuery({+ ...filters,+ sortOrder: "desc",+ });// Validate the provided cursor IDconst cursorId = filters.startingAfter || filters.endingBefore;diff --git a/apps/web/lib/constants/misc.ts b/apps/web/lib/constants/misc.tsindex 67acabbdce..452a117869 100644--- a/apps/web/lib/constants/misc.ts+++ b/apps/web/lib/constants/misc.ts@@ -1,5 +1,6 @@export const REFERRALS_EMBED_EARNINGS_LIMIT = 8;export const CUSTOMER_PAGE_EVENTS_LIMIT = 8;+export const SORTABLE_LINKS_LIMIT = 10_000;export const MEGA_WORKSPACE_LINKS_LIMIT = 1_000_000;export const MIN_PAYOUT_AMOUNT_FOR_REMINDERS = 10_00;export const SLACK_SUPPORT_INVITE_MAX_EMAILS = 5;diff --git a/apps/web/lib/zod/schemas/links.ts b/apps/web/lib/zod/schemas/links.tsindex cd543ea3fb..b1e550830f 100644--- a/apps/web/lib/zod/schemas/links.ts+++ b/apps/web/lib/zod/schemas/links.ts@@ -156,23 +156,12 @@ const LinksQuerySchema = z.object({.meta({ deprecated: true }),});-const sortBy = z+const linksSortBy = z.enum(["createdAt", "clicks", "saleAmount", "lastClicked"]).optional()- .default("createdAt")- .describe("The field to sort the links by. The default is `createdAt`.");+ .default("createdAt");-export const getLinksQuerySchemaBase = LinksQuerySchema.extend({- sortBy,- sortOrder: z- .enum(["asc", "desc"])- .optional()- .default("desc")- .describe("The sort order. The default is `desc`."),- sort: sortBy- .meta({ deprecated: true })- .describe("DEPRECATED. Use `sortBy` instead."),-}).extend({+export const getLinksQuerySchemaBase = LinksQuerySchema.extend({}).extend({...getCursorPaginationQuerySchema({example: "link_1KAP4CDPBSVMMBMH9XX3YZZ0Z...",}),@@ -275,6 +264,7 @@ export const exportLinksColumnsDefault = exportLinksColumnsexport const linksExportQuerySchema = getLinksQuerySchemaBase.omit({ page: true, pageSize: true }).extend({+ sortBy: linksSortBy,columns: z.string().default(exportLinksColumnsDefault.join(","))@@ -857,6 +847,7 @@ export const getLinkInfoQuerySchema = domainKeySchema.partial().extend({export const getLinksQuerySchemaExtended = getLinksQuerySchemaBase.extend({// Only Dub UI uses the following query parameters+ sortBy: linksSortBy,includeUser: booleanQuerySchema.default(false),includeWebhooks: booleanQuerySchema.default(false),includeDashboard: booleanQuerySchema.default(false),diff --git a/apps/web/ui/links/link-display.tsx b/apps/web/ui/links/link-display.tsxindex 401c52e080..d38f0a3fb3 100644--- a/apps/web/ui/links/link-display.tsx+++ b/apps/web/ui/links/link-display.tsx@@ -1,3 +1,4 @@+import { SORTABLE_LINKS_LIMIT } from "@/lib/constants/misc";import {linksDisplayProperties,LinksViewMode,@@ -37,7 +38,7 @@ export default function LinkDisplay() {reset,} = useContext(LinksDisplayContext);- const { isMegaWorkspace } = useWorkspace();+ const { totalLinks, isMegaWorkspace } = useWorkspace();const [openPopover, setOpenPopover] = useState(false);const { queryParams } = useRouterStuff();@@ -79,7 +80,7 @@ export default function LinkDisplay() {);})}</div>- {!isMegaWorkspace && (+ {totalLinks && totalLinks < SORTABLE_LINKS_LIMIT && (<div className="flex h-16 items-center justify-between gap-2 px-4"><span className="flex items-center gap-2"><ArrowsOppositeDirectionY className="h-4 w-4 text-neutral-800" />