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.

Restore action-specific bounty and campaign condition schemas.

Kiran Kecaa5e781b87
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts
index 5e03a6c3ef..d5d21b169c 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/use-add-edit-bounty-form.ts
@@ -1,5 +1,6 @@
"use client";
+import { awardBountyConditionSchema } from "@/lib/api/workflows/award-bounty/schema";
import { isCurrencyAttribute } from "@/lib/api/workflows/utils";
import { generatePerformanceBountyName } from "@/lib/bounty/api/generate-performance-bounty-name";
import {
@@ -12,7 +13,6 @@ import { useApiMutation } from "@/lib/swr/use-api-mutation";
import useWorkspace from "@/lib/swr/use-workspace";
import { BountyProps } from "@/lib/types";
import { bountySocialContentRequirementsSchema } from "@/lib/zod/schemas/bounties";
-import { workflowConditionSchema } from "@/lib/zod/schemas/workflows";
import { formatDate } from "@dub/utils";
import { BountySubmissionFrequency } from "@prisma/client";
import { Dispatch, SetStateAction, useEffect, useMemo, useState } from "react";
@@ -546,7 +546,7 @@ export function useAddEditBountyForm({
numAmount != null && numAmount > 0 ? numAmount * 100 : null;
if (data.type === "performance") {
- const result = workflowConditionSchema.safeParse(
+ const result = awardBountyConditionSchema.safeParse(
data.performanceCondition,
);
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..0642cc2a08 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 useWorkspace from "@/lib/swr/use-workspace";
import { CampaignList } from "@/lib/types";
-import { workflowConditionSchema } from "@/lib/zod/schemas/workflows";
+import { sendCampaignConditionSchema } from "@/lib/api/workflows/send-campaign/schema";
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/api/workflows/award-bounty/schema.ts b/apps/web/lib/api/workflows/award-bounty/schema.ts
index ed499a1f37..1e70e0b473 100644
--- a/apps/web/lib/api/workflows/award-bounty/schema.ts
+++ b/apps/web/lib/api/workflows/award-bounty/schema.ts
@@ -1,4 +1,5 @@
import { WORKFLOW_OPERATORS } from "@/lib/api/workflows/operator-definitions";
+import * as z from "zod/v4";
import { WORKFLOW_ATTRIBUTES } from "../attribute-definitions";
export const AWARD_BOUNTY_ATTRIBUTES = {
@@ -15,3 +16,13 @@ export const AWARD_BOUNTY_ATTRIBUTE_KEYS = Object.keys(
export const AWARD_BOUNTY_OPERATORS = {
gte: WORKFLOW_OPERATORS.gte,
};
+
+const AWARD_BOUNTY_OPERATOR_KEYS = Object.keys(
+ AWARD_BOUNTY_OPERATORS,
+) as readonly (keyof typeof AWARD_BOUNTY_OPERATORS)[];
+
+export const awardBountyConditionSchema = z.object({
+ attribute: z.enum(AWARD_BOUNTY_ATTRIBUTE_KEYS),
+ operator: z.enum(AWARD_BOUNTY_OPERATOR_KEYS).default("gte"),
+ value: z.number(),
+});
diff --git a/apps/web/lib/api/workflows/send-campaign/schema.ts b/apps/web/lib/api/workflows/send-campaign/schema.ts
index cb15f9eb3a..8b04698ba0 100644
--- a/apps/web/lib/api/workflows/send-campaign/schema.ts
+++ b/apps/web/lib/api/workflows/send-campaign/schema.ts
@@ -1,3 +1,5 @@
+import { WORKFLOW_OPERATORS } from "@/lib/api/workflows/operator-definitions";
+import * as z from "zod/v4";
import { WORKFLOW_ATTRIBUTES } from "../attribute-definitions";
export const SEND_CAMPAIGN_ATTRIBUTES = {
@@ -12,3 +14,17 @@ export const SEND_CAMPAIGN_ATTRIBUTES = {
export const SEND_CAMPAIGN_ATTRIBUTE_KEYS = Object.keys(
SEND_CAMPAIGN_ATTRIBUTES,
) as readonly (keyof typeof SEND_CAMPAIGN_ATTRIBUTES)[];
+
+const SEND_CAMPAIGN_OPERATORS = {
+ gte: WORKFLOW_OPERATORS.gte,
+};
+
+const SEND_CAMPAIGN_OPERATOR_KEYS = Object.keys(
+ SEND_CAMPAIGN_OPERATORS,
+) as readonly (keyof typeof SEND_CAMPAIGN_OPERATORS)[];
+
+export const sendCampaignConditionSchema = z.object({
+ attribute: z.enum(SEND_CAMPAIGN_ATTRIBUTE_KEYS),
+ operator: z.enum(SEND_CAMPAIGN_OPERATOR_KEYS).default("gte"),
+ value: z.number(),
+});
diff --git a/apps/web/lib/zod/schemas/bounties.ts b/apps/web/lib/zod/schemas/bounties.ts
index 60d4ad5478..19e9128c85 100644
--- a/apps/web/lib/zod/schemas/bounties.ts
+++ b/apps/web/lib/zod/schemas/bounties.ts
@@ -18,13 +18,13 @@ import {
BountyType,
} from "@prisma/client";
import * as z from "zod/v4";
+import { awardBountyConditionSchema } from "../../api/workflows/award-bounty/schema";
import { CommissionSchema } from "./commissions";
import { GroupSchema } from "./groups";
import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";
import { EnrolledPartnerSchema } from "./partners";
import { UserSchema } from "./users";
import { nullableCountSchema, parseDateSchema } from "./utils";
-import { workflowConditionSchema } from "./workflows";
// Eg: for each additional 1000 views, earn $1, up to $100
export const bountySocialContentIncrementalBonusSchema = z
@@ -117,7 +117,7 @@ export const createBountySchema = z.object({
.nullish(),
submissionRequirements: submissionRequirementsSchema.nullish(),
groupIds: z.array(z.string()).nullable(),
- performanceCondition: workflowConditionSchema.nullish(),
+ performanceCondition: awardBountyConditionSchema.nullish(),
performanceScope: z.enum(BountyPerformanceScope).nullish(),
sendNotificationEmails: z.boolean().optional(),
});
@@ -149,7 +149,7 @@ export const BountySchema = z.object({
maxSubmissions: z.number(),
rewardAmount: z.number().nullable(),
rewardDescription: z.string().nullable(),
- performanceCondition: workflowConditionSchema.nullable().default(null),
+ performanceCondition: awardBountyConditionSchema.nullable().default(null),
performanceScope: z.enum(BountyPerformanceScope).nullable(),
submissionRequirements: submissionRequirementsSchema.nullable().default(null),
socialMetricsLastSyncedAt: z.date().nullable().optional(),
diff --git a/apps/web/lib/zod/schemas/campaigns.ts b/apps/web/lib/zod/schemas/campaigns.ts
index d0998ef27d..c60ec31e74 100644
--- a/apps/web/lib/zod/schemas/campaigns.ts
+++ b/apps/web/lib/zod/schemas/campaigns.ts
@@ -1,10 +1,10 @@
import { CampaignStatus, CampaignType } from "@prisma/client";
import * as z from "zod/v4";
+import { sendCampaignConditionSchema } from "../../api/workflows/send-campaign/schema";
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",
@@ -21,7 +21,7 @@ export const CampaignSchema = z.object({
bodyJson: z.record(z.string(), z.any()),
type: z.enum(CampaignType),
status: z.enum(CampaignStatus),
- triggerCondition: workflowConditionSchema.nullable().default(null),
+ triggerCondition: sendCampaignConditionSchema.nullable().default(null),
groups: z.array(GroupSchema.pick({ id: true })),
scheduledAt: z.date().nullable(),
createdAt: z.date(),
@@ -54,7 +54,7 @@ export const updateCampaignSchema = z
preview: z.string().nullish(),
from: z.email().trim().toLowerCase(),
bodyJson: z.record(z.string(), z.any()),
- triggerCondition: workflowConditionSchema.nullish(),
+ triggerCondition: sendCampaignConditionSchema.nullish(),
groupIds: z.array(z.string()).nullable(),
scheduledAt: parseDateSchema.nullish(),
status: z.enum([
@@ -77,7 +77,7 @@ export const getCampaignsQuerySchema = z
.pipe(
z.preprocess(
(input: string) => JSON.parse(input),
- workflowConditionSchema,
+ sendCampaignConditionSchema,
),
)
.optional(),
diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.ts
index 0051acea7f..baa1d344f7 100644
--- a/apps/web/lib/zod/schemas/partner-profile.ts
+++ b/apps/web/lib/zod/schemas/partner-profile.ts
@@ -2,6 +2,7 @@ import {
DATE_RANGE_INTERVAL_PRESETS,
DUB_PARTNERS_ANALYTICS_INTERVAL,
} from "@/lib/analytics/constants";
+import { awardBountyConditionSchema } from "@/lib/api/workflows/award-bounty/schema";
import { PARTNER_CUSTOMERS_MAX_PAGE_SIZE } from "@/lib/constants/partner-profile";
import {
CommissionType,
@@ -27,7 +28,6 @@ import { getPaginationQuerySchema } from "./misc";
import { payoutsQuerySchema } from "./payouts";
import { submittedLeadFormDataSchema } from "./submitted-lead-form";
import { centsSchema } from "./utils";
-import { workflowConditionSchema } from "./workflows";
export const PartnerEarningsSchema = CommissionSchema.omit({
userId: true,
@@ -164,7 +164,7 @@ export const PartnerBountySchema = BountySchema.omit({
socialMetricsLastSyncedAt: true,
}).extend({
submissions: z.array(partnerBountySubmissionSchema),
- performanceCondition: workflowConditionSchema.nullable().default(null),
+ performanceCondition: awardBountyConditionSchema.nullable().default(null),
partner: z.object({
totalClicks: z.number(),
totalLeads: z.number(),