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.

support linkIdOperator filtering

Steven Tey3b7816384567
diff --git a/apps/web/app/api/analytics/route.ts b/apps/web/app/api/analytics/route.ts
index 36d2d92957..c4c3fb5590 100644
--- a/apps/web/app/api/analytics/route.ts
+++ b/apps/web/app/api/analytics/route.ts
@@ -41,10 +41,10 @@ export const GET = withWorkspace(
interval,
start,
end,
- linkId,
externalId,
domain: domainFilter,
key,
+ linkId: linkIdFilter,
folderId: folderIdFilter,
programId,
} = parsedParams;
@@ -52,6 +52,7 @@ export const GET = withWorkspace(
// Extract string values for specific link/folder lookup
// When domain+key is provided, it's for getting a specific link (not filtering)
const domain = getFirstFilterValue(domainFilter);
+ const linkId = getFirstFilterValue(linkIdFilter);
const folderId = getFirstFilterValue(folderIdFilter);
let link: Link | null = null;
@@ -132,7 +133,6 @@ export const GET = withWorkspace(
...parsedParams,
event,
groupBy,
- ...(link && { linkId: link.id }),
folderIds,
workspaceId: workspace.id,
isDeprecatedClicksEndpoint,
diff --git a/apps/web/lib/analytics/constants.ts b/apps/web/lib/analytics/constants.ts
index 1f061b8f50..b48666dc25 100644
--- a/apps/web/lib/analytics/constants.ts
+++ b/apps/web/lib/analytics/constants.ts
@@ -120,6 +120,7 @@ export const SINGULAR_ANALYTICS_ENDPOINTS = {
export const VALID_ANALYTICS_FILTERS = [
"domain",
"key",
+ "linkId",
"interval",
"start",
"end",
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
index ea98bd9e4f..e84b0663de 100644
--- a/apps/web/lib/analytics/filter-helpers.ts
+++ b/apps/web/lib/analytics/filter-helpers.ts
@@ -88,6 +88,7 @@ export function ensureParsedFilter(
* so they need to be passed as separate parameters (not in the filters JSON).
*/
export function extractWorkspaceLinkFilters(params: {
+ linkId?: ParsedFilter;
domain?: ParsedFilter;
tagIds?: ParsedFilter;
folderId?: ParsedFilter;
@@ -103,6 +104,7 @@ export function extractWorkspaceLinkFilters(params: {
| "NOT IN",
});
+ const linkId = extractFilter(params.linkId);
const domain = extractFilter(params.domain);
const tagIds = extractFilter(params.tagIds);
const folderId = extractFilter(params.folderId);
@@ -112,6 +114,8 @@ export function extractWorkspaceLinkFilters(params: {
const root = extractFilter(params.root);
return {
+ linkId: linkId.values,
+ linkIdOperator: linkId.operator,
domain: domain.values,
domainOperator: domain.operator,
tagIds: tagIds.values,
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 0c9927d115..e780d6902c 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -28,7 +28,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
event,
groupBy,
workspaceId,
- linkIds,
+ linkId,
interval,
start,
end,
@@ -43,13 +43,13 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
} = params;
// get all-time clicks count if:
- // 1. linkIds is defined
+ // 1. linkId 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 (
- linkIds &&
+ linkId &&
groupBy === "count" &&
interval === "all" &&
!start &&
@@ -58,22 +58,20 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
(filter) => !params[filter as keyof AnalyticsFilters],
)
) {
- if (linkIds && linkIds.length > 0) {
- const linkIdsToFilter = linkIds.map(() => "?").join(",");
- const aggregateColumns =
- event === "composite"
- ? `SUM(clicks) as clicks, SUM(leads) as leads, SUM(sales) as sales, SUM(saleAmount) as saleAmount`
- : event === "sales"
- ? `SUM(sales) as sales, SUM(saleAmount) as saleAmount`
- : `SUM(${event}) as ${event}`;
+ const linkIdPlaceholders = linkId.values.map(() => "?").join(",");
+ const aggregateColumns =
+ event === "composite"
+ ? `SUM(clicks) as clicks, SUM(leads) as leads, SUM(sales) as sales, SUM(saleAmount) as saleAmount`
+ : event === "sales"
+ ? `SUM(sales) as sales, SUM(saleAmount) as saleAmount`
+ : `SUM(${event}) as ${event}`;
- const response = await conn.execute(
- `SELECT ${aggregateColumns} FROM Link WHERE id IN (${linkIdsToFilter})`,
- linkIds,
- );
+ const response = await conn.execute(
+ `SELECT ${aggregateColumns} FROM Link WHERE id IN (${linkIdPlaceholders})`,
+ linkId.values,
+ );
- return analyticsResponse["count"].parse(response.rows[0]);
- }
+ return analyticsResponse["count"].parse(response.rows[0]);
}
if (groupBy === "trigger") groupBy = "triggers";
@@ -136,6 +134,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
const {
domain: domainParam,
domainOperator,
+ linkId: linkIdParam,
+ linkIdOperator,
tagIds: tagIdsParam,
tagIdsOperator,
folderId: folderIdParam,
@@ -155,8 +155,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
const tinybirdParams: any = {
workspaceId,
- linkId: params.linkId,
- linkIds: params.linkIds,
+ linkId: linkIdParam,
+ linkIdOperator,
folderIds: params.folderIds,
customerId: params.customerId,
programId: params.programId,
@@ -181,7 +181,6 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
granularity,
timezone,
region: typeof regionForPipe === "string" ? regionForPipe : undefined,
-
filters: allFilters.length > 0 ? JSON.stringify(allFilters) : undefined,
};
diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.ts
index 91742eb572..4bc3236b2b 100644
--- a/apps/web/lib/analytics/types.ts
+++ b/apps/web/lib/analytics/types.ts
@@ -44,7 +44,6 @@ export type AnalyticsFilters = Partial<
workspaceId?: string;
dataAvailableFrom?: Date;
isDeprecatedClicksEndpoint?: boolean;
- linkIds?: string[];
folderIds?: string[]; // TODO: remove this once it's been added to the public API
start?: Date | null;
end?: Date | null;
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index 3c56ba3fe6..b8aa9536ef 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -74,16 +74,11 @@ export const analyticsQuerySchema = z.object({
linkId: z
.string()
.optional()
+ .transform(parseFilterValue)
.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.",
+ "The unique ID of the link to retrieve analytics for." +
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+ "Examples: `link_123`, `link_123,link_456`, `-link_789`.",
),
externalId: z
.string()
@@ -434,14 +429,9 @@ export const analyticsQuerySchema = z.object({
* Parse analytics query parameters with backward compatibility
* Converts deprecated singular fields (linkId, tagId) to their plural equivalents
*/
-export function parseAnalyticsQuery(searchParams: unknown) {
+export function parseAnalyticsQuery(searchParams: Record<string, string>) {
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
@@ -465,13 +455,15 @@ export const analyticsFilterTB = z.object({
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
+ linkId: 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."),
+ .describe(
+ "The link IDs to retrieve analytics for (with operator support).",
+ ),
+ linkIdOperator: z.enum(["IN", "NOT IN"]).optional(),
+ // TODO: remove folderIds since we'll just use folderId
folderIds: z
.union([z.string(), z.array(z.string())])
.transform((v) => (Array.isArray(v) ? v : v.split(",")))
@@ -484,6 +476,7 @@ export const analyticsFilterTB = z.object({
.describe(
"The folder ID(s) to retrieve analytics for (with operator support).",
),
+ folderIdOperator: z.enum(["IN", "NOT IN"]).optional(),
domain: z
.union([z.string(), z.array(z.string())])
.transform((v) => (Array.isArray(v) ? v : v.split(",")))
@@ -496,7 +489,6 @@ export const analyticsFilterTB = z.object({
.optional()
.describe("The tag IDs to retrieve analytics for."),
tagIdsOperator: z.enum(["IN", "NOT IN"]).optional(),
- folderIdOperator: z.enum(["IN", "NOT IN"]).optional(),
root: z
.union([
z.string(),
@@ -598,11 +590,6 @@ export const eventsQuerySchema = analyticsQuerySchema
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
diff --git a/apps/web/ui/analytics/top-links.tsx b/apps/web/ui/analytics/top-links.tsx
index c06776981f..7f9e7e7fe7 100644
--- a/apps/web/ui/analytics/top-links.tsx
+++ b/apps/web/ui/analytics/top-links.tsx
@@ -173,15 +173,12 @@ export function TopLinks() {
// Determine href
let href: string | undefined;
if (isLinksSubtab) {
- const hasLinkFilter =
- searchParams.has("domain") && searchParams.has("key");
href = queryParams({
- ...(hasLinkFilter
- ? { del: ["domain", "key"] }
+ ...(searchParams.has("linkId")
+ ? { del: ["linkId"] }
: {
set: {
- domain: d.domain,
- key: d.key || "_root",
+ linkId: d.id,
},
}),
getNewPath: true,
diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index 6a09cd189d..cf395ce590 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -126,7 +126,7 @@ export function useAnalyticsFilters({
);
const activeFilters = useMemo(() => {
- const { domain, key, tagIds, root, folderId, ...params } = searchParamsObj;
+ const { domain, key, root, ...params } = searchParamsObj;
// Handle special cases first
const filters: Array<{
@@ -134,11 +134,11 @@ export function useAnalyticsFilters({
operator: FilterOperator;
values: any[];
}> = [
- // Handle domain/key special case for links
- ...(domain && key
+ // Legacy: show one link chip when domain+key are present (no linkId)
+ ...(domain && key && !params.linkId
? [
{
- key: "link",
+ key: "linkId",
operator: "IS" as FilterOperator,
values: [linkConstructor({ domain, key, pretty: true })],
},
@@ -166,20 +166,13 @@ export function useAnalyticsFilters({
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;
+ // Skip domain if we're showing a specific link (domain + key) without linkId
+ if (filter === "domain" && domain && key && !params.linkId) return;
const value =
params[filter] ||
- (filter === "domain"
- ? domain
- : filter === "tagIds"
- ? tagIds
- : filter === "root"
- ? root
- : filter === "folderId"
- ? folderId
- : undefined);
+ (filter === "domain" ? domain : filter === "root" ? root : undefined);
+
if (value) {
const parsed = parseFilterParam(value);
if (parsed) {
@@ -209,7 +202,7 @@ export function useAnalyticsFilters({
);
const { data: links } = useAnalyticsFilterOption("top_links", {
- disabled: !isRequested("link"),
+ disabled: !isRequested("linkId"),
omitGroupByFilterKey: true,
context,
});
@@ -362,22 +355,28 @@ export function useAnalyticsFilters({
const [streaming, setStreaming] = useState<boolean>(false);
const LinkFilterItem = {
- key: "link",
+ key: "linkId",
icon: Hyperlink,
label: "Link",
- getOptionIcon: (value, props) => {
- const url = props.option?.data?.url;
- const [domain, key] = value.split("/");
-
- return <LinkIcon url={url} domain={domain} linkKey={key} />;
+ multiple: true,
+ getOptionIcon: (_value, props) => {
+ const data = props.option?.data;
+ const url = data?.url;
+ return <LinkIcon url={url} />;
},
options:
links?.map(
- ({ domain, key, url, ...rest }: LinkProps & { count?: number }) => ({
- value: linkConstructor({ domain, key, pretty: true }),
+ ({
+ id,
+ domain,
+ key,
+ url,
+ ...rest
+ }: LinkProps & { id?: string; count?: number }) => ({
+ value: id,
label: linkConstructor({ domain, key, pretty: true }),
right: getFilterOptionTotal(rest),
- data: { url },
+ data: { url, domain, key },
permalink:
slug && !partnerPage
? `/${slug}/links/${linkConstructor({ domain, key, pretty: true })}`
@@ -576,10 +575,6 @@ export function useAnalyticsFilters({
/>
);
},
- getOptionLabel: (value) => {
- if (typeof value !== "string") return String(value);
- return COUNTRIES[value] || value;
- },
options:
countries?.map(({ country, ...rest }) => ({
value: country,
@@ -862,7 +857,10 @@ export function useAnalyticsFilters({
async (key, value) => {
if (Array.isArray(value)) {
if (value.length === 0) {
- queryParams({ del: key, scroll: false });
+ queryParams({
+ del: key,
+ scroll: false,
+ });
} else {
const currentParam = searchParamsObj[key];
const isNegated = currentParam?.startsWith("-") ?? false;
@@ -897,15 +895,6 @@ export function useAnalyticsFilters({
}
}
setStreaming(false);
- } else if (key === "link") {
- queryParams({
- set: {
- domain: new URL(`https://${value}`).hostname,
- key: new URL(`https://${value}`).pathname.slice(1) || "_root",
- },
- del: "page",
- scroll: false,
- });
} else {
const currentParam = searchParamsObj[key];
@@ -938,36 +927,29 @@ export function useAnalyticsFilters({
const onRemove = useCallback(
(key, value) => {
- if (key === "link") {
- queryParams({
- del: ["domain", "key", "url"],
- scroll: false,
- });
- } else {
- const currentParam = searchParamsObj[key];
+ const currentParam = searchParamsObj[key];
- if (!currentParam) return;
+ if (!currentParam) return;
- const parsed = parseFilterParam(currentParam);
- if (!parsed) {
- queryParams({ del: key, scroll: false });
- return;
- }
+ const parsed = parseFilterParam(currentParam);
+ if (!parsed) {
+ queryParams({ del: key, scroll: false });
+ return;
+ }
- const newValues = parsed.values.filter((v) => v !== value);
+ const newValues = parsed.values.filter((v) => v !== value);
- if (newValues.length === 0) {
- queryParams({ del: key, scroll: false });
- } else {
- const newParam = parsed.operator.includes("NOT")
- ? `-${newValues.join(",")}`
- : newValues.join(",");
+ if (newValues.length === 0) {
+ queryParams({ del: key, scroll: false });
+ } else {
+ const newParam = parsed.operator.includes("NOT")
+ ? `-${newValues.join(",")}`
+ : newValues.join(",");
- queryParams({
- set: { [key]: newParam },
- scroll: false,
- });
- }
+ queryParams({
+ set: { [key]: newParam },
+ scroll: false,
+ });
}
},
[queryParams, searchParamsObj, parseFilterParam],
@@ -1009,13 +991,7 @@ export function useAnalyticsFilters({
);
const onRemoveFilter = useCallback(
- (key) => {
- if (key === "link") {
- queryParams({ del: ["domain", "key", "url"], scroll: false });
- } else {
- queryParams({ del: key, scroll: false });
- }
- },
+ (key) => queryParams({ del: key, scroll: false }),
[queryParams],
);
diff --git a/apps/web/ui/analytics/utils.ts b/apps/web/ui/analytics/utils.ts
index cb2e5e8794..c7c405bcb0 100644
--- a/apps/web/ui/analytics/utils.ts
+++ b/apps/web/ui/analytics/utils.ts
@@ -60,7 +60,7 @@ export function useAnalyticsFilterOption(
// else, we need to remove the filter for that groupBy param
(() => {
if (!groupBy || !options?.omitGroupByFilterKey) return undefined;
- if (groupBy === "top_links") return ["domain", "key"];
+ if (groupBy === "top_links") return ["linkId"];
return SINGULAR_ANALYTICS_ENDPOINTS[groupBy]
? SINGULAR_ANALYTICS_ENDPOINTS[groupBy]
: undefined;
diff --git a/packages/tinybird/pipes/v4_count.pipe b/packages/tinybird/pipes/v4_count.pipe
index 88b06b2dbd..ca63703851 100644
--- a/packages/tinybird/pipes/v4_count.pipe
+++ b/packages/tinybird/pipes/v4_count.pipe
@@ -93,8 +93,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -243,8 +247,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -450,8 +458,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND se.workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND se.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND se.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND se.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND se.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
diff --git a/packages/tinybird/pipes/v4_events.pipe b/packages/tinybird/pipes/v4_events.pipe
index 36fc609bd8..6b5ecdd706 100644
--- a/packages/tinybird/pipes/v4_events.pipe
+++ b/packages/tinybird/pipes/v4_events.pipe
@@ -97,8 +97,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -261,8 +265,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -460,8 +468,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND se.workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND se.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND se.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND se.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND se.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
diff --git a/packages/tinybird/pipes/v4_group_by.pipe b/packages/tinybird/pipes/v4_group_by.pipe
index dae18e1f73..edd070cc69 100644
--- a/packages/tinybird/pipes/v4_group_by.pipe
+++ b/packages/tinybird/pipes/v4_group_by.pipe
@@ -138,8 +138,12 @@ SQL >
WHERE
groupByField != '' AND groupByField != 'Unknown'
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -357,8 +361,12 @@ SQL >
WHERE
groupByField != '' AND groupByField != 'Unknown'
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -612,8 +620,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND se.workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND se.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND se.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND se.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND se.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
diff --git a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
index b0a02fdaf9..a15c5be9d5 100644
--- a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
+++ b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
@@ -115,8 +115,12 @@ SQL >
required=True,
)
}}
- {% if defined(linkIds) %} AND ce.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND ce.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND ce.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND ce.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% end %}
{% if defined(region) %} AND region = {{ region }} {% end %}
{% if defined(start) %} AND timestamp >= {{ DateTime64(start) }} {% end %}
@@ -234,8 +238,12 @@ SQL >
required=True,
)
}}
- {% if defined(linkIds) %} AND le.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND le.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND le.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND le.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% end %}
{% if defined(customerId) %} AND customer_id = {{ String(customerId) }} {% end %}
{% if defined(continent) %} AND continent = {{ continent }} {% end %}
@@ -425,8 +433,12 @@ SQL >
required=True,
)
}}
- {% if defined(linkIds) %} AND se.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND se.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND se.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND se.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% end %}
{% if defined(customerId) %} AND se.customer_id = {{ String(customerId) }} {% end %}
{% if defined(continent) %} AND se.continent = {{ continent }} {% end %}
diff --git a/packages/tinybird/pipes/v4_timeseries.pipe b/packages/tinybird/pipes/v4_timeseries.pipe
index 3557e784dc..d2eb087b76 100644
--- a/packages/tinybird/pipes/v4_timeseries.pipe
+++ b/packages/tinybird/pipes/v4_timeseries.pipe
@@ -176,8 +176,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -328,8 +332,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(
@@ -575,8 +583,12 @@ SQL >
WHERE
true
{% if defined(workspaceId) %} AND se.workspace_id = {{ workspaceId }} {% end %}
- {% if defined(linkIds) %} AND se.link_id IN {{ Array(linkIds, 'String') }}
- {% elif defined(linkId) %} AND se.link_id = {{ linkId }}
+ {% if defined(linkId) %}
+ {% if defined(linkIdOperator) and String(linkIdOperator) == 'NOT IN' %}
+ AND se.link_id NOT IN {{ Array(linkId, 'String') }}
+ {% else %}
+ AND se.link_id IN {{ Array(linkId, 'String') }}
+ {% end %}
{% elif defined(programId) or defined(partnerId) or defined(groupId) or defined(
tenantId
) or defined(folderIds) or defined(folderId) or defined(domain) or defined(