The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Add dedicated Zod schema for group move rule conditions
Kiran K8dd29d4f5fa0
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsxindex 22c95b6b0f..55d70fe351 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx@@ -3,9 +3,16 @@import { getPlanCapabilities } from "@/lib/plan-capabilities";import useGroup from "@/lib/swr/use-group";import useWorkspace from "@/lib/swr/use-workspace";-import { WorkflowCondition } from "@/lib/types";-import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";+import {+ GROUP_MOVE_ATTRIBUTE_CONFIG,+ GROUP_MOVE_ATTRIBUTES,+ type GroupMoveAttribute,+ type GroupMoveAttributeConfig,+ type GroupMoveCondition,+ type GroupMoveRules as GroupMoveRulesForm,+} from "@/lib/zod/schemas/group-move-workflows";import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";+import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";import {InlineBadgePopover,InlineBadgePopoverAmountInput,@@ -17,22 +24,10 @@ import { X } from "lucide-react";import { Fragment, useMemo } from "react";import { Controller, useFieldArray, useFormContext } from "react-hook-form";-const ATTRIBUTES = [- { key: "totalLeads", text: "total leads", type: "number" },- { key: "totalConversions", text: "total conversions", type: "number" },- { key: "totalSaleAmount", text: "total revenue", type: "currency" },- { key: "totalCommissions", text: "total commissions", type: "currency" },-] as const;--type Attribute = (typeof ATTRIBUTES)[number];-type AttributeType = (typeof ATTRIBUTES)[number]["type"];+// Draft form value shapes (partial ranges allowed while editing)type RangeValue = { min: number; max?: number };type ValueType = number | RangeValue | undefined;-const ATTRIBUTE_BY_KEY = Object.fromEntries(- ATTRIBUTES.map(({ key, text, type }) => [key, { text, type }]),-);-const RANGE_SELECTOR_OPTIONS = [{ text: "and no limit", value: "noLimit" },{ text: "and less than", value: "lessThan" },@@ -42,7 +37,7 @@ export function GroupMoveRules() {const { plan } = useWorkspace();const { control, watch } = useFormContext<{- moveRules?: WorkflowCondition[];+ moveRules?: GroupMoveRulesForm;}>();const moveRules = watch("moveRules") ?? [];@@ -66,7 +61,8 @@ export function GroupMoveRules() {[moveRules],);- const disableAddRuleButton = ruleFields.length >= ATTRIBUTES.length;+ const disableAddRuleButton =+ ruleFields.length >= GROUP_MOVE_ATTRIBUTES.length;const { canUseGroupMoveRule } = getPlanCapabilities(plan);@@ -85,9 +81,10 @@ export function GroupMoveRules() {}// Filter out attributes already used by other rules- const availableAttributes = ATTRIBUTES.filter(- (a) =>- a.key === rule.attribute || !usedAttributes?.includes(a.key),+ const availableAttributes = GROUP_MOVE_ATTRIBUTES.filter(+ (attribute) =>+ attribute === rule.attribute ||+ !usedAttributes?.includes(attribute),);return (@@ -126,7 +123,7 @@ export function GroupMoveRules() {attribute: undefined,operator: "gte",value: undefined,- } as unknown as WorkflowCondition);+ } as unknown as GroupMoveCondition);}}disabled={disableAddRuleButton}disabledTooltip={@@ -147,14 +144,17 @@ function GroupRule({index,availableAttributes,}: {- rule: WorkflowCondition;- onUpdate: (updates: Partial<WorkflowCondition>) => void;+ rule: GroupMoveCondition;+ onUpdate: (updates: Partial<GroupMoveCondition>) => void;onRemove: () => void;index: number;- availableAttributes: Attribute[];+ availableAttributes: GroupMoveAttribute[];}) {const isFirst = index === 0;- const attributeType = ATTRIBUTE_BY_KEY[rule.attribute]?.type || "number";+ const attributeConfig = rule.attribute+ ? GROUP_MOVE_ATTRIBUTE_CONFIG[rule.attribute]+ : undefined;+ const attributeType = attributeConfig?.inputType || "number";// Determine if "and less than" is selected based on operator// If operator is "between", it means "and less than" was selected (even if max is not set yet)@@ -206,14 +206,14 @@ function GroupRule({{isFirst ? "If partner" : "And if partner"}{/* Select the attribute */}<InlineBadgePopover- text={ATTRIBUTE_BY_KEY[rule.attribute]?.text || "activity"}+ text={attributeConfig?.label || "activity"}invalid={!rule.attribute}buttonClassName="mx-1"><InlineBadgePopoverMenu- items={availableAttributes.map((a) => ({- value: a.key,- text: a.text,+ items={availableAttributes.map((attribute) => ({+ value: attribute,+ text: GROUP_MOVE_ATTRIBUTE_CONFIG[attribute].label,}))}selectedValue={rule.attribute}onSelect={(value) => {@@ -365,13 +365,13 @@ function ValueInput({onUpdate,}: {index: number;- rule: WorkflowCondition;- attributeType: AttributeType;+ rule: GroupMoveCondition;+ attributeType: GroupMoveAttributeConfig["inputType"];part: "min" | "max";- onUpdate: (updates: Partial<WorkflowCondition>) => void;+ onUpdate: (updates: Partial<GroupMoveCondition>) => void;}) {const { control } = useFormContext<{- moveRules?: WorkflowCondition[];+ moveRules?: GroupMoveRulesForm;}>();const isCurrency = attributeType === "currency";@@ -451,7 +451,7 @@ const handleClearValue = (const handleUpdateMinValue = (currentFieldValue: ValueType,convertedValue: number,- operator: WorkflowCondition["operator"],+ operator: GroupMoveCondition["operator"],): ValueType => {if (operator === "between" && isRangeValue(currentFieldValue)) {const rangeValue = currentFieldValue as RangeValue;@@ -463,8 +463,8 @@ const handleUpdateMinValue = (const handleUpdateMaxValue = (currentFieldValue: ValueType,convertedValue: number,- onUpdate: (updates: Partial<WorkflowCondition>) => void,- ruleOperator: WorkflowCondition["operator"],+ onUpdate: (updates: Partial<GroupMoveCondition>) => void,+ ruleOperator: GroupMoveCondition["operator"],): ValueType => {if (isRangeValue(currentFieldValue)) {const rangeValue = currentFieldValue as RangeValue;@@ -537,7 +537,7 @@ const convertFromDisplayValue = (// Format the value based on the attribute typeconst formatValue = (value: ValueType,- type: AttributeType | undefined,+ type: GroupMoveAttributeConfig["inputType"] | undefined,part: "min" | "max" = "min",) => {const numValue = part === "min" ? getMinValue(value) : getMaxValue(value);diff --git a/apps/web/lib/api/groups/find-groups-with-matching-rules.ts b/apps/web/lib/api/groups/find-groups-with-matching-rules.tsindex 2610f5d971..39b6a9010c 100644--- a/apps/web/lib/api/groups/find-groups-with-matching-rules.ts+++ b/apps/web/lib/api/groups/find-groups-with-matching-rules.ts@@ -1,4 +1,7 @@-import { WorkflowCondition } from "@/lib/types";+import type {+ GroupMoveCondition,+ GroupMoveRules,+} from "@/lib/zod/schemas/group-move-workflows";import { groupRulesSchema } from "@/lib/zod/schemas/groups";import * as z from "zod/v4";@@ -8,7 +11,7 @@ export const findGroupsWithMatchingRules = ({currentGroupId,}: {groups: z.infer<typeof groupRulesSchema>;- currentRules: WorkflowCondition[] | null | undefined;+ currentRules: GroupMoveRules | null | undefined;currentGroupId: string;}): Array<{ id: string; name: string }> => {if (@@ -34,15 +37,15 @@ export const findGroupsWithMatchingRules = ({// Two rule sets conflict if there exists ANY set of attribute values that would satisfy both simultaneously.// This ensures that for any given set of attribute values, at most one group rule set will match.const doRuleSetsOverlap = (- rules1: WorkflowCondition[],- rules2: WorkflowCondition[],+ rules1: GroupMoveRules,+ rules2: GroupMoveRules,): boolean => {- const rules1ByAttribute = new Map<string, WorkflowCondition>();+ const rules1ByAttribute = new Map<string, GroupMoveCondition>();for (const rule of rules1) {rules1ByAttribute.set(rule.attribute, rule);}- const rules2ByAttribute = new Map<string, WorkflowCondition>();+ const rules2ByAttribute = new Map<string, GroupMoveCondition>();for (const rule of rules2) {rules2ByAttribute.set(rule.attribute, rule);}@@ -78,7 +81,7 @@ const doRuleSetsOverlap = (};const conditionToInterval = (- condition: WorkflowCondition,+ condition: GroupMoveCondition,): { min: number; max: number } | null => {switch (condition.operator) {case "gte":@@ -105,8 +108,8 @@ const conditionToInterval = (};const doConditionsOverlap = (- condition1: WorkflowCondition,- condition2: WorkflowCondition,+ condition1: GroupMoveCondition,+ condition2: GroupMoveCondition,): boolean => {// Conditions must be for the same attribute to overlapif (condition1.attribute !== condition2.attribute) {diff --git a/apps/web/lib/api/groups/upsert-group-move-rules.ts b/apps/web/lib/api/groups/upsert-group-move-rules.tsindex 99068de36b..8cdc3fe930 100644--- a/apps/web/lib/api/groups/upsert-group-move-rules.ts+++ b/apps/web/lib/api/groups/upsert-group-move-rules.ts@@ -1,6 +1,7 @@import { getPlanCapabilities } from "@/lib/plan-capabilities";import { prisma } from "@/lib/prisma";-import { WorkflowAction, WorkflowCondition, WorkspaceProps } from "@/lib/types";+import { WorkflowAction, WorkspaceProps } from "@/lib/types";+import type { GroupMoveRules } from "@/lib/zod/schemas/group-move-workflows";import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";import { pluralize } from "@dub/utils";import { PartnerGroup, WorkflowTrigger } from "@prisma/client";@@ -16,7 +17,7 @@ export async function upsertGroupMoveRules({}: {workspace: Pick<WorkspaceProps, "plan" | "defaultProgramId">;group: PartnerGroup;- moveRules?: WorkflowCondition[];+ moveRules?: GroupMoveRules;}): Promise<{ workflowId: string | null | undefined }> {const { canUseGroupMoveRule } = getPlanCapabilities(workspace.plan);diff --git a/apps/web/lib/api/groups/validate-group-move-rules.ts b/apps/web/lib/api/groups/validate-group-move-rules.tsindex d01e53e58c..c84ece07cb 100644--- a/apps/web/lib/api/groups/validate-group-move-rules.ts+++ b/apps/web/lib/api/groups/validate-group-move-rules.ts@@ -1,6 +1,6 @@-import { WorkflowCondition } from "@/lib/types";+import type { GroupMoveRules } from "@/lib/zod/schemas/group-move-workflows";-export const validateGroupMoveRules = (rules?: WorkflowCondition[]) => {+export const validateGroupMoveRules = (rules?: GroupMoveRules) => {if (!rules || rules.length === 0) {return;}diff --git a/apps/web/lib/zod/schemas/group-move-workflows.ts b/apps/web/lib/zod/schemas/group-move-workflows.tsnew file mode 100644index 0000000000..12ec7c097b--- /dev/null+++ b/apps/web/lib/zod/schemas/group-move-workflows.ts@@ -0,0 +1,69 @@+import * as z from "zod/v4";++export const GROUP_MOVE_ATTRIBUTES = [+ "totalLeads",+ "totalConversions",+ "totalSaleAmount",+ "totalCommissions",+] as const;++export const GROUP_MOVE_OPERATORS = ["gte", "between"] as const;++export const GROUP_MOVE_ATTRIBUTE_CONFIG: Record<+ GroupMoveAttribute,+ GroupMoveAttributeConfig+> = {+ totalLeads: {+ label: "total leads",+ inputType: "number",+ operators: ["gte", "between"],+ },+ totalConversions: {+ label: "total conversions",+ inputType: "number",+ operators: ["gte", "between"],+ },+ totalSaleAmount: {+ label: "total revenue",+ inputType: "currency",+ operators: ["gte", "between"],+ },+ totalCommissions: {+ label: "total commissions",+ inputType: "currency",+ operators: ["gte", "between"],+ },+};++export const GROUP_MOVE_OPERATOR_LABELS: Record<GroupMoveOperator, string> = {+ gte: "more than",+ between: "between",+} as const;++export const groupMoveConditionSchema = z.object({+ attribute: z.enum(GROUP_MOVE_ATTRIBUTES),+ operator: z.enum(GROUP_MOVE_OPERATORS).default("gte"),+ value: z.union([+ z.number(),+ z.object({+ min: z.number(),+ max: z.number(),+ }),+ ]),+});++export const groupMoveRulesSchema = z.array(groupMoveConditionSchema);++export type GroupMoveCondition = z.infer<typeof groupMoveConditionSchema>;++export type GroupMoveRules = z.infer<typeof groupMoveRulesSchema>;++export type GroupMoveAttribute = (typeof GROUP_MOVE_ATTRIBUTES)[number];++type GroupMoveOperator = (typeof GROUP_MOVE_OPERATORS)[number];++export type GroupMoveAttributeConfig = {+ label: string;+ inputType: "number" | "currency";+ operators: readonly GroupMoveOperator[];+};diff --git a/apps/web/lib/zod/schemas/groups.ts b/apps/web/lib/zod/schemas/groups.tsindex bc41e25fc9..3a55baf703 100644--- a/apps/web/lib/zod/schemas/groups.ts+++ b/apps/web/lib/zod/schemas/groups.ts@@ -7,13 +7,13 @@ import slugify from "@sindresorhus/slugify";import * as z from "zod/v4";import { DiscountSchema } from "./discount";import { GroupBountySummarySchema } from "./group-bounties";+import { groupMoveRulesSchema } from "./group-move-workflows";import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";import { programApplicationFormSchema } from "./program-application-form";import { programLanderSchema } from "./program-lander";import { RewardSchema } from "./rewards";import { centsSchemaWithDefault, parseUrlSchema } from "./utils";import { UTMTemplateSchema } from "./utm";-import { workflowConditionSchema } from "./workflows";export const DEFAULT_PARTNER_GROUP = {name: "Default Group",@@ -73,7 +73,7 @@ export const GroupSchema = z.object({additionalLinks: z.array(additionalPartnerLinkSchema).nullable(),maxPartnerLinks: z.number(),linkStructure: z.enum(PartnerLinkStructure),- moveRules: z.array(workflowConditionSchema).nullish().default(null),+ moveRules: groupMoveRulesSchema.nullish().default(null),});export const GroupWithFormDataSchema = GroupSchema.extend({@@ -152,7 +152,7 @@ export const updateGroupSchema = createGroupSchema.partial().extend({autoApprovePartners: z.coerce.boolean().optional(),updateAutoApprovePartnersForAllGroups: z.coerce.boolean().optional(),updateHoldingPeriodDaysForAllGroups: z.coerce.boolean().optional(),- moveRules: z.array(workflowConditionSchema).optional(),+ moveRules: groupMoveRulesSchema.optional(),});export const PartnerGroupDefaultLinkSchema = z.object({diff --git a/apps/web/lib/zod/schemas/workflows.ts b/apps/web/lib/zod/schemas/workflows.tsindex 710990f5da..f9a5ad896c 100644--- a/apps/web/lib/zod/schemas/workflows.ts+++ b/apps/web/lib/zod/schemas/workflows.ts@@ -63,14 +63,6 @@ export const OPERATOR_FUNCTIONS: Record<},};-export const WORKFLOW_COMPARISON_OPERATOR_LABELS: Record<- WorkflowComparisonOperator,- string-> = {- gte: "more than",- between: "between",-} as const;-export enum WORKFLOW_ACTION_TYPES {AwardBounty = "awardBounty",SendCampaign = "sendCampaign",