Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

fix(advanced-filter): resolve build type errors - EventsFilters Partial, getFirstFilterValue in partner-profile/export routes

Pedro Ladeirac28d46362d6b
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.ts
index 821c00f8e2..ac00dd4e1d 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
@@ -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,
diff --git a/apps/web/app/(ee)/api/events/export/route.ts b/apps/web/app/(ee)/api/events/export/route.ts
index 2296f1a66d..2fe17be449 100644
--- a/apps/web/app/(ee)/api/events/export/route.ts
+++ b/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) =>
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.ts
index da549eb616..bf3c0cd068 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,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)) {
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.ts
index fec8ed9d2e..d71db79463 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,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({
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.ts
index dd8ac6cfab..1d74bf226b 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
@@ -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[]> = {
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.ts
index 7a032dd508..629b36d826 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,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({
diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.ts
index 6dc8ace45d..8c4f5d9ab4 100644
--- a/apps/web/lib/analytics/types.ts
+++ b/apps/web/lib/analytics/types.ts
@@ -38,7 +38,7 @@ 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'>> & {
+export type AnalyticsFilters = Partial<Omit<z.infer<typeof analyticsQuerySchema>, 'start' | 'end' | 'partnerId'>> & {
workspaceId?: string;
dataAvailableFrom?: Date;
isDeprecatedClicksEndpoint?: boolean;
@@ -46,16 +46,24 @@ export type AnalyticsFilters = Partial<Omit<z.infer<typeof analyticsQuerySchema>
folderIds?: string[]; // TODO: remove this once it's been added to the public API
start?: Date | null;
end?: Date | null;
+ // Accept plain string (from partner-profile routes) or ParsedFilter (from API schema)
partnerId?: string | ParsedFilter;
};
-export type EventsFilters = z.infer<typeof eventsQuerySchema> & {
- workspaceId?: string;
- dataAvailableFrom?: Date;
- customerId?: string;
- folderIds?: string[];
- partnerId?: string | ParsedFilter;
-};
+// Structural fields from eventsQuerySchema that should remain required
+type EventsStructuralFields = Pick<z.infer<typeof eventsQuerySchema>, 'event' | 'page' | 'limit' | 'sortBy'>;
+
+export type EventsFilters = Partial<Omit<z.infer<typeof eventsQuerySchema>, 'start' | 'end' | 'partnerId' | keyof EventsStructuralFields>> &
+ EventsStructuralFields & {
+ workspaceId?: string;
+ dataAvailableFrom?: Date;
+ customerId?: string;
+ folderIds?: string[];
+ start?: Date | null;
+ end?: Date | null;
+ // Accept plain string (from partner-profile routes) or ParsedFilter (from API schema)
+ partnerId?: string | ParsedFilter;
+ };
const partnerAnalyticsSchema = analyticsQuerySchema
.pick({