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.

tagIds → tagId for analytics

Steven Teyb26c2fb9ee9e
diff --git a/apps/web/lib/analytics/constants.ts b/apps/web/lib/analytics/constants.ts
index da7839428e..d4a7f5f7bb 100644
--- a/apps/web/lib/analytics/constants.ts
+++ b/apps/web/lib/analytics/constants.ts
@@ -109,7 +109,7 @@ export const SINGULAR_ANALYTICS_ENDPOINTS = {
utm_contents: "utm_content",
// extra fields
top_folders: "folderId",
- top_link_tags: "tagIds",
+ top_link_tags: "tagId",
top_domains: "domain",
top_links: "linkId",
top_urls: "url",
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
index 78a4b156f8..256221a525 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) into
+ * Extract workspace link filters (domain, tagId, folderId, partnerId) into
* separate values and operators for Tinybird.
*
* These filters are applied on the workspace_links node in Tinybird,
diff --git a/apps/web/ui/analytics/analytics-provider.tsx b/apps/web/ui/analytics/analytics-provider.tsx
index 4c849415d5..162ff2b732 100644
--- a/apps/web/ui/analytics/analytics-provider.tsx
+++ b/apps/web/ui/analytics/analytics-provider.tsx
@@ -68,7 +68,7 @@ export const AnalyticsContext = createContext<{
start?: Date;
end?: Date;
interval?: string;
- tagIds?: string;
+ tagId?: string;
totalEvents?: {
[key in AnalyticsResponseOptions]: number;
};
@@ -206,7 +206,7 @@ export default function AnalyticsProvider({
start,
end,
interval,
- tagIds,
+ tagId,
folderId,
selectedTab,
} = useAnalyticsQuery({
@@ -292,11 +292,11 @@ export default function AnalyticsProvider({
domain: domain || undefined, // domain for the link (e.g. dub.sh, stey.me, etc.)
key: key ? decodeURIComponent(key) : undefined, // link key (e.g. github, weathergpt, etc.)
url: dashboardProps?.url, // url for the link (only for public stats pages)
- folderId: folderId || undefined, // id of the folder to filter by
+ folderId: folderId || undefined, // id of the folder(s) to filter by
+ tagId, // ids of the tag(s) to filter by
start, // start of time period
end, // end of time period
interval, /// time period interval
- tagIds, // ids of the tags to filter by
totalEvents, // totalEvents (clicks, leads, sales)
totalEventsLoading: totalEventsLoading,
adminPage, // whether the user is an admin
diff --git a/apps/web/ui/analytics/partner-section.tsx b/apps/web/ui/analytics/partner-section.tsx
index 36c2860753..a6237f4525 100644
--- a/apps/web/ui/analytics/partner-section.tsx
+++ b/apps/web/ui/analytics/partner-section.tsx
@@ -212,13 +212,13 @@ export function PartnerSection() {
getNewPath: true,
}) as string;
} else if (isTagsSubtab) {
- const hasTagFilter = searchParams.has("tagIds");
+ const hasTagFilter = searchParams.has("tagId");
href = queryParams({
...(hasTagFilter
- ? { del: "tagIds" }
+ ? { del: "tagId" }
: {
set: {
- tagIds: d.tagId,
+ tagId: d.tagId,
},
}),
getNewPath: true,
diff --git a/apps/web/ui/analytics/top-links.tsx b/apps/web/ui/analytics/top-links.tsx
index c7b81f5441..57c684d89a 100644
--- a/apps/web/ui/analytics/top-links.tsx
+++ b/apps/web/ui/analytics/top-links.tsx
@@ -209,13 +209,13 @@ export function TopLinks() {
getNewPath: true,
}) as string;
} else if (isTagsSubtab) {
- const hasTagFilter = searchParams.has("tagIds");
+ const hasTagFilter = searchParams.has("tagId");
href = queryParams({
...(hasTagFilter
- ? { del: "tagIds" }
+ ? { del: "tagId" }
: {
set: {
- tagIds: d.tagId,
+ tagId: d.tagId,
},
}),
getNewPath: true,
diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index 15d231adf3..3f6baea6ba 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -160,10 +160,10 @@ export function useAnalyticsFilters({
: []),
];
- // Handle all filters dynamically (including domain, tagIds, folderId, root)
+ // Handle all filters dynamically (including domain, tagId, folderId, root)
VALID_ANALYTICS_FILTERS.forEach((filter) => {
// Skip special cases we handled above
- if (["key", "tagId", "customerId"].includes(filter)) return;
+ if (["key", "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) without linkId
@@ -212,7 +212,7 @@ export function useAnalyticsFilters({
context,
});
const { data: linkTags } = useAnalyticsFilterOption("top_link_tags", {
- disabled: !isRequested("tagIds"),
+ disabled: !isRequested("tagId"),
omitGroupByFilterKey: true,
context,
});
@@ -515,7 +515,7 @@ export function useAnalyticsFilters({
})) ?? null,
},
{
- key: "tagIds",
+ key: "tagId",
icon: Tag,
label: "Tag",
getOptionIcon: (_value, props) => {
@@ -856,7 +856,7 @@ export function useAnalyticsFilters({
refererUrls,
baseUrls,
utmData,
- searchParamsObj.tagIds,
+ searchParamsObj.tagId,
searchParamsObj.domain,
],
);
diff --git a/apps/web/ui/analytics/use-analytics-query.tsx b/apps/web/ui/analytics/use-analytics-query.tsx
index 32ef651ccd..9acb7773f2 100644
--- a/apps/web/ui/analytics/use-analytics-query.tsx
+++ b/apps/web/ui/analytics/use-analytics-query.tsx
@@ -4,7 +4,6 @@ import {
VALID_ANALYTICS_FILTERS,
} from "@/lib/analytics/constants";
import { EventType } from "@/lib/analytics/types";
-import { combineTagIds } from "@/lib/api/tags/combine-tag-ids";
import useWorkspace from "@/lib/swr/use-workspace";
import { endOfDay, startOfDay, subDays } from "date-fns";
import { useSearchParams } from "next/navigation";
@@ -30,14 +29,9 @@ export function useAnalyticsQuery({
// key can be a query param (stats pages in app) or passed as a staticKey (shared analytics dashboards)
const key = searchParams?.get("key") || defaultKey;
- const tagIds = combineTagIds({
- tagId: searchParams?.get("tagId"),
- tagIds: searchParams?.get("tagIds")?.split(","),
- })?.join(",");
-
const folderId =
searchParams?.get("folderId") ?? defaultFolderId ?? undefined;
-
+ const tagId = searchParams?.get("tagId") ?? undefined;
const customerId = searchParams?.get("customerId") ?? undefined;
// Default to last 24 hours
@@ -81,17 +75,17 @@ export function useAnalyticsQuery({
);
return new URLSearchParams({
...availableFilterParams,
+ event: selectedTab,
...(workspaceId && { workspaceId }),
...(domain && { domain }),
...(key && { key }),
...(start &&
end && { start: start.toISOString(), end: end.toISOString() }),
...(interval && { interval }),
- ...(tagIds && { tagIds }),
- ...(root && { root: root.toString() }),
- event: selectedTab,
...(folderId && { folderId }),
+ ...(tagId && { tagId }),
...(customerId && { customerId }),
+ ...(root && { root: root.toString() }),
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
}).toString();
}, [
@@ -102,10 +96,10 @@ export function useAnalyticsQuery({
start,
end,
interval,
- tagIds,
+ folderId,
+ tagId,
root,
selectedTab,
- folderId,
customerId,
]);
@@ -116,10 +110,10 @@ export function useAnalyticsQuery({
start,
end,
interval,
- tagIds,
+ folderId,
+ tagId,
root,
selectedTab,
- folderId,
customerId,
};
}
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 69a16cf851..d6a3b50e5b 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -623,7 +623,7 @@ export function AppSidebarNav({
slug: slug || "",
pathname,
queryString: getQueryString(undefined, {
- include: ["folderId", "tagIds"],
+ include: ["folderId"],
}),
session: session || undefined,
showNews: pathname.startsWith(`/${slug}/program`) ? false : true,