The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
fix exports, isAdvancedFilter
Steven Teyf96b6c4a3af5
diff --git a/apps/web/app/(ee)/api/cron/export/events/workspace/route.ts b/apps/web/app/(ee)/api/cron/export/events/workspace/route.tsindex d264030b57..d497fe824b 100644--- a/apps/web/app/(ee)/api/cron/export/events/workspace/route.ts+++ b/apps/web/app/(ee)/api/cron/export/events/workspace/route.ts@@ -24,9 +24,6 @@ const payloadSchema = eventsQuerySchema.extend({.pipe(z.string().array()),workspaceId: z.string(),userId: z.string(),- linkId: z.string().optional(),- folderIds: z.array(z.string()).optional(),- dataAvailableFrom: z.string().optional(),});// POST /api/cron/export/events/workspace - QStash worker for processing large event exports@@ -39,7 +36,7 @@ export async function POST(req: Request) {rawBody,});- const { columns, workspaceId, userId, ...filters } = payloadSchema.parse(+ const { columns, userId, ...filters } = payloadSchema.parse(JSON.parse(rawBody),);@@ -62,7 +59,7 @@ export async function POST(req: Request) {const workspace = await prisma.project.findUnique({where: {- id: workspaceId,+ id: filters.workspaceId,},select: {id: true,@@ -73,26 +70,14 @@ export async function POST(req: Request) {if (!workspace) {return logAndRespond(- `Workspace ${workspaceId} not found. Skipping the export.`,+ `Workspace ${filters.workspaceId} not found. Skipping the export.`,);}- const { linkId, folderIds, dataAvailableFrom, ...eventFilters } = filters;-// Fetch events in batches and build CSVconst allEvents: Record<string, any>[] = [];- const eventsFilters = {- ...eventFilters,- ...(linkId && { linkId }),- workspaceId,- folderIds,- dataAvailableFrom: dataAvailableFrom- ? new Date(dataAvailableFrom)- : workspace.createdAt,- };-- for await (const { events } of fetchEventsBatch(eventsFilters)) {+ for await (const { events } of fetchEventsBatch(filters)) {const formattedEvents = events.map((row) =>Object.fromEntries(columns.map((c) => [diff --git a/apps/web/app/(ee)/api/events/export/route.ts b/apps/web/app/(ee)/api/events/export/route.tsindex 2fe17be449..caeade5417 100644--- a/apps/web/app/(ee)/api/events/export/route.ts+++ b/apps/web/app/(ee)/api/events/export/route.ts@@ -5,7 +5,6 @@ import {import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";import { getEvents } from "@/lib/analytics/get-events";-import { getFolderIdsToFilter } from "@/lib/analytics/get-folder-ids-to-filter";import { convertToCSV } from "@/lib/analytics/utils";import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";@@ -14,50 +13,63 @@ import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-rimport { withWorkspace } from "@/lib/auth";import { qstash } from "@/lib/cron";import { verifyFolderAccess } from "@/lib/folder/permissions";-import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";+import { parseEventsQuery } from "@/lib/zod/schemas/analytics";+import { Link } from "@dub/prisma/client";import { APP_DOMAIN_WITH_NGROK, capitalize } from "@dub/utils";import { NextResponse } from "next/server";import * as z from "zod/v4";const MAX_EVENTS_TO_EXPORT = 1000;+const exportQuerySchema = z+ .object({+ columns: z+ .string()+ .transform((c) => c.split(","))+ .pipe(z.string().array()),+ })+ .passthrough();+// GET /api/events/export – export events to CSV (with async support if >1000 events)export const GET = withWorkspace(async ({ searchParams, workspace, session }) => {throwIfClicksUsageExceeded(workspace);- const parsedParams = eventsQuerySchema- .extend({- columns: z- .string()- .transform((c) => c.split(","))- .pipe(z.string().array()),- })- .parse(searchParams);+ const parsedParams = parseEventsQuery(searchParams);+ const { columns } = exportQuerySchema.parse(searchParams);const {event,- domain: domainFilter,interval,start,end,- columns,+ linkId: linkIdFilter,+ externalId,+ domain: domainFilter,key,folderId: folderIdFilter,} = parsedParams;// Extract string values for specific link/folder lookupconst domain = getFirstFilterValue(domainFilter);+ const linkId = getFirstFilterValue(linkIdFilter);const folderId = getFirstFilterValue(folderIdFilter);+ let link: Link | null = null;+if (domain) {await getDomainOrThrow({ workspace, domain });}- const link =- domain && key- ? await getLinkOrThrow({ workspaceId: workspace.id, domain, key })- : null;+ if (linkId || externalId || (domain && key)) {+ link = await getLinkOrThrow({+ workspaceId: workspace.id,+ linkId,+ externalId,+ domain,+ key,+ });+ }const folderIdToVerify = link?.folderId || folderId;if (folderIdToVerify) {@@ -77,19 +89,10 @@ export const GET = withWorkspace(end,});- const folderIds = folderIdToVerify- ? undefined- : await getFolderIdsToFilter({- workspace,- userId: session.user.id,- });-// Count events using getAnalytics with groupBy: "count"const countResponse = await getAnalytics({...parsedParams,groupBy: "count",- ...(link && { linkId: link.id }),- folderIds,workspaceId: workspace.id,dataAvailableFrom: workspace.createdAt,});@@ -111,9 +114,6 @@ export const GET = withWorkspace(...searchParams,workspaceId: workspace.id,userId: session.user.id,- ...(link && { linkId: link.id }),- folderIds: folderIds ? folderIds : undefined,- dataAvailableFrom: workspace.createdAt.toISOString(),},});@@ -122,10 +122,9 @@ export const GET = withWorkspace(const response = await getEvents({...parsedParams,- ...(link && { linkId: link.id }),+ event,workspaceId: workspace.id,limit: MAX_EVENTS_TO_EXPORT,- folderIds,});const data = response.map((row) =>diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.tsindex 99807b67bc..db5344d007 100644--- a/apps/web/app/api/analytics/export/route.ts+++ b/apps/web/app/api/analytics/export/route.ts@@ -1,12 +1,15 @@import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";import { getAnalytics } from "@/lib/analytics/get-analytics";-import { getFolderIdsToFilter } from "@/lib/analytics/get-folder-ids-to-filter";import { convertToCSV } from "@/lib/analytics/utils";import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";+import { DubApiError } from "@/lib/api/errors";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";+import { prefixWorkspaceId } from "@/lib/api/workspaces/workspace-id";import { withWorkspace } from "@/lib/auth";import { verifyFolderAccess } from "@/lib/folder/permissions";import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";@@ -24,19 +27,38 @@ export const GET = withWorkspace(interval,start,end,- linkId,+ linkId: linkIdFilter,externalId,domain: domainFilter,key,folderId: folderIdFilter,+ programId,} = parsedParams;// Extract string values for specific link/folder lookupconst domain = getFirstFilterValue(domainFilter);+ const linkId = getFirstFilterValue(linkIdFilter);const folderId = getFirstFilterValue(folderIdFilter);let link: Link | null = null;+ let programStartedAt: Date | null | undefined = null;+ if (programId) {+ const workspaceProgramId = getDefaultProgramIdOrThrow(workspace);+ if (programId !== workspaceProgramId) {+ throw new DubApiError({+ code: "forbidden",+ message: `Program ${programId} does not belong to workspace ${prefixWorkspaceId(workspace.id)}.`,+ });+ }+ // dataAvailableFrom for timeseries is resolved per-endpoint below+ const program = await getProgramOrThrow({+ workspaceId: workspace.id,+ programId,+ });+ programStartedAt = program.startedAt;+ }+if (domain) {await getDomainOrThrow({ workspace, domain });}@@ -70,13 +92,6 @@ export const GET = withWorkspace(end,});- const folderIds = folderIdToVerify- ? undefined- : await getFolderIdsToFilter({- workspace,- userId: session.user.id,- });-const zip = new JSZip();await Promise.all(@@ -90,10 +105,11 @@ export const GET = withWorkspace(const response = await getAnalytics({...parsedParams,workspaceId: workspace.id,- ...(link && { linkId: link.id }),groupBy: endpoint,- folderIds,- folderId: folderIdFilter || undefined,+ isDeprecatedClicksEndpoint: false,+ ...(endpoint === "timeseries" && {+ dataAvailableFrom: programStartedAt ?? workspace.createdAt,+ }),});if (!response || response.length === 0) return;diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsxindex e746f10134..2321472d5f 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsx@@ -100,7 +100,7 @@ export function ProgramAnalyticsPageClient() {onSelect={onSelect}onRemove={onRemove}onOpenFilter={onOpenFilter}- isAdvancedFilter={true}+ isAdvancedFilteraskAI/><SimpleDateRangePicker align="start" className="w-fit" />@@ -134,7 +134,7 @@ export function ProgramAnalyticsPageClient() {onRemoveFilter={onRemoveFilter}onRemoveAll={onRemoveAll}onToggleOperator={onToggleOperator}- isAdvancedFilter={true}+ isAdvancedFilter/></div></div>diff --git a/apps/web/ui/analytics/toggle.tsx b/apps/web/ui/analytics/toggle.tsxindex fcf3dbbcac..d4a65f1851 100644--- a/apps/web/ui/analytics/toggle.tsx+++ b/apps/web/ui/analytics/toggle.tsx@@ -83,7 +83,7 @@ export function AnalyticsToggle({onSelect={onSelect}onRemove={onRemove}onOpenFilter={onOpenFilter}- isAdvancedFilter={true}+ isAdvancedFilteraskAI/>);@@ -294,7 +294,7 @@ export function AnalyticsToggle({onRemoveFilter={onRemoveFilter}onRemoveAll={onRemoveAll}onToggleOperator={onToggleOperator}- isAdvancedFilter={true}+ isAdvancedFilter/><divclassName={cn(