The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
initial support for advanced filters in link
Pedro Ladeira36dfe29c0684
diff --git a/apps/web/lib/analytics/build-advanced-filters.ts b/apps/web/lib/analytics/build-advanced-filters.tsnew file mode 100644index 0000000000..ba1adfe47e--- /dev/null+++ b/apps/web/lib/analytics/build-advanced-filters.ts@@ -0,0 +1,48 @@+import { ParsedFilter } from "@dub/utils";++export interface AdvancedFilter {+ field: string;+ operator: "=" | "!=" | "IN" | "NOT IN";+ values: string[];+}++// Fields that support advanced filtering+const SUPPORTED_FIELDS = [+ "country",+ "city",+ "region",+ "continent",+ "device",+ "browser",+ "os",+ "referer",+ "refererUrl",+ "url",+ "trigger",+ "utm_source",+ "utm_medium",+ "utm_campaign",+ "utm_term",+ "utm_content",+] 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;+}diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.tsindex dffdb1295c..95b28c06a4 100644--- a/apps/web/lib/analytics/get-analytics.ts+++ b/apps/web/lib/analytics/get-analytics.ts@@ -8,6 +8,7 @@ import { decodeKeyIfCaseSensitive } from "../api/links/case-sensitivity";import { conn } from "../planetscale";import { analyticsFilterTB } from "../zod/schemas/analytics";import { analyticsResponse } from "../zod/schemas/analytics-response";+import { buildAdvancedFilters } from "./build-advanced-filters";import {DIMENSIONAL_ANALYTICS_FILTERS,SINGULAR_ANALYTICS_ENDPOINTS,@@ -104,14 +105,19 @@ export const getAnalytics = async (params: AnalyticsFilters) => {timezone,});- if (qr) {- trigger = "qr";+ // Handle qr backward compatibility+ let triggerForPipe = trigger;+ if (qr && !trigger) {+ triggerForPipe = { operator: "IS" as const, sqlOperator: "=" as const, values: ["qr"] };}- if (region) {+ // Handle region split (format: "US-CA")+ let countryForPipe = country;+ let regionForPipe = region;+ if (region && typeof region === 'string') {const split = region.split("-");- country = split[0];- region = split[1];+ countryForPipe = { operator: "IS" as const, sqlOperator: "=" as const, values: [split[0]] };+ regionForPipe = split[1];}// Create a Tinybird pipe@@ -119,12 +125,12 @@ export const getAnalytics = async (params: AnalyticsFilters) => {pipe: ["count", "timeseries"].includes(groupBy)? `v3_${groupBy}`: [- "top_folders",- "top_link_tags",- "top_domains",- "top_partners",- "top_groups",- ].includes(groupBy)+ "top_folders",+ "top_link_tags",+ "top_domains",+ "top_partners",+ "top_groups",+ ].includes(groupBy)? "v3_group_by_link_metadata": "v3_group_by",parameters: analyticsFilterTB,@@ -140,23 +146,68 @@ export const getAnalytics = async (params: AnalyticsFilters) => {}),});- const filters = queryParser(query);+ const metadataFilters = queryParser(query) || [];- const response = await pipe({- ...params,+ const advancedFilters = buildAdvancedFilters({+ country: countryForPipe,+ city: params.city,+ continent: params.continent,+ device: params.device,+ browser: params.browser,+ os: params.os,+ referer: params.referer,+ refererUrl: params.refererUrl,+ url: params.url,+ trigger: triggerForPipe,+ });++ const allFilters = [...metadataFilters, ...advancedFilters];+ const fieldsInAdvancedFilters = new Set(advancedFilters.map(f => f.field));++ const tinybirdParams: any = {+ workspaceId: params.workspaceId,+ linkId: params.linkId,+ linkIds: params.linkIds,+ folderIds: params.folderIds,+ domain: params.domain,+ tagIds: params.tagIds,+ customerId: params.customerId,+ programId: params.programId,+ partnerId: params.partnerId,+ tenantId: params.tenantId,+ folderId: params.folderId,+ groupId: params.groupId,+ root: params.root,+ saleType: params.saleType,++ country: !fieldsInAdvancedFilters.has('country') && countryForPipe?.sqlOperator === '=' ? countryForPipe.values[0] : undefined,+ city: !fieldsInAdvancedFilters.has('city') && params.city?.sqlOperator === '=' ? params.city.values[0] : undefined,+ continent: !fieldsInAdvancedFilters.has('continent') && params.continent?.sqlOperator === '=' ? params.continent.values[0] : undefined,+ device: !fieldsInAdvancedFilters.has('device') && params.device?.sqlOperator === '=' ? params.device.values[0] : undefined,+ browser: !fieldsInAdvancedFilters.has('browser') && params.browser?.sqlOperator === '=' ? params.browser.values[0] : undefined,+ os: !fieldsInAdvancedFilters.has('os') && params.os?.sqlOperator === '=' ? params.os.values[0] : undefined,+ trigger: !fieldsInAdvancedFilters.has('trigger') && triggerForPipe?.sqlOperator === '=' ? triggerForPipe.values[0] : undefined,+ referer: !fieldsInAdvancedFilters.has('referer') && params.referer?.sqlOperator === '=' ? params.referer.values[0] : undefined,+ refererUrl: !fieldsInAdvancedFilters.has('refererUrl') && params.refererUrl?.sqlOperator === '=' ? params.refererUrl.values[0] : undefined,+ url: !fieldsInAdvancedFilters.has('url') && params.url?.sqlOperator === '=' ? params.url.values[0] : undefined,++ utm_source: params.utm_source,+ utm_medium: params.utm_medium,+ utm_campaign: params.utm_campaign,+ utm_term: params.utm_term,+ utm_content: params.utm_content,groupBy,eventType: event,- workspaceId,- tagIds,- trigger,start: formatUTCDateTimeClickhouse(startDate),end: formatUTCDateTimeClickhouse(endDate),granularity,timezone,- country,- region,- filters: filters ? JSON.stringify(filters) : undefined,- });+ region: typeof regionForPipe === 'string' ? regionForPipe : undefined,++ filters: allFilters.length > 0 ? JSON.stringify(allFilters) : undefined,+ };++ const response = await pipe(tinybirdParams);if (groupBy === "count") {const { groupByField, ...rest } = response.data[0];diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.tsindex 008e097026..8549503248 100644--- a/apps/web/lib/analytics/types.ts+++ b/apps/web/lib/analytics/types.ts@@ -49,9 +49,9 @@ export type AnalyticsFilters = Override<end?: Date | null;// TODO: Fix the schema so that we can avoid the override here- device?: string | undefined;- browser?: string | undefined;- os?: string | undefined;+ // device?: string | undefined;+ // browser?: string | undefined;+ // os?: string | undefined;}>;diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.tsindex c528951c6e..d5d7a93cc1 100644--- a/apps/web/lib/zod/schemas/analytics.ts+++ b/apps/web/lib/zod/schemas/analytics.ts@@ -12,6 +12,7 @@ import {DUB_FOUNDING_DATE,capitalize,formatDate,+ parseFilterValue,} from "@dub/utils";import * as z from "zod/v4";import { booleanQuerySchema } from "./misc";@@ -135,60 +136,92 @@ export const analyticsQuerySchema = zcountry: z.string().optional()+ .transform(parseFilterValue).describe(- "The country to retrieve analytics for. Must be passed as a 2-letter ISO 3166-1 country code. See https://d.to/geo for more information.",+ "The country to retrieve analytics for. Must be passed as a 2-letter ISO 3166-1 country code. Supports multiple values (comma-separated) and negation (prefix with `-`). Examples: `US`, `US,BR,FR`, `-US`, `-US,BR`. See https://d.to/geo for more information.",),city: z.string().optional()- .describe("The city to retrieve analytics for.")+ .transform(parseFilterValue)+ .describe("The city to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`).").meta({ example: "New York" }),region: z.string().optional().describe("The ISO 3166-2 region code to retrieve analytics for."),continent: z- .enum(CONTINENT_CODES)+ .string().optional()- .describe("The continent to retrieve analytics for."),+ .transform(parseFilterValue)+ .describe("The continent to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`)."),device: z.string().optional()- .transform((v) => capitalize(v) as string | undefined)- .describe("The device to retrieve analytics for.")+ .transform((v) => {+ if (!v) return undefined;+ // Capitalize each value+ const parsed = parseFilterValue(v);+ if (!parsed) return undefined;+ return {+ ...parsed,+ values: parsed.values.map((val) => capitalize(val)).filter(Boolean) as string[],+ };+ })+ .describe("The device to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`).").meta({ example: "Desktop" }),browser: z.string().optional()- .transform((v) => capitalize(v) as string | undefined)- .describe("The browser to retrieve analytics for.")+ .transform((v) => {+ if (!v) return undefined;+ const parsed = parseFilterValue(v);+ if (!parsed) return undefined;+ return {+ ...parsed,+ values: parsed.values.map((val) => capitalize(val)).filter(Boolean) as string[],+ };+ })+ .describe("The browser to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`).").meta({ example: "Chrome" }),os: z.string().optional().transform((v) => {- if (v === "iOS") return "iOS";- return capitalize(v) as string | undefined;+ if (!v) return undefined;+ const parsed = parseFilterValue(v);+ if (!parsed) return undefined;+ return {+ ...parsed,+ values: parsed.values.map((val) => (val === "iOS" ? "iOS" : capitalize(val))).filter(Boolean) as string[],+ };})- .describe("The OS to retrieve analytics for.")+ .describe("The OS to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`).").meta({ example: "Windows" }),trigger: z- .enum(TRIGGER_TYPES)+ .string().optional()+ .transform(parseFilterValue).describe(- "The trigger to retrieve analytics for. If undefined, returns all trigger types.",+ "The trigger to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`). If undefined, returns all trigger types.",),referer: z.string().optional()- .describe("The referer hostname to retrieve analytics for.")+ .transform(parseFilterValue)+ .describe("The referer hostname to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`).").meta({ example: "google.com" }),refererUrl: z.string().optional()- .describe("The full referer URL to retrieve analytics for.")+ .transform(parseFilterValue)+ .describe("The full referer URL to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`).").meta({ example: "https://dub.co/blog" }),- url: z.string().optional().describe("The URL to retrieve analytics for."),+ url: z+ .string()+ .optional()+ .transform(parseFilterValue)+ .describe("The URL to retrieve analytics for. Supports multiple values (comma-separated) and negation (prefix with `-`)."),tagIds: z.union([z.string(), z.array(z.string())]).transform((v) => (Array.isArray(v) ? v : v.split(",")))@@ -250,7 +283,7 @@ export const analyticsFilterTB = zcustomerId: z.string().optional(),root: z.boolean().optional(),saleType: z.string().optional(),- trigger: z.enum(TRIGGER_TYPES).optional(),+ trigger: z.string().optional(), // Changed to string to support comma-separated valuesstart: z.string(),end: z.string(),granularity: z.enum(["minute", "hour", "day", "month"]).optional(),diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsxindex 2d509eed2e..5e69aa354e 100644--- a/apps/web/ui/analytics/use-analytics-filters.tsx+++ b/apps/web/ui/analytics/use-analytics-filters.tsx@@ -8,7 +8,6 @@ import { readStreamableValue } from "@ai-sdk/rsc";import {BlurImage,Filter,- FilterOperator,LinkLogo,Sliders,useRouterStuff,@@ -49,7 +48,10 @@ import {linkConstructor,nFormatter,OG_AVATAR_URL,+ parseFilterValue,REGIONS,+ type FilterOperator,+ type ParsedFilter,} from "@dub/utils";import { useParams } from "next/navigation";import posthog from "posthog-js";@@ -122,22 +124,8 @@ export function useAnalyticsFilters({const [requestedFilters, setRequestedFilters] = useState<string[]>([]);- const parseFilterParam = useCallback((value: string): {- operator: FilterOperator;- values: string[];- } => {- const isNegated = value.startsWith('-');- const cleanValue = isNegated ? value.slice(1) : value;- const values = cleanValue.split(',').filter(Boolean);-- const operator: FilterOperator = isNegated- ? (values.length > 1 ? 'IS_NOT_ONE_OF' : 'IS_NOT')- : (values.length > 1 ? 'IS_ONE_OF' : 'IS');-- return {- operator,- values,- };+ const parseFilterParam = useCallback((value: string): ParsedFilter | undefined => {+ return parseFilterValue(value);}, []);const activeFilters = useMemo(() => {@@ -198,8 +186,10 @@ export function useAnalyticsFilters({const value = params[filter];if (value) {- const { operator, values } = parseFilterParam(value);- filters.push({ key: filter, operator, values });+ const parsed = parseFilterParam(value);+ if (parsed) {+ filters.push({ key: filter, operator: parsed.operator, values: parsed.values });+ }}});diff --git a/packages/tinybird/pipes/v3_count.pipe b/packages/tinybird/pipes/v3_count.pipeindex 442ba99d72..536542aee3 100644--- a/packages/tinybird/pipes/v3_count.pipe+++ b/packages/tinybird/pipes/v3_count.pipe@@ -96,6 +96,76 @@ SQL >{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}@@ -166,6 +236,79 @@ SQL >{% elif operator == 'lessThanOrEqual' %}AND JSONExtractString(metadata, {{ metadataKey }}) <= {{ value }}{% end %}+ {% elif item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %}+ AND ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == 'NOT IN' %}+ AND NOT ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == '=' %}+ AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% elif operator == '!=' %}+ AND url NOT LIKE concat('%utm_source=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% end %}+ {% elif field == 'utm_medium' %}+ {% if operator == 'IN' %}+ AND ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == 'NOT IN' %}+ AND NOT ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == '=' %}+ AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% elif operator == '!=' %}+ AND url NOT LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% end %}+ {% elif field == 'utm_campaign' %}+ {% if operator == 'IN' %}+ AND ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == 'NOT IN' %}+ AND NOT ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == '=' %}+ AND url LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% elif operator == '!=' %}+ AND url NOT LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% end %}+ {% elif field == 'utm_term' %}+ {% if operator == 'IN' %}+ AND ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == 'NOT IN' %}+ AND NOT ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == '=' %}+ AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% elif operator == '!=' %}+ AND url NOT LIKE concat('%utm_term=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% end %}+ {% elif field == 'utm_content' %}+ {% if operator == 'IN' %}+ AND ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == 'NOT IN' %}+ AND NOT ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})+ {% elif operator == '=' %}+ AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% elif operator == '!=' %}+ AND url NOT LIKE concat('%utm_content=', encodeURLFormComponent({{ String(values[0]) }}), '%')+ {% end %}+ {% end %}{% end %}{% end %}{% end %}diff --git a/packages/tinybird/pipes/v3_group_by.pipe b/packages/tinybird/pipes/v3_group_by.pipeindex 3e8926441f..6fcf0c7eb8 100644--- a/packages/tinybird/pipes/v3_group_by.pipe+++ b/packages/tinybird/pipes/v3_group_by.pipe@@ -141,6 +141,93 @@ SQL >{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('operand', '').startswith('metadata.') %}+ {% set metadataKey = item.get('operand', '').split('.')[1] %}+ {% set operator = item.get('operator', 'equals') %}+ {% set value = item.get('value', '') %}+ {% if operator == 'equals' %}+ AND JSONExtractString(metadata, {{ metadataKey }}) = {{ value }}+ {% elif operator == 'notEquals' %}+ AND JSONExtractString(metadata, {{ metadataKey }}) != {{ value }}+ {% elif operator == 'greaterThan' %}+ AND JSONExtractString(metadata, {{ metadataKey }}) > {{ value }}+ {% elif operator == 'lessThan' %}+ AND JSONExtractString(metadata, {{ metadataKey }}) < {{ value }}+ {% elif operator == 'greaterThanOrEqual' %}+ AND JSONExtractString(metadata, {{ metadataKey }}) >= {{ value }}+ {% elif operator == 'lessThanOrEqual' %}+ AND JSONExtractString(metadata, {{ metadataKey }}) <= {{ value }}+ {% end %}+ {% elif item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}GROUP BYgroupByField{% if String(groupBy) == 'cities' %}, country, region@@ -263,6 +350,71 @@ SQL >{% elif operator == 'lessThanOrEqual' %}AND JSONExtractString(metadata, {{ metadataKey }}) <= {{ value }}{% end %}+ {% elif item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}{% end %}{% end %}{% end %}@@ -424,6 +576,71 @@ SQL >{% elif operator == 'lessThanOrEqual' %}AND JSONExtractString(se.metadata, {{ metadataKey }}) <= {{ value }}{% end %}+ {% elif item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND se.country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND se.city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND se.continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND se.device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND se.browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND se.os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', se.referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', se.referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', se.referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', se.referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', se.url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', se.url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', se.url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', se.url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}{% end %}{% end %}{% end %}diff --git a/packages/tinybird/pipes/v3_group_by_link_metadata.pipe b/packages/tinybird/pipes/v3_group_by_link_metadata.pipeindex b0f277b3d1..fcb9e7abd9 100644--- a/packages/tinybird/pipes/v3_group_by_link_metadata.pipe+++ b/packages/tinybird/pipes/v3_group_by_link_metadata.pipe@@ -111,6 +111,76 @@ SQL >{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}GROUP BY wl.groupByFieldORDER BY clicks DESCLIMIT 5000@@ -167,6 +237,76 @@ SQL >{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}GROUP BY wl.groupByFieldORDER BY leads DESCLIMIT 5000@@ -260,6 +400,76 @@ SQL >{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}{% if defined(start) %} AND se.timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND se.timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND se.country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND se.city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND se.continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND se.device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND se.browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND se.os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', se.referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', se.referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', se.referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', se.referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', se.url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', se.url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', se.url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', se.url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}) AS tJOIN workspace_links AS wlON t.link_id = wl.link_iddiff --git a/packages/tinybird/pipes/v3_timeseries.pipe b/packages/tinybird/pipes/v3_timeseries.pipeindex fb290381d1..f4064daa1f 100644--- a/packages/tinybird/pipes/v3_timeseries.pipe+++ b/packages/tinybird/pipes/v3_timeseries.pipe@@ -179,6 +179,76 @@ SQL >{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}GROUP BY intervalORDER BY interval@@ -257,6 +327,76 @@ SQL >{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}GROUP BY intervalORDER BY interval@@ -388,6 +528,76 @@ SQL >{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}{% if defined(start) %} AND se.timestamp >= {{ DateTime64(start) }} {% end %}{% if defined(end) %} AND se.timestamp <= {{ DateTime64(end) }} {% end %}+ {% if defined(filters) %}+ {% for item in JSON(filters, '[]') %}+ {% if item.get('field', '') %}+ {% set field = item.get('field', '') %}+ {% set operator = item.get('operator', '=') %}+ {% set values = item.get('values', []) %}+ {% if field == 'country' %}+ {% if operator == 'IN' %} AND se.country IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.country NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.country = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.country != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'city' %}+ {% if operator == 'IN' %} AND se.city IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.city NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.city = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.city != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'continent' %}+ {% if operator == 'IN' %} AND se.continent IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.continent NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.continent = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.continent != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'device' %}+ {% if operator == 'IN' %} AND se.device IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.device NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.device = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.device != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'browser' %}+ {% if operator == 'IN' %} AND se.browser IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.browser NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.browser = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.browser != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'os' %}+ {% if operator == 'IN' %} AND se.os IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.os NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.os = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.os != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'trigger' %}+ {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.trigger = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.trigger != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'referer' %}+ {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND se.referer = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND se.referer != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'refererUrl' %}+ {% if operator == 'IN' %} AND splitByString('?', se.referer_url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', se.referer_url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', se.referer_url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', se.referer_url)[1] != {{ String(values[0]) }}+ {% end %}+ {% elif field == 'url' %}+ {% if operator == 'IN' %} AND splitByString('?', se.url)[1] IN {{ Array(values, 'String') }}+ {% elif operator == 'NOT IN' %} AND splitByString('?', se.url)[1] NOT IN {{ Array(values, 'String') }}+ {% elif operator == '=' %} AND splitByString('?', se.url)[1] = {{ String(values[0]) }}+ {% elif operator == '!=' %} AND splitByString('?', se.url)[1] != {{ String(values[0]) }}+ {% end %}+ {% end %}+ {% end %}+ {% end %}+ {% end %}) AS typedWHEREtruediff --git a/packages/utils/src/functions/index.ts b/packages/utils/src/functions/index.tsindex 73deb553e9..f2a577251a 100644--- a/packages/utils/src/functions/index.ts+++ b/packages/utils/src/functions/index.ts@@ -24,6 +24,7 @@ export * from "./log";export * from "./nanoid";export * from "./nformatter";export * from "./normalize-string";+export * from "./parse-filter-value";export * from "./pick";export * from "./pluralize";export * from "./pretty-print";diff --git a/packages/utils/src/functions/parse-filter-value.ts b/packages/utils/src/functions/parse-filter-value.tsnew file mode 100644index 0000000000..cc6a0c49e6--- /dev/null+++ b/packages/utils/src/functions/parse-filter-value.ts@@ -0,0 +1,69 @@+export type FilterOperator = "IS" | "IS_NOT" | "IS_ONE_OF" | "IS_NOT_ONE_OF";+export type SQLOperator = "=" | "!=" | "IN" | "NOT IN";++export interface ParsedFilter {+ operator: FilterOperator;+ sqlOperator: SQLOperator;+ values: string[];+}++/**+ * Parse filter value from URL format to structured filter+ *+ * Formats supported:+ * - "US" → IS, values: ["US"]+ * - "US,BR,FR" → IS_ONE_OF, values: ["US", "BR", "FR"]+ * - "-US" → IS_NOT, values: ["US"]+ * - "-US,BR" → IS_NOT_ONE_OF, values: ["US", "BR"]+ *+ * @param value - The filter value string (can include "-" prefix for negation)+ * @returns Parsed filter with operator and values array+ */+export function parseFilterValue(+ value: string | string[] | undefined,+): ParsedFilter | undefined {+ if (!value) return undefined;++ if (Array.isArray(value)) {+ return {+ operator: value.length > 1 ? "IS_ONE_OF" : "IS",+ sqlOperator: value.length > 1 ? "IN" : "=",+ values: value,+ };+ }++ const isNegated = value.startsWith("-");+ const cleanValue = isNegated ? value.slice(1) : value;+ const values = cleanValue.split(",").filter(Boolean);++ if (values.length === 0) return undefined;++ const operator: FilterOperator = isNegated+ ? values.length > 1+ ? "IS_NOT_ONE_OF"+ : "IS_NOT"+ : values.length > 1+ ? "IS_ONE_OF"+ : "IS";++ const sqlOperator: SQLOperator = isNegated+ ? values.length > 1+ ? "NOT IN"+ : "!="+ : values.length > 1+ ? "IN"+ : "=";++ return { operator, sqlOperator, values };+}++/**+ * Build filter value string from parsed filter+ *+ * @param parsed - The parsed filter object+ * @returns URL-formatted filter string+ */+export function buildFilterValue(parsed: ParsedFilter): string {+ const joined = parsed.values.join(",");+ return parsed.operator.includes("NOT") ? `-${joined}` : joined;+}