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.

lead and sales rewards metadata condition

Pedro Ladeira8bc444a1117b
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index c274aa3074..e3fd9add56 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -36,6 +36,7 @@ jobs:
E2E_TOKEN_MEMBER: ${{ secrets.E2E_TOKEN_MEMBER }}
E2E_TOKEN_OLD: ${{ secrets.E2E_TOKEN_OLD }}
E2E_PUBLISHABLE_KEY: ${{ secrets.E2E_PUBLISHABLE_KEY }}
+ QSTASH_URL: "https://qstash-us-east-1.upstash.io"
QSTASH_TOKEN: ${{ secrets.QSTASH_TOKEN }}
QSTASH_CURRENT_SIGNING_KEY: ${{ secrets.QSTASH_CURRENT_SIGNING_KEY }}
NEXT_PUBLIC_NGROK_URL: ${{ github.event.deployment_status.environment_url }}
diff --git a/.github/workflows/playwright.yaml b/.github/workflows/playwright.yaml
index c342690c45..1cc68d030d 100644
--- a/.github/workflows/playwright.yaml
+++ b/.github/workflows/playwright.yaml
@@ -47,6 +47,7 @@ jobs:
UPSTASH_REDIS_REST_TOKEN: "e2e_srh_token"
UPSTASH_VECTOR_REST_URL: "https://sensible-camel-xxxx.upstash.io"
UPSTASH_VECTOR_REST_TOKEN: "xx"
+ QSTASH_URL: "https://qstash-us-east-1.upstash.io"
QSTASH_TOKEN: "xx"
QSTASH_CURRENT_SIGNING_KEY: "xx"
QSTASH_NEXT_SIGNING_KEY: "xx"
diff --git a/apps/web/.env.example b/apps/web/.env.example
index ac8c3dc3b3..cc68a4d716 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -29,6 +29,7 @@ UPSTASH_REDIS_REST_TOKEN=
# Upstash QStash – required for queues and background jobs
# Get your QStash Token here: https://upstash.com/docs/qstash/overall/getstarted
+QSTASH_URL="https://qstash-us-east-1.upstash.io"
QSTASH_TOKEN=
QSTASH_CURRENT_SIGNING_KEY=
QSTASH_NEXT_SIGNING_KEY=
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
index 97dce7aa39..3177403c00 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
@@ -517,6 +517,9 @@ export async function checkoutSessionCompleted(
sale: {
products,
amount: saleData.amount,
+ ...(charge.metadata && Object.keys(charge.metadata).length > 0
+ ? { metadata: charge.metadata }
+ : {}),
},
},
clickEvent: {
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
index fc240af326..74d66a1d0c 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
@@ -315,6 +315,12 @@ export async function invoicePaid(
| undefined = undefined;
if (link.programId && link.partnerId) {
+ const saleMetadata = {
+ ...invoice.parent?.subscription_details?.metadata,
+ ...invoice.lines.data[0]?.metadata,
+ ...invoice.metadata,
+ };
+
const products = invoice.lines.data
.map((line) => {
const productId = line.pricing?.price_details?.product;
@@ -351,6 +357,9 @@ export async function invoicePaid(
sale: {
products,
amount: saleData.amount,
+ ...(Object.keys(saleMetadata).length > 0
+ ? { metadata: saleMetadata }
+ : {}),
},
},
clickEvent: {
diff --git a/apps/web/lib/api/conversions/track-lead.ts b/apps/web/lib/api/conversions/track-lead.ts
index 9766018b56..c2cf08ad06 100644
--- a/apps/web/lib/api/conversions/track-lead.ts
+++ b/apps/web/lib/api/conversions/track-lead.ts
@@ -304,6 +304,13 @@ export const trackLead = async ({
country: customer.country,
source,
},
+ ...(metadata != null
+ ? {
+ lead: {
+ metadata: metadata as Record<string, unknown>,
+ },
+ }
+ : {}),
},
clickEvent: {
url: clickData.url,
diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.ts
index 8aaf9fa9ba..e64edd86e1 100644
--- a/apps/web/lib/api/conversions/track-sale.ts
+++ b/apps/web/lib/api/conversions/track-sale.ts
@@ -489,6 +489,11 @@ const _trackSale = async ({
sale: {
productId: metadata?.productId,
amount: saleData.amount,
+ ...(metadata != null
+ ? {
+ metadata: metadata as Record<string, unknown>,
+ }
+ : {}),
},
},
clickEvent: {
diff --git a/apps/web/lib/partners/evaluate-reward-conditions.ts b/apps/web/lib/partners/evaluate-reward-conditions.ts
index 83fea66b1c..92c8e0af25 100644
--- a/apps/web/lib/partners/evaluate-reward-conditions.ts
+++ b/apps/web/lib/partners/evaluate-reward-conditions.ts
@@ -4,6 +4,10 @@ import {
RewardConditionsArray,
RewardContext,
} from "../types";
+import {
+ METADATA_NUMBER_CONDITION_OPERATORS,
+ METADATA_TEXT_CONDITION_OPERATORS,
+} from "../zod/schemas/rewards";
import { getRewardAmount } from "./get-reward-amount";
export const evaluateRewardConditions = ({
@@ -22,15 +26,7 @@ export const evaluateRewardConditions = ({
for (const conditionGroup of conditions) {
// Evaluate each condition in the group
const conditionResults = conditionGroup.conditions.map((condition) => {
- let fieldValue = undefined;
-
- if (condition.entity === "customer") {
- fieldValue = context.customer?.[condition.attribute];
- } else if (condition.entity === "sale") {
- fieldValue = context.sale?.[condition.attribute];
- } else if (condition.entity === "partner") {
- fieldValue = context.partner?.[condition.attribute];
- }
+ const fieldValue = resolveConditionFieldValue({ condition, context });
if (fieldValue === undefined) {
return false;
@@ -75,6 +71,97 @@ export const evaluateRewardConditions = ({
)[0];
};
+function resolveConditionFieldValue({
+ condition,
+ context,
+}: {
+ condition: RewardCondition;
+ context: RewardContext;
+}): string | number | string[] | number[] | undefined {
+ if (condition.attribute === "metadata") {
+ const metaKey = condition.metadataField?.trim() ?? "";
+ if (!metaKey) return undefined;
+
+ if (condition.entity === "lead") {
+ const raw = context.lead?.metadata?.[metaKey];
+ return prepareMetadataFieldValue(raw, condition);
+ }
+
+ if (condition.entity === "sale") {
+ const raw = context.sale?.metadata?.[metaKey];
+ return prepareMetadataFieldValue(raw, condition);
+ }
+
+ return undefined;
+ }
+
+ if (condition.entity === "customer") {
+ return context.customer?.[condition.attribute];
+ }
+ if (condition.entity === "sale") {
+ return context.sale?.[condition.attribute];
+ }
+ if (condition.entity === "partner") {
+ return context.partner?.[condition.attribute];
+ }
+ if (condition.entity === "lead") {
+ return undefined;
+ }
+
+ return undefined;
+}
+
+function parseMetadataNumeric(raw: unknown): number | undefined {
+ if (raw == null) {
+ return undefined;
+ }
+ if (typeof raw === "number" && !Number.isNaN(raw)) {
+ return raw;
+ }
+ if (typeof raw === "string") {
+ if (raw.trim() === "" || Number.isNaN(Number(raw))) {
+ return undefined;
+ }
+ return Number(raw);
+ }
+ if (typeof raw === "boolean") {
+ return undefined;
+ }
+ const n = Number(raw);
+ return Number.isNaN(n) ? undefined : n;
+}
+
+function metadataRawToString(raw: unknown): string {
+ return typeof raw === "string" ? raw : String(raw);
+}
+
+function prepareMetadataFieldValue(
+ raw: unknown,
+ condition: RewardCondition,
+): string | number | string[] | number[] | undefined {
+ if (raw == null) return undefined;
+
+ const op = condition.operator;
+ const equalsOrNot = op === "equals_to" || op === "not_equals";
+
+ if (METADATA_TEXT_CONDITION_OPERATORS.includes(op) && !equalsOrNot) {
+ return metadataRawToString(raw);
+ }
+
+ const ordering = METADATA_NUMBER_CONDITION_OPERATORS.includes(op);
+ if (!ordering && !equalsOrNot) return undefined;
+
+ const numeric = parseMetadataNumeric(raw);
+ if (ordering) return numeric;
+
+ // For equals_to / not_equals, match the coercion to condition.value's type
+ // so that strict === in evaluateCondition sees the same type on both sides.
+ if (typeof condition.value === "number") {
+ return numeric !== undefined ? numeric : metadataRawToString(raw);
+ }
+ return metadataRawToString(raw);
+}
+
const evaluateCondition = ({
condition,
fieldValue,
@@ -98,6 +185,8 @@ const evaluateCondition = ({
return false;
}
+ if (condition.value === "") return false;
+
return fieldValue.startsWith(condition.value);
}
@@ -107,9 +196,35 @@ const evaluateCondition = ({
return false;
}
+ if (condition.value === "") return false;
+
return fieldValue.endsWith(condition.value);
}
+ // Contains
+ if (condition.operator === "contains") {
+ if (typeof fieldValue !== "string" || typeof condition.value !== "string") {
+ return false;
+ }
+
+ const needle = condition.value.trim();
+ if (needle === "") return false;
+
+ return String(fieldValue).includes(needle);
+ }
+
+ // Not contains
+ if (condition.operator === "not_contains") {
+ if (typeof fieldValue !== "string" || typeof condition.value !== "string") {
+ return false;
+ }
+
+ const needle = condition.value.trim();
+ if (needle === "") return false;
+
+ return !String(fieldValue).includes(needle);
+ }
+
// In
if (condition.operator === "in") {
if (!Array.isArray(condition.value)) {
@@ -123,7 +238,7 @@ const evaluateCondition = ({
// Not in
if (condition.operator === "not_in") {
- if (!Array.isArray(condition.value)) {
+ if (!Array.isArray(condition.value) || condition.value.length === 0) {
return false;
}
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
index 5cec9a1350..73741cd226 100644
--- a/apps/web/lib/zod/schemas/rewards.ts
+++ b/apps/web/lib/zod/schemas/rewards.ts
@@ -22,7 +22,7 @@ export const COMMISSION_TYPES = [
export type RewardConditionEntityAttribute = {
id: string;
label: string;
- type: "string" | "enum" | "number" | "currency" | "date";
+ type: "string" | "enum" | "number" | "currency" | "date" | "metadata";
options?: {
id: string;
label: string;
@@ -30,11 +30,23 @@ export type RewardConditionEntityAttribute = {
};
export type RewardConditionEntity = {
- id: "partner" | "customer" | "sale";
+ id: "partner" | "customer" | "sale" | "lead";
label: string;
attributes: RewardConditionEntityAttribute[];
};
+const LEAD_ENTITY: RewardConditionEntity = {
+ id: "lead",
+ label: "Lead",
+ attributes: [
+ {
+ id: "metadata",
+ label: "Metadata",
+ type: "metadata",
+ },
+ ],
+};
+
const PARTNER_ENTITY: RewardConditionEntity = {
id: "partner",
label: "Partner",
@@ -124,6 +136,7 @@ export const REWARD_CONDITIONS: Record<
],
},
PARTNER_ENTITY,
+ LEAD_ENTITY,
],
},
@@ -196,6 +209,11 @@ export const REWARD_CONDITIONS: Record<
},
],
},
+ {
+ id: "metadata",
+ label: "Metadata",
+ type: "metadata",
+ },
],
},
],
@@ -213,19 +231,23 @@ export const REWARD_CONDITION_ENTITIES = [
),
];
-export const REWARD_CONDITION_ATTRIBUTES = [
- ...new Set(
- Object.values(REWARD_CONDITIONS).flatMap(({ entities }) =>
- entities.flatMap(({ attributes }) => attributes),
- ),
- ),
+export const REWARD_CONDITION_ATTRIBUTES = Object.values(
+ REWARD_CONDITIONS,
+).flatMap(({ entities }) => entities.flatMap(({ attributes }) => attributes));
+
+export const REWARD_CONDITION_ATTRIBUTE_IDS = [
+ ...new Set(REWARD_CONDITION_ATTRIBUTES.map(({ id }) => id)),
];
+export const REWARD_METADATA_CONDITION_ENTITIES = ["lead", "sale"] as const;
+
export const CONDITION_OPERATORS = [
"equals_to",
"not_equals",
"starts_with",
"ends_with",
+ "contains",
+ "not_contains",
"in",
"not_in",
"greater_than",
@@ -253,11 +275,32 @@ export const NUMBER_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][]
export const DATE_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][] =
["greater_than", "greater_than_or_equal", "less_than", "less_than_or_equal"];
+export const METADATA_NUMBER_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][] =
+ ["greater_than", "greater_than_or_equal", "less_than", "less_than_or_equal"];
+
+export const METADATA_TEXT_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][] =
+ [
+ "equals_to",
+ "not_equals",
+ "starts_with",
+ "ends_with",
+ "contains",
+ "not_contains",
+ ];
+
+export const METADATA_CONDITION_OPERATORS: (typeof CONDITION_OPERATORS)[number][] =
+ [
+ ...METADATA_TEXT_CONDITION_OPERATORS,
+ ...METADATA_NUMBER_CONDITION_OPERATORS,
+ ];
+
export const CONDITION_OPERATOR_LABELS = {
equals_to: "is",
not_equals: "is not",
starts_with: "starts with",
ends_with: "ends with",
+ contains: "contains",
+ not_contains: "does not contain",
in: "is one of",
not_in: "is not one of",
greater_than: "is greater than",
@@ -266,13 +309,11 @@ export const CONDITION_OPERATOR_LABELS = {
less_than_or_equal: "is less than or equal to",
} as const;
-export const rewardConditionSchema = z.object({
+export const rewardConditionBaseSchema = z.object({
entity: z.enum(
REWARD_CONDITION_ENTITIES.map(({ id }) => id) as [string, ...string[]],
),
- attribute: z.enum(
- REWARD_CONDITION_ATTRIBUTES.map(({ id }) => id) as [string, ...string[]],
- ),
+ attribute: z.enum(REWARD_CONDITION_ATTRIBUTE_IDS as [string, ...string[]]),
operator: z.enum(CONDITION_OPERATORS),
value: z.union([
z.string(),
@@ -284,8 +325,47 @@ export const rewardConditionSchema = z.object({
.string()
.nullish()
.describe("Product name used for display purposes in the UI."),
+ metadataField: z.string().optional(),
});
+export const rewardConditionSchema = rewardConditionBaseSchema.superRefine(
+ (data, ctx) => {
+ if (data.entity === "lead" && data.attribute !== "metadata") {
+ ctx.addIssue({
+ code: "custom",
+ message: "Lead conditions only support the Metadata attribute.",
+ path: ["attribute"],
+ });
+ return;
+ }
+
+ if (data.attribute !== "metadata") {
+ return;
+ }
+
+ const metadataEntities =
+ REWARD_METADATA_CONDITION_ENTITIES as readonly string[];
+ if (!metadataEntities.includes(data.entity)) {
+ ctx.addIssue({
+ code: "custom",
+ message:
+ "Metadata is only valid for lead and sale reward condition entities.",
+ path: ["entity"],
+ });
+ return;
+ }
+
+ const key = data.metadataField?.trim() ?? "";
+ if (!key) {
+ ctx.addIssue({
+ code: "custom",
+ message: "Metadata field name is required when attribute is Metadata.",
+ path: ["metadataField"],
+ });
+ }
+ },
+);
+
export const PERCENTAGE_REWARD_AMOUNT_SCHEMA = z
.number()
.min(0, { message: "Reward percentage amount cannot be less than 0%" })
@@ -417,11 +497,18 @@ export const rewardContextSchema = z.object({
})
.optional(),
+ lead: z
+ .object({
+ metadata: z.record(z.string(), z.unknown()).optional(),
+ })
+ .optional(),
+
sale: z
.object({
productId: z.string().nullish(),
amount: z.number().nullish(),
type: z.enum(["new", "recurring"]).nullish(),
+ metadata: z.record(z.string(), z.unknown()).optional(),
products: z
.array(
z.object({
diff --git a/apps/web/tests/rewards/reward-conditions.test.ts b/apps/web/tests/rewards/reward-conditions.test.ts
index 026ba6c3a4..610911404b 100644
--- a/apps/web/tests/rewards/reward-conditions.test.ts
+++ b/apps/web/tests/rewards/reward-conditions.test.ts
@@ -1,5 +1,6 @@
import { evaluateRewardConditions } from "@/lib/partners/evaluate-reward-conditions";
import { RewardContext } from "@/lib/types";
+import { rewardConditionSchema } from "@/lib/zod/schemas/rewards";
import { describe, expect, test } from "vitest";
describe("evaluateRewardConditions", () => {
@@ -597,6 +598,198 @@ describe("evaluateRewardConditions", () => {
expect(result).toBe(null);
});
+
+ test("should not match when condition value is an empty array", () => {
+ expect(
+ evaluateRewardConditions({
+ conditions: [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "customer" as const,
+ attribute: "country" as const,
+ operator: "not_in" as const,
+ value: [],
+ },
+ ],
+ },
+ ],
+ context: { customer: { country: "FR" } },
+ }),
+ ).toBe(null);
+ });
+
+ test("should not match when condition value is not an array", () => {
+ expect(
+ evaluateRewardConditions({
+ conditions: [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "customer" as const,
+ attribute: "country" as const,
+ operator: "not_in" as const,
+ value: "US",
+ },
+ ],
+ },
+ ],
+ context: { customer: { country: "FR" } },
+ }),
+ ).toBe(null);
+ });
+ });
+
+ describe("contains", () => {
+ test("should match when field contains the substring", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "contains" as const,
+ value: "plan",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "premium-plan" } },
+ }),
+ ).toEqual(conditions[0]);
+ });
+
+ test("should not match when field does not contain the substring", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "contains" as const,
+ value: "plan",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "basic-tier" } },
+ }),
+ ).toBe(null);
+ });
+
+ test("should not match when needle is empty string", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "contains" as const,
+ value: " ",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "any-value" } },
+ }),
+ ).toBe(null);
+ });
+ });
+
+ describe("not_contains", () => {
+ test("should match when field does not contain the substring", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "not_contains" as const,
+ value: "plan",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "basic-tier" } },
+ }),
+ ).toEqual(conditions[0]);
+ });
+
+ test("should not match when field contains the substring", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "not_contains" as const,
+ value: "plan",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "premium-plan" } },
+ }),
+ ).toBe(null);
+ });
+
+ test("should not match when needle is empty string", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "not_contains" as const,
+ value: " ",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "any-value" } },
+ }),
+ ).toBe(null);
+ });
});
describe("starts_with", () => {
@@ -659,6 +852,30 @@ describe("evaluateRewardConditions", () => {
expect(result).toBe(null);
});
+
+ test("should not match when value is empty string", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "starts_with" as const,
+ value: "",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { productId: "any-value" } },
+ }),
+ ).toBe(null);
+ });
});
describe("ends_with", () => {
@@ -692,6 +909,28 @@ describe("evaluateRewardConditions", () => {
expect(result).toEqual(conditions[0]);
});
+ test("should not match when value is empty string", () => {
+ expect(
+ evaluateRewardConditions({
+ conditions: [
+ {
+ operator: "AND" as const,
+ amountInCents: 5000,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "productId" as const,
+ operator: "ends_with" as const,
+ value: "",
+ },
+ ],
+ },
+ ],
+ context: { sale: { productId: "any-value" } },
+ }),
+ ).toBe(null);
+ });
+
test("should not match when string does not end with value", () => {
const conditions = [
{
@@ -1869,4 +2108,377 @@ describe("evaluateRewardConditions", () => {
expect(result).toBeNull();
});
});
+
+ describe("metadata conditions (lead / sale)", () => {
+ test("matches lead metadata equals_to", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 100,
+ conditions: [
+ {
+ entity: "lead" as const,
+ attribute: "metadata" as const,
+ metadataField: "plan",
+ operator: "equals_to" as const,
+ value: "pro",
+ },
+ ],
+ },
+ ];
+
+ const context: RewardContext = {
+ lead: { metadata: { plan: "pro" } },
+ };
+
+ expect(evaluateRewardConditions({ conditions, context })).toEqual(
+ conditions[0],
+ );
+ });
+
+ test("matches sale metadata greater_than for string number", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 200,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: "seats",
+ operator: "greater_than" as const,
+ value: 5,
+ },
+ ],
+ },
+ ];
+
+ const context: RewardContext = {
+ sale: {
+ amount: 1000,
+ metadata: { seats: "10" },
+ },
+ };
+
+ expect(evaluateRewardConditions({ conditions, context })).toEqual(
+ conditions[0],
+ );
+ });
+
+ test("matches sale metadata equals_to when metadata is number and condition value is number", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 500,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: "seats",
+ operator: "equals_to" as const,
+ value: 42,
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { metadata: { seats: 42 } } },
+ }),
+ ).toEqual(conditions[0]);
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { metadata: { seats: "42" } } },
+ }),
+ ).toEqual(conditions[0]);
+ });
+
+ test("equals_to uses string comparison when condition.value is a string", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 200,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: "tier",
+ operator: "equals_to" as const,
+ value: "gold",
+ },
+ ],
+ },
+ ];
+
+ // metadata value is the string "gold" — should match
+ expect(
+ evaluateRewardConditions({
+ conditions,
+ context: { sale: { metadata: { tier: "gold" } } },
+ }),
+ ).toEqual(conditions[0]);
+
+ // metadata value is numeric "42" but condition.value is string "42" — should match
+ const numericStringConditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 200,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: "tier",
+ operator: "equals_to" as const,
+ value: "42",
+ },
+ ],
+ },
+ ];
+
+ expect(
+ evaluateRewardConditions({
+ conditions: numericStringConditions,
+ context: { sale: { metadata: { tier: "42" } } },
+ }),
+ ).toEqual(numericStringConditions[0]);
+
+ // metadata value is number 42 and condition.value is string "42" — SHOULD match
+ // because we stringify the metadata before comparing when condition.value is a string
+ expect(
+ evaluateRewardConditions({
+ conditions: numericStringConditions,
+ context: { sale: { metadata: { tier: 42 } } },
+ }),
+ ).toEqual(numericStringConditions[0]);
+ });
+
+ test("returns null when metadata key is missing", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 100,
+ conditions: [
+ {
+ entity: "lead" as const,
+ attribute: "metadata" as const,
+ metadataField: "missing",
+ operator: "equals_to" as const,
+ value: "x",
+ },
+ ],
+ },
+ ];
+
+ const context: RewardContext = {
+ lead: { metadata: { plan: "pro" } },
+ };
+
+ expect(evaluateRewardConditions({ conditions, context })).toBeNull();
+ });
+
+ test("returns null when metadataField is empty", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 100,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: " ",
+ operator: "equals_to" as const,
+ value: "a",
+ },
+ ],
+ },
+ ];
+
+ const context: RewardContext = {
+ sale: { metadata: { tier: "a" } },
+ };
+
+ expect(evaluateRewardConditions({ conditions, context })).toBeNull();
+ });
+
+ test("returns null when metadata value is null (numeric operator)", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 100,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: "seats",
+ operator: "greater_than" as const,
+ value: 0,
+ },
+ ],
+ },
+ ];
+
+ const context: RewardContext = {
+ sale: {
+ metadata: { seats: null },
+ },
+ };
+
+ expect(evaluateRewardConditions({ conditions, context })).toBeNull();
+ });
+
+ test("returns null when metadata value is empty string (numeric operator)", () => {
+ const conditions = [
+ {
+ operator: "AND" as const,
+ type: "flat" as const,
+ amountInCents: 100,
+ conditions: [
+ {
+ entity: "sale" as const,
+ attribute: "metadata" as const,
+ metadataField: "seats",
+ operator: "greater_than" as const,
+ value: 0,
+ },
+ ],
+ },
+ ];
+
+ const context: RewardContext = {
+ sale: {
+ metadata: { seats: "" },
+ },
+ };
+
+ expect(evaluateRewardConditions({ conditions, context })).toBeNull();
+ });
+ });
+});
+
+describe("rewardConditionSchema", () => {
+ test("rejects metadata attribute when metadataField is missing or only whitespace", () => {
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "lead",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ }).success,
+ ).toBe(false);
+
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "lead",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ metadataField: " ",
+ }).success,
+ ).toBe(false);
+
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "lead",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ metadataField: "plan",
+ }).success,
+ ).toBe(true);
+
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "sale",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ metadataField: "plan",
+ }).success,
+ ).toBe(true);
+ });
+
+ test("rejects metadata attribute for entities other than lead and sale", () => {
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "customer",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ metadataField: "plan",
+ }).success,
+ ).toBe(false);
+
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "partner",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ metadataField: "plan",
+ }).success,
+ ).toBe(false);
+ });
+
+ test("allows is one of / is not one of with string arrays", () => {
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "customer",
+ attribute: "country",
+ operator: "in",
+ value: ["US", "CA"],
+ }).success,
+ ).toBe(true);
+
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "customer",
+ attribute: "country",
+ operator: "not_in",
+ value: ["US", "CA"],
+ }).success,
+ ).toBe(true);
+ });
+
+ test("rejects non-metadata attribute for lead entity", () => {
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "lead",
+ attribute: "country",
+ operator: "equals_to",
+ value: "US",
+ }).success,
+ ).toBe(false);
+
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "lead",
+ attribute: "metadata",
+ operator: "equals_to",
+ value: "x",
+ metadataField: "plan",
+ }).success,
+ ).toBe(true);
+ });
+
+ test("allows non-metadata attributes without metadataField", () => {
+ expect(
+ rewardConditionSchema.safeParse({
+ entity: "customer",
+ attribute: "country",
+ operator: "equals_to",
+ value: "US",
+ }).success,
+ ).toBe(true);
+ });
});
diff --git a/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx b/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx
index 5ff9afdcaa..0650d462d9 100644
--- a/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx
+++ b/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx
@@ -169,7 +169,13 @@ const RewardItem = ({
<span className="shrink-0 text-lg leading-none">&bull;</span>
<span className="min-w-0">
{idx === 0 ? "If" : capitalize(operator)}{" "}
- {capitalize(condition.entity)} {capitalize(attribute?.label)}{" "}
+ {capitalize(condition.entity)}{" "}
+ {(condition.entity === "lead" ||
+ condition.entity === "sale") &&
+ condition.attribute === "metadata" &&
+ condition.metadataField?.trim()
+ ? `"${condition.metadataField.trim()}"`
+ : capitalize(attribute?.label)}{" "}
{condition.label
? "is" // if custom label is set, use "is" instead of the actual operator to sound more natural
: CONDITION_OPERATOR_LABELS[condition.operator]}{" "}
diff --git a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
index ea69ef28a8..c590d15b44 100644
--- a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
+++ b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
@@ -18,8 +18,8 @@ import {
REWARD_CONDITION_ATTRIBUTES,
REWARD_DESCRIPTION_MAX_LENGTH,
REWARD_TOOLTIP_DESCRIPTION_MAX_LENGTH,
+ rewardConditionBaseSchema,
rewardConditionsArraySchema,
- rewardConditionSchema,
rewardConditionsSchema,
} from "@/lib/zod/schemas/rewards";
import { DurationPopoverContent } from "@/ui/shared/duration-popover-content";
@@ -82,7 +82,7 @@ const formSchema = createOrUpdateRewardSchema.extend({
modifiers: z
.array(
rewardConditionsSchema.extend({
- conditions: z.array(rewardConditionSchema.partial()).min(1),
+ conditions: z.array(rewardConditionBaseSchema.partial()).min(1),
}),
)
.min(1),
diff --git a/apps/web/ui/partners/rewards/rewards-logic.tsx b/apps/web/ui/partners/rewards/rewards-logic.tsx
index 5fdd6d0d09..8dbc677c38 100644
--- a/apps/web/ui/partners/rewards/rewards-logic.tsx
+++ b/apps/web/ui/partners/rewards/rewards-logic.tsx
@@ -11,6 +11,9 @@ import {
CONDITION_OPERATORS,
DATE_CONDITION_OPERATORS,
ENUM_CONDITION_OPERATORS,
+ METADATA_CONDITION_OPERATORS,
+ METADATA_NUMBER_CONDITION_OPERATORS,
+ METADATA_TEXT_CONDITION_OPERATORS,
NUMBER_CONDITION_OPERATORS,
REWARD_CONDITIONS,
RewardConditionEntityAttribute,
@@ -32,6 +35,7 @@ import {
User,
Users,
} from "@dub/ui";
+import { UserPlus } from "@dub/ui/icons";
import {
capitalize,
cn,
@@ -44,12 +48,13 @@ import {
import { Command } from "cmdk";
import { Package } from "lucide-react";
import { motion } from "motion/react";
-import { Fragment, useEffect, useState } from "react";
+import { Fragment, useContext, useEffect, useState } from "react";
import { useFieldArray, useWatch } from "react-hook-form";
import { v4 as uuid } from "uuid";
import {
InlineBadgePopover,
InlineBadgePopoverAmountInput,
+ InlineBadgePopoverContext,
InlineBadgePopoverInput,
InlineBadgePopoverInputs,
InlineBadgePopoverMenu,
@@ -223,7 +228,17 @@ function ConditionalGroup({
const formatValue = (
value: string | number | string[] | number[] | undefined,
attribute?: Pick<RewardConditionEntityAttribute, "type" | "options">,
+ metadataOperator?: (typeof CONDITION_OPERATORS)[number],
) => {
+ if (
+ metadataOperator &&
+ METADATA_NUMBER_CONDITION_OPERATORS.includes(metadataOperator)
+ ) {
+ if (value === "" || value === undefined || isNaN(Number(value)))
+ return "Value";
+ return String(value);
+ }
+
const type = attribute?.type ?? "string";
if (
@@ -281,6 +296,60 @@ const formatValue = (
return truncate(value!.toString(), 20);
};
+function MetadataConditionOperatorMenu({
+ selectedValue,
+ onSelect,
+}: {
+ selectedValue?: (typeof CONDITION_OPERATORS)[number];
+ onSelect: (value: (typeof CONDITION_OPERATORS)[number]) => void;
+}) {
+ const { setIsOpen } = useContext(InlineBadgePopoverContext);
+
+ const renderItem = (op: (typeof CONDITION_OPERATORS)[number]) => (
+ <Command.Item
+ key={op}
+ value={`${CONDITION_OPERATOR_LABELS[op]} ${op}`}
+ onSelect={() => {
+ onSelect(op);
+ setIsOpen(false);
+ }}
+ className="flex cursor-pointer items-center justify-between rounded-md px-1.5 py-1 transition-colors duration-150 data-[selected=true]:bg-neutral-100"
+ >
+ <span className="text-content-default pr-3 text-left text-sm font-medium">
+ {CONDITION_OPERATOR_LABELS[op]}
+ </span>
+ {selectedValue === op && (
+ <Check2 className="text-content-emphasis size-3.5 shrink-0" />
+ )}
+ </Command.Item>
+ );
+
+ return (
+ <div className="-mx-1 box-border w-[calc(100%+0.5rem)] min-w-0 max-w-none">
+ <Command loop className="w-full focus:outline-none">
+ <Command.List className="scrollbar-hide flex max-h-64 w-full max-w-52 flex-col gap-1 overflow-y-auto transition-all">
+ <div className="text-content-subtle mx-2 py-2 text-xs font-medium">
+ Text fields
+ </div>
+ <div className="mx-1 flex flex-col gap-1">
+ {METADATA_TEXT_CONDITION_OPERATORS.map(renderItem)}
+ </div>
+ <div
+ className="bg-border-subtle mt-1 h-px w-full min-w-0 shrink-0"
+ role="separator"
+ />
+ <div className="text-content-subtle mx-2 py-2 text-xs font-medium">
+ Number fields
+ </div>
+ <div className="mx-1 flex flex-col gap-1">
+ {METADATA_NUMBER_CONDITION_OPERATORS.map(renderItem)}
+ </div>
+ </Command.List>
+ </Command>
+ </div>
+ );
+}
+
function ConditionLogic({
modifierIndex,
conditionIndex,
@@ -312,12 +381,29 @@ function ConditionLogic({
const attributeType = attribute?.type ?? "string";
+ const isMetadataCondition =
+ (condition.entity === "lead" || condition.entity === "sale") &&
+ condition.attribute === "metadata";
+
+ const isMetadataNumeric =
+ isMetadataCondition &&
+ !!condition.operator &&
+ METADATA_NUMBER_CONDITION_OPERATORS.includes(condition.operator);
+
const icon = entity
- ? { customer: User, sale: InvoiceDollar, partner: Users }[entity.id] ?? User
+ ? {
+ customer: User,
+ sale: InvoiceDollar,
+ partner: Users,
+ lead: UserPlus,
+ }[entity.id] ?? User
: ArrowTurnRight2;
const isArrayValue =
- condition.operator && ["in", "not_in"].includes(condition.operator);
+ condition.operator === "in" || condition.operator === "not_in";
+
+ const isContainsOperator =
+ condition.operator === "contains" || condition.operator === "not_contains";
const [displayProductLabel, setDisplayProductLabel] = useState(false);
@@ -327,16 +413,42 @@ function ConditionLogic({
const isSaleTypeCondition =
condition.entity === "sale" && condition.attribute === "type";
- const availableConditionOperators: (typeof CONDITION_OPERATORS)[number][] = [
- "number",
- "currency",
- ].includes(attributeType)
- ? NUMBER_CONDITION_OPERATORS
- : attributeType === "enum"
- ? ENUM_CONDITION_OPERATORS
- : attributeType === "date"
- ? DATE_CONDITION_OPERATORS
- : STRING_CONDITION_OPERATORS;
+ const availableConditionOperators: (typeof CONDITION_OPERATORS)[number][] =
+ attributeType === "metadata"
+ ? METADATA_CONDITION_OPERATORS
+ : ["number", "currency"].includes(attributeType)
+ ? NUMBER_CONDITION_OPERATORS
+ : attributeType === "enum"
+ ? ENUM_CONDITION_OPERATORS
+ : attributeType === "date"
+ ? DATE_CONDITION_OPERATORS
+ : STRING_CONDITION_OPERATORS;
+
+ useEffect(() => {
+ if (
+ isMetadataCondition &&
+ condition.operator &&
+ !METADATA_CONDITION_OPERATORS.includes(condition.operator)
+ ) {
+ setValue(
+ conditionKey,
+ {
+ ...condition,
+ operator: undefined,
+ value: undefined,
+ },
+ {
+ shouldDirty: true,
+ },
+ );
+ }
+ }, [
+ isMetadataCondition,
+ condition.operator,
+ condition,
+ conditionKey,
+ setValue,
+ ]);
useEffect(() => {
if (
@@ -385,6 +497,7 @@ function ConditionLogic({
attribute: undefined,
operator: undefined,
value: undefined,
+ metadataField: undefined,
},
{
shouldDirty: true,
@@ -417,6 +530,9 @@ function ConditionLogic({
{
entity: condition.entity,
attribute: value,
+ ...(value !== "metadata"
+ ? { metadataField: undefined }
+ : {}),
},
{
shouldDirty: true,
@@ -438,6 +554,23 @@ function ConditionLogic({
}))}
/>
</InlineBadgePopover>{" "}
+ {isMetadataCondition && (
+ <>
+ <InlineBadgePopover
+ text={
+ condition.metadataField?.trim()
+ ? truncate(condition.metadataField.trim(), 24)
+ : "Field name"
+ }
+ invalid={!condition.metadataField?.trim()}
+ >
+ <InlineBadgePopoverInput
+ placeholder="Field name"
+ {...register(`${conditionKey}.metadataField`)}
+ />
+ </InlineBadgePopover>{" "}
+ </>
+ )}
{isCustomerSourceCondition || isSaleTypeCondition ? (
<span className="text-content-emphasis font-medium">is </span>
) : (
@@ -449,47 +582,77 @@ function ConditionLogic({
}
invalid={!condition.operator}
>
- <InlineBadgePopoverMenu
- selectedValue={condition.operator}
- onSelect={(value) =>
- setValue(
- conditionKey,
- {
- ...condition,
- operator:
- value as (typeof CONDITION_OPERATORS)[number],
- // Update value to array / string / number if needed
- ...(["in", "not_in"].includes(value)
- ? !Array.isArray(condition.value)
+ {isMetadataCondition ? (
+ <MetadataConditionOperatorMenu
+ selectedValue={condition.operator}
+ onSelect={(value) => {
+ const metadataNumeric =
+ METADATA_NUMBER_CONDITION_OPERATORS.includes(value);
+ setValue(
+ conditionKey,
+ {
+ ...condition,
+ operator: value,
+ ...(["in", "not_in"].includes(value)
? { value: [] }
- : null
- : ["number", "currency"].includes(attributeType)
- ? typeof condition.value !== "number"
+ : ["contains", "not_contains"].includes(value)
? { value: "" }
- : null
- : attributeType === "date"
+ : metadataNumeric
+ ? typeof condition.value !== "number"
+ ? { value: "" }
+ : null
+ : typeof condition.value !== "string" &&
+ !Array.isArray(condition.value)
+ ? { value: "" }
+ : null),
+ },
+ {
+ shouldDirty: true,
+ },
+ );
+ }}
+ />
+ ) : (
+ <InlineBadgePopoverMenu
+ selectedValue={condition.operator}
+ onSelect={(value) =>
+ setValue(
+ conditionKey,
+ {
+ ...condition,
+ operator:
+ value as (typeof CONDITION_OPERATORS)[number],
+ // Reset value shape when operator changes
+ ...(["in", "not_in"].includes(value)
+ ? { value: [] }
+ : ["number", "currency"].includes(attributeType)
? typeof condition.value !== "number"
- ? { value: undefined }
- : null
- : typeof condition.value !== "string"
? { value: "" }
- : null),
- },
- {
- shouldDirty: true,
- },
- )
- }
- items={availableConditionOperators.map((operator) => ({
- text: CONDITION_OPERATOR_LABELS[operator],
- value: operator,
- }))}
- />
+ : null
+ : attributeType === "date"
+ ? typeof condition.value !== "number"
+ ? { value: undefined }
+ : null
+ : typeof condition.value !== "string"
+ ? { value: "" }
+ : null),
+ },
+ {
+ shouldDirty: true,
+ },
+ )
+ }
+ items={availableConditionOperators.map((operator) => ({
+ text: CONDITION_OPERATOR_LABELS[operator],
+ value: operator,
+ }))}
+ />
+ )}
</InlineBadgePopover>
)}{" "}
{condition.operator && (
<>
- {attributeType === "date" ? (
+ {attributeType === "date" && !isMetadataCondition ? (
<DatePicker
value={
condition.value
@@ -521,28 +684,36 @@ function ConditionLogic({
/>
) : (
<InlineBadgePopover
- text={formatValue(condition.value, attribute)}
+ text={formatValue(
+ condition.value,
+ attribute,
+ isMetadataCondition ? condition.operator : undefined,
+ )}
invalid={
- Array.isArray(condition.value)
- ? condition.value.filter(Boolean).length === 0
- : ["number", "currency"].includes(attributeType)
- ? condition.value === "" ||
- isNaN(Number(condition.value))
- : !condition.value
+ isContainsOperator
+ ? String(condition.value ?? "").trim() === ""
+ : Array.isArray(condition.value)
+ ? condition.value.filter(Boolean).length === 0
+ : isMetadataNumeric
+ ? condition.value === "" ||
+ isNaN(Number(condition.value))
+ : ["number", "currency"].includes(attributeType)
+ ? condition.value === "" ||
+ isNaN(Number(condition.value))
+ : !condition.value
}
buttonClassName={cn(
condition.attribute === "productId" &&
"rounded-r-none",
)}
>
- {/* Country selection */}
- {condition.attribute === "country" ? (
+ {/* Country selection (single value only) */}
+ {condition.attribute === "country" && !isArrayValue ? (
// Country selector
<InlineBadgePopoverMenu
search
selectedValue={
- (condition.value as string[] | undefined) ??
- (isArrayValue ? [] : undefined)
+ condition.value as string | undefined
}
items={Object.entries(COUNTRIES).map(
([key, name]) => ({
@@ -559,30 +730,16 @@ function ConditionLogic({
onSelect={(value) => {
setValue(conditionKey, {
...condition,
- value: isArrayValue
- ? Array.isArray(condition.value)
- ? (condition.value as string[]).includes(
- value,
- )
- ? (condition.value.filter(
- (v) => v !== value,
- ) as string[])
- : ([
- ...condition.value,
- value,
- ] as string[])
- : [value]
- : value,
+ value,
});
}}
/>
- ) : attribute?.options ? (
+ ) : attribute?.options && !isArrayValue ? (
// Select option selector
<InlineBadgePopoverMenu
search={attribute.options.length > 4}
selectedValue={
- (condition.value as string[] | undefined) ??
- (isArrayValue ? [] : undefined)
+ condition.value as string | undefined
}
items={attribute.options.map(({ id, label }) => ({
text: label,
@@ -591,32 +748,24 @@ function ConditionLogic({
onSelect={(value) => {
setValue(conditionKey, {
...condition,
- value: isArrayValue
- ? Array.isArray(condition.value)
- ? (condition.value as string[]).includes(
- value,
- )
- ? (condition.value.filter(
- (v) => v !== value,
- ) as string[])
- : ([
- ...condition.value,
- value,
- ] as string[])
- : [value]
- : value,
+ value,
});
}}
/>
+ ) : isContainsOperator ? (
+ <InlineBadgePopoverInput
+ placeholder="Substring to match"
+ {...register(`${conditionKey}.value`, {
+ required: true,
+ })}
+ />
) : isArrayValue ? (
- // String array input
+ // Multi-value list input for is one of / is not one of
<InlineBadgePopoverInputs
values={
- condition.value
- ? Array.isArray(condition.value)
- ? condition.value.map(String)
- : [condition.value.toString()]
- : [""]
+ Array.isArray(condition.value)
+ ? (condition.value as string[])
+ : []
}
onChange={(values) => {
setValue(conditionKey, {
@@ -625,11 +774,16 @@ function ConditionLogic({
});
}}
/>
- ) : ["number", "currency"].includes(attributeType) ? (
+ ) : ["number", "currency"].includes(attributeType) ||
+ isMetadataNumeric ? (
// Number/currency input
<AmountInput
fieldKey={`${conditionKey}.value`}
- type={attributeType as "number" | "currency"}
+ type={
+ attributeType === "currency"
+ ? "currency"
+ : "number"
+ }
/>
) : (
// String input