The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
remove root & saleType operator from tinybird / API
Steven Tey34a82c27607f
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.tsindex ed1370cb41..78a4b156f8 100644--- a/apps/web/lib/analytics/filter-helpers.ts+++ b/apps/web/lib/analytics/filter-helpers.ts@@ -81,7 +81,7 @@ export function ensureParsedFilter(}/**- * Extract workspace link filters (domain, tagIds, folderId, partnerId, root) into+ * Extract workspace link filters (domain, tagIds, folderId, partnerId) into* separate values and operators for Tinybird.** These filters are applied on the workspace_links node in Tinybird,@@ -95,7 +95,6 @@ export function extractWorkspaceLinkFilters(params: {partnerId?: ParsedFilter;groupId?: ParsedFilter;tenantId?: ParsedFilter;- root?: ParsedFilter;}) {const extractFilter = (filter?: ParsedFilter) => ({values: filter?.values,@@ -111,7 +110,6 @@ export function extractWorkspaceLinkFilters(params: {const partnerId = extractFilter(params.partnerId);const groupId = extractFilter(params.groupId);const tenantId = extractFilter(params.tenantId);- const root = extractFilter(params.root);return {linkId: linkId.values,@@ -128,8 +126,6 @@ export function extractWorkspaceLinkFilters(params: {groupIdOperator: groupId.operator,tenantId: tenantId.values,tenantIdOperator: tenantId.operator,- root: root.values,- rootOperator: root.operator,};}@@ -154,7 +150,6 @@ const SUPPORTED_FIELDS = ["utm_campaign","utm_term","utm_content",- "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.tsindex 4d5106a844..5a46cc5fc5 100644--- a/apps/web/lib/analytics/get-analytics.ts+++ b/apps/web/lib/analytics/get-analytics.ts@@ -148,8 +148,6 @@ export const getAnalytics = async (params: AnalyticsFilters) => {groupIdOperator,tenantId: tenantIdParam,tenantIdOperator,- root: rootParam,- rootOperator,} = extractWorkspaceLinkFilters({...params,partnerId: partnerIdFilter,@@ -174,8 +172,6 @@ export const getAnalytics = async (params: AnalyticsFilters) => {folderIdOperator,tagId: tagIdParam,tagIdOperator,- root: rootParam,- rootOperator,groupBy,eventType: event,start: formatUTCDateTimeClickhouse(startDate),@@ -183,6 +179,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {granularity,timezone,region: typeof regionForPipe === "string" ? regionForPipe : undefined,+ root: params.root,+ saleType: params.saleType,filters: allFilters.length > 0 ? JSON.stringify(allFilters) : undefined,};diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.tsindex 12fdecae87..d98fed4dcf 100644--- a/apps/web/lib/analytics/get-events.ts+++ b/apps/web/lib/analytics/get-events.ts@@ -112,8 +112,6 @@ export const getEvents = async (params: EventsFilters) => {groupIdOperator,tenantId: tenantIdParam,tenantIdOperator,- root: rootParam,- rootOperator,} = extractWorkspaceLinkFilters({...params,partnerId: partnerIdFilter,@@ -146,7 +144,8 @@ export const getEvents = async (params: EventsFilters) => {...(domainParam ? { domain: domainParam, domainOperator } : {}),...(tagIdParam ? { tagId: tagIdParam, tagIdOperator } : {}),...(folderIdParam ? { folderId: folderIdParam, folderIdOperator } : {}),- ...(rootParam ? { root: rootParam, rootOperator } : {}),+ ...(params.root !== undefined ? { root: params.root } : {}),+ ...(params.saleType ? { saleType: params.saleType } : {}),order: sortOrder,offset: (params.page - 1) * params.limit,limit: params.limit,diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.tsindex cce233f749..3f458c2b9f 100644--- a/apps/web/lib/zod/schemas/analytics.ts+++ b/apps/web/lib/zod/schemas/analytics.ts@@ -336,39 +336,16 @@ export const analyticsQuerySchema = z.object({"The UTM content to retrieve analytics for. " +"Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`).",),- root: z- .string()+ root: booleanQuerySchema.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. " +- "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.",+ "Filter for root domains. If true, filter for domains only. If false, filter for links only. If undefined, return both.",),saleType: z- .string()+ .enum(["new", "recurring"]).optional()- .transform(parseFilterValue).describe(- "Filter sales by type. Valid values: `new` (first-time purchases), `recurring` (repeat purchases). " +- "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +- "Examples: `new`, `new,recurring`, `-recurring`. " +- "If undefined, returns both.",+ "Filter sales by type: 'new' for first-time purchases, 'recurring' for repeat purchases. If undefined, returns both.",),query: z.string()@@ -492,23 +469,22 @@ export const analyticsFilterTB = z.object({// Region is a special case - it's the subdivision part of a region coderegion: z.string().optional(),root: z- .union([- z.string(),- z.boolean(),- z.array(z.union([z.string(), z.boolean()])),- ])+ .union([z.string(), z.boolean()]).transform((v) => {- const normalize = (val: string | boolean): boolean => {- if (typeof val === "boolean") return val;- return val === "true" || val === "1" || val === "yes";- };- if (Array.isArray(v)) return v.map(normalize);- return [normalize(v)];+ if (typeof v === "boolean") return v;+ return v === "true" || v === "1" || v === "yes";}).optional()- .describe("Filter for root domain links."),- rootOperator: z.enum(["IN", "NOT IN"]).optional(),+ .describe(+ "Filter for root domain links. True = root only, false = links only. Single value (no operator).",+ ),programId: z.string().optional(),+ saleType: z+ .enum(["new", "recurring"])+ .optional()+ .describe(+ "Filter sales by type: 'new' or 'recurring'. Single value only (no operator).",+ ),// All dimensional filters now go through the JSON filters parameterfilters: z.string()diff --git a/packages/tinybird/pipes/v4_count.pipe b/packages/tinybird/pipes/v4_count.pipeindex bc97262977..29b5717bd6 100644--- a/packages/tinybird/pipes/v4_count.pipe+++ b/packages/tinybird/pipes/v4_count.pipe@@ -65,11 +65,7 @@ SQL >{% end %}{% end %}{% if defined(root) %}- {% if defined(rootOperator) and String(rootOperator) == 'NOT IN' %}- AND NOT (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% else %}- AND (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% end %}+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}{% end %}@@ -223,14 +219,6 @@ SQL >{% 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 %}@@ -394,14 +382,6 @@ SQL >{% 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 %}@@ -605,14 +585,6 @@ SQL >{% 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 %}@@ -620,17 +592,7 @@ SQL >) AS typedWHEREtrue- {% 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 %}+ {% if defined(saleType) %} AND typed.sale_type = {{ String(saleType) }} {% end %}) AS subquerydiff --git a/packages/tinybird/pipes/v4_events.pipe b/packages/tinybird/pipes/v4_events.pipeindex 5777f1d17d..e017018671 100644--- a/packages/tinybird/pipes/v4_events.pipe+++ b/packages/tinybird/pipes/v4_events.pipe@@ -65,11 +65,7 @@ SQL >{% end %}{% end %}{% if defined(root) %}- {% if defined(rootOperator) and String(rootOperator) == 'NOT IN' %}- AND NOT (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% else %}- AND (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% end %}+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}{% end %}@@ -238,10 +234,6 @@ SQL >{# tagId is already filtered at workspace_links node level #}{% elif field == 'folderId' %}{# folderId is already filtered at workspace_links node level #}- {% elif field == 'root' %}- {# root is already filtered at workspace_links node level #}- {% elif field == 'saleType' %}- {# saleType only applies to sales events #}{% end %}{% end %}{% end %}@@ -406,10 +398,6 @@ SQL >{# tagId is already filtered at workspace_links node level #}{% elif field == 'folderId' %}{# folderId is already filtered at workspace_links node level #}- {% elif field == 'root' %}- {# root is already filtered at workspace_links node level #}- {% elif field == 'saleType' %}- {# saleType only applies to sales events #}{% end %}{% end %}{% end %}@@ -618,10 +606,6 @@ SQL >{# tagId is already filtered at workspace_links node level #}{% elif field == 'folderId' %}{# folderId is already filtered at workspace_links node level #}- {% elif field == 'root' %}- {# root is already filtered at workspace_links node level #}- {% elif field == 'saleType' %}- {# saleType is filtered in the outer query where the computed sale_type is available #}{% end %}{% end %}{% end %}@@ -630,17 +614,6 @@ SQL >) AS tWHERE 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 %}ORDER BY t.timestamp {% if order == 'asc' %} ASC {% else %} DESC {% end %}LIMIT {{ Int32(limit, 100) }}{% if defined(offset) %} OFFSET {{ Int32(offset, 0) }} {% end %}diff --git a/packages/tinybird/pipes/v4_group_by.pipe b/packages/tinybird/pipes/v4_group_by.pipeindex 2192d5d05c..790c1f8e63 100644--- a/packages/tinybird/pipes/v4_group_by.pipe+++ b/packages/tinybird/pipes/v4_group_by.pipe@@ -65,11 +65,7 @@ SQL >{% end %}{% end %}{% if defined(root) %}- {% if defined(rootOperator) and String(rootOperator) == 'NOT IN' %}- AND NOT (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% else %}- AND (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% end %}+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}{% end %}@@ -285,14 +281,6 @@ SQL >{% 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 %}@@ -508,14 +496,6 @@ SQL >{% 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 %}@@ -767,14 +747,6 @@ SQL >{% 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 %}@@ -782,17 +754,7 @@ SQL >) AS typedWHEREgroupByField != '' AND groupByField != 'Unknown'- {% 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 %}+ {% if defined(saleType) %} AND typed.sale_type = {{ String(saleType) }} {% end %}GROUP BYgroupByField{% if String(groupBy) == 'cities' %}, country, regiondiff --git a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe b/packages/tinybird/pipes/v4_group_by_link_metadata.pipeindex 0b232cb42d..a5a0f5ecba 100644--- a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe+++ b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe@@ -89,11 +89,7 @@ SQL >{% end %}{% end %}{% if defined(root) %}- {% if defined(rootOperator) and String(rootOperator) == 'NOT IN' %}- AND NOT (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% else %}- AND (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% end %}+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}{% end %}@@ -207,10 +203,6 @@ SQL >{# tagId is already filtered at workspace_links node level #}{% elif field == 'folderId' %}{# folderId is already filtered at workspace_links node level #}- {% elif field == 'root' %}- {# root is already filtered at workspace_links node level #}- {% elif field == 'saleType' %}- {# saleType is handled in the sales subquery, not here #}{% end %}{% end %}{% end %}@@ -361,14 +353,6 @@ SQL >{% 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 %}@@ -556,14 +540,6 @@ SQL >{% 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 %}@@ -573,17 +549,7 @@ SQL >ON t.link_id = wl.link_idWHEREtrue- {% 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 %}+ {% if defined(saleType) %} AND t.sale_type = {{ String(saleType) }} {% end %}GROUP BY wl.groupByFieldORDER BY saleAmount DESCLIMIT 5000diff --git a/packages/tinybird/pipes/v4_timeseries.pipe b/packages/tinybird/pipes/v4_timeseries.pipeindex d99df0c288..06ad2a3e24 100644--- a/packages/tinybird/pipes/v4_timeseries.pipe+++ b/packages/tinybird/pipes/v4_timeseries.pipe@@ -138,11 +138,7 @@ SQL >{% end %}{% end %}{% if defined(root) %}- {% if defined(rootOperator) and String(rootOperator) == 'NOT IN' %}- AND NOT (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% else %}- AND (0{% for val in root %}{% if val == 'true' %} OR key = '_root'{% else %} OR key != '_root'{% end %}{% end %})- {% end %}+ {% if Boolean(root) == 1 %} AND key = '_root' {% else %} AND key != '_root' {% end %}{% end %}@@ -281,14 +277,6 @@ SQL >{% 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 %}@@ -462,14 +450,6 @@ SQL >{% 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 %}{% elif item.get('operand', '').startswith('metadata.') %}{% set metadataKey = item.get('operand', '').split('.')[1] %}@@ -713,14 +693,6 @@ SQL >{% 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 %}{% elif item.get('operand', '').startswith('metadata.') %}{% set metadataKey = item.get('operand', '').split('.')[1] %}@@ -745,17 +717,7 @@ SQL >) AS typedWHEREtrue- {% 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 %}+ {% if defined(saleType) %} AND typed.sale_type = {{ String(saleType) }} {% end %}GROUP BY intervalORDER BY interval