The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Add /links prefix to analytics, events, customers, Program Events page
Steven Tey6202a4b57dea
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/events/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/events/page.tsxindex 91563e0fab..752e9281a8 100644--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/events/page.tsx+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/events/page.tsx@@ -1,7 +1,7 @@import Events from "@/ui/analytics/events";import { EventsProvider } from "@/ui/analytics/events/events-provider";import LayoutLoader from "@/ui/layout/layout-loader";-import AnalyticsClient from "app/app.dub.co/(dashboard)/[slug]/analytics/client";+import AnalyticsClient from "app/app.dub.co/(dashboard)/[slug]/links/analytics/client";import { Suspense } from "react";export default function AdminEvents() {diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page-client.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page-client.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page-client.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/earnings/page.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/layout.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/layout.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/layout.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/sales/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/sales/page-client.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/sales/page-client.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/sales/page-client.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/sales/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/sales/page.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/[customerId]/sales/page.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/sales/page.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/page.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/customers/page.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/page.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/events/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/events/page.tsxsimilarity index 82%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/events/page.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/events/page.tsxindex 1f70476e76..0f3b49dd25 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/events/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/events/page.tsx@@ -3,9 +3,9 @@ import { EventsProvider } from "@/ui/analytics/events/events-provider";import LayoutLoader from "@/ui/layout/layout-loader";import { PageContent } from "@/ui/layout/page-content";import { Suspense } from "react";-import AnalyticsClient from "../../analytics/client";+import AnalyticsClient from "../../../links/analytics/client";-export default function WorkspaceAnalyticsEvents() {+export default function WorkspaceLinksEventsPage() {return (<Suspense fallback={<LayoutLoader />}><PageContent title="Events">diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsxindex f48f5d5437..1b5cdf07fe 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx@@ -64,15 +64,10 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {} as ContextType<typeof AnalyticsContext>;}, [searchParamsObj]);- const queryString = editQueryString(- useAnalyticsQuery({- defaultEvent: program?.primaryRewardEvent === "lead" ? "leads" : "sales",- defaultInterval: DUB_PARTNERS_ANALYTICS_INTERVAL,- }).queryString,- {- programId: defaultProgramId!,- },- );+ const { queryString } = useAnalyticsQuery({+ defaultEvent: program?.primaryRewardEvent === "lead" ? "leads" : "sales",+ defaultInterval: DUB_PARTNERS_ANALYTICS_INTERVAL,+ });const { data: totalEvents } = useSWR<{[key in AnalyticsResponseOptions]: number;@@ -198,7 +193,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {? `/${slug}/program/commissions${getQueryString({}, { include: ["interval", "start", "end", "partnerId", "groupId", "partnerTagId", "type"] })}`: pageTab === "applications"? `/${slug}/program/partners/applications`- : `/${slug}/events${getQueryString({ folderId: program?.defaultFolderId, event: selectedTab, interval })}`+ : `/${slug}/events${getQueryString({ event: selectedTab, interval })}`}><Buttondiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/events/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/events/page.tsxnew file mode 100644index 0000000000..4709206fae--- /dev/null+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/events/page.tsx@@ -0,0 +1,21 @@+import Events from "@/ui/analytics/events";+import { EventsProvider } from "@/ui/analytics/events/events-provider";+import LayoutLoader from "@/ui/layout/layout-loader";+import { PageContent } from "@/ui/layout/page-content";+import { Suspense } from "react";+import AnalyticsClient from "../../../links/analytics/client";+import ProgramEventsPageTitleLink from "./title-link";++export default function WorkspaceProgramEventsPage() {+ return (+ <Suspense fallback={<LayoutLoader />}>+ <PageContent title={<ProgramEventsPageTitleLink />}>+ <AnalyticsClient eventsPage>+ <EventsProvider>+ <Events />+ </EventsProvider>+ </AnalyticsClient>+ </PageContent>+ </Suspense>+ );+}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/events/title-link.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/events/title-link.tsxnew file mode 100644index 0000000000..5d45ce3069--- /dev/null+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/events/title-link.tsx@@ -0,0 +1,21 @@+"use client";++import { ChevronRight } from "@dub/ui";+import Link from "next/link";+import { useParams } from "next/navigation";++export default function ProgramEventsPageTitleLink() {+ const { slug } = useParams();+ return (+ <div className="flex items-center gap-1.5">+ <Link+ href={`/${slug}/program/analytics`}+ className="transition-all duration-150 hover:text-neutral-600 active:scale-95"+ >+ Analytics+ </Link>+ <ChevronRight className="text-content-muted size-2.5 shrink-0 [&_*]:stroke-2" />+ <h1>Events</h1>+ </div>+ );+}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/analytics/client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/analytics/client.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/analytics/client.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/links/analytics/client.tsxdiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/analytics/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/analytics/page.tsxsimilarity index 100%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/analytics/page.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/links/analytics/page.tsxdiff --git a/apps/web/lib/middleware/utils/app-redirect.ts b/apps/web/lib/middleware/utils/app-redirect.tsindex 6f5a154c43..22aae74c1f 100644--- a/apps/web/lib/middleware/utils/app-redirect.ts+++ b/apps/web/lib/middleware/utils/app-redirect.ts@@ -1,4 +1,3 @@-import { RESERVED_SLUGS } from "@dub/utils";import { getWorkspaceProduct } from "./get-workspace-product";const APP_REDIRECTS = {@@ -30,11 +29,14 @@ export const appRedirect = async (path: string) => {return APP_REDIRECTS[path];}- // Redirect "/[slug]" to "/[slug]/[product]"- const rootRegex = /^\/([^\/]+)$/;- if (rootRegex.test(path) && !RESERVED_SLUGS.includes(path.split("/")[1])) {- const product = await getWorkspaceProduct(path.split("/")[1]);- return path.replace(rootRegex, `/$1/${product}`);+ // Redirect "/[slug]" and "/[slug]/analytics|events|customers" to "/[slug]/[product]/..."+ const workspaceProductPathRegex =+ /^\/([^\/]+)(?:\/(analytics|events|customers))?$/;+ const workspaceProductPathMatch = path.match(workspaceProductPathRegex);+ if (workspaceProductPathMatch) {+ const [, slug, subPath] = workspaceProductPathMatch;+ const product = await getWorkspaceProduct(slug);+ return subPath ? `/${slug}/${product}/${subPath}` : `/${slug}/${product}`;}// Redirect "/[slug]/upgrade" to "/[slug]/settings/billing/upgrade"diff --git a/apps/web/ui/analytics/toggle.tsx b/apps/web/ui/analytics/toggle.tsxindex 34d8eded7a..8667dc9655 100644--- a/apps/web/ui/analytics/toggle.tsx+++ b/apps/web/ui/analytics/toggle.tsx@@ -13,6 +13,7 @@ import {Filter,SquareLayoutGrid6,TooltipContent,+ useCurrentProduct,useMediaQuery,useRouterStuff,useScroll,@@ -43,6 +44,7 @@ export function AnalyticsToggle({}) {const { slug, programSlug } = useParams();const { plan, createdAt } = useWorkspace();+ const { product } = useCurrentProduct();const { queryParams, getQueryString } = useRouterStuff();@@ -243,7 +245,7 @@ export function AnalyticsToggle({<><ShareButton /><Link- href={`/${partnerPage ? `programs/${programSlug}/` : adminPage ? "" : `${slug}/`}events${getQueryString()}`}+ href={`/${partnerPage ? `programs/${programSlug}/` : adminPage ? "" : `${slug}/${product ? `${product}/` : ""}events${getQueryString()}`}`}><Buttonvariant="secondary"@@ -259,7 +261,7 @@ export function AnalyticsToggle({{page === "events" && (<><Link- href={`/${partnerPage ? `programs/${programSlug}/` : adminPage ? "" : `${slug}/`}analytics${getQueryString()}`}+ href={`/${partnerPage ? `programs/${programSlug}/` : adminPage ? "" : `${slug}/${product ? `${product}/` : ""}analytics${getQueryString()}`}`}><Buttonvariant="secondary"diff --git a/apps/web/ui/analytics/use-analytics-query.tsx b/apps/web/ui/analytics/use-analytics-query.tsxindex 9acb7773f2..03b394e9b2 100644--- a/apps/web/ui/analytics/use-analytics-query.tsx+++ b/apps/web/ui/analytics/use-analytics-query.tsx@@ -5,6 +5,7 @@ import {} from "@/lib/analytics/constants";import { EventType } from "@/lib/analytics/types";import useWorkspace from "@/lib/swr/use-workspace";+import { useCurrentProduct } from "@dub/ui";import { endOfDay, startOfDay, subDays } from "date-fns";import { useSearchParams } from "next/navigation";import { useMemo } from "react";@@ -23,7 +24,8 @@ export function useAnalyticsQuery({defaultInterval?: string;} = {}) {const searchParams = useSearchParams();- const { id: workspaceId } = useWorkspace();+ const { id: workspaceId, defaultProgramId } = useWorkspace();+ const { product } = useCurrentProduct();const domain = domainParam ?? searchParams?.get("domain");// key can be a query param (stats pages in app) or passed as a staticKey (shared analytics dashboards)@@ -87,10 +89,13 @@ export function useAnalyticsQuery({...(customerId && { customerId }),...(root && { root: root.toString() }),timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ ...(product === "program" && { programId: defaultProgramId }),}).toString();}, [searchParams,workspaceId,+ defaultProgramId,+ product,domain,key,start,diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsxindex f2c39e11b5..4aefed4d25 100644--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx@@ -206,6 +206,9 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {name: "Analytics",icon: LinesYStatic,href: `/${slug}/program/analytics`,+ isActive: (pathname: string, href: string) =>+ pathname.startsWith(href) ||+ pathname.startsWith(href.replace("/analytics", "/events")),},{name: "Customers",@@ -329,17 +332,17 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {{name: "Analytics",icon: LinesY,- href: `/${slug}/analytics${pathname === `/${slug}/analytics` ? "" : queryString}`,+ href: `/${slug}/links/analytics${pathname === `/${slug}/analytics` ? "" : queryString}`,},{name: "Events",icon: CursorRays,- href: `/${slug}/events${pathname === `/${slug}/events` ? "" : queryString}`,+ href: `/${slug}/links/events${pathname === `/${slug}/events` ? "" : queryString}`,},{name: "Customers",icon: User,- href: `/${slug}/customers`,+ href: `/${slug}/links/customers`,},],},diff --git a/packages/ui/src/hooks/index.ts b/packages/ui/src/hooks/index.tsindex 5056d839ff..a02d957afe 100644--- a/packages/ui/src/hooks/index.ts+++ b/packages/ui/src/hooks/index.ts@@ -3,6 +3,7 @@ export * from "./use-column-visibility";export * from "./use-cookies";export * from "./use-copy-to-clipboard";export * from "./use-current-anchor";+export * from "./use-current-product";export * from "./use-current-subdomain";export * from "./use-enter-submit";export * from "./use-in-viewport";diff --git a/packages/ui/src/hooks/use-current-product.ts b/packages/ui/src/hooks/use-current-product.tsnew file mode 100644index 0000000000..90ef32abda--- /dev/null+++ b/packages/ui/src/hooks/use-current-product.ts@@ -0,0 +1,18 @@+import { usePathname } from "next/navigation";+import { useEffect, useState } from "react";++export function useCurrentProduct() {+ const pathname = usePathname();+ const [product, setProduct] = useState<"links" | "program" | null>(null);++ useEffect(() => {+ const productParam = pathname.split("/")[2];+ if (productParam === "links") {+ setProduct("links");+ } else if (productParam === "program") {+ setProduct("program");+ }+ }, [pathname]);++ return { product };+}