The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
linkIds → linkId across routes
Pedro Ladeira4d950cf622e1
diff --git a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts b/apps/web/app/(ee)/api/cron/export/events/partner/route.tsindex ec5ad30c7f..02b8235779 100644--- a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts+++ b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts@@ -18,7 +18,7 @@ import {import { sendEmail } from "@dub/email";import ExportReady from "@dub/email/templates/export-ready";import { prisma } from "@dub/prisma";-import { capitalize, log } from "@dub/utils";+import { capitalize, log, parseFilterValue } from "@dub/utils";import * as z from "zod/v4";import { logAndRespond } from "../../../utils";import { fetchEventsBatch } from "../fetch-events-batch";@@ -105,7 +105,7 @@ export async function POST(req: Request) {? { linkId: resolvedLinkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId }- : { linkIds: links.map((link) => link.id) }),+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),dataAvailableFrom: dataAvailableFrom? new Date(dataAvailableFrom): program.startedAt ?? program.createdAt,diff --git a/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts b/apps/web/app/(ee)/api/embed/referrals/analytics/route.tsindex 81920632e0..a216817e63 100644--- a/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts+++ b/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts@@ -1,5 +1,6 @@import { getAnalytics } from "@/lib/analytics/get-analytics";import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";+import { parseFilterValue } from "@dub/utils";import { NextResponse } from "next/server";// GET /api/embed/referrals/analytics – get timeseries analytics for a partner@@ -12,7 +13,7 @@ export const GET = withReferralsEmbedToken(async ({ links, program }) => {event: "composite",groupBy: "timeseries",interval: "1y",- linkIds: links.map((link) => link.id),+ linkId: parseFilterValue(links.map((link) => link.id)),dataAvailableFrom: program.startedAt ?? program.createdAt,});diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.tsindex bf3c0cd068..ff41c21c19 100644--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts@@ -1,6 +1,7 @@import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";+import { parseFilterValue } from "@dub/utils";import { convertToCSV } from "@/lib/analytics/utils";import { DubApiError } from "@/lib/api/errors";import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";@@ -38,10 +39,11 @@ export const GET = withPartnerProfile(const parsedParams = partnerProfileAnalyticsQuerySchema.parse(searchParams);- let { linkId, domain: domainFilter, key, ...rest } = parsedParams;+ let { linkId: linkIdFilter, domain: domainFilter, key, ...rest } = parsedParams;- // Extract string value for link lookup+ // Extract string values for link lookupconst domain = getFirstFilterValue(domainFilter);+ let linkId = getFirstFilterValue(linkIdFilter);if (linkId) {if (!links.some((link) => link.id === linkId)) {@@ -93,7 +95,7 @@ export const GET = withPartnerProfile(? { linkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId: partner.id }- : { linkIds: links.map((link) => link.id) }),+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),dataAvailableFrom: program.startedAt ?? program.createdAt,groupBy: endpoint,});diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.tsindex 78e12f299d..4bbca00b75 100644--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts@@ -1,5 +1,6 @@import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";+import { parseFilterValue } from "@dub/utils";import { DubApiError } from "@/lib/api/errors";import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";import { withPartnerProfile } from "@/lib/auth/partner";@@ -25,13 +26,14 @@ export const GET = withPartnerProfile(});let {- linkId,+ linkId: linkIdFilter,domain: domainFilter,key,...rest} = partnerProfileAnalyticsQuerySchema.parse(searchParams);const domain = getFirstFilterValue(domainFilter);+ let linkId = getFirstFilterValue(linkIdFilter);if (linkId) {if (!links.some((link) => link.id === linkId)) {@@ -64,7 +66,7 @@ export const GET = withPartnerProfile(? { linkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId: partner.id }- : { linkIds: links.map((link) => link.id) }),+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),dataAvailableFrom: program.startedAt ?? program.createdAt,});diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.tsindex 1d74bf226b..84d7a3c738 100644--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts@@ -20,7 +20,11 @@ import {PartnerProfileLinkSchema,partnerProfileEventsQuerySchema,} from "@/lib/zod/schemas/partner-profile";-import { APP_DOMAIN_WITH_NGROK, capitalize } from "@dub/utils";+import {+ APP_DOMAIN_WITH_NGROK,+ capitalize,+ parseFilterValue,+} from "@dub/utils";import { NextResponse } from "next/server";import * as z from "zod/v4";@@ -60,9 +64,15 @@ export const GET = withPartnerProfile(.parse(searchParams);const { event, columns: columnsParam } = parsedParams;- let { linkId, domain: domainFilter, key, ...rest } = parsedParams;+ let {+ linkId: linkIdFilter,+ domain: domainFilter,+ key,+ ...rest+ } = parsedParams;const domain = getFirstFilterValue(domainFilter);+ let linkId = getFirstFilterValue(linkIdFilter);// Default columns based on event type if not providedconst defaultColumns: Record<string, string[]> = {@@ -123,7 +133,7 @@ export const GET = withPartnerProfile(? { linkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId: partner.id }- : { linkIds: links.map((link) => link.id) }),+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),dataAvailableFrom: program.startedAt ?? program.createdAt,});@@ -165,7 +175,7 @@ export const GET = withPartnerProfile(? { linkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId: partner.id }- : { linkIds: links.map((link) => link.id) }),+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),dataAvailableFrom: program.startedAt ?? program.createdAt,limit: MAX_EVENTS_TO_EXPORT,});diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.tsindex 4e2bf77e13..339092af1e 100644--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts@@ -1,5 +1,6 @@import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getEvents } from "@/lib/analytics/get-events";+import { parseFilterValue } from "@dub/utils";import { DubApiError } from "@/lib/api/errors";import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";import { withPartnerProfile } from "@/lib/auth/partner";@@ -40,13 +41,14 @@ export const GET = withPartnerProfile(}let {- linkId,+ linkId: linkIdFilter,domain: domainFilter,key,...rest} = partnerProfileEventsQuerySchema.parse(searchParams);const domain = getFirstFilterValue(domainFilter);+ let linkId = getFirstFilterValue(linkIdFilter);if (linkId) {if (!links.some((link) => link.id === linkId)) {@@ -80,7 +82,7 @@ export const GET = withPartnerProfile(? { linkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId: partner.id }- : { linkIds: links.map((link) => link.id) }),+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),dataAvailableFrom: program.startedAt ?? program.createdAt,});diff --git a/apps/web/app/(ee)/api/partners/analytics/route.ts b/apps/web/app/(ee)/api/partners/analytics/route.tsindex f3e0c79d8d..976ca0de9f 100644--- a/apps/web/app/(ee)/api/partners/analytics/route.ts+++ b/apps/web/app/(ee)/api/partners/analytics/route.ts@@ -1,5 +1,6 @@import { getAnalytics } from "@/lib/analytics/get-analytics";import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";+import { parseFilterValue } from "@dub/utils";import { DubApiError } from "@/lib/api/errors";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { withWorkspace } from "@/lib/auth";@@ -72,7 +73,7 @@ export const GET = withWorkspace(const analytics = await getAnalytics({event: "composite",groupBy,- linkIds: programEnrollment.links.map((link) => link.id),+ linkId: parseFilterValue(programEnrollment.links.map((link) => link.id)),interval,start,end,diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.tsindex ccaf0cfbb1..6c2cf40f4e 100644--- a/apps/web/lib/analytics/get-analytics.ts+++ b/apps/web/lib/analytics/get-analytics.ts@@ -42,6 +42,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {query,} = params;+ const normalizedLinkId = ensureParsedFilter(linkId);+// get all-time clicks count if:// 1. linkId is defined// 2. type is count@@ -49,7 +51,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {// 4. no custom start or end date is provided// 5. no other dimensional filters are appliedif (- linkId &&+ normalizedLinkId &&groupBy === "count" &&interval === "all" &&!start &&@@ -58,7 +60,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {(filter) => !params[filter as keyof AnalyticsFilters],)) {- const linkIdPlaceholders = linkId.values.map(() => "?").join(",");+ const linkIdPlaceholders = normalizedLinkId.values.map(() => "?").join(",");const aggregateColumns =event === "composite"? `SUM(clicks) as clicks, SUM(leads) as leads, SUM(sales) as sales, SUM(saleAmount) as saleAmount`@@ -68,7 +70,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {const response = await conn.execute(`SELECT ${aggregateColumns} FROM Link WHERE id IN (${linkIdPlaceholders})`,- linkId.values,+ normalizedLinkId.values,);return analyticsResponse["count"].parse(response.rows[0]);@@ -151,6 +153,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {} = extractWorkspaceLinkFilters({...params,partnerId: partnerIdFilter,+ linkId: normalizedLinkId,});const tinybirdParams: any = {diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.tsindex 908f97e702..fbe9e718e8 100644--- a/apps/web/lib/analytics/get-events.ts+++ b/apps/web/lib/analytics/get-events.ts@@ -108,6 +108,7 @@ export const getEvents = async (params: EventsFilters) => {const allFilters = [...metadataFilters, ...advancedFilters];const partnerIdFilter = ensureParsedFilter(params.partnerId);+ const linkIdFilter = ensureParsedFilter(params.linkId);const {linkId: linkIdParam,@@ -129,6 +130,7 @@ export const getEvents = async (params: EventsFilters) => {} = extractWorkspaceLinkFilters({...params,partnerId: partnerIdFilter,+ linkId: linkIdFilter,});const tinybirdParams: any = {diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.tsindex cf4313e2be..e6bedd41ef 100644--- a/apps/web/lib/analytics/types.ts+++ b/apps/web/lib/analytics/types.ts@@ -39,15 +39,19 @@ export type AnalyticsSaleUnit = (typeof ANALYTICS_SALE_UNIT)[number];export type DeviceTabs = "devices" | "browsers" | "os" | "triggers";export type AnalyticsFilters = Partial<- Omit<z.infer<typeof analyticsQuerySchema>, "start" | "end" | "partnerId">+ Omit<+ z.infer<typeof analyticsQuerySchema>,+ "start" | "end" | "partnerId" | "linkId"+ >> & {workspaceId?: string;dataAvailableFrom?: Date;isDeprecatedClicksEndpoint?: boolean;start?: Date | null;end?: Date | null;- // Accept plain string (from partner-profile routes) or ParsedFilter (from API schema)+ // Accept plain string (from partner-profile/cron routes) or ParsedFilter (from API schema)partnerId?: string | ParsedFilter;+ linkId?: string | ParsedFilter;};// Structural fields from eventsQuerySchema that should remain required@@ -59,7 +63,7 @@ type EventsStructuralFields = Pick<export type EventsFilters = Partial<Omit<z.infer<typeof eventsQuerySchema>,- "start" | "end" | "partnerId" | keyof EventsStructuralFields+ "start" | "end" | "partnerId" | "linkId" | keyof EventsStructuralFields>> &EventsStructuralFields & {@@ -68,8 +72,9 @@ export type EventsFilters = Partial<customerId?: string;start?: Date | null;end?: Date | null;- // Accept plain string (from partner-profile routes) or ParsedFilter (from API schema)+ // Accept plain string (from partner-profile/cron routes) or ParsedFilter (from API schema)partnerId?: string | ParsedFilter;+ linkId?: string | ParsedFilter;};const partnerAnalyticsSchema = analyticsQuerySchema@@ -79,11 +84,12 @@ const partnerAnalyticsSchema = analyticsQuerySchemastart: true,end: true,groupBy: true,- linkId: true,}).partial();-export type PartnerAnalyticsFilters = z.infer<typeof partnerAnalyticsSchema>;+export type PartnerAnalyticsFilters = z.infer<typeof partnerAnalyticsSchema> & {+ linkId?: string;+};export type PartnerEarningsTimeseriesFilters = z.infer<typeof getPartnerEarningsTimeseriesSchema>;diff --git a/apps/web/scripts/misc/restore-link-analytics.ts b/apps/web/scripts/misc/restore-link-analytics.tsindex b6c3be30f1..9597b4f3b5 100644--- a/apps/web/scripts/misc/restore-link-analytics.ts+++ b/apps/web/scripts/misc/restore-link-analytics.ts@@ -1,5 +1,5 @@import { prisma } from "@dub/prisma";-import { chunk } from "@dub/utils";+import { chunk, parseFilterValue } from "@dub/utils";import "dotenv-flow/config";import * as fs from "fs";import * as Papa from "papaparse";@@ -28,7 +28,7 @@ async function main() {const stats = await getAnalytics({event: "composite",groupBy: "top_links",- linkIds,+ linkId: parseFilterValue(linkIds),interval: "1y",});if (stats.length === 0) {