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.

Redirect the Invitations page to the Programs Invitations tab

Rafi3ced57412043
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx
index 56c882b582..46d25dac70 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx
@@ -27,7 +27,7 @@ export function TasksCard() {
{
icon: UserCheck,
label: "Review new invitations",
- href: "/programs/invitations",
+ href: "/programs?tab=invitations",
count: invitationsCount,
},
].filter((task): task is typeof task & { count: number } => !!task.count);
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page-client.tsx
deleted file mode 100644
index ba4a24840f..0000000000
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page-client.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-"use client";
-
-import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { ProgramCardSkeleton } from "@/ui/partners/program-card";
-import { ProgramInviteCard } from "@/ui/partners/program-invite-card";
-import { SimpleEmptyState } from "@/ui/shared/simple-empty-state";
-import { HexadecagonStar } from "@dub/ui/icons";
-
-export function ProgramInvitationsPageClient() {
- const { programEnrollments, isLoading } = useProgramEnrollments({
- includeRewardsDiscounts: true,
- status: "invited",
- });
-
- return (
- <PageWidthWrapper className="pb-10">
- {programEnrollments?.length == 0 ? (
- <SimpleEmptyState
- title="No program invitations"
- description="When a program sends you an invitation to join them, they will appear here."
- graphic={
- <div className="border-border-subtle flex flex-col gap-4 rounded-xl border p-3 shadow-[0_4px_12px_#0001]">
- <HexadecagonStar className="text-content-default size-6" />
- <div className="flex flex-col gap-2">
- <div className="bg-bg-emphasis h-2.5 w-8 rounded" />
- <div className="bg-bg-emphasis h-2.5 w-16 rounded" />
- </div>
- <div className="h-5 w-40 max-w-full rounded bg-neutral-800" />
- </div>
- }
- />
- ) : (
- <div className="@md/page:grid-cols-2 @3xl/page:grid-cols-3 grid gap-4">
- {isLoading
- ? Array.from({ length: 3 }).map((_, idx) => (
- <ProgramCardSkeleton key={idx} />
- ))
- : programEnrollments?.map((programEnrollment, idx) => (
- <ProgramInviteCard
- key={idx}
- programEnrollment={programEnrollment}
- />
- ))}
- </div>
- )}
- </PageWidthWrapper>
- );
-}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page.tsx
index 4e2f50b63d..3eb8ddea5d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/invitations/page.tsx
@@ -1,10 +1,6 @@
-import { PageContent } from "@/ui/layout/page-content";
-import { ProgramInvitationsPageClient } from "./page-client";
+import { redirect } from "next/navigation";
+// invitations are now a tab on the Programs page
export default function ProgramInvitationsPage() {
- return (
- <PageContent title="Invitations">
- <ProgramInvitationsPageClient />
- </PageContent>
- );
+ redirect("/programs?tab=invitations");
}
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index 151a035274..70dc22ed30 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -5,7 +5,6 @@ import { getGroupSubmittedLeadForm } from "@/lib/submitted-leads/get-group-submi
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { usePartnerProgramBounties } from "@/lib/swr/use-partner-program-bounties";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
import { MarketplaceSidebarFilters } from "@/ui/program-marketplace/marketplace-sidebar-filters";
import { ProgramMarketplaceCard } from "@/ui/program-marketplace/program-marketplace-card";
import { isMarketplaceFilterSidebarPath } from "@/ui/program-marketplace/utils/urls";
@@ -54,7 +53,6 @@ type SidebarNavData = {
isMobile?: boolean;
programSlug?: string;
isUnapproved: boolean;
- invitationsCount?: number;
unreadMessagesCount?: number;
programBountiesCount?: number;
showDetailedAnalytics?: boolean;
@@ -105,11 +103,7 @@ const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
},
];
-const PROGRAMS_CONTENT = ({
- invitationsCount,
-}: {
- invitationsCount?: number;
-}): { items: NavItemType[] }[] => [
+const PROGRAMS_CONTENT = (): { items: NavItemType[] }[] => [
{
items: [
{
@@ -121,8 +115,7 @@ const PROGRAMS_CONTENT = ({
name: "Programs",
icon: GridIcon,
href: "/programs",
- isActive: (pathname, href) =>
- pathname.startsWith(href) && pathname !== "/programs/invitations",
+ isActive: (pathname, href) => pathname.startsWith(href),
},
{
name: "Marketplace",
@@ -131,31 +124,21 @@ const PROGRAMS_CONTENT = ({
isActive: (pathname) => pathname.startsWith("/marketplace"),
badge: "New",
},
- {
- name: "Invitations",
- icon: UserCheck,
- href: "/programs/invitations",
- badge: invitationsCount || undefined,
- },
],
},
];
const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
// Top-level
- programs: ({ invitationsCount }) => ({
+ programs: () => ({
title: <PartnerProgramDropdown />,
- content: PROGRAMS_CONTENT({ invitationsCount }),
+ content: PROGRAMS_CONTENT(),
direction: "left",
}),
- marketplace: ({ isMobile, invitationsCount }) => ({
+ marketplace: ({ isMobile }) => ({
title: <PartnerProgramDropdown />,
- content: isMobile ? (
- PROGRAMS_CONTENT({ invitationsCount })
- ) : (
- <MarketplaceSidebarFilters />
- ),
+ content: isMobile ? PROGRAMS_CONTENT() : <MarketplaceSidebarFilters />,
direction: "right",
}),
@@ -379,10 +362,6 @@ export function PartnersSidebarNav({
: "programs";
}, [pathname, isEnrolledProgramPage, isMarketplaceFilterSidebarPage]);
- const { count: invitationsCount } = useProgramEnrollmentsCount({
- status: "invited",
- });
-
const isUnapproved = useMemo(
() =>
!!programEnrollment &&
@@ -447,7 +426,6 @@ export function PartnersSidebarNav({
isMobile,
programSlug: programSlug || "",
isUnapproved,
- invitationsCount,
unreadMessagesCount,
programBountiesCount: bountiesCount.active,
showDetailedAnalytics,