Advanced Analytics Filters

apps/web/app/(ee)/api/admin/analytics/route.ts

@@ -1,11 +1,11 @@
 import { getAnalytics } from "@/lib/analytics/get-analytics";
 import { withAdmin } from "@/lib/auth";
-import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
 import { NextResponse } from "next/server";
 
 // GET /api/admin/analytics – get analytics for admin
 export const GET = withAdmin(async ({ searchParams }) => {
-  const parsedParams = analyticsQuerySchema.parse(searchParams);
+  const parsedParams = parseAnalyticsQuery(searchParams);
 
   const response = await getAnalytics(parsedParams);
 

apps/web/app/(ee)/api/admin/events/route.ts

@@ -1,11 +1,11 @@
 import { getEvents } from "@/lib/analytics/get-events";
 import { withAdmin } from "@/lib/auth";
-import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseEventsQuery } from "@/lib/zod/schemas/analytics";
 import { NextResponse } from "next/server";
 
 // GET /api/admin/events – get events for admin
 export const GET = withAdmin(async ({ searchParams }) => {
-  const parsedParams = eventsQuerySchema.parse(searchParams);
+  const parsedParams = parseEventsQuery(searchParams);
 
   const response = await getEvents(parsedParams);
 

apps/web/app/(ee)/api/cron/usage/utils.ts

@@ -122,7 +122,7 @@ export const updateUsage = async () => {
           event: "clicks",
           groupBy: "top_links",
           interval: "30d",
-          root: false,
+          root: { values: ["false"], operator: "IS", sqlOperator: "IN" },
         });
 
         const topFive = topLinks.slice(0, 5);

apps/web/app/(ee)/api/events/route.ts

@@ -6,7 +6,7 @@ import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
 import { withWorkspace } from "@/lib/auth";
 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 { NextResponse } from "next/server";
 
@@ -15,7 +15,7 @@ export const GET = withWorkspace(
   async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
-    const parsedParams = eventsQuerySchema.parse(searchParams);
+    const parsedParams = parseEventsQuery(searchParams);
 
     let {
       event,
@@ -24,11 +24,19 @@ export const GET = withWorkspace(
       end,
       linkId,
       externalId,
-      domain,
+      domain: domainFilter,
       key,
-      folderId,
+      folderId: folderIdFilter,
     } = parsedParams;
 
+    // Extract string values for specific link/folder lookup
+    const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter 
+      ? domainFilter.values[0] 
+      : undefined;
+    const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+      ? folderIdFilter.values[0]
+      : undefined;
+
     let link: Link | null = null;
 
     if (domain) {
@@ -78,7 +86,7 @@ export const GET = withWorkspace(
       ...(link && { linkId: link.id }),
       workspaceId: workspace.id,
       folderIds,
-      folderId: folderId || "",
+      folderId: folderIdFilter || undefined,
     });
     console.timeEnd("getEvents");
 

apps/web/app/api/analytics/dashboard/route.ts

@@ -4,7 +4,7 @@ import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-r
 import { exceededLimitError } from "@/lib/exceeded-limit-error";
 import { PlanProps } from "@/lib/types";
 import { redis } from "@/lib/upstash";
-import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
 import { prisma } from "@dub/prisma";
 import { DUB_DEMO_LINKS, DUB_WORKSPACE_ID, getSearchParams } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
@@ -16,9 +16,17 @@ export const dynamic = "force-dynamic";
 export const GET = async (req: Request) => {
   try {
     const searchParams = getSearchParams(req.url);
-    const parsedParams = analyticsQuerySchema.parse(searchParams);
+    const parsedParams = parseAnalyticsQuery(searchParams);
 
-    const { domain, key, folderId, interval, start, end } = parsedParams;
+    const { domain: domainFilter, key, folderId: folderIdFilter, interval, start, end } = parsedParams;
+
+    // Extract string values for specific link/folder lookup
+    const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter 
+      ? domainFilter.values[0] 
+      : undefined;
+    const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+      ? folderIdFilter.values[0]
+      : undefined;
 
     if ((!domain || !key) && !folderId) {
       throw new DubApiError({

apps/web/app/api/analytics/export/route.ts

@@ -8,7 +8,7 @@ import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
 import { withWorkspace } from "@/lib/auth";
 import { verifyFolderAccess } from "@/lib/folder/permissions";
-import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
 import { Link } from "@dub/prisma/client";
 import JSZip from "jszip";
 
@@ -17,11 +17,19 @@ export const GET = withWorkspace(
   async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
-    const parsedParams = analyticsQuerySchema.parse(searchParams);
+    const parsedParams = parseAnalyticsQuery(searchParams);
 
-    const { interval, start, end, linkId, externalId, domain, key, folderId } =
+    const { interval, start, end, linkId, externalId, domain: domainFilter, key, folderId: folderIdFilter } =
       parsedParams;
 
+    // Extract string values for specific link/folder lookup
+    const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter 
+      ? domainFilter.values[0] 
+      : undefined;
+    const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+      ? folderIdFilter.values[0]
+      : undefined;
+
     let link: Link | null = null;
 
     if (domain) {
@@ -80,7 +88,7 @@ export const GET = withWorkspace(
           ...(link && { linkId: link.id }),
           groupBy: endpoint,
           folderIds,
-          folderId: folderId || "",
+          folderId: folderIdFilter || undefined,
         });
 
         if (!response || response.length === 0) return;

apps/web/app/api/analytics/route.ts

@@ -13,7 +13,7 @@ import { withWorkspace } from "@/lib/auth";
 import { verifyFolderAccess } from "@/lib/folder/permissions";
 import {
   analyticsPathParamsSchema,
-  analyticsQuerySchema,
+  parseAnalyticsQuery,
 } from "@/lib/zod/schemas/analytics";
 import { Link } from "@dub/prisma/client";
 import { NextResponse } from "next/server";
@@ -32,7 +32,7 @@ export const GET = withWorkspace(
       oldEvent = undefined;
     }
 
-    const parsedParams = analyticsQuerySchema.parse(searchParams);
+    const parsedParams = parseAnalyticsQuery(searchParams);
 
     let {
       event,
@@ -42,12 +42,21 @@ export const GET = withWorkspace(
       end,
       linkId,
       externalId,
-      domain,
+      domain: domainFilter,
       key,
-      folderId,
+      folderId: folderIdFilter,
       programId,
     } = parsedParams;
 
+    // Extract string values for specific link/folder lookup
+    // When domain+key is provided, it's for getting a specific link (not filtering)
+    const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter 
+      ? domainFilter.values[0] 
+      : undefined;
+    const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+      ? folderIdFilter.values[0]
+      : undefined;
+
     let link: Link | null = null;
 
     event = oldEvent || event;

apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx

@@ -93,6 +93,7 @@ function WorkspaceLinks() {
     activeFilters,
     onSelect,
     onRemove,
+    onRemoveFilter,
     onRemoveAll,
     setSearch,
     setSelectedFilter,
@@ -250,6 +251,7 @@ function WorkspaceLinks() {
             activeFilters={activeFilters}
             onSelect={onSelect}
             onRemove={onRemove}
+            onRemoveFilter={onRemoveFilter}
             onRemoveAll={onRemoveAll}
           />
         </PageWidthWrapper>

apps/web/lib/analytics/build-advanced-filters.ts

@@ -0,0 +1,47 @@
+import { ParsedFilter, type SQLOperator } from "@dub/utils";
+
+export interface AdvancedFilter {
+  field: string;
+  operator: SQLOperator;
+  values: string[];
+}
+
+const SUPPORTED_FIELDS = [
+  "country",
+  "city",
+  "continent",
+  "device",
+  "browser",
+  "os",
+  "referer",
+  "refererUrl",
+  "url",
+  "trigger",
+  "utm_source",
+  "utm_medium",
+  "utm_campaign",
+  "utm_term",
+  "utm_content",
+  "saleType",
+] as const;
+
+type SupportedField = (typeof SUPPORTED_FIELDS)[number];
+
+export function buildAdvancedFilters(
+  params: Partial<Record<SupportedField, ParsedFilter | undefined>>,
+): AdvancedFilter[] {
+  const filters: AdvancedFilter[] = [];
+
+  for (const field of SUPPORTED_FIELDS) {
+    const parsed = params[field];
+    if (!parsed) continue;
+
+    filters.push({
+      field,
+      operator: parsed.sqlOperator,
+      values: parsed.values,
+    });
+  }
+
+  return filters;
+}

apps/web/lib/analytics/filter-helpers.ts

@@ -0,0 +1,74 @@
+import { ParsedFilter } from "@dub/utils";
+
+/**
+ * Prepare trigger and region filters for Tinybird pipes.
+ * Handles backward compatibility for qr parameter and region splitting.
+ */
+export function prepareFiltersForPipe(params: {
+  qr?: boolean;
+  trigger?: ParsedFilter;
+  region?: string | ParsedFilter;
+  country?: ParsedFilter;
+}) {
+  // Handle qr backward compatibility
+  let triggerForPipe = params.trigger;
+  if (params.qr && !params.trigger) {
+    triggerForPipe = {
+      operator: "IS" as const,
+      sqlOperator: "IN" as const,
+      values: ["qr"],
+    };
+  }
+
+  // Handle region split (format: "US-CA")
+  let countryForPipe = params.country;
+  let regionForPipe = params.region;
+  if (params.region && typeof params.region === "string") {
+    const split = params.region.split("-");
+    countryForPipe = {
+      operator: "IS" as const,
+      sqlOperator: "IN" as const,
+      values: [split[0]],
+    };
+    regionForPipe = split[1];
+  }
+
+  return { triggerForPipe, countryForPipe, regionForPipe };
+}
+
+/**
+ * Extract workspace link filters (domain, tagIds, folderId, root) into
+ * separate values and operators for Tinybird.
+ *
+ * These filters are applied on the workspace_links node in Tinybird,
+ * so they need to be passed as separate parameters (not in the filters JSON).
+ */
+export function extractWorkspaceLinkFilters(params: {
+  domain?: ParsedFilter;
+  tagIds?: ParsedFilter;
+  folderId?: ParsedFilter;
+  root?: ParsedFilter;
+}) {
+  const extractFilter = (filter?: ParsedFilter) => ({
+    values: filter?.values,
+    operator: (filter?.sqlOperator === "NOT IN" ? "NOT IN" : "IN") as
+      | "IN"
+      | "NOT IN",
+  });
+
+  const domain = extractFilter(params.domain);
+  const tagIds = extractFilter(params.tagIds);
+  const folderId = extractFilter(params.folderId);
+  const root = extractFilter(params.root);
+
+  return {
+    domain: domain.values,
+    domainOperator: domain.operator,
+    tagIds: tagIds.values,
+    tagIdsOperator: tagIds.operator,
+    folderId: folderId.values,
+    folderIdOperator: folderId.operator,
+    root: root.values,
+    rootOperator: root.operator,
+  };
+}