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.

show QueryLinkStructureHelpText in PartnerLinkCard

Steven Teyd9d76343d4a5
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
index 9bb044a58c..640a9a6e48 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
@@ -1,5 +1,6 @@
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";
import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { PartnerProfileLinkProps } from "@/lib/types";
@@ -137,18 +138,25 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
{/* The max width implementation here is a bit hacky, we should improve in the future */}
<div className="flex max-w-[100px] items-center gap-1 py-0 pl-1 pr-1.5 sm:w-fit sm:max-w-[400px]">
<ArrowTurnRight2 className="h-3 w-3 shrink-0 text-neutral-400" />
- <a
- href={isDeactivated ? undefined : link.url}
- target="_blank"
- rel="noopener noreferrer"
- className="cursor-alias truncate text-sm text-neutral-500 decoration-dotted transition-colors hover:text-neutral-700 hover:underline hover:underline-offset-2"
- title={getPrettyUrl(link.url)}
- onClick={
- isDeactivated ? (e) => e.preventDefault() : undefined
- }
- >
- {getPrettyUrl(link.url)}
- </a>
+ {programEnrollment?.group?.linkStructure === "query" ? (
+ <QueryLinkStructureHelpText
+ link={link}
+ className="mt-0.5"
+ />
+ ) : (
+ <a
+ href={isDeactivated ? undefined : link.url}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="cursor-alias truncate text-sm text-neutral-500 decoration-dotted transition-colors hover:text-neutral-700 hover:underline hover:underline-offset-2"
+ title={getPrettyUrl(link.url)}
+ onClick={
+ isDeactivated ? (e) => e.preventDefault() : undefined
+ }
+ >
+ {getPrettyUrl(link.url)}
+ </a>
+ )}
</div>
</div>
</div>
diff --git a/apps/web/lib/partners/construct-partner-link.ts b/apps/web/lib/partners/construct-partner-link.ts
index cb1420f23e..2f580bd542 100644
--- a/apps/web/lib/partners/construct-partner-link.ts
+++ b/apps/web/lib/partners/construct-partner-link.ts
@@ -17,9 +17,9 @@ export function constructPartnerLink({
const urlObj = link?.url ? getUrlObjFromString(link.url) : null;
if (linkStructure === "query" && urlObj) {
- return urlObj.hostname
- ? `https://${urlObj.hostname}?via=${link.key}`
- : `${link.url}?via=${link.key}`;
+ // Destination URL without query params, with ?via= appended
+ const baseUrl = `${urlObj.origin}${urlObj.pathname}`.replace(/\/$/, "");
+ return `${baseUrl || urlObj.origin}?via=${link.key}`;
}
// if (linkStructure === "path" && urlObj) {
diff --git a/apps/web/lib/partners/query-link-structure-help-text.tsx b/apps/web/lib/partners/query-link-structure-help-text.tsx
index 28c0e64af9..10d68c7bf8 100644
--- a/apps/web/lib/partners/query-link-structure-help-text.tsx
+++ b/apps/web/lib/partners/query-link-structure-help-text.tsx
@@ -15,8 +15,8 @@ export const QueryLinkStructureHelpText = ({
const appendValue = `?via=${link.key}`;
return (
- <p className={cn("text-xs text-neutral-500", className)}>
- Link to any page on{" "}
+ <p className={cn("whitespace-nowrap text-xs text-neutral-500", className)}>
+ or link to any page on{" "}
<a
href={link.url}
target="_blank"
diff --git a/apps/web/scripts/fix-payouts-amount.ts b/apps/web/scripts/fix-payouts-amount.ts
new file mode 100644
index 0000000000..0e03591804
--- /dev/null
+++ b/apps/web/scripts/fix-payouts-amount.ts
@@ -0,0 +1,86 @@
+import { prisma } from "@/lib/prisma";
+import { PayoutStatus } from "@prisma/client";
+import "dotenv-flow/config";
+import { reconcilePayoutAmounts } from "../lib/api/commissions/reconcile-payout-amounts";
+
+const BATCH_SIZE = 500;
+
+async function main() {
+ let startingAfter: string | undefined;
+ let scanned = 0;
+ let fixed = 0;
+
+ while (true) {
+ const payouts = await prisma.payout.findMany({
+ where: {
+ status: PayoutStatus.pending,
+ ...(startingAfter && {
+ id: {
+ gt: startingAfter,
+ },
+ }),
+ },
+ select: {
+ id: true,
+ amount: true,
+ },
+ take: BATCH_SIZE,
+ orderBy: {
+ id: "asc",
+ },
+ });
+
+ if (payouts.length === 0) {
+ console.log(`Scanned ${scanned} payouts, fixed ${fixed} mismatches`);
+ break;
+ }
+
+ scanned += payouts.length;
+
+ const aggregates = await prisma.commission.groupBy({
+ by: ["payoutId"],
+ where: {
+ payoutId: {
+ in: payouts.map((payout) => payout.id),
+ },
+ },
+ _sum: {
+ earnings: true,
+ },
+ });
+
+ const commissionSumByPayoutId = new Map(
+ aggregates.map((a) => [a.payoutId!, a._sum.earnings ?? 0]),
+ );
+
+ const mismatches: {
+ id: string;
+ payoutAmount: number;
+ commissionSum: number;
+ diff: number;
+ }[] = [];
+
+ for (const payout of payouts) {
+ const commissionSum = commissionSumByPayoutId.get(payout.id) ?? 0;
+
+ if (payout.amount !== commissionSum) {
+ mismatches.push({
+ id: payout.id,
+ payoutAmount: payout.amount,
+ commissionSum,
+ diff: payout.amount - commissionSum,
+ });
+ }
+ }
+
+ if (mismatches.length > 0) {
+ console.table(mismatches);
+ await reconcilePayoutAmounts(mismatches.map((mismatch) => mismatch.id));
+ fixed += mismatches.length;
+ }
+
+ startingAfter = payouts[payouts.length - 1].id;
+ }
+}
+
+main();
diff --git a/apps/web/scripts/partners/delete-partner-profile.ts b/apps/web/scripts/partners/delete-partner-profile.ts
index 459e4c08b1..eeb2fcabb4 100644
--- a/apps/web/scripts/partners/delete-partner-profile.ts
+++ b/apps/web/scripts/partners/delete-partner-profile.ts
@@ -95,6 +95,13 @@ async function main() {
});
console.log(`Deleted ${deletedProgramEnrollments.count} program enrollments`);
+ const deletedPartnerUsers = await prisma.partnerUser.deleteMany({
+ where: {
+ partnerId: partner.id,
+ },
+ });
+ console.log(`Deleted ${deletedPartnerUsers.count} partner users`);
+
// using conn.execute here since Prisma is throwing a weird error
const res = await conn.execute(`DELETE FROM Partner WHERE id = ?`, [
partner.id,