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.

fix ai reward builder crash when replacing a reward that already has conditions

Pedro Ladeiraeffbbb043131
diff --git a/apps/web/ui/partners/rewards/ai-reward-builder.tsx b/apps/web/ui/partners/rewards/ai-reward-builder.tsx
index 015d4811b7..58b0f5ff4c 100644
--- a/apps/web/ui/partners/rewards/ai-reward-builder.tsx
+++ b/apps/web/ui/partners/rewards/ai-reward-builder.tsx
@@ -37,13 +37,23 @@ const CHROME_ENTER_MS = 240;
type BuilderPhase = "idle" | "streaming" | "review" | "error";
+type DraftCondition = NonNullable<
+ NonNullable<AIRewardDraft["modifiers"]>[number]["conditions"]
+>[number];
+
+type DraftModifier = NonNullable<AIRewardDraft["modifiers"]>[number] & {
+ conditions?: Array<DraftCondition | null | undefined>;
+};
+
function buildRewardFormValuesFromDraft({
draft,
event,
current,
finalize = false,
}: {
- draft: AIRewardDraft | Partial<AIRewardDraft>;
+ draft: Omit<Partial<AIRewardDraft>, "modifiers"> & {
+ modifiers?: Array<DraftModifier | null | undefined>;
+ };
event: Exclude<EventType, "referral">;
current: Record<string, unknown>;
finalize?: boolean;
@@ -77,11 +87,27 @@ function buildRewardFormValuesFromDraft({
next.maxDuration = maxDuration;
}
- const modifiers = draft.modifiers?.filter((m) => m.conditions?.length);
- if (!modifiers?.length) {
+ const modifiers = (draft.modifiers ?? [])
+ .map((modifier) => {
+ if (!modifier) return null;
+
+ const conditions = (modifier.conditions ?? []).filter(
+ (condition): condition is DraftCondition => condition != null,
+ );
+
+ if (!conditions.length) return null;
+
+ return { ...modifier, conditions };
+ })
+ .filter((modifier): modifier is NonNullable<typeof modifier> =>
+ Boolean(modifier),
+ );
+
+ if (!modifiers.length) {
// Only clear stale conditions on the final draft so partial streams do not wipe them.
+ // Empty array (not undefined) so react-hook-form useFieldArray syncs and unmounts rows.
if (finalize) {
- next.modifiers = undefined;
+ next.modifiers = [];
}
return next;
}
diff --git a/apps/web/ui/partners/rewards/rewards-logic.tsx b/apps/web/ui/partners/rewards/rewards-logic.tsx
index 5ce0598972..86b0bc52fd 100644
--- a/apps/web/ui/partners/rewards/rewards-logic.tsx
+++ b/apps/web/ui/partners/rewards/rewards-logic.tsx
@@ -386,25 +386,27 @@ function ConditionLogic({
name: ["event", conditionKey, `${modifierKey}.operator`],
});
+ const [displayProductLabel, setDisplayProductLabel] = useState(false);
+
const entities = REWARD_CONDITIONS[event].entities;
- const entity = condition.entity
+ const entity = condition?.entity
? entities.find((e) => e.id === condition.entity)
: undefined;
const attribute =
- entity && condition.attribute
+ entity && condition?.attribute
? entity.attributes.find((a) => a.id === condition.attribute)
: undefined;
const attributeType = attribute?.type ?? "string";
const isMetadataCondition =
- (condition.entity === "lead" || condition.entity === "sale") &&
- condition.attribute === "metadata";
+ (condition?.entity === "lead" || condition?.entity === "sale") &&
+ condition?.attribute === "metadata";
const isMetadataNumeric =
isMetadataCondition &&
- !!condition.operator &&
+ !!condition?.operator &&
METADATA_NUMBER_CONDITION_OPERATORS.includes(condition.operator);
const icon = entity
@@ -417,18 +419,17 @@ function ConditionLogic({
: ArrowTurnRight2;
const isArrayValue =
- condition.operator === "in" || condition.operator === "not_in";
+ condition?.operator === "in" || condition?.operator === "not_in";
const isContainsOperator =
- condition.operator === "contains" || condition.operator === "not_contains";
-
- const [displayProductLabel, setDisplayProductLabel] = useState(false);
+ condition?.operator === "contains" ||
+ condition?.operator === "not_contains";
// Auto-set operator to "equals_to" for customer.source
const isCustomerSourceCondition =
- condition.entity === "customer" && condition.attribute === "source";
+ condition?.entity === "customer" && condition?.attribute === "source";
const isSaleTypeCondition =
- condition.entity === "sale" && condition.attribute === "type";
+ condition?.entity === "sale" && condition?.attribute === "type";
const availableConditionOperators: (typeof CONDITION_OPERATORS)[number][] =
attributeType === "metadata"
@@ -443,6 +444,7 @@ function ConditionLogic({
useEffect(() => {
if (
+ condition &&
isMetadataCondition &&
condition.operator &&
!METADATA_CONDITION_OPERATORS.includes(condition.operator)
@@ -461,7 +463,7 @@ function ConditionLogic({
}
}, [
isMetadataCondition,
- condition.operator,
+ condition?.operator,
condition,
conditionKey,
setValue,
@@ -469,6 +471,7 @@ function ConditionLogic({
useEffect(() => {
if (
+ condition &&
(isCustomerSourceCondition || isSaleTypeCondition) &&
condition.operator !== "equals_to"
) {
@@ -486,19 +489,21 @@ function ConditionLogic({
}, [
isCustomerSourceCondition,
isSaleTypeCondition,
- condition.operator,
+ condition?.operator,
condition,
conditionKey,
setValue,
]);
+ if (!condition) return null;
+
return (
<div className="flex w-full flex-col">
<div className="flex items-center justify-between p-2.5">
<div className="flex items-center gap-1.5">
<RewardIconSquare icon={icon} />
<span className="text-content-emphasis font-medium leading-relaxed">
- {conditionIndex === 0 ? "If" : capitalize(operator.toLowerCase())}{" "}
+ {conditionIndex === 0 ? "If" : capitalize(operator?.toLowerCase())}{" "}
<InlineBadgePopover
text={capitalize(condition.entity) || "Select item"}
invalid={!condition.entity}