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/export/events/workspace/route.ts

@@ -26,7 +26,6 @@ const payloadSchema = eventsQuerySchema.extend({
   userId: z.string(),
   linkId: z.string().optional(),
   folderIds: z.array(z.string()).optional(),
-  folderId: z.string().optional(),
   dataAvailableFrom: z.string().optional(),
 });
 
@@ -78,7 +77,7 @@ export async function POST(req: Request) {
       );
     }
 
-    const { linkId, folderIds, folderId, dataAvailableFrom, ...eventFilters } =
+    const { linkId, folderIds, dataAvailableFrom, ...eventFilters } =
       filters;
 
     // Fetch events in batches and build CSV
@@ -89,7 +88,6 @@ export async function POST(req: Request) {
       ...(linkId && { linkId }),
       workspaceId,
       folderIds,
-      folderId: folderId || "",
       dataAvailableFrom: dataAvailableFrom
         ? new Date(dataAvailableFrom)
         : workspace.createdAt,

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/export/route.ts

@@ -2,6 +2,7 @@ import {
   eventsExportColumnAccessors,
   eventsExportColumnNames,
 } from "@/lib/analytics/events-export-helpers";
+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";
@@ -34,8 +35,20 @@ export const GET = withWorkspace(
       })
       .parse(searchParams);
 
-    const { event, domain, interval, start, end, columns, key, folderId } =
-      parsedParams;
+    const {
+      event,
+      domain: domainFilter,
+      interval,
+      start,
+      end,
+      columns,
+      key,
+      folderId: folderIdFilter,
+    } = parsedParams;
+
+    // Extract string values for specific link/folder lookup
+    const domain = getFirstFilterValue(domainFilter);
+    const folderId = getFirstFilterValue(folderIdFilter);
 
     if (domain) {
       await getDomainOrThrow({ workspace, domain });
@@ -100,7 +113,6 @@ export const GET = withWorkspace(
           userId: session.user.id,
           ...(link && { linkId: link.id }),
           folderIds: folderIds ? folderIds : undefined,
-          folderId: folderId || "",
           dataAvailableFrom: workspace.createdAt.toISOString(),
         },
       });
