Skip to content

[pull] main from dubinc:main #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
May 6, 2026
Merged

[pull] main from dubinc:main #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9075d37
improve commissions tab
steven-tey May 6, 2026
63826c2
Cascade DiscoveredPartner deletion from ProgramEnrollment (#3857)
devkiran May 6, 2026
f2cb4fd
Fix `customer.subscription.deleted` crash when workspace has no owner…
devkiran May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
currencyFormatter,
DUB_FOUNDING_DATE,
fetcher,
getDomainWithoutWWW,
OG_AVATAR_URL,
} from "@dub/utils";
import NumberFlow from "@number-flow/react";
Expand All @@ -41,6 +42,7 @@ function CommissionsPageClient() {
programs: {
id: string;
name: string;
url: string;
logo: string;
commissions: number;
fees: number;
Expand Down Expand Up @@ -187,15 +189,23 @@ function CommissionsPageClient() {
id: "program",
header: "Program",
cell: ({ row }) => (
<div className="flex items-center gap-1.5">
<div className="flex items-center gap-1.5 text-sm font-medium">
<img
src={row.original.logo}
alt={row.original.name}
width={20}
height={20}
className="size-4 rounded-full"
/>
<span className="text-sm font-medium">{row.original.name}</span>
<span className="text-sm font-medium">{row.original.name}</span>•
<a
className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"
href={row.original.url}
target="_blank"
rel="noopener noreferrer"
>
{getDomainWithoutWWW(row.original.url)}
</a>
</div>
),
meta: {
Expand Down
10 changes: 8 additions & 2 deletions apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,19 @@ export async function getTopProgramsByCommissions({
earnings: "desc",
},
},
take: 50,
take: 150,
});

const topPrograms = await prisma.program.findMany({
where: {
id: {
in: programCommissions.map(({ programId }) => programId),
},
NOT: {
slug: {
endsWith: "-staging",
},
},
},
include: {
workspace: {
Expand All @@ -66,7 +71,8 @@ export async function getTopProgramsByCommissions({
fees: commissions * payoutFee,
};
})
.filter(Boolean);
.filter(Boolean)
.slice(0, 100);

return topProgramsWithCommissions;
}
3 changes: 2 additions & 1 deletion apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ export async function customerSubscriptionDeleted(
}

const owner = workspaceUsers[0];
if (owner.email && losesAdvancedFeatures) {

if (owner?.email && losesAdvancedFeatures) {
await sendEmail({
to: owner.email,
subject: "Your Advanced plan features have been removed",
Expand Down
2 changes: 1 addition & 1 deletion packages/prisma/schema/network.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ model DiscoveredPartner {

program Program @relation(fields: [programId], references: [id], onDelete: Cascade)
partner Partner @relation(fields: [partnerId], references: [id], onDelete: Cascade)
programEnrollment ProgramEnrollment? @relation(fields: [programId, partnerId], references: [programId, partnerId])
programEnrollment ProgramEnrollment? @relation(fields: [programId, partnerId], references: [programId, partnerId], onDelete: Cascade)

@@unique([programId, partnerId])
@@index(partnerId)
Expand Down
43 changes: 21 additions & 22 deletions packages/prisma/schema/program.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,8 @@ model Program {
sourceFraudEvents FraudEvent[] @relation("SourceFraudEvents")
fraudAlerts FraudAlert[]
referrals PartnerReferral[]

partnerTags PartnerTag[]
programPartnerTags ProgramPartnerTag[]
partnerTags PartnerTag[]
programPartnerTags ProgramPartnerTag[]

@@index(workspaceId)
@@index(addedToMarketplaceAt)
Expand Down Expand Up @@ -138,25 +137,25 @@ model ProgramEnrollment {
bannedAt DateTime?
bannedReason PartnerBannedReason?

partner Partner @relation(fields: [partnerId], references: [id], onUpdate: Cascade, onDelete: Cascade)
program Program @relation(fields: [programId], references: [id], onUpdate: Cascade, onDelete: Cascade)
links Link[]
customers Customer[]
partnerGroup PartnerGroup? @relation(fields: [groupId], references: [id])
application ProgramApplication? @relation(fields: [applicationId], references: [id])
clickReward Reward? @relation("ClickRewardEnrollments", fields: [clickRewardId], references: [id])
leadReward Reward? @relation("LeadRewardEnrollments", fields: [leadRewardId], references: [id])
saleReward Reward? @relation("SaleRewardEnrollments", fields: [saleRewardId], references: [id])
discount Discount? @relation(fields: [discountId], references: [id])
bountySubmissions BountySubmission[]
discountCodes DiscountCode[]
commissions Commission[]
payouts Payout[]
messages Message[]
fraudEventGroups FraudEventGroup[]
referrals PartnerReferral[]
fraudAlerts FraudAlert[]
discoveredPartner DiscoveredPartner?
partner Partner @relation(fields: [partnerId], references: [id], onUpdate: Cascade, onDelete: Cascade)
program Program @relation(fields: [programId], references: [id], onUpdate: Cascade, onDelete: Cascade)
links Link[]
customers Customer[]
partnerGroup PartnerGroup? @relation(fields: [groupId], references: [id])
application ProgramApplication? @relation(fields: [applicationId], references: [id])
clickReward Reward? @relation("ClickRewardEnrollments", fields: [clickRewardId], references: [id])
leadReward Reward? @relation("LeadRewardEnrollments", fields: [leadRewardId], references: [id])
saleReward Reward? @relation("SaleRewardEnrollments", fields: [saleRewardId], references: [id])
discount Discount? @relation(fields: [discountId], references: [id])
bountySubmissions BountySubmission[]
discountCodes DiscountCode[]
commissions Commission[]
payouts Payout[]
messages Message[]
fraudEventGroups FraudEventGroup[]
referrals PartnerReferral[]
fraudAlerts FraudAlert[]
discoveredPartner DiscoveredPartner?
programPartnerTags ProgramPartnerTag[]

// unique constraints
Expand Down
Loading