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.

Fix marketplace application form (#4448)

Pedro Ladeira0b250923d504
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/default-group/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/default-group/route.ts
new file mode 100644
index 0000000000..1e202f8c4b
--- /dev/null
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/default-group/route.ts
@@ -0,0 +1,32 @@
+import { DubApiError } from "@/lib/api/errors";
+import { withPartnerProfile } from "@/lib/auth/partner";
+import { prisma } from "@/lib/prisma";
+import {
+ DEFAULT_PARTNER_GROUP,
+ PartnerProgramGroupSchema,
+} from "@/lib/zod/schemas/groups";
+import { NextResponse } from "next/server";
+
+// GET /api/partner-profile/programs/[programId]/default-group - get information about a program's default group
+export const GET = withPartnerProfile(async ({ params, partner }) => {
+ const { programId } = params;
+
+ const group = await prisma.partnerGroup.findUnique({
+ where: {
+ programId_slug: {
+ programId,
+ slug: DEFAULT_PARTNER_GROUP.slug,
+ },
+ },
+ });
+
+ // should never happen, but just in case
+ if (!group) {
+ throw new DubApiError({
+ code: "not_found",
+ message: `Program "${programId}" does not have a default group.`,
+ });
+ }
+
+ return NextResponse.json(PartnerProgramGroupSchema.parse(group));
+});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/groups/[groupIdOrSlug]/route.ts
deleted file mode 100644
index 49f516ffc4..0000000000
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/groups/[groupIdOrSlug]/route.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { DubApiError } from "@/lib/api/errors";
-import { withPartnerProfile } from "@/lib/auth/partner";
-import { prisma } from "@/lib/prisma";
-import { PartnerProgramGroupSchema } from "@/lib/zod/schemas/groups";
-import { NextResponse } from "next/server";
-
-// GET /api/partner-profile/programs/[programId]/groups/[groupIdOrSlug] - get information about a program's group
-export const GET = withPartnerProfile(async ({ params, partner }) => {
- const { programId, groupIdOrSlug } = params;
-
- const group = await prisma.partnerGroup.findUnique({
- where: {
- ...(groupIdOrSlug.startsWith("grp_")
- ? {
- id: groupIdOrSlug,
- }
- : {
- programId_slug: {
- programId,
- slug: groupIdOrSlug,
- },
- }),
- programId,
- partners: {
- some: {
- partnerId: partner.id,
- },
- },
- },
- });
-
- if (!group) {
- throw new DubApiError({
- code: "not_found",
- message: `Group "${groupIdOrSlug}" not found.`,
- });
- }
-
- return NextResponse.json(PartnerProgramGroupSchema.parse(group));
-});
diff --git a/apps/web/ui/partners/program-application-sheet.tsx b/apps/web/ui/partners/program-application-sheet.tsx
index dd1434fcb0..6ca06cd861 100644
--- a/apps/web/ui/partners/program-application-sheet.tsx
+++ b/apps/web/ui/partners/program-application-sheet.tsx
@@ -4,10 +4,7 @@ import { parseActionError } from "@/lib/actions/parse-action-errors";
import { createProgramApplicationAction } from "@/lib/actions/partners/create-program-application";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { ProgramEnrollmentProps, ProgramProps } from "@/lib/types";
-import {
- DEFAULT_PARTNER_GROUP,
- PartnerProgramGroupSchema,
-} from "@/lib/zod/schemas/groups";
+import { PartnerProgramGroupSchema } from "@/lib/zod/schemas/groups";
import { createProgramApplicationSchema } from "@/lib/zod/schemas/programs";
import { X } from "@/ui/shared/icons";
import {
@@ -55,22 +52,11 @@ function ProgramApplicationSheetContent({
programEnrollment,
...rest
}: ProgramApplicationSheetProps) {
- const groupIdOrSlug =
- programEnrollment?.groupId ||
- program?.defaultGroupId ||
- DEFAULT_PARTNER_GROUP.slug;
-
const { data: group, error: groupError } = useSWR<
z.infer<typeof PartnerProgramGroupSchema>
- >(
- groupIdOrSlug
- ? `/api/partner-profile/programs/${program.id}/groups/${groupIdOrSlug}`
- : null,
- fetcher,
- {
- keepPreviousData: true,
- },
- );
+ >(`/api/partner-profile/programs/${program.id}/default-group`, fetcher, {
+ keepPreviousData: true,
+ });
return group ? (
<ProgramApplicationSheetForm