@@ -114,7 +126,6 @@ export const GET = withWorkspace(
       workspaceId: workspace.id,
       limit: MAX_EVENTS_TO_EXPORT,
       folderIds,
-      folderId: folderId || "",
     });
 
     const data = response.map((row) =>

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

@@ -1,3 +1,4 @@
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
 import { getEvents } from "@/lib/analytics/get-events";
 import { getFolderIdsToFilter } from "@/lib/analytics/get-folder-ids-to-filter";
 import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
@@ -6,7 +7,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 +16,7 @@ export const GET = withWorkspace(
   async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);
 
-    const parsedParams = eventsQuerySchema.parse(searchParams);
+    const parsedParams = parseEventsQuery(searchParams);
 
     let {
       event,
@@ -24,11 +25,15 @@ 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 = getFirstFilterValue(domainFilter);
+    const folderId = getFirstFilterValue(folderIdFilter);
+
     let link: Link | null = null;
 
     if (domain) {
@@ -78,7 +83,7 @@ export const GET = withWorkspace(
       ...(link && { linkId: link.id }),
       workspaceId: workspace.id,
       folderIds,
-      folderId: folderId || "",
+      folderId: folderIdFilter || undefined,
     });
     console.timeEnd("getEvents");
 

apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts

@@ -1,4 +1,5 @@
 import { VALID_ANALYTICS_ENDPOINTS } from "@/lib/analytics/constants";
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
 import { getAnalytics } from "@/lib/analytics/get-analytics";
 import { convertToCSV } from "@/lib/analytics/utils";
 import { DubApiError } from "@/lib/api/errors";
@@ -37,7 +38,10 @@ export const GET = withPartnerProfile(
 
     const parsedParams = partnerProfileAnalyticsQuerySchema.parse(searchParams);
 
-    let { linkId, domain, key, ...rest } = parsedParams;
+    let { linkId, domain: domainFilter, key, ...rest } = parsedParams;
+
+    // Extract string value for link lookup
+    const domain = getFirstFilterValue(domainFilter);
 
     if (linkId) {
       if (!links.some((link) => link.id === linkId)) {

apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts

@@ -1,3 +1,4 @@
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
 import { getAnalytics } from "@/lib/analytics/get-analytics";
 import { DubApiError } from "@/lib/api/errors";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
@@ -23,9 +24,11 @@ export const GET = withPartnerProfile(
         },
       });
 
-    let { linkId, domain, key, ...rest } =
+    let { linkId, domain: domainFilter, key, ...rest } =
       partnerProfileAnalyticsQuerySchema.parse(searchParams);
 
+    const domain = getFirstFilterValue(domainFilter);
+
     if (linkId) {
       if (!links.some((link) => link.id === linkId)) {
         throw new DubApiError({

apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts

@@ -2,6 +2,7 @@ import {
   eventsExportColumnAccessors,
   eventsExportColumnNames,
 } from "@/lib/analytics/events-export-helpers";
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
 import { getAnalytics } from "@/lib/analytics/get-analytics";
 import { getEvents } from "@/lib/analytics/get-events";
 import { convertToCSV } from "@/lib/analytics/utils";
@@ -59,7 +60,9 @@ export const GET = withPartnerProfile(
       .parse(searchParams);
 
     const { event, columns: columnsParam } = parsedParams;
-    let { linkId, domain, key, ...rest } = parsedParams;
+    let { linkId, domain: domainFilter, key, ...rest } = parsedParams;
+
+    const domain = getFirstFilterValue(domainFilter);
 
     // Default columns based on event type if not provided
     const defaultColumns: Record<string, string[]> = {

apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts

@@ -1,3 +1,4 @@
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
 import { getEvents } from "@/lib/analytics/get-events";
 import { DubApiError } from "@/lib/api/errors";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
@@ -38,9 +39,11 @@ export const GET = withPartnerProfile(
       });
     }
 
-    let { linkId, domain, key, ...rest } =
+    let { linkId, domain: domainFilter, key, ...rest } =
       partnerProfileEventsQuerySchema.parse(searchParams);
 
+    const domain = getFirstFilterValue(domainFilter);
+
     if (linkId) {
       if (!links.some((link) => link.id === linkId)) {
         throw new DubApiError({

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

@@ -1,10 +1,11 @@
+import { getFirstFilterValue } from "@/lib/analytics/filter-helpers";
 import { getAnalytics } from "@/lib/analytics/get-analytics";
 import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
 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 +17,13 @@ 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 = getFirstFilterValue(domainFilter);
+    const folderId = getFirstFilterValue(folderIdFilter);
 
     if ((!domain || !key) && !folderId) {
       throw new DubApiError({

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

@@ -1,4 +1,5 @@
 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";
@@ -8,7 +9,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 +18,15 @@ 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 = getFirstFilterValue(domainFilter);
+    const folderId = getFirstFilterValue(folderIdFilter);
+
     let link: Link | null = null;
 
     if (domain) {
@@ -80,7 +85,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

@@ -1,4 +1,5 @@
 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 { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
@@ -13,7 +14,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 +33,7 @@ export const GET = withWorkspace(
       oldEvent = undefined;
     }
 
-    const parsedParams = analyticsQuerySchema.parse(searchParams);
+    const parsedParams = parseAnalyticsQuery(searchParams);
 
     let {
       event,
@@ -42,12 +43,17 @@ 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 = getFirstFilterValue(domainFilter);
+    const folderId = getFirstFilterValue(folderIdFilter);
+
     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,
@@ -247,6 +248,7 @@ function WorkspaceLinks() {
             activeFilters={activeFilters}
             onSelect={onSelect}
             onRemove={onRemove}
+            onRemoveFilter={onRemoveFilter}
             onRemoveAll={onRemoveAll}
           />
         </PageWidthWrapper>