redirect to marketplace page

Author: steven-tey

apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx

@@ -29,8 +29,14 @@ export default async function ApplicationPage(props: {
     !program.group.applicationFormData ||
     !program.group.applicationFormPublishedAt
   ) {
-    // throw 404 if it's the default group, else redirect to the default group page
+    // for the default group:
+    // - if the program is found, redirect to the marketplace program page
+    // - otherwise, throw 404
+    // for other groups: redirect to the default group variant
     if (partnerGroupSlug === DEFAULT_PARTNER_GROUP.slug) {
+      if (program) {
+        redirect(`/marketplace/${programSlug}`);
+      }
       notFound();
     } else {
       redirect(`/${programSlug}/apply`);

apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx

@@ -65,8 +65,14 @@ export default async function SuccessPage(props: {
     !program.group.applicationFormData ||
     !program.group.applicationFormPublishedAt
   ) {
-    // throw 404 if it's the default group, else redirect to the default group page
+    // for the default group:
+    // - if the program is found, redirect to the marketplace program page
+    // - otherwise, throw 404
+    // for other groups: redirect to the default group variant
     if (partnerGroupSlug === DEFAULT_PARTNER_GROUP.slug) {
+      if (program) {
+        redirect(`/marketplace/${programSlug}`);
+      }
       notFound();
     } else {
       redirect(`/${programSlug}/apply`);

apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx

@@ -28,8 +28,14 @@ export default async function ApplyPage(props: {
     !program.group.landerData ||
     !program.group.landerPublishedAt
   ) {
-    // throw 404 if it's the default group, else redirect to the default group page
+    // for the default group:
+    // - if the program is found, redirect to the marketplace program page
+    // - otherwise, throw 404
+    // for other groups: redirect to the default group variant
     if (partnerGroupSlug === DEFAULT_PARTNER_GROUP.slug) {
+      if (program) {
+        redirect(`/marketplace/${programSlug}`);
+      }
       notFound();
     } else {
       redirect(`/${programSlug}`);

apps/web/lib/fetchers/get-public-network-programs.ts

@@ -49,26 +49,25 @@ export const getPublicNetworkPrograms = cache(
             },
           },
         }),
-        groups: {
-          some: {
-            slug: DEFAULT_PARTNER_GROUP.slug,
-            applicationFormPublishedAt: {
-              not: null,
+        ...(rewardType && {
+          groups: {
+            some: {
+              slug: DEFAULT_PARTNER_GROUP.slug,
+              ...(rewardType === "sale" && {
+                saleRewardId: { not: null },
+              }),
+              ...(rewardType === "lead" && {
+                leadRewardId: { not: null },
+              }),
+              ...(rewardType === "click" && {
+                clickRewardId: { not: null },
+              }),
+              ...(rewardType === "discount" && {
+                discountId: { not: null },
+              }),
             },
-            ...(rewardType === "sale" && {
-              saleRewardId: { not: null },
-            }),
-            ...(rewardType === "lead" && {
-              leadRewardId: { not: null },
-            }),
-            ...(rewardType === "click" && {
-              clickRewardId: { not: null },
-            }),
-            ...(rewardType === "discount" && {
-              discountId: { not: null },
-            }),
           },
-        },
+        }),
       },
       include: {
         groups: {

apps/web/ui/program-marketplace/external/marketplace-external-home-page.tsx

@@ -18,7 +18,7 @@ async function fetchHomePrograms(
 
 export async function MarketplaceExternalHomePage() {
   const [featuredPrograms, ...rowPrograms] = await Promise.all([
-    fetchHomePrograms({ featured: true, pageSize: 6 }),
+    fetchHomePrograms({ featured: true }),
     ...MARKETPLACE_HOME_ROWS.map((row) => fetchHomePrograms(row.fetchParams)),
   ]);