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.

feat: ensure multi select filter for other attrs

Pedro Ladeirab4ff07c1dac3
diff --git a/apps/web/app/(ee)/api/admin/analytics/route.ts b/apps/web/app/(ee)/api/admin/analytics/route.ts
index dc11691ced..57a98beaa8 100644
--- a/apps/web/app/(ee)/api/admin/analytics/route.ts
+++ b/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);
diff --git a/apps/web/app/(ee)/api/admin/events/route.ts b/apps/web/app/(ee)/api/admin/events/route.ts
index f6696fc3df..cc791e4f46 100644
--- a/apps/web/app/(ee)/api/admin/events/route.ts
+++ b/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);
diff --git a/apps/web/app/(ee)/api/events/route.ts b/apps/web/app/(ee)/api/events/route.ts
index 84390b27c7..5406dbb422 100644
--- a/apps/web/app/(ee)/api/events/route.ts
+++ b/apps/web/app/(ee)/api/events/route.ts
@@ -6,7 +6,7 @@ import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
import { withWorkspace } from "@/lib/auth";
import { verifyFolderAccess } from "@/lib/folder/permissions";
-import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseEventsQuery } from "@/lib/zod/schemas/analytics";
import { Link } from "@dub/prisma/client";
import { NextResponse } from "next/server";
@@ -15,7 +15,7 @@ export const GET = withWorkspace(
async ({ searchParams, workspace, session }) => {
throwIfClicksUsageExceeded(workspace);
- const parsedParams = eventsQuerySchema.parse(searchParams);
+ const parsedParams = parseEventsQuery(searchParams);
let {
event,
@@ -24,11 +24,19 @@ export const GET = withWorkspace(
end,
linkId,
externalId,
- domain,
+ domain: domainFilter,
key,
- folderId,
+ folderId: folderIdFilter,
} = parsedParams;
+ // Extract string values for specific link/folder lookup
+ const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
+ ? domainFilter.values[0]
+ : undefined;
+ const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+ ? folderIdFilter.values[0]
+ : undefined;
+
let link: Link | null = null;
if (domain) {
@@ -78,7 +86,7 @@ export const GET = withWorkspace(
...(link && { linkId: link.id }),
workspaceId: workspace.id,
folderIds,
- folderId: folderId || "",
+ folderId: folderIdFilter || undefined,
});
console.timeEnd("getEvents");
diff --git a/apps/web/app/api/analytics/dashboard/route.ts b/apps/web/app/api/analytics/dashboard/route.ts
index a5984041b3..6c4d81087c 100644
--- a/apps/web/app/api/analytics/dashboard/route.ts
+++ b/apps/web/app/api/analytics/dashboard/route.ts
@@ -4,7 +4,7 @@ import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-r
import { exceededLimitError } from "@/lib/exceeded-limit-error";
import { PlanProps } from "@/lib/types";
import { redis } from "@/lib/upstash";
-import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
import { prisma } from "@dub/prisma";
import { DUB_DEMO_LINKS, DUB_WORKSPACE_ID, getSearchParams } from "@dub/utils";
import { waitUntil } from "@vercel/functions";
@@ -16,9 +16,17 @@ export const dynamic = "force-dynamic";
export const GET = async (req: Request) => {
try {
const searchParams = getSearchParams(req.url);
- const parsedParams = analyticsQuerySchema.parse(searchParams);
+ const parsedParams = parseAnalyticsQuery(searchParams);
- const { domain, key, folderId, interval, start, end } = parsedParams;
+ const { domain: domainFilter, key, folderId: folderIdFilter, interval, start, end } = parsedParams;
+
+ // Extract string values for specific link/folder lookup
+ const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
+ ? domainFilter.values[0]
+ : undefined;
+ const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+ ? folderIdFilter.values[0]
+ : undefined;
if ((!domain || !key) && !folderId) {
throw new DubApiError({
diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.ts
index 3caf41659c..a5c375ae3e 100644
--- a/apps/web/app/api/analytics/export/route.ts
+++ b/apps/web/app/api/analytics/export/route.ts
@@ -8,7 +8,7 @@ import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
import { withWorkspace } from "@/lib/auth";
import { verifyFolderAccess } from "@/lib/folder/permissions";
-import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
import { Link } from "@dub/prisma/client";
import JSZip from "jszip";
@@ -17,11 +17,19 @@ export const GET = withWorkspace(
async ({ searchParams, workspace, session }) => {
throwIfClicksUsageExceeded(workspace);
- const parsedParams = analyticsQuerySchema.parse(searchParams);
+ const parsedParams = parseAnalyticsQuery(searchParams);
- const { interval, start, end, linkId, externalId, domain, key, folderId } =
+ const { interval, start, end, linkId, externalId, domain: domainFilter, key, folderId: folderIdFilter } =
parsedParams;
+ // Extract string values for specific link/folder lookup
+ const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
+ ? domainFilter.values[0]
+ : undefined;
+ const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+ ? folderIdFilter.values[0]
+ : undefined;
+
let link: Link | null = null;
if (domain) {
@@ -80,7 +88,7 @@ export const GET = withWorkspace(
...(link && { linkId: link.id }),
groupBy: endpoint,
folderIds,
- folderId: folderId || "",
+ folderId: folderIdFilter || undefined,
});
if (!response || response.length === 0) return;
diff --git a/apps/web/app/api/analytics/route.ts b/apps/web/app/api/analytics/route.ts
index 77a5fb6cb4..e706c03f6b 100644
--- a/apps/web/app/api/analytics/route.ts
+++ b/apps/web/app/api/analytics/route.ts
@@ -13,7 +13,7 @@ import { withWorkspace } from "@/lib/auth";
import { verifyFolderAccess } from "@/lib/folder/permissions";
import {
analyticsPathParamsSchema,
- analyticsQuerySchema,
+ parseAnalyticsQuery,
} from "@/lib/zod/schemas/analytics";
import { Link } from "@dub/prisma/client";
import { NextResponse } from "next/server";
@@ -32,7 +32,7 @@ export const GET = withWorkspace(
oldEvent = undefined;
}
- const parsedParams = analyticsQuerySchema.parse(searchParams);
+ const parsedParams = parseAnalyticsQuery(searchParams);
let {
event,
@@ -42,12 +42,21 @@ export const GET = withWorkspace(
end,
linkId,
externalId,
- domain,
+ domain: domainFilter,
key,
- folderId,
+ folderId: folderIdFilter,
programId,
} = parsedParams;
+ // Extract string values for specific link/folder lookup
+ // When domain+key is provided, it's for getting a specific link (not filtering)
+ const domain = domainFilter && typeof domainFilter === 'object' && 'values' in domainFilter
+ ? domainFilter.values[0]
+ : undefined;
+ const folderId = folderIdFilter && typeof folderIdFilter === 'object' && 'values' in folderIdFilter
+ ? folderIdFilter.values[0]
+ : undefined;
+
let link: Link | null = null;
event = oldEvent || event;
diff --git a/apps/web/lib/analytics/build-advanced-filters.ts b/apps/web/lib/analytics/build-advanced-filters.ts
index ba1adfe47e..0dde686ab8 100644
--- a/apps/web/lib/analytics/build-advanced-filters.ts
+++ b/apps/web/lib/analytics/build-advanced-filters.ts
@@ -1,16 +1,16 @@
-import { ParsedFilter } from "@dub/utils";
+import { ParsedFilter, type SQLOperator } from "@dub/utils";
export interface AdvancedFilter {
field: string;
- operator: "=" | "!=" | "IN" | "NOT IN";
+ operator: SQLOperator;
values: string[];
}
-// Fields that support advanced filtering
+// All fields that support advanced filtering with operators (IN, NOT IN)
+// These fields will be passed via the JSON filters array to Tinybird
const SUPPORTED_FIELDS = [
"country",
"city",
- "region",
"continent",
"device",
"browser",
@@ -24,6 +24,11 @@ const SUPPORTED_FIELDS = [
"utm_campaign",
"utm_term",
"utm_content",
+ "domain",
+ "tagIds",
+ "folderId",
+ "root",
+ "saleType",
] as const;
type SupportedField = (typeof SUPPORTED_FIELDS)[number];
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 95b28c06a4..6b8dfa66da 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -24,7 +24,6 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
event,
groupBy,
workspaceId,
- linkId,
linkIds,
interval,
start,
@@ -39,16 +38,14 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
query,
} = params;
- const tagIds = combineTagIds(params);
-
// get all-time clicks count if:
- // 1. linkId or linkIds is defined
+ // 1. linkIds is defined
// 2. type is count
// 3. interval is all
// 4. no custom start or end date is provided
// 5. no other dimensional filters are applied
if (
- (linkId || linkIds) &&
+ (linkIds) &&
groupBy === "count" &&
interval === "all" &&
!start &&
@@ -64,15 +61,15 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
? `sales, saleAmount`
: `${event}`;
- // Handle single linkId
- if (linkId) {
- const response = await conn.execute(
- `SELECT ${columns} FROM Link WHERE id = ?`,
- [linkId],
- );
+ // // Handle single linkId
+ // if (linkId) {
+ // const response = await conn.execute(
+ // `SELECT ${columns} FROM Link WHERE id = ?`,
+ // [linkId],
+ // );
- return analyticsResponse["count"].parse(response.rows[0]);
- }
+ // return analyticsResponse["count"].parse(response.rows[0]);
+ // }
// Handle multiple linkIds with aggregation
if (linkIds && linkIds.length > 0) {
@@ -108,7 +105,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
// Handle qr backward compatibility
let triggerForPipe = trigger;
if (qr && !trigger) {
- triggerForPipe = { operator: "IS" as const, sqlOperator: "=" as const, values: ["qr"] };
+ triggerForPipe = { operator: "IS" as const, sqlOperator: "IN" as const, values: ["qr"] };
}
// Handle region split (format: "US-CA")
@@ -116,7 +113,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
let regionForPipe = region;
if (region && typeof region === 'string') {
const split = region.split("-");
- countryForPipe = { operator: "IS" as const, sqlOperator: "=" as const, values: [split[0]] };
+ countryForPipe = { operator: "IS" as const, sqlOperator: "IN" as const, values: [split[0]] };
regionForPipe = split[1];
}
@@ -150,6 +147,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
const advancedFilters = buildAdvancedFilters({
country: countryForPipe,
+ trigger: triggerForPipe,
city: params.city,
continent: params.continent,
device: params.device,
@@ -158,44 +156,30 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
referer: params.referer,
refererUrl: params.refererUrl,
url: params.url,
- trigger: triggerForPipe,
+ 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,
+ domain: params.domain,
+ tagIds: params.tagIds,
+ folderId: params.folderId,
+ root: params.root,
+ saleType: params.saleType,
});
const allFilters = [...metadataFilters, ...advancedFilters];
- const fieldsInAdvancedFilters = new Set(advancedFilters.map(f => f.field));
const tinybirdParams: any = {
- workspaceId: params.workspaceId,
+ 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,
start: formatUTCDateTimeClickhouse(startDate),
diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.ts
index 008e097026..564025f657 100644
--- a/apps/web/lib/analytics/types.ts
+++ b/apps/web/lib/analytics/types.ts
@@ -47,11 +47,6 @@ export type AnalyticsFilters = Override<
folderIds?: string[]; // TODO: remove this once it's been added to the public API
start?: Date | null;
end?: Date | null;
-
- // TODO: Fix the schema so that we can avoid the override here
- device?: string | undefined;
- browser?: string | undefined;
- os?: string | undefined;
}
>;
diff --git a/apps/web/lib/stripe/index.ts b/apps/web/lib/stripe/index.ts
index 9e01e9a52a..6b756e8ffc 100644
--- a/apps/web/lib/stripe/index.ts
+++ b/apps/web/lib/stripe/index.ts
@@ -1,13 +1,15 @@
import Stripe from "stripe";
import { StripeMode } from "../types";
-export const stripe = new Stripe(`${process.env.STRIPE_SECRET_KEY}`, {
- apiVersion: "2025-05-28.basil",
- appInfo: {
- name: "Dub.co",
- version: "0.1.0",
- },
-});
+export const stripe = process.env.STRIPE_SECRET_KEY
+ ? new Stripe(process.env.STRIPE_SECRET_KEY, {
+ apiVersion: "2025-05-28.basil",
+ appInfo: {
+ name: "Dub.co",
+ version: "0.1.0",
+ },
+ })
+ : null;
const secretMap: Record<StripeMode, string | undefined> = {
live: process.env.STRIPE_APP_SECRET_KEY,
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index 71fe4827cf..9d11ed74d4 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -17,7 +17,6 @@ import {
import * as z from "zod/v4";
import { booleanQuerySchema } from "./misc";
import { parseDateSchema } from "./utils";
-import { UTMTemplateSchema } from "./utm";
const analyticsEvents = z
.enum([...EVENT_TYPES, "composite"], {
@@ -55,14 +54,19 @@ export const analyticsPathParamsSchema = z.object({
});
// Query schema for GET /analytics and GET /events endpoints
-export const analyticsQuerySchema = z
- .object({
+export const analyticsQuerySchema = z.object({
event: analyticsEvents,
groupBy: analyticsGroupBy,
domain: z
.string()
.optional()
- .describe("The domain to filter analytics for."),
+ .transform(parseFilterValue)
+ .describe(
+ "The domain to filter analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `dub.co`, `dub.co,google.com`, `-spam.com`."
+ )
+ .meta({ example: "dub.co" }),
key: z
.string()
.optional()
@@ -74,15 +78,15 @@ export const analyticsQuerySchema = z
.optional()
.describe(
"The unique ID of the short link on Dub to retrieve analytics for.",
+ )
+ .meta({ deprecated: false }), // Keep for backward compatibility
+ linkIds: z
+ .union([z.string(), z.array(z.string())])
+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ .optional()
+ .describe(
+ "The link IDs to retrieve analytics for. Supports comma-separated values or array format.",
),
- // TODO: Add this to the public API when we can properly verify linkIds ownership in /api/analytics
- // linkIds: z
- // .union([z.string(), z.array(z.string())])
- // .transform((v) => (Array.isArray(v) ? v : v.split(",")))
- // .optional()
- // .describe(
- // "A list of link IDs to retrieve analytics for. Takes precidence over ",
- // ),
externalId: z
.string()
.optional()
@@ -271,31 +275,67 @@ export const analyticsQuerySchema = z
)
.meta({ example: "https://example.com" }),
tagIds: z
- .union([z.string(), z.array(z.string())])
- .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ .string()
.optional()
- .describe("The tag IDs to retrieve analytics for."),
+ .transform(parseFilterValue)
+ .describe(
+ "The tag IDs to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `tag_123`, `tag_123,tag_456`, `-tag_789`."
+ )
+ .meta({ example: "tag_123" }),
folderId: z
.string()
.optional()
+ .transform(parseFilterValue)
.describe(
- "The folder ID to retrieve analytics for. If not provided, return analytics for unsorted links.",
- ),
+ "The folder ID to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `folder_123`, `folder_123,folder_456`, `-folder_789`. " +
+ "If not provided, return analytics for all links."
+ )
+ .meta({ example: "folder_123" }),
groupId: z
.string()
.optional()
.describe("The group ID to retrieve analytics for."),
- root: booleanQuerySchema
+ root: z
+ .string()
.optional()
+ .transform((v) => {
+ if (!v) return undefined;
+ // Normalize boolean values to "true" or "false" strings for consistency
+ const parsed = parseFilterValue(v);
+ if (!parsed) return undefined;
+ return {
+ ...parsed,
+ values: parsed.values.map((val) => {
+ // Normalize various truthy/falsy values to "true"/"false"
+ if (val === "true" || val === "1" || val === "yes") return "true";
+ if (val === "false" || val === "0" || val === "no") return "false";
+ return val;
+ }),
+ };
+ })
.describe(
- "Filter for root domains. If true, filter for domains only. If false, filter for links only. If undefined, return both.",
- ),
+ "Filter for root domains. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `true` (root domains only), `false` (regular links only), `true,false` (both). " +
+ "If undefined, return both."
+ )
+ .meta({ example: "true" }),
saleType: z
- .enum(["new", "recurring"])
+ .string()
.optional()
+ .transform(parseFilterValue)
.describe(
- "Filter sales by type: 'new' for first-time purchases, 'recurring' for repeat purchases. If undefined, returns both.",
- ),
+ "Filter sales by type. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Valid values: `new` (first-time purchases), `recurring` (repeat purchases). " +
+ "Examples: `new`, `new,recurring`, `-recurring`. " +
+ "If undefined, returns both."
+ )
+ .meta({ example: "new" }),
query: z
.string()
.max(10000)
@@ -320,66 +360,112 @@ export const analyticsQuerySchema = z
"Deprecated: Use the `trigger` field instead. Filter for QR code scans. If true, filter for QR codes only. If false, filter for links only. If undefined, return both.",
)
.meta({ deprecated: true }),
- })
- .extend(UTMTemplateSchema.omit({ id: true, name: true }).shape);
-
-// Analytics filter params for Tinybird endpoints
-export const analyticsFilterTB = z
- .object({
- eventType: analyticsEvents,
- workspaceId: z.string().optional(),
- customerId: z.string().optional(),
- root: z.boolean().optional(),
- saleType: z.string().optional(),
- trigger: z.string().optional(), // Changed to string to support comma-separated values
- start: z.string(),
- end: z.string(),
- granularity: z.enum(["minute", "hour", "day", "month"]).optional(),
- timezone: z.string().optional(),
- // TODO: remove this once it's been added to the public API
- linkIds: z
- .union([z.string(), z.array(z.string())])
- .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ utm_source: z
+ .string()
.optional()
- .describe("The link IDs to retrieve analytics for."),
- folderIds: z
- .union([z.string(), z.array(z.string())])
- .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ .transform(parseFilterValue)
+ .describe(
+ "The UTM source to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `google`, `google,twitter`, `-spam`."
+ )
+ .meta({ example: "google" }),
+ utm_medium: z
+ .string()
.optional()
- .describe("The folder IDs to retrieve analytics for."),
- filters: z
+ .transform(parseFilterValue)
+ .describe(
+ "The UTM medium to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `cpc`, `cpc,social`, `-email`."
+ )
+ .meta({ example: "cpc" }),
+ utm_campaign: z
.string()
.optional()
- .describe("The filters to apply to the analytics."),
- })
- .extend(
- analyticsQuerySchema.pick({
- groupBy: true,
- browser: true,
- city: true,
- country: true,
- continent: true,
- region: true,
- device: true,
- domain: true,
- linkId: true,
- os: true,
- referer: true,
- refererUrl: true,
- tagIds: true,
- url: true,
- utm_source: true,
- utm_medium: true,
- utm_campaign: true,
- utm_term: true,
- utm_content: true,
- programId: true,
- partnerId: true,
- tenantId: true,
- folderId: true,
- groupId: true,
- }).shape,
- );
+ .transform(parseFilterValue)
+ .describe(
+ "The UTM campaign to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `summer_sale`, `summer_sale,winter_sale`, `-old_campaign`."
+ )
+ .meta({ example: "summer_sale" }),
+ utm_term: z
+ .string()
+ .optional()
+ .transform(parseFilterValue)
+ .describe(
+ "The UTM term to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`)."
+ )
+ .meta({ example: "keyword" }),
+ utm_content: z
+ .string()
+ .optional()
+ .transform(parseFilterValue)
+ .describe(
+ "The UTM content to retrieve analytics for. " +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`)."
+ )
+ .meta({ example: "banner" }),
+});
+
+/**
+ * Parse analytics query parameters with backward compatibility
+ * Converts deprecated singular fields (linkId, tagId) to their plural equivalents
+ */
+export function parseAnalyticsQuery(searchParams: unknown) {
+ const data = analyticsQuerySchema.parse(searchParams);
+
+ // Backward compatibility: convert linkId to linkIds
+ if (data.linkId && !data.linkIds) {
+ data.linkIds = [data.linkId];
+ }
+
+ // Backward compatibility: convert tagId to tagIds
+ if (data.tagId && !data.tagIds) {
+ // Convert single tagId to the multi-value format
+ data.tagIds = { operator: "IS" as const, sqlOperator: "IN" as const, values: [data.tagId] };
+ }
+
+ return data;
+}
+
+// Analytics filter params for Tinybird endpoints
+export const analyticsFilterTB = z.object({
+ eventType: analyticsEvents,
+ workspaceId: z.string().optional(),
+ customerId: z.string().optional(),
+ start: z.string(),
+ end: z.string(),
+ granularity: z.enum(["minute", "hour", "day", "month"]).optional(),
+ timezone: z.string().optional(),
+ groupBy: analyticsGroupBy,
+ // Link-specific filters (not using advanced filtering)
+ linkId: z.string().optional(),
+ linkIds: z
+ .union([z.string(), z.array(z.string())])
+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))
+ .optional()
+ .describe("The link IDs to retrieve analytics for."),
+ 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."),
+ // Program/Partner/Group filters (not using advanced filtering)
+ programId: z.string().optional(),
+ partnerId: z.string().optional(),
+ tenantId: z.string().optional(),
+ groupId: z.string().optional(),
+ // Region is a special case - it's the subdivision part of a region code
+ region: z.string().optional(),
+ // All dimensional filters now go through the JSON filters parameter
+ filters: z
+ .string()
+ .optional()
+ .describe("JSON array of advanced filters with operators (IN, NOT IN)."),
+});
export const eventsFilterTB = analyticsFilterTB
.omit({ granularity: true, timezone: true })
@@ -422,3 +508,24 @@ export const eventsQuerySchema = analyticsQuerySchema
.describe("DEPRECATED. Use `sortOrder` instead.")
.meta({ deprecated: true }),
});
+
+/**
+ * Parse events query parameters with backward compatibility
+ * Converts deprecated singular fields (linkId, tagId) to their plural equivalents
+ */
+export function parseEventsQuery(searchParams: unknown) {
+ const data = eventsQuerySchema.parse(searchParams);
+
+ // Backward compatibility: convert linkId to linkIds
+ if (data.linkId && !data.linkIds) {
+ data.linkIds = [data.linkId];
+ }
+
+ // Backward compatibility: convert tagId to tagIds
+ if (data.tagId && !data.tagIds) {
+ // Convert single tagId to the multi-value format
+ data.tagIds = { operator: "IS" as const, sqlOperator: "IN" as const, values: [data.tagId] };
+ }
+
+ return data;
+}
diff --git a/apps/web/ui/analytics/toggle.tsx b/apps/web/ui/analytics/toggle.tsx
index d42aa2d8b3..38cff9d622 100644
--- a/apps/web/ui/analytics/toggle.tsx
+++ b/apps/web/ui/analytics/toggle.tsx
@@ -83,7 +83,6 @@ export function AnalyticsToggle({
onSelect={onSelect}
onRemove={onRemove}
onOpenFilter={onOpenFilter}
- multiSelect={true}
askAI
/>
);
diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index 5e69aa354e..e810e04611 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -101,11 +101,6 @@ export function useAnalyticsFilters({
const { queryParams, searchParamsObj } = useRouterStuff();
- const selectedTagIds = useMemo(
- () => searchParamsObj.tagIds?.split(",")?.filter(Boolean) ?? [],
- [searchParamsObj.tagIds],
- );
-
const selectedCustomerId = searchParamsObj.customerId;
const { data: selectedCustomerWorkspace } = useCustomer({
@@ -129,39 +124,26 @@ export function useAnalyticsFilters({
}, []);
const activeFilters = useMemo(() => {
- const { domain, key, root, folderId, ...params } = searchParamsObj;
+ const { domain, key, tagIds, root, folderId, ...params } = searchParamsObj;
// Handle special cases first
- const filters = [
- // Handle domain/key special case
- ...(domain && !key ? [{ key: "domain", operator: "IS" as const, values: [domain] }] : []),
+ const filters: Array<{ key: string; operator: FilterOperator; values: any[] }> = [
+ // Handle domain/key special case for links
...(domain && key
? [
{
key: "link",
- operator: "IS" as const,
+ operator: "IS" as FilterOperator,
values: [linkConstructor({ domain, key, pretty: true })],
},
]
: []),
- // Handle tagIds special case
- ...(selectedTagIds.length > 0
- ? [{
- key: "tagIds",
- operator: (selectedTagIds.length > 1 ? "IS_ONE_OF" : "IS") as FilterOperator,
- values: selectedTagIds
- }]
- : []),
- // Handle root special case - convert string to boolean
- ...(root ? [{ key: "root", operator: "IS" as const, values: [root === "true"] }] : []),
- // Handle folderId special case
- ...(folderId ? [{ key: "folderId", operator: "IS" as const, values: [folderId] }] : []),
// Handle customerId special case
...(selectedCustomer
? [
{
key: "customerId",
- operator: "IS" as const,
+ operator: "IS" as FilterOperator,
values: [
selectedCustomer.email ||
selectedCustomer["name"] ||
@@ -172,19 +154,16 @@ export function useAnalyticsFilters({
: []),
];
- // Handle all other filters dynamically
+ // Handle all filters dynamically (including domain, tagIds, folderId, root)
VALID_ANALYTICS_FILTERS.forEach((filter) => {
// Skip special cases we handled above
- if (
- ["domain", "key", "tagId", "tagIds", "root", "customerId"].includes(
- filter,
- )
- )
- return;
- // also skip date range filters and qr
+ if (["key", "tagId", "customerId"].includes(filter)) return;
+ // Also skip date range filters and qr
if (["interval", "start", "end", "qr"].includes(filter)) return;
+ // Skip domain if we're showing a specific link (domain + key)
+ if (filter === "domain" && domain && key) return;
- const value = params[filter];
+ const value = params[filter] || (filter === "domain" ? domain : filter === "tagIds" ? tagIds : filter === "root" ? root : filter === "folderId" ? folderId : undefined);
if (value) {
const parsed = parseFilterParam(value);
if (parsed) {
@@ -196,7 +175,6 @@ export function useAnalyticsFilters({
return filters;
}, [
searchParamsObj,
- selectedTagIds,
partnerPage,
selectedCustomerId,
selectedCustomer,
@@ -367,7 +345,6 @@ export function useAnalyticsFilters({
key: "link",
icon: Hyperlink,
label: "Link",
- singleSelect: true,
getOptionIcon: (value, props) => {
const url = props.option?.data?.url;
const [domain, key] = value.split("/");
@@ -393,7 +370,6 @@ export function useAnalyticsFilters({
key: "domain",
icon: Globe2,
label: "Domain",
- singleSelect: true,
getOptionIcon: (value) => (
<BlurImage
src={`${GOOGLE_FAVICON_URL}${value}`}
@@ -415,7 +391,6 @@ export function useAnalyticsFilters({
key: "saleType",
icon: Receipt2,
label: "Sale type",
- singleSelect: true,
separatorAfter: true,
options: [
{
@@ -498,7 +473,6 @@ export function useAnalyticsFilters({
key: "folderId",
icon: Folder,
label: "Folder",
- singleSelect: true,
getOptionIcon: (_value, props) => {
const folder = props.option?.data?.folder;
return folder ? (
@@ -552,7 +526,6 @@ export function useAnalyticsFilters({
key: "root",
icon: Sliders,
label: "Link type",
- singleSelect: true,
options: [
{
value: true,
@@ -793,7 +766,6 @@ export function useAnalyticsFilters({
key: "customerId",
icon: User,
label: "Customer",
- singleSelect: true,
hideInFilterDropdown: true,
getOptionIcon: () => {
return selectedCustomer ? (
@@ -820,7 +792,6 @@ export function useAnalyticsFilters({
key: "partnerId",
icon: Users6,
label: "Partner",
- singleSelect: true,
hideInFilterDropdown: true,
getOptionIcon: () => {
return selectedPartner ? (
@@ -850,7 +821,6 @@ export function useAnalyticsFilters({
linkTags,
folders,
groups,
- selectedTagIds,
selectedCustomerId,
countries,
cities,
@@ -920,14 +890,6 @@ export function useAnalyticsFilters({
del: "page",
scroll: false,
});
- } else if (key === "tagIds") {
- queryParams({
- set: {
- tagIds: selectedTagIds.concat(value).join(","),
- },
- del: "page",
- scroll: false,
- });
} else {
const currentParam = searchParamsObj[key];
@@ -940,7 +902,7 @@ export function useAnalyticsFilters({
} else {
const parsed = parseFilterParam(currentParam);
- if (!parsed.values.includes(value)) {
+ if (parsed && !parsed.values.includes(value)) {
const newValues = [...parsed.values, value];
const newParam = parsed.operator.includes("NOT")
? `-${newValues.join(",")}`
@@ -955,23 +917,12 @@ export function useAnalyticsFilters({
}
}
},
- [queryParams, activeFilters, selectedTagIds, searchParamsObj, parseFilterParam],
+ [queryParams, activeFilters, searchParamsObj, parseFilterParam],
);
const onRemove = useCallback(
(key, value) => {
- if (key === "tagIds") {
- if (selectedTagIds.length === 1 && selectedTagIds[0] === value) {
- queryParams({ del: "tagIds", scroll: false });
- } else {
- queryParams({
- set: {
- tagIds: selectedTagIds.filter((id) => id !== value).join(","),
- },
- scroll: false,
- });
- }
- } else if (key === "link") {
+ if (key === "link") {
queryParams({
del: ["domain", "key", "url"],
scroll: false,
@@ -982,23 +933,23 @@ export function useAnalyticsFilters({
if (!currentParam) return;
const parsed = parseFilterParam(currentParam);
- const newValues = parsed.values.filter((v) => v !== value);
+ const newValues = parsed?.values?.filter((v) => v !== value);
- if (newValues.length === 0) {
+ if (newValues?.length === 0) {
queryParams({ del: key, scroll: false });
} else {
- const newParam = parsed.operator.includes("NOT")
- ? `-${newValues.join(",")}`
- : newValues.join(",");
+ const newParam = parsed?.operator?.includes("NOT")
+ ? `-${newValues?.join(",")}`
+ : newValues?.join(",");
queryParams({
- set: { [key]: newParam },
+ set: { [key]: newParam as string },
scroll: false,
});
}
}
},
- [queryParams, selectedTagIds, searchParamsObj, parseFilterParam],
+ [queryParams, searchParamsObj, parseFilterParam],
);
const onRemoveAll = useCallback(
diff --git a/packages/tinybird/pipes/v3_count.pipe b/packages/tinybird/pipes/v3_count.pipe
index 536542aee3..af87f72657 100644
--- a/packages/tinybird/pipes/v3_count.pipe
+++ b/packages/tinybird/pipes/v3_count.pipe
@@ -78,20 +78,19 @@ SQL >
{% if defined(referer) %} AND referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}
@@ -100,68 +99,98 @@ SQL >
{% for item in JSON(filters, '[]') %}
{% if item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -199,20 +228,19 @@ SQL >
{% if defined(referer) %} AND referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime(start) }} {% end %}
@@ -238,76 +266,98 @@ SQL >
{% end %}
{% elif item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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') }}
+ {% end %}
+ {% elif field == 'browser' %}
+ {% if operator == 'IN' %} AND browser IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND browser NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% elif field == 'os' %}
+ {% if operator == 'IN' %} AND os IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND os NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% elif field == 'trigger' %}
+ {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% elif field == 'referer' %}
+ {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}
+ {% 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') }}
+ {% 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') }}
+ {% end %}
+ {% elif field == 'utm_source' %}
{% if operator == 'IN' %}
- AND ({% for val in values %}{% if not loop.first %} OR {% end %}url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ AND (0{% for val in values %} OR 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]) }}), '%')
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
{% 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 %})
+ AND (0{% for val in values %} OR 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]) }}), '%')
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
{% 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 %})
+ AND (0{% for val in values %} OR 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]) }}), '%')
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
{% 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 %})
+ AND (0{% for val in values %} OR 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]) }}), '%')
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
{% 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 %})
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% 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]) }}), '%')
+ AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
{% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -383,29 +433,21 @@ SQL >
{% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
{% if defined(os) %} AND se.os = {{ os }} {% end %}
{% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
- {% if defined(refererUrl) %}
- AND splitByString('?', se.referer_url)[1] = {{ refererUrl }}
- {% end %}
+ {% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND se.url
- LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND se.url
- LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND se.url LIKE concat(
- '%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%'
- )
+ AND se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND se.url
- LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND se.url
- LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND se.timestamp >= {{ DateTime(start) }} {% end %}
@@ -429,13 +471,118 @@ 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', 'IN') %}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% 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') }}
+ {% end %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND se.link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled after this subquery #}
+ {% end %}
{% end %}
{% end %}
{% end %}
) AS typed
WHERE
true
- {% if defined(saleType) %} AND typed.sale_type = {{ String(saleType) }} {% end %}
+ {% if defined(filters) %}
+ {% for item in JSON(filters, '[]') %}
+ {% if item.get('field', '') == 'saleType' %}
+ {% set operator = item.get('operator', 'IN') %}
+ {% set values = item.get('values', []) %}
+ {% if operator == 'IN' %} AND typed.sale_type IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND typed.sale_type NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% end %}
+ {% end %}
+ {% end %}
) AS subquery
diff --git a/packages/tinybird/pipes/v3_group_by.pipe b/packages/tinybird/pipes/v3_group_by.pipe
index 6fcf0c7eb8..4863a92c2e 100644
--- a/packages/tinybird/pipes/v3_group_by.pipe
+++ b/packages/tinybird/pipes/v3_group_by.pipe
@@ -123,20 +123,19 @@ SQL >
{% if defined(referer) %} AND referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}
@@ -162,68 +161,98 @@ SQL >
{% end %}
{% elif item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -313,20 +342,19 @@ SQL >
{% if defined(referer) %} AND referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime(start) }} {% end %}
@@ -352,68 +380,98 @@ SQL >
{% end %}
{% elif item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -539,20 +597,19 @@ SQL >
{% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND se.url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND se.url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND se.url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND se.url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND se.url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND se.timestamp >= {{ DateTime(start) }} {% end %}
@@ -578,68 +635,98 @@ SQL >
{% end %}
{% elif item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND se.link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled after this subquery #}
{% end %}
{% end %}
{% end %}
@@ -647,7 +734,17 @@ SQL >
) AS typed
WHERE
groupByField != '' AND groupByField != 'Unknown'
- {% if defined(saleType) %} AND typed.sale_type = {{ String(saleType) }} {% end %}
+ {% if defined(filters) %}
+ {% for item in JSON(filters, '[]') %}
+ {% if item.get('field', '') == 'saleType' %}
+ {% set operator = item.get('operator', 'IN') %}
+ {% set values = item.get('values', []) %}
+ {% if operator == 'IN' %} AND typed.sale_type IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND typed.sale_type NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% end %}
+ {% end %}
+ {% end %}
GROUP BY
groupByField
{% if String(groupBy) == 'cities' %}, country, region
diff --git a/packages/tinybird/pipes/v3_group_by_link_metadata.pipe b/packages/tinybird/pipes/v3_group_by_link_metadata.pipe
index fcb9e7abd9..aeae867436 100644
--- a/packages/tinybird/pipes/v3_group_by_link_metadata.pipe
+++ b/packages/tinybird/pipes/v3_group_by_link_metadata.pipe
@@ -82,101 +82,105 @@ SQL >
{% if defined(linkIds) %} AND ce.link_id IN {{ Array(linkIds, 'String') }}
{% elif defined(linkId) %} AND ce.link_id = {{ linkId }}
{% end %}
- {% if defined(continent) %} AND continent = {{ continent }} {% end %}
- {% if defined(country) %} AND country = {{ country }} {% end %}
{% if defined(region) %} AND region = {{ region }} {% end %}
- {% if defined(city) %} AND city = {{ city }} {% end %}
- {% if defined(device) %} AND device = {{ device }} {% end %}
- {% if defined(browser) %} AND browser = {{ browser }} {% end %}
- {% if defined(os) %} AND os = {{ os }} {% end %}
- {% if defined(trigger) %} AND trigger = {{ trigger }} {% end %}
- {% if defined(referer) %} AND referer = {{ referer }} {% end %}
- {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
- {% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
- {% end %}
- {% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
- {% end %}
- {% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
- {% end %}
- {% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
- {% end %}
- {% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
- {% end %}
- {% 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 operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND ce.link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND ce.link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND ce.link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND ce.link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND ce.link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND ce.link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND ce.link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND ce.link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -215,24 +219,22 @@ SQL >
{% if defined(device) %} AND device = {{ device }} {% end %}
{% if defined(browser) %} AND browser = {{ browser }} {% end %}
{% if defined(os) %} AND os = {{ os }} {% end %}
- {% if defined(trigger) %} AND trigger = {{ trigger }} {% end %}
{% if defined(referer) %} AND referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}
@@ -241,68 +243,98 @@ SQL >
{% for item in JSON(filters, '[]') %}
{% if item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND le.link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND le.link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND le.link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND le.link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND le.link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND le.link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND le.link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND le.link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -378,24 +410,22 @@ SQL >
{% if defined(device) %} AND se.device = {{ device }} {% end %}
{% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
{% if defined(os) %} AND se.os = {{ os }} {% end %}
- {% if defined(trigger) %} AND se.trigger = {{ trigger }} {% end %}
{% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND se.url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND se.url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND se.url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND se.url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND se.url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND se.timestamp >= {{ DateTime64(start) }} {% end %}
@@ -404,68 +434,98 @@ SQL >
{% for item in JSON(filters, '[]') %}
{% if item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND se.link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled after this subquery #}
{% end %}
{% end %}
{% end %}
@@ -475,7 +535,17 @@ SQL >
ON t.link_id = wl.link_id
WHERE
true
- {% if defined(saleType) %} AND t.sale_type = {{ String(saleType) }} {% end %}
+ {% if defined(filters) %}
+ {% for item in JSON(filters, '[]') %}
+ {% if item.get('field', '') == 'saleType' %}
+ {% set operator = item.get('operator', 'IN') %}
+ {% set values = item.get('values', []) %}
+ {% if operator == 'IN' %} AND t.sale_type IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND t.sale_type NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% end %}
+ {% end %}
+ {% end %}
GROUP BY wl.groupByField
ORDER BY saleAmount DESC
LIMIT 5000
diff --git a/packages/tinybird/pipes/v3_timeseries.pipe b/packages/tinybird/pipes/v3_timeseries.pipe
index f4064daa1f..7030bb7904 100644
--- a/packages/tinybird/pipes/v3_timeseries.pipe
+++ b/packages/tinybird/pipes/v3_timeseries.pipe
@@ -150,101 +150,105 @@ SQL >
root
) %} AND link_id in (SELECT link_id from workspace_links)
{% end %}
- {% if defined(continent) %} AND continent = {{ continent }} {% end %}
- {% if defined(country) %} AND country = {{ country }} {% end %}
{% if defined(region) %} AND region = {{ region }} {% end %}
- {% if defined(city) %} AND city = {{ city }} {% end %}
- {% if defined(device) %} AND device = {{ device }} {% end %}
- {% if defined(browser) %} AND browser = {{ browser }} {% end %}
- {% if defined(os) %} AND os = {{ os }} {% end %}
- {% if defined(trigger) %} AND trigger = {{ trigger }} {% end %}
- {% if defined(referer) %} AND referer = {{ referer }} {% end %}
- {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
- {% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
- {% end %}
- {% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
- {% end %}
- {% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
- {% end %}
- {% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
- {% end %}
- {% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
- {% end %}
- {% 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 operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -309,20 +313,19 @@ SQL >
{% if defined(referer) %} AND referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}
@@ -331,68 +334,98 @@ SQL >
{% for item in JSON(filters, '[]') %}
{% if item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled in the sales subquery, not here #}
{% end %}
{% end %}
{% end %}
@@ -510,20 +543,19 @@ SQL >
{% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
{% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
{% if defined(utm_source) %}
- AND se.url LIKE concat('%utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
+ AND se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(utm_source) }}), '%')
{% end %}
{% if defined(utm_medium) %}
- AND se.url LIKE concat('%utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
+ AND se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(utm_medium) }}), '%')
{% end %}
{% if defined(utm_campaign) %}
- AND se.url
- LIKE concat('%utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
+ AND se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(utm_campaign) }}), '%')
{% end %}
{% if defined(utm_term) %}
- AND se.url LIKE concat('%utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
+ AND se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(utm_term) }}), '%')
{% end %}
{% if defined(utm_content) %}
- AND se.url LIKE concat('%utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
+ AND se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(utm_content) }}), '%')
{% end %}
{% if defined(url) %} AND splitByString('?', se.url)[1] = {{ url }} {% end %}
{% if defined(start) %} AND se.timestamp >= {{ DateTime64(start) }} {% end %}
@@ -532,76 +564,116 @@ SQL >
{% for item in JSON(filters, '[]') %}
{% if item.get('field', '') %}
{% set field = item.get('field', '') %}
- {% set operator = item.get('operator', '=') %}
+ {% set operator = item.get('operator', 'IN') %}
{% 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 %}
+ {% elif field == 'utm_source' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_source=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_medium' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_medium=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_campaign' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_campaign=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_term' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_term=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'utm_content' %}
+ {% if operator == 'IN' %}
+ AND (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% elif operator == 'NOT IN' %}
+ AND NOT (0{% for val in values %} OR se.url LIKE concat('%', 'utm_content=', encodeURLFormComponent({{ String(val) }}), '%'){% end %})
+ {% end %}
+ {% elif field == 'domain' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE domain IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'tagIds' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE arrayIntersect(tag_ids, {{ Array(values, 'String') }}) != [])
+ {% end %}
+ {% elif field == 'folderId' %}
+ {% if operator == 'IN' %} AND se.link_id IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% elif operator == 'NOT IN' %} AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE folder_id IN {{ Array(values, 'String') }})
+ {% end %}
+ {% elif field == 'root' %}
+ {% if operator == 'IN' %}
+ AND se.link_id IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% elif operator == 'NOT IN' %}
+ AND se.link_id NOT IN (SELECT link_id FROM workspace_links WHERE 0{% for val in values %} OR {% if val == 'true' %}key = '_root'{% else %}key != '_root'{% end %}{% end %})
+ {% end %}
+ {% elif field == 'saleType' %}
+ {# saleType is handled after this subquery #}
+ {% end %}
{% end %}
{% end %}
{% end %}
- {% end %}
) AS typed
WHERE
true
- {% if defined(saleType) %} AND typed.sale_type = {{ String(saleType) }} {% end %}
+ {% if defined(filters) %}
+ {% for item in JSON(filters, '[]') %}
+ {% if item.get('field', '') == 'saleType' %}
+ {% set operator = item.get('operator', 'IN') %}
+ {% set values = item.get('values', []) %}
+ {% if operator == 'IN' %} AND typed.sale_type IN {{ Array(values, 'String') }}
+ {% elif operator == 'NOT IN' %} AND typed.sale_type NOT IN {{ Array(values, 'String') }}
+ {% end %}
+ {% end %}
+ {% end %}
+ {% end %}
GROUP BY interval
ORDER BY interval
diff --git a/packages/ui/src/filter/filter-select.tsx b/packages/ui/src/filter/filter-select.tsx
index 70f957d652..d0968fb980 100644
--- a/packages/ui/src/filter/filter-select.tsx
+++ b/packages/ui/src/filter/filter-select.tsx
@@ -28,7 +28,6 @@ type FilterSelectProps = {
onSearchChange?: (search: string) => void;
onSelectedFilterChange?: (key: string | null) => void;
activeFilters?: ActiveFilter[];
- multiSelect?: boolean;
askAI?: boolean;
children?: ReactNode;
emptyState?: ReactNode | Record<string, ReactNode>;
@@ -43,7 +42,6 @@ export function FilterSelect({
onSearchChange,
onSelectedFilterChange,
activeFilters,
- multiSelect = false,
askAI,
children,
emptyState,
@@ -116,7 +114,8 @@ export function FilterSelect({
const selectOption = useCallback(
(value: FilterOption["value"]) => {
if (selectedFilter) {
- const isSingleSelect = selectedFilter.singleSelect || !multiSelect;
+ const isSingleSelect = selectedFilter?.singleSelect;
+
if (isSingleSelect) {
const isSelected = isOptionSelected(value);
isSelected
@@ -133,7 +132,7 @@ export function FilterSelect({
}
}
},
- [selectedFilter, multiSelect, isOptionSelected, onSelect, onRemove],
+ [selectedFilter, isOptionSelected, onSelect, onRemove],
);
@@ -240,7 +239,7 @@ export function FilterSelect({
selectedFilter.options
?.filter((option) => !search || !option.hideDuringSearch)
?.map((option) => {
- const isSingleSelect = selectedFilter.singleSelect || !multiSelect;
+ const isSingleSelect = selectedFilter?.singleSelect;
const isSelected = isOptionSelected(option.value);
return (
diff --git a/packages/utils/src/functions/parse-filter-value.ts b/packages/utils/src/functions/parse-filter-value.ts
index cc6a0c49e6..9aea182679 100644
--- a/packages/utils/src/functions/parse-filter-value.ts
+++ b/packages/utils/src/functions/parse-filter-value.ts
@@ -1,5 +1,5 @@
export type FilterOperator = "IS" | "IS_NOT" | "IS_ONE_OF" | "IS_NOT_ONE_OF";
-export type SQLOperator = "=" | "!=" | "IN" | "NOT IN";
+export type SQLOperator = "IN" | "NOT IN";
export interface ParsedFilter {
operator: FilterOperator;
@@ -11,10 +11,13 @@ export interface ParsedFilter {
* 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"]
+ * - "US" → IS, values: ["US"], SQL: IN
+ * - "US,BR,FR" → IS_ONE_OF, values: ["US", "BR", "FR"], SQL: IN
+ * - "-US" → IS_NOT, values: ["US"], SQL: NOT IN
+ * - "-US,BR" → IS_NOT_ONE_OF, values: ["US", "BR"], SQL: NOT IN
+ *
+ * Note: All filters now use IN/NOT IN operators for consistency,
+ * even for single values. This simplifies SQL query generation.
*
* @param value - The filter value string (can include "-" prefix for negation)
* @returns Parsed filter with operator and values array
@@ -27,7 +30,7 @@ export function parseFilterValue(
if (Array.isArray(value)) {
return {
operator: value.length > 1 ? "IS_ONE_OF" : "IS",
- sqlOperator: value.length > 1 ? "IN" : "=",
+ sqlOperator: "IN",
values: value,
};
}
@@ -46,13 +49,7 @@ export function parseFilterValue(
? "IS_ONE_OF"
: "IS";
- const sqlOperator: SQLOperator = isNegated
- ? values.length > 1
- ? "NOT IN"
- : "!="
- : values.length > 1
- ? "IN"
- : "=";
+ const sqlOperator: SQLOperator = isNegated ? "NOT IN" : "IN";
return { operator, sqlOperator, values };
}