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.

Use action-specific condition schemas for bounty and campaign workflows.

Kiran K80d4073c28b0
diff --git a/apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.ts b/apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.ts
index 9f398264e9..ff0234134c 100644
--- a/apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.ts
+++ b/apps/web/app/(ee)/api/cron/bounties/create-draft-submissions/route.ts
@@ -1,11 +1,11 @@
import { createId } from "@/lib/api/create-id";
import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { awardBountyConditionSchema } from "@/lib/api/workflows/award-bounty/schema";
import { evaluateWorkflowConditions } from "@/lib/api/workflows/evaluate-workflow-conditions";
import { qstash } from "@/lib/cron";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
import { prisma } from "@/lib/prisma";
-import { workflowConditionSchema } from "@/lib/zod/schemas/workflows";
import { APP_DOMAIN_WITH_NGROK, log, toCentsNumber } from "@dub/utils";
import { Prisma } from "@prisma/client";
import { differenceInMinutes } from "date-fns";
@@ -133,7 +133,7 @@ export async function POST(req: Request) {
// Find the workflow condition
const condition = z
- .array(workflowConditionSchema)
+ .array(awardBountyConditionSchema)
.parse(bounty.workflow.triggerConditions)[0];
// Partners with their link metrics
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/duplicate-logic-warning.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/duplicate-logic-warning.tsx
index 0353eaa6b3..c79f402973 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/duplicate-logic-warning.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/duplicate-logic-warning.tsx
@@ -1,6 +1,6 @@
+import { sendCampaignConditionSchema } from "@/lib/api/workflows/send-campaign/schema";
import useWorkspace from "@/lib/swr/use-workspace";
import { CampaignList } from "@/lib/types";
-import { workflowConditionSchema } from "@/lib/zod/schemas/workflows";
import { ChevronUp, Copy, LoadingSpinner } from "@dub/ui";
import { cn, fetcher } from "@dub/utils";
import Link from "next/link";
@@ -21,7 +21,7 @@ export function DuplicateLogicWarning() {
const triggerCondition = useWatch({ control, name: "triggerCondition" });
const parsedTriggerCondition = triggerCondition
- ? workflowConditionSchema.safeParse(triggerCondition)
+ ? sendCampaignConditionSchema.safeParse(triggerCondition)
: undefined;
const { data: campaigns, isLoading } = useSWR<CampaignList[]>(
diff --git a/apps/web/lib/zod/schemas/campaigns.ts b/apps/web/lib/zod/schemas/campaigns.ts
index e9c83034a1..c60ec31e74 100644
--- a/apps/web/lib/zod/schemas/campaigns.ts
+++ b/apps/web/lib/zod/schemas/campaigns.ts
@@ -5,7 +5,6 @@ import { GroupSchema } from "./groups";
import { getPaginationQuerySchema } from "./misc";
import { EnrolledPartnerSchema } from "./partners";
import { parseDateSchema } from "./utils";
-import { workflowConditionSchema } from "./workflows";
export const EMAIL_TEMPLATE_VARIABLES = [
"PartnerName",
@@ -78,7 +77,7 @@ export const getCampaignsQuerySchema = z
.pipe(
z.preprocess(
(input: string) => JSON.parse(input),
- workflowConditionSchema,
+ sendCampaignConditionSchema,
),
)
.optional(),