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.

code improvements

Pedro Ladeira089844801b82
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/application-settings-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/application-settings-sheet.tsx
index 19f7ff0b45..d966ec7ea3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/application-settings-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/application-settings-sheet.tsx
@@ -26,7 +26,7 @@ import { cn } from "@dub/utils";
import { Category } from "@prisma/client";
import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
-import { Dispatch, SetStateAction, useEffect, useState } from "react";
+import { Dispatch, SetStateAction, useEffect, useRef, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { toast } from "sonner";
import {
@@ -65,6 +65,8 @@ function ApplicationSettingsSheetContent({
"applications" | "marketplace"
>("applications");
+ const hiddenEligibilityConditions = useRef<ApplicationRequirementsDB>([]);
+
const {
control,
handleSubmit,
@@ -86,13 +88,18 @@ function ApplicationSettingsSheetContent({
return;
}
+ const requirements =
+ (program.applicationRequirements as ApplicationRequirementsDB | null) ??
+ [];
+
+ hiddenEligibilityConditions.current = requirements.filter(
+ (c) => c.key !== "country",
+ );
+
reset({
description: program.description ?? "",
categories: program.categories ?? [],
- eligibilityConditions: (
- (program.applicationRequirements as ApplicationRequirementsDB | null) ??
- []
- )
+ eligibilityConditions: requirements
.filter((c) => c.key === "country")
.map((c) => ({ ...c, key: "country" as const, id: generateId() })),
applicationScreeningCriteria: program.applicationScreeningCriteria ?? "",
@@ -114,13 +121,16 @@ function ApplicationSettingsSheetContent({
workspaceId,
description: data.description,
categories: data.categories,
- eligibilityConditions: data.eligibilityConditions
- .filter((c) => c.key && c.operator && c.value && c.value.length > 0)
- .map(({ id: _id, key, operator, value }) => ({
- key: key!,
- operator: operator!,
- value: value!,
- })),
+ eligibilityConditions: [
+ ...data.eligibilityConditions
+ .filter((c) => c.key && c.operator && c.value && c.value.length > 0)
+ .map(({ id: _id, key, operator, value }) => ({
+ key: key!,
+ operator: operator!,
+ value: value!,
+ })),
+ ...hiddenEligibilityConditions.current,
+ ],
applicationScreeningCriteria: data.applicationScreeningCriteria,
aiAutoApproveEnabled: data.aiAutoApproveEnabled,
}).then((result) => {
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index 61f03fc381..5476dadc46 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -338,12 +338,18 @@ async function createApplicationAndEnrollment({
application,
}),
- dispatchPartnerApplicationReview({
- programId: program.id,
- partnerId: partner.id,
- autoApprovePartnersEnabledAt: group.autoApprovePartnersEnabledAt,
- applicationScreeningCriteria: program.applicationScreeningCriteria,
- }),
+ ...(result.reason === "requirementsNotMet"
+ ? []
+ : [
+ dispatchPartnerApplicationReview({
+ programId: program.id,
+ partnerId: partner.id,
+ autoApprovePartnersEnabledAt:
+ group.autoApprovePartnersEnabledAt,
+ applicationScreeningCriteria:
+ program.applicationScreeningCriteria,
+ }),
+ ]),
// Send "partner.application_submitted" webhook
sendWorkspaceWebhook({