Enhance CEL expression evaluation tests for country code handling. Added tests to verify behavior of 'in_list' and 'equals' operations for country codes. Updated user dialog and country code select components to handle null values and improve validation logic. Refactored condition builder to ensure proper handling of single values and arrays for country code conditions.

Author: mantrakp04

apps/backend/src/lib/cel-evaluator.ts

@@ -332,3 +332,17 @@ import.meta.vitest?.test('evaluateCelExpression with missing email', async ({ ex
   // Empty email should match empty string
   expect(evaluateCelExpression('email == ""', context)).toBe(true);
 });
+
+import.meta.vitest?.test('countryCode in_list vs equals', ({ expect }) => {
+  const usContext = createSignUpRuleContext({
+    email: 'test@example.com',
+    countryCode: 'US',
+    authMethod: 'password',
+    oauthProvider: null,
+    riskScores: { bot: 0, freeTrialAbuse: 0 },
+  });
+
+  expect(evaluateCelExpression('countryCode in ["US", "CA"]', usContext)).toBe(true);
+  expect(evaluateCelExpression('countryCode in ["CA"]', usContext)).toBe(false);
+  expect(evaluateCelExpression('countryCode == "US"', usContext)).toBe(true);
+});

apps/dashboard/src/components/country-code-select.tsx

@@ -125,7 +125,7 @@ export function CountryCodeField<F extends FieldValues>(props: {
             <FormControl>
               <CountryCodeSelect
                 value={field.value || null}
-                onChange={(val) => field.onChange(val ?? "")}
+                onChange={(val) => field.onChange(val)}
                 placeholder={props.placeholder ?? "Select country code..."}
                 disabled={props.disabled}
                 className="max-w-lg"

apps/dashboard/src/components/rule-builder/condition-builder.tsx

@@ -175,9 +175,8 @@ function ConditionRow({
 
   const handleOperatorChange = (operator: ConditionOperator) => {
     let value = condition.value;
-    // Convert between single value and array for in_list
     if (operator === 'in_list' && !Array.isArray(value)) {
-      value = value ? [String(value)] : [];
+      value = value ? [String(value)] : [''];
     } else if (operator !== 'in_list' && Array.isArray(value)) {
       value = value[0] ?? '';
     }
@@ -261,7 +260,6 @@ function ConditionRow({
                   aria-label={`Remove country code ${index + 1}`}
                   title="Remove country code"
                   onClick={() => handleRemoveCountryCodeListItem(index)}
-                  disabled={countryCodeListValues.length <= 1}
                 >
                   <MinusIcon className="h-4 w-4" />
                 </Button>

apps/dashboard/src/components/user-dialog.tsx

@@ -42,7 +42,7 @@ export function UserDialog(props: {
   } else {
     defaultValues = {
       signedUpAt: new Date(),
-      countryCode: "",
+      countryCode: null as string | null,
       botRiskScore: "",
       freeTrialAbuseRiskScore: "",
     };
@@ -75,7 +75,7 @@ export function UserDialog(props: {
     }).optional(),
     passwordEnabled: yup.boolean().optional(),
     updatePassword: yup.boolean().optional(),
-    countryCode: countryCodeSchema.transform((value) => value === "" ? undefined : value).optional(),
+    countryCode: countryCodeSchema.nullable().transform((value) => value === "" || value == null ? undefined : value).optional(),
     botRiskScore: yup.string().test({
       name: "bot-risk-score-format",
       message: "Bot risk score must be an integer between 0 and 100",

apps/dashboard/src/lib/cel-visual-parser.test.ts

@@ -231,4 +231,5 @@ describe('cel-visual-parser', () => {
       }
     });
   });
+
 });

apps/dashboard/src/lib/cel-visual-parser.ts

@@ -174,7 +174,6 @@ function groupToCel(group: GroupNode): string {
   const celOperator = group.operator === 'and' ? ' && ' : ' || ';
   const childExpressions = group.children.map(child => {
     const expr = visualTreeToCel(child);
-    // Wrap child groups in parentheses if they have a different operator
     if (child.type === 'group' && child.operator !== group.operator) {
       return `(${expr})`;
     }