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.

`approved_invited` → "Pending invites"

Steven Tey28cc0a416be2
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx
index 9f659d128d..3899af924e 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/members/page-client.tsx
@@ -253,7 +253,7 @@ export function ProfileMembersPageClient() {
/>
{inviteCount && status !== "invited" ? (
<Button
- text="View pending invites"
+ text="Pending invites"
variant="secondary"
className="w-fit"
right={
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index bdc131c151..4f91701d8a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -136,7 +136,7 @@ export function PartnersTable() {
const status = (
searchParams.get("status") || searchParams.get("search")
? undefined
- : "approved_invited"
+ : ProgramEnrollmentStatus.approved
) as ProgramEnrollmentStatus;
const sortBy =
@@ -187,30 +187,9 @@ export function PartnersTable() {
enableHiding: false,
minSize: 150,
maxSize: 250,
- cell: ({ row }) => {
- const showInvitedInline =
- columnVisibility.status === false &&
- row.original.status === ProgramEnrollmentStatus.invited &&
- searchParams.get("status") !== ProgramEnrollmentStatus.invited;
-
- return (
- <PartnerRowItem
- partner={row.original}
- showPermalink={false}
- suffix={
- showInvitedInline ? (
- <StatusBadge
- size="sm"
- icon={null}
- variant={PartnerStatusBadges.invited.variant}
- >
- {PartnerStatusBadges.invited.label}
- </StatusBadge>
- ) : null
- }
- />
- );
- },
+ cell: ({ row }) => (
+ <PartnerRowItem partner={row.original} showPermalink={false} />
+ ),
},
{
id: "group",
@@ -448,7 +427,7 @@ export function PartnersTable() {
),
},
].filter((c) => c.id === "menu" || partnersColumns.all.includes(c.id)),
- [workspaceId, groups, columnVisibility, searchParams, workspaceSlug],
+ [workspaceId, groups, workspaceSlug],
);
const { table, ...tableProps } = useTable({
@@ -558,6 +537,12 @@ function PartnersFilters({
sortOrder: "asc" | "desc";
status: ProgramEnrollmentStatus;
}) {
+ const { queryParams, searchParams } = useRouterStuff();
+
+ const { partnersCount: inviteCount } = usePartnersCount<number>({
+ status: ProgramEnrollmentStatus.invited,
+ });
+
const {
filters,
activeFilters,
@@ -568,17 +553,41 @@ function PartnersFilters({
onToggleOperator,
} = usePartnerFilters({ sortBy, sortOrder, status });
+ const showPendingInvitesButton =
+ inviteCount > 0 &&
+ searchParams.get("status") !== ProgramEnrollmentStatus.invited;
+
return (
<div>
<div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
- <Filter.Select
- className="w-full md:w-fit"
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveFilter={onRemoveFilter}
- />
+ <div className="flex items-center gap-2">
+ <Filter.Select
+ className="w-full md:w-fit"
+ filters={filters}
+ activeFilters={activeFilters}
+ onSelect={onSelect}
+ onRemove={onRemove}
+ onRemoveFilter={onRemoveFilter}
+ />
+ {showPendingInvitesButton ? (
+ <Button
+ text="Pending invites"
+ variant="secondary"
+ className="w-fit"
+ right={
+ <span className="rounded-full bg-neutral-200 px-1.5 py-0.5 text-xs font-medium text-neutral-700">
+ {inviteCount}
+ </span>
+ }
+ onClick={() =>
+ queryParams({
+ set: { status: ProgramEnrollmentStatus.invited },
+ del: "page",
+ })
+ }
+ />
+ ) : null}
+ </div>
<SearchBoxPersisted
placeholder="Search by name, email, or company"
inputClassName="md:w-80"
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
index 71b31e4789..9ceb07c1b5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
@@ -334,7 +334,7 @@ export default function WorkspaceMembersPage() {
/>
{inviteCount && status !== "invited" ? (
<Button
- text="View pending invites"
+ text="Pending invites"
variant="secondary"
className="w-fit"
right={
diff --git a/apps/web/lib/api/partners/get-partners-count.ts b/apps/web/lib/api/partners/get-partners-count.ts
index bca289f706..0588619bca 100644
--- a/apps/web/lib/api/partners/get-partners-count.ts
+++ b/apps/web/lib/api/partners/get-partners-count.ts
@@ -104,12 +104,7 @@ export async function getPartnersCount<T>(
some: {
...enrollmentScope,
...(groupIdWhere ?? {}),
- status:
- status === "approved_invited"
- ? {
- in: ["approved", "invited"],
- }
- : status,
+ status,
...enrollmentMetricWhere,
},
},
@@ -162,12 +157,7 @@ export async function getPartnersCount<T>(
where: {
...enrollmentScope,
partner: partnerWhereWithCountry,
- status:
- status === "approved_invited"
- ? {
- in: ["approved", "invited"],
- }
- : status,
+ status,
...enrollmentMetricWhere,
},
_count: true,
@@ -215,12 +205,7 @@ export async function getPartnersCount<T>(
programEnrollment: {
...enrollmentScope,
...(groupIdWhere ?? {}),
- status:
- status === "approved_invited"
- ? {
- in: ["approved", "invited"],
- }
- : status,
+ status,
partner: partnerWhereWithCountry,
...enrollmentMetricWhere,
},
diff --git a/apps/web/lib/api/partners/program-enrollment-query.ts b/apps/web/lib/api/partners/program-enrollment-query.ts
index d540ddbe9f..adfc21f2b7 100644
--- a/apps/web/lib/api/partners/program-enrollment-query.ts
+++ b/apps/web/lib/api/partners/program-enrollment-query.ts
@@ -271,12 +271,7 @@ export function buildProgramEnrollmentWhereForList(
in: partnerIds,
},
}),
- status:
- status === "approved_invited"
- ? {
- in: ["approved", "invited"],
- }
- : status,
+ status,
...(groupIdWhere ?? {}),
...(hasPartnerWhere ? { partner: partnerWhere } : {}),
...(referredByPartnerId && {
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index b7ffc40429..9096fc1453 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -203,10 +203,7 @@ export const getPartnersQuerySchema = z
// Only Dub UI uses the following query parameters
export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
- status: z
- .enum(ProgramEnrollmentStatus)
- .or(z.enum(["approved_invited"]))
- .optional(),
+ status: z.enum(ProgramEnrollmentStatus).optional(),
// TODO: refactor to use multi/negative filtering syntax
partnerIds: z
.union([z.string(), z.array(z.string())])
diff --git a/apps/web/prisma/schema/program.prisma b/apps/web/prisma/schema/program.prisma
index 7d88029486..3d86b34415 100644
--- a/apps/web/prisma/schema/program.prisma
+++ b/apps/web/prisma/schema/program.prisma
@@ -173,6 +173,7 @@ model ProgramEnrollment {
@@unique([partnerId, programId])
@@unique([tenantId, programId])
// indexes for sorting partners
+ @@index([programId, status, createdAt])
@@index([programId, status, totalClicks])
@@index([programId, status, totalLeads])
@@index([programId, status, totalConversions])