diff --git a/apps/web/app/(ee)/api/partners/applications/analytics/route.ts b/apps/web/app/(ee)/api/partners/applications/analytics/route.ts index 88adad9d5b0..581332a9544 100644 --- a/apps/web/app/(ee)/api/partners/applications/analytics/route.ts +++ b/apps/web/app/(ee)/api/partners/applications/analytics/route.ts @@ -138,6 +138,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => { if (groupBy === "partnerId") { return byPartnerId({ where, + programId, }); } @@ -155,8 +156,10 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => { async function byPartnerId({ where, + programId, }: { where: Prisma.ProgramApplicationEventWhereInput; + programId: string; }) { const events = await prisma.programApplicationEvent.groupBy({ by: ["referredByPartnerId"], @@ -175,6 +178,12 @@ async function byPartnerId({ id: { in: partnerIds, }, + // TODO: remove this once we have a way to show the partners + CTA to invite them + programs: { + some: { + programId, + }, + }, }, select: { id: true, diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx index 647aac30cbb..f76d7e16a30 100644 --- a/apps/web/ui/analytics/use-analytics-filters.tsx +++ b/apps/web/ui/analytics/use-analytics-filters.tsx @@ -223,7 +223,6 @@ export function useAnalyticsFilters({ // Skip special cases we handled above if ( [ - "domain", "key", "tagId", "partnerTagId", @@ -234,8 +233,8 @@ export function useAnalyticsFilters({ 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 - if (filter === "domain" && domain && key && !params.linkId) return; + // Skip domain when domain+key identify a specific link (link chip / linkId handles that) + if (filter === "domain" && domain && key) return; const value = params[filter] || diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx index 4a423991b6f..053a34438ec 100644 --- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx +++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx @@ -478,7 +478,7 @@ const NAV_AREAS: SidebarNavAreas = { { name: "Notifications", icon: Bell, - href: `/${slug}/settings/notifications`, + href: "/settings/notifications", arrow: true, }, ],