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.

standardize tagIds → tagId

Steven Teycfc392dbddde
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
index e84b0663de..ed1370cb41 100644
--- a/apps/web/lib/analytics/filter-helpers.ts
+++ b/apps/web/lib/analytics/filter-helpers.ts
@@ -90,8 +90,8 @@ export function ensureParsedFilter(
export function extractWorkspaceLinkFilters(params: {
linkId?: ParsedFilter;
domain?: ParsedFilter;
- tagIds?: ParsedFilter;
folderId?: ParsedFilter;
+ tagId?: ParsedFilter;
partnerId?: ParsedFilter;
groupId?: ParsedFilter;
tenantId?: ParsedFilter;
@@ -106,7 +106,7 @@ export function extractWorkspaceLinkFilters(params: {
const linkId = extractFilter(params.linkId);
const domain = extractFilter(params.domain);
- const tagIds = extractFilter(params.tagIds);
+ const tagId = extractFilter(params.tagId);
const folderId = extractFilter(params.folderId);
const partnerId = extractFilter(params.partnerId);
const groupId = extractFilter(params.groupId);
@@ -118,8 +118,8 @@ export function extractWorkspaceLinkFilters(params: {
linkIdOperator: linkId.operator,
domain: domain.values,
domainOperator: domain.operator,
- tagIds: tagIds.values,
- tagIdsOperator: tagIds.operator,
+ tagId: tagId.values,
+ tagIdOperator: tagId.operator,
folderId: folderId.values,
folderIdOperator: folderId.operator,
partnerId: partnerId.values,
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 4c97ff1fe4..ccaf0cfbb1 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -136,10 +136,10 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
domainOperator,
linkId: linkIdParam,
linkIdOperator,
- tagIds: tagIdsParam,
- tagIdsOperator,
folderId: folderIdParam,
folderIdOperator,
+ tagId: tagIdParam,
+ tagIdOperator,
partnerId: partnerIdParam,
partnerIdOperator,
groupId: groupIdParam,
@@ -167,10 +167,10 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
linkIdOperator,
domain: domainParam,
domainOperator,
- tagIds: tagIdsParam,
- tagIdsOperator,
folderId: folderIdParam,
folderIdOperator,
+ tagId: tagIdParam,
+ tagIdOperator,
root: rootParam,
rootOperator,
groupBy,
diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.ts
index 1639bcea3a..908f97e702 100644
--- a/apps/web/lib/analytics/get-events.ts
+++ b/apps/web/lib/analytics/get-events.ts
@@ -114,8 +114,8 @@ export const getEvents = async (params: EventsFilters) => {
linkIdOperator,
domain: domainParam,
domainOperator,
- tagIds: tagIdsParam,
- tagIdsOperator,
+ tagId: tagIdParam,
+ tagIdOperator,
folderId: folderIdParam,
folderIdOperator,
partnerId: partnerIdParam,
@@ -155,7 +155,7 @@ export const getEvents = async (params: EventsFilters) => {
...(typeof regionForPipe === "string" ? { region: regionForPipe } : {}),
// Workspace links filters with operators
...(domainParam ? { domain: domainParam, domainOperator } : {}),
- ...(tagIdsParam ? { tagIds: tagIdsParam, tagIdsOperator } : {}),
+ ...(tagIdParam ? { tagId: tagIdParam, tagIdOperator } : {}),
...(folderIdParam ? { folderId: folderIdParam, folderIdOperator } : {}),
...(rootParam ? { root: rootParam, rootOperator } : {}),
order: sortOrder,
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index 6f1cb22c8a..17ca266e6f 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -283,12 +283,12 @@ export const analyticsQuerySchema = z.object({
"Examples: `https://example.com`, `https://example.com,https://other.com`, `-https://spam.com`.",
)
.meta({ example: "https://example.com" }),
- tagIds: z
+ tagId: z
.string()
.optional()
.transform(parseFilterValue)
.describe(
- "The tag IDs to retrieve analytics for. " +
+ "The tag ID 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`.",
)
@@ -314,6 +314,54 @@ export const analyticsQuerySchema = z.object({
"Examples: `grp_123`, `grp_123,grp_456`, `-grp_789`.",
)
.meta({ example: "grp_123" }),
+ utm_source: z
+ .string()
+ .optional()
+ .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()
+ .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()
+ .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" }),
root: z
.string()
.optional()
@@ -362,11 +410,12 @@ export const analyticsQuerySchema = z.object({
example: "metadata['key']:'value'",
}),
// deprecated fields
- tagId: z
+ tagIds: z
.string()
.optional()
+ .transform(parseFilterValue)
.describe(
- "Deprecated: Use `tagIds` instead. The tag ID to retrieve analytics for.",
+ "Deprecated: Use `tagId` instead. The tag IDs to retrieve analytics for.",
)
.meta({ deprecated: true }),
qr: booleanQuerySchema
@@ -375,71 +424,17 @@ export const analyticsQuerySchema = z.object({
"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 }),
- utm_source: z
- .string()
- .optional()
- .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()
- .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()
- .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
+ * Converts deprecated multiple value fields (tagIds) to singular fields (tagId)
*/
export function parseAnalyticsQuery(searchParams: Record<string, string>) {
const data = analyticsQuerySchema.parse(searchParams);
- // 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],
- };
+ if (data.tagIds && !data.tagId) {
+ data.tagId = data.tagIds;
}
return data;
@@ -477,12 +472,14 @@ export const analyticsFilterTB = z.object({
.optional()
.describe("The domain(s) to retrieve analytics for."),
domainOperator: z.enum(["IN", "NOT IN"]).optional(),
- tagIds: z
+ tagId: z
.union([z.string(), z.array(z.string())])
.transform((v) => (Array.isArray(v) ? v : v.split(",")))
.optional()
- .describe("The tag IDs to retrieve analytics for."),
- tagIdsOperator: z.enum(["IN", "NOT IN"]).optional(),
+ .describe(
+ "The tag ID(s) to retrieve analytics for (with operator support).",
+ ),
+ tagIdOperator: z.enum(["IN", "NOT IN"]).optional(),
root: z
.union([
z.string(),
@@ -576,23 +573,3 @@ 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 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/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index c27358c6ae..a04c585271 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -1007,7 +1007,7 @@ export function useAnalyticsFilters({
...(streaming && !activeFilters.length
? Array.from({ length: 2 }, (_, i) => i).map((i) => ({
key: "loader",
- values: [i],
+ values: [String(i)],
operator: "IS" as const,
}))
: []),
diff --git a/packages/tinybird/pipes/v4_count.pipe b/packages/tinybird/pipes/v4_count.pipe
index 6b8aa337e4..bc97262977 100644
--- a/packages/tinybird/pipes/v4_count.pipe
+++ b/packages/tinybird/pipes/v4_count.pipe
@@ -50,11 +50,11 @@ SQL >
AND domain IN {{ Array(domain, 'String') }}
{% end %}
{% end %}
- {% if defined(tagIds) %}
- {% if defined(tagIdsOperator) and String(tagIdsOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagIds, 'String') }}, tag_ids)) = length(tag_ids)
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
{% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagIds, 'String') }}) != []
+ AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
{% end %}
{% if defined(folderId) %}
@@ -102,7 +102,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -215,7 +215,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -256,7 +256,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -386,7 +386,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -467,7 +467,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND se.link_id in (SELECT link_id from workspace_links)
@@ -597,7 +597,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
diff --git a/packages/tinybird/pipes/v4_events.pipe b/packages/tinybird/pipes/v4_events.pipe
index 1ecb8ec3e6..5777f1d17d 100644
--- a/packages/tinybird/pipes/v4_events.pipe
+++ b/packages/tinybird/pipes/v4_events.pipe
@@ -50,11 +50,11 @@ SQL >
AND domain IN {{ Array(domain, 'String') }}
{% end %}
{% end %}
- {% if defined(tagIds) %}
- {% if defined(tagIdsOperator) and String(tagIdsOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagIds, 'String') }}, tag_ids)) = length(tag_ids)
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
{% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagIds, 'String') }}) != []
+ AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
{% end %}
{% if defined(folderId) %}
@@ -106,7 +106,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -234,8 +234,8 @@ SQL >
{% end %}
{% elif field == 'domain' %}
{# domain is already filtered at workspace_links node level #}
- {% elif field == 'tagIds' %}
- {# tagIds is already filtered at workspace_links node level #}
+ {% elif field == 'tagId' %}
+ {# tagId is already filtered at workspace_links node level #}
{% elif field == 'folderId' %}
{# folderId is already filtered at workspace_links node level #}
{% elif field == 'root' %}
@@ -274,7 +274,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -402,8 +402,8 @@ SQL >
{% end %}
{% elif field == 'domain' %}
{# domain is already filtered at workspace_links node level #}
- {% elif field == 'tagIds' %}
- {# tagIds is already filtered at workspace_links node level #}
+ {% elif field == 'tagId' %}
+ {# tagId is already filtered at workspace_links node level #}
{% elif field == 'folderId' %}
{# folderId is already filtered at workspace_links node level #}
{% elif field == 'root' %}
@@ -477,7 +477,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND se.link_id in (SELECT link_id from workspace_links)
@@ -614,8 +614,8 @@ SQL >
{% end %}
{% elif field == 'domain' %}
{# domain is already filtered at workspace_links node level #}
- {% elif field == 'tagIds' %}
- {# tagIds is already filtered at workspace_links node level #}
+ {% elif field == 'tagId' %}
+ {# tagId is already filtered at workspace_links node level #}
{% elif field == 'folderId' %}
{# folderId is already filtered at workspace_links node level #}
{% elif field == 'root' %}
diff --git a/packages/tinybird/pipes/v4_group_by.pipe b/packages/tinybird/pipes/v4_group_by.pipe
index f25ecd1991..2192d5d05c 100644
--- a/packages/tinybird/pipes/v4_group_by.pipe
+++ b/packages/tinybird/pipes/v4_group_by.pipe
@@ -50,11 +50,11 @@ SQL >
AND domain IN {{ Array(domain, 'String') }}
{% end %}
{% end %}
- {% if defined(tagIds) %}
- {% if defined(tagIdsOperator) and String(tagIdsOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagIds, 'String') }}, tag_ids)) = length(tag_ids)
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
{% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagIds, 'String') }}) != []
+ AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
{% end %}
{% if defined(folderId) %}
@@ -147,7 +147,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -277,7 +277,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -370,7 +370,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -500,7 +500,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -629,7 +629,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND se.link_id in (SELECT link_id from workspace_links)
@@ -759,7 +759,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
diff --git a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
index a15c5be9d5..0b232cb42d 100644
--- a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
+++ b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
@@ -74,11 +74,11 @@ SQL >
AND domain IN {{ Array(domain, 'String') }}
{% end %}
{% end %}
- {% if defined(tagIds) %}
- {% if defined(tagIdsOperator) and String(tagIdsOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagIds, 'String') }}, tag_ids)) = length(tag_ids)
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
{% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagIds, 'String') }}) != []
+ AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
{% end %}
{% if defined(folderId) %}
@@ -203,8 +203,8 @@ SQL >
{% end %}
{% elif field == 'domain' %}
{# domain is already filtered at workspace_links node level #}
- {% elif field == 'tagIds' %}
- {# tagIds is already filtered at workspace_links node level #}
+ {% elif field == 'tagId' %}
+ {# tagId is already filtered at workspace_links node level #}
{% elif field == 'folderId' %}
{# folderId is already filtered at workspace_links node level #}
{% elif field == 'root' %}
@@ -353,7 +353,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -548,7 +548,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
diff --git a/packages/tinybird/pipes/v4_timeseries.pipe b/packages/tinybird/pipes/v4_timeseries.pipe
index bafbd03c0f..d99df0c288 100644
--- a/packages/tinybird/pipes/v4_timeseries.pipe
+++ b/packages/tinybird/pipes/v4_timeseries.pipe
@@ -123,11 +123,11 @@ SQL >
AND domain IN {{ Array(domain, 'String') }}
{% end %}
{% end %}
- {% if defined(tagIds) %}
- {% if defined(tagIdsOperator) and String(tagIdsOperator) == 'NOT IN' %}
- AND length(arrayFilter(x -> x NOT IN {{ Array(tagIds, 'String') }}, tag_ids)) = length(tag_ids)
+ {% if defined(tagId) %}
+ {% if defined(tagIdOperator) and String(tagIdOperator) == 'NOT IN' %}
+ AND length(arrayFilter(x -> x NOT IN {{ Array(tagId, 'String') }}, tag_ids)) = length(tag_ids)
{% else %}
- AND arrayIntersect(tag_ids, {{ Array(tagIds, 'String') }}) != []
+ AND arrayIntersect(tag_ids, {{ Array(tagId, 'String') }}) != []
{% end %}
{% end %}
{% if defined(folderId) %}
@@ -185,7 +185,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -273,7 +273,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -341,7 +341,7 @@ SQL >
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderId) or defined(domain) or defined(
- tagIds
+ tagId
) or defined(
root
) %} AND link_id in (SELECT link_id from workspace_links)
@@ -454,7 +454,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}
@@ -591,9 +591,9 @@ SQL >
{% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
- ) or defined(folderId) or defined(domain) or defined(
- tagIds
- ) or defined(
+ ) or defined(folderId) or defined(domain) or defined(
+ tagId
+ ) or defined(
root
) %} AND se.link_id in (SELECT link_id from workspace_links)
{% end %}
@@ -705,7 +705,7 @@ SQL >
{% 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' %}
+ {% elif field == 'tagId' %}
{% 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 %}