The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
folderIds → folderId
Steven Tey02e7d7821804
diff --git a/apps/web/app/(ee)/api/events/route.ts b/apps/web/app/(ee)/api/events/route.tsindex 452a59d85b..fdb76f7da1 100644--- a/apps/web/app/(ee)/api/events/route.ts+++ b/apps/web/app/(ee)/api/events/route.ts@@ -1,6 +1,5 @@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";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";@@ -23,7 +22,7 @@ export const GET = withWorkspace(interval,start,end,- linkId,+ linkId: linkIdFilter,externalId,domain: domainFilter,key,@@ -32,6 +31,7 @@ export const GET = withWorkspace(// Extract string values for specific link/folder lookupconst domain = getFirstFilterValue(domainFilter);+ const linkId = getFirstFilterValue(linkIdFilter);const folderId = getFirstFilterValue(folderIdFilter);let link: Link | null = null;@@ -69,21 +69,11 @@ export const GET = withWorkspace(end,});- const folderIds = folderIdToVerify- ? undefined- : await getFolderIdsToFilter({- workspace,- userId: session.user.id,- });-console.time("getEvents");const response = await getEvents({...parsedParams,event,- ...(link && { linkId: link.id }),workspaceId: workspace.id,- folderIds,- folderId: folderIdFilter || undefined,});console.timeEnd("getEvents");diff --git a/apps/web/app/api/analytics/route.ts b/apps/web/app/api/analytics/route.tsindex c4c3fb5590..fc56054110 100644--- a/apps/web/app/api/analytics/route.ts+++ b/apps/web/app/api/analytics/route.ts@@ -1,7 +1,6 @@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";import { DubApiError } from "@/lib/api/errors";import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";@@ -111,15 +110,6 @@ export const GET = withWorkspace(end,});- // no need to get folder ids if we are filtering by a folder or program- const folderIds =- folderIdToVerify || programId- ? undefined- : await getFolderIdsToFilter({- workspace,- userId: session.user.id,- });-// Identify the request is from deprecated clicks endpoint// (/api/analytics/clicks)// (/api/analytics/count)@@ -133,7 +123,6 @@ export const GET = withWorkspace(...parsedParams,event,groupBy,- folderIds,workspaceId: workspace.id,isDeprecatedClicksEndpoint,// dataAvailableFrom is only relevant for timeseries groupBydiff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.tsindex e780d6902c..4c97ff1fe4 100644--- a/apps/web/lib/analytics/get-analytics.ts+++ b/apps/web/lib/analytics/get-analytics.ts@@ -155,9 +155,6 @@ export const getAnalytics = async (params: AnalyticsFilters) => {const tinybirdParams: any = {workspaceId,- linkId: linkIdParam,- linkIdOperator,- folderIds: params.folderIds,customerId: params.customerId,programId: params.programId,partnerId: partnerIdParam,@@ -166,6 +163,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {tenantIdOperator,groupId: groupIdParam,groupIdOperator,+ linkId: linkIdParam,+ linkIdOperator,domain: domainParam,domainOperator,tagIds: tagIdsParam,diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.tsindex a155fc0bee..1639bcea3a 100644--- a/apps/web/lib/analytics/get-events.ts+++ b/apps/web/lib/analytics/get-events.ts@@ -110,6 +110,8 @@ export const getEvents = async (params: EventsFilters) => {const partnerIdFilter = ensureParsedFilter(params.partnerId);const {+ linkId: linkIdParam,+ linkIdOperator,domain: domainParam,domainOperator,tagIds: tagIdsParam,@@ -132,11 +134,12 @@ export const getEvents = async (params: EventsFilters) => {const tinybirdParams: any = {eventType,workspaceId,- linkId: params.linkId,- linkIds: params.linkIds,- folderIds: params.folderIds,- customerId: params.customerId,programId: params.programId,+ customerId: params.customerId,+ linkId: linkIdParam,+ linkIdOperator,+ folderId: folderIdParam,+ folderIdOperator,partnerId: partnerIdParam,partnerIdOperator,tenantId: tenantIdParam,diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.tsindex 4bc3236b2b..cf4313e2be 100644--- a/apps/web/lib/analytics/types.ts+++ b/apps/web/lib/analytics/types.ts@@ -44,7 +44,6 @@ export type AnalyticsFilters = Partial<workspaceId?: string;dataAvailableFrom?: Date;isDeprecatedClicksEndpoint?: boolean;- folderIds?: string[]; // TODO: remove this once it's been added to the public APIstart?: Date | null;end?: Date | null;// Accept plain string (from partner-profile routes) or ParsedFilter (from API schema)@@ -67,7 +66,6 @@ export type EventsFilters = Partial<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)diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.tsindex b8aa9536ef..6f1cb22c8a 100644--- a/apps/web/lib/zod/schemas/analytics.ts+++ b/apps/web/lib/zod/schemas/analytics.ts@@ -463,12 +463,6 @@ export const analyticsFilterTB = z.object({"The link IDs to retrieve analytics for (with operator support).",),linkIdOperator: z.enum(["IN", "NOT IN"]).optional(),- // TODO: remove folderIds since we'll just use folderId- folderIds: z- .union([z.string(), z.array(z.string())])- .transform((v) => (Array.isArray(v) ? v : v.split(",")))- .optional()- .describe("The folder IDs to retrieve analytics for."),folderId: z.union([z.string(), z.array(z.string())]).transform((v) => (Array.isArray(v) ? v : v.split(",")))diff --git a/packages/tinybird/pipes/v4_count.pipe b/packages/tinybird/pipes/v4_count.pipeindex ca63703851..6b8aa337e4 100644--- a/packages/tinybird/pipes/v4_count.pipe+++ b/packages/tinybird/pipes/v4_count.pipe@@ -101,7 +101,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -255,7 +255,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -466,7 +466,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(rootdiff --git a/packages/tinybird/pipes/v4_events.pipe b/packages/tinybird/pipes/v4_events.pipeindex 6b5ecdd706..1ecb8ec3e6 100644--- a/packages/tinybird/pipes/v4_events.pipe+++ b/packages/tinybird/pipes/v4_events.pipe@@ -105,7 +105,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -273,7 +273,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -476,7 +476,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(rootdiff --git a/packages/tinybird/pipes/v4_group_by.pipe b/packages/tinybird/pipes/v4_group_by.pipeindex edd070cc69..f25ecd1991 100644--- a/packages/tinybird/pipes/v4_group_by.pipe+++ b/packages/tinybird/pipes/v4_group_by.pipe@@ -146,7 +146,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -369,7 +369,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -628,7 +628,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(rootdiff --git a/packages/tinybird/pipes/v4_timeseries.pipe b/packages/tinybird/pipes/v4_timeseries.pipeindex d2eb087b76..bafbd03c0f 100644--- a/packages/tinybird/pipes/v4_timeseries.pipe+++ b/packages/tinybird/pipes/v4_timeseries.pipe@@ -184,7 +184,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -340,7 +340,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root@@ -591,7 +591,7 @@ SQL >{% end %}{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(tenantId- ) or defined(folderIds) or defined(folderId) or defined(domain) or defined(+ ) or defined(folderId) or defined(domain) or defined(tagIds) or defined(root