The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
code improvements
Pedro Ladeirab66b78241f83
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.tsindex 63383f0e3a..a80c24f98c 100644--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts@@ -11,9 +11,9 @@ import { qstash } from "@/lib/cron";import { prisma } from "@/lib/prisma";import { GroupWithProgramSchema } from "@/lib/zod/schemas/group-with-program";import {- additionalPartnerLinkSchema,DEFAULT_PARTNER_GROUP,GroupSchema,+ parseAdditionalLinks,updateGroupSchema,} from "@/lib/zod/schemas/groups";import { APP_DOMAIN_WITH_NGROK, constructURLFromUTMParams } from "@dub/utils";@@ -36,10 +36,7 @@ export const GET = withWorkspace(GroupWithProgramSchema.parse({...group,additionalLinks: Array.isArray(group.additionalLinks)- ? group.additionalLinks.flatMap((link) => {- const parsed = additionalPartnerLinkSchema.safeParse(link);- return parsed.success ? [parsed.data] : [];- })+ ? parseAdditionalLinks(group.additionalLinks): group.additionalLinks,}),);@@ -258,7 +255,14 @@ export const PATCH = withWorkspace(})(),);- return NextResponse.json(GroupSchema.parse(updatedGroup));+ return NextResponse.json(+ GroupSchema.parse({+ ...updatedGroup,+ additionalLinks: Array.isArray(updatedGroup.additionalLinks)+ ? parseAdditionalLinks(updatedGroup.additionalLinks)+ : updatedGroup.additionalLinks,+ }),+ );},{requiredPermissions: ["groups.write"],diff --git a/apps/web/app/(ee)/api/groups/route.ts b/apps/web/app/(ee)/api/groups/route.tsindex 30d8420f26..0fadef5431 100644--- a/apps/web/app/(ee)/api/groups/route.ts+++ b/apps/web/app/(ee)/api/groups/route.ts@@ -8,12 +8,12 @@ import { withWorkspace } from "@/lib/auth";import { exceededLimitError } from "@/lib/exceeded-limit-error";import { prisma } from "@/lib/prisma";import {- additionalPartnerLinkSchema,createGroupSchema,DEFAULT_PARTNER_GROUP,getGroupsQuerySchema,GroupSchema,GroupSchemaExtended,+ parseAdditionalLinks,} from "@/lib/zod/schemas/groups";import { waitUntil } from "@vercel/functions";import { NextResponse } from "next/server";@@ -37,10 +37,7 @@ export const GET = withWorkspace(groups.map((group) => ({...group,additionalLinks: Array.isArray(group.additionalLinks)- ? group.additionalLinks.flatMap((link) => {- const parsed = additionalPartnerLinkSchema.safeParse(link);- return parsed.success ? [parsed.data] : [];- })+ ? parseAdditionalLinks(group.additionalLinks): group.additionalLinks,})),),@@ -140,7 +137,9 @@ export const POST = withWorkspace(brandColor,holdingPeriodDays,autoApprovePartnersEnabledAt,- ...(additionalLinks && { additionalLinks }),+ ...(additionalLinks && {+ additionalLinks: parseAdditionalLinks(additionalLinks),+ }),...(maxPartnerLinks && { maxPartnerLinks }),...(linkStructure && { linkStructure }),...(applicationFormData && { applicationFormData }),diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-additional-link-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-additional-link-modal.tsxindex 33633465af..b93bc44fac 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-additional-link-modal.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-additional-link-modal.tsx@@ -74,10 +74,9 @@ function formDataToPartnerLink(path: urlObj.pathname + urlObj.search + urlObj.hash,};} catch {- // Fallback if URL parsing failsreturn {validationMode: "exact",- domain: formData.url,+ domain: "",path: "",};}diff --git a/apps/web/lib/actions/partners/create-program.ts b/apps/web/lib/actions/partners/create-program.tsindex 20ca4ac44e..50e40c41bf 100644--- a/apps/web/lib/actions/partners/create-program.ts+++ b/apps/web/lib/actions/partners/create-program.ts@@ -12,6 +12,7 @@ import { redis } from "@/lib/upstash";import {DEFAULT_ADDITIONAL_PARTNER_LINKS,DEFAULT_PARTNER_GROUP,+ parseAdditionalLinks,} from "@/lib/zod/schemas/groups";import { programDataSchema } from "@/lib/zod/schemas/program-onboarding";import { REWARD_EVENT_COLUMN_MAPPING } from "@/lib/zod/schemas/rewards";@@ -184,12 +185,12 @@ export const createProgram = async ({...(createdReward && {[REWARD_EVENT_COLUMN_MAPPING[createdReward.event]]: createdReward.id,}),- additionalLinks: [+ additionalLinks: parseAdditionalLinks([{- domain: getDomainWithoutWWW(programData.url!)!,+ domain: getDomainWithoutWWW(programData.url!),validationMode: "domain",},- ],+ ]),maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,partnerGroupDefaultLinks: {create: {diff --git a/apps/web/lib/firstpromoter/import-campaigns.ts b/apps/web/lib/firstpromoter/import-campaigns.tsindex e7d507cd8d..9ed0e6a086 100644--- a/apps/web/lib/firstpromoter/import-campaigns.ts+++ b/apps/web/lib/firstpromoter/import-campaigns.ts@@ -3,7 +3,10 @@ import { RESOURCE_COLORS } from "@/ui/colors";import { randomValue } from "@dub/utils";import slugify from "@sindresorhus/slugify";import { createId } from "../api/create-id";-import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";+import {+ DEFAULT_PARTNER_GROUP,+ parseAdditionalLinks,+} from "../zod/schemas/groups";import { FirstPromoterApi } from "./api";import { firstPromoterImporter, MAX_BATCHES } from "./importer";import { FirstPromoterImportPayload } from "./types";@@ -88,7 +91,9 @@ export async function importCampaigns(payload: FirstPromoterImportPayload) {brandColor,holdingPeriodDays,autoApprovePartnersEnabledAt,- ...(additionalLinks && { additionalLinks }),+ ...(additionalLinks && {+ additionalLinks: parseAdditionalLinks(additionalLinks),+ }),...(maxPartnerLinks && { maxPartnerLinks }),...(linkStructure && { linkStructure }),...(applicationFormData && { applicationFormData }),diff --git a/apps/web/lib/partnerstack/import-groups.ts b/apps/web/lib/partnerstack/import-groups.tsindex 6408984c28..2ca13b9eb3 100644--- a/apps/web/lib/partnerstack/import-groups.ts+++ b/apps/web/lib/partnerstack/import-groups.ts@@ -2,7 +2,10 @@ import { prisma } from "@/lib/prisma";import { RESOURCE_COLORS } from "@/ui/colors";import { getDomainWithoutWWW, randomValue } from "@dub/utils";import { createId } from "../api/create-id";-import { DEFAULT_ADDITIONAL_PARTNER_LINKS } from "../zod/schemas/groups";+import {+ DEFAULT_ADDITIONAL_PARTNER_LINKS,+ parseAdditionalLinks,+} from "../zod/schemas/groups";import { PartnerStackApi } from "./api";import { partnerStackImporter } from "./importer";import { PartnerStackImportPayload } from "./types";@@ -51,12 +54,12 @@ export async function importGroups(payload: PartnerStackImportPayload) {name: group.name,slug: group.slug,color: randomValue(RESOURCE_COLORS),- additionalLinks: [+ additionalLinks: parseAdditionalLinks([{domain: getDomainWithoutWWW(program.url),validationMode: "domain",},- ],+ ]),maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,partnerGroupDefaultLinks: {create: {diff --git a/apps/web/lib/zod/schemas/groups.ts b/apps/web/lib/zod/schemas/groups.tsindex 8e2c365cf3..9927cfe6d2 100644--- a/apps/web/lib/zod/schemas/groups.ts+++ b/apps/web/lib/zod/schemas/groups.ts@@ -53,6 +53,19 @@ export const additionalPartnerLinkSchemaOptionalPath =path: z.string().optional(),});+export function parseAdditionalLinks(+ links: unknown,+): z.infer<typeof additionalPartnerLinkSchema>[] {+ if (!Array.isArray(links)) {+ return [];+ }++ return links.flatMap((link) => {+ const parsed = additionalPartnerLinkSchema.safeParse(link);+ return parsed.success ? [parsed.data] : [];+ });+}+// This is the standard response we send for all /api/groups/** endpointsexport const GroupSchema = z.object({id: z.string(